From 4ab95bd255d2c56c04fb52d6e5a0dcec34840238 Mon Sep 17 00:00:00 2001
From: bangbang93 <bangbang93@163.com>
Date: Thu, 5 Jul 2018 11:28:59 +0800
Subject: [PATCH 001/836] fix mockjs.Random.string()

mockjs.Random.string() can be called without arguments.
---
 types/mockjs/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/mockjs/index.d.ts b/types/mockjs/index.d.ts
index a0ca673b0a..9be645b791 100644
--- a/types/mockjs/index.d.ts
+++ b/types/mockjs/index.d.ts
@@ -58,7 +58,7 @@ declare namespace mockjs {
     character(pool?: S): S;
 
     // Random.string
-    string(pool: S | N, min?: N, max?: N): S;
+    string(pool?: S | N, min?: N, max?: N): S;
 
     // Random.range
     range(start?: N, stop?: N, step?: N): N;

From abdca373e90201f817c2b20643e01d03a1eb0697 Mon Sep 17 00:00:00 2001
From: ptrdu <ptrdu@MacBook-Pro-3.local>
Date: Wed, 26 Sep 2018 17:12:52 +0800
Subject: [PATCH 002/836] FEAT: add bucket operations

---
 types/ali-oss/ali-oss-tests.ts |   3 +
 types/ali-oss/index.d.ts       | 247 +++++++++++++++++++++++++++++++++
 types/ali-oss/tsconfig.json    |  23 +++
 types/ali-oss/tslint.json      |  79 +++++++++++
 4 files changed, 352 insertions(+)
 create mode 100644 types/ali-oss/ali-oss-tests.ts
 create mode 100644 types/ali-oss/index.d.ts
 create mode 100644 types/ali-oss/tsconfig.json
 create mode 100644 types/ali-oss/tslint.json

diff --git a/types/ali-oss/ali-oss-tests.ts b/types/ali-oss/ali-oss-tests.ts
new file mode 100644
index 0000000000..3cf3229da9
--- /dev/null
+++ b/types/ali-oss/ali-oss-tests.ts
@@ -0,0 +1,3 @@
+import OSS from "ali-oss";
+
+const client = new OSS();
diff --git a/types/ali-oss/index.d.ts b/types/ali-oss/index.d.ts
new file mode 100644
index 0000000000..b7c0f35067
--- /dev/null
+++ b/types/ali-oss/index.d.ts
@@ -0,0 +1,247 @@
+// Type definitions for ali-oss 6.0.1
+// Project: https://github.com/ali-sdk/ali-oss
+// Definitions by: Ptrdu <https://github.com/ptrdu>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 3.2.0
+
+export  type Bucket = {
+
+}
+
+export type StorageType = "Standard" | "IA" | "Archive"
+
+export type ACLType = "public-read-write" | "public-read" | "and private"
+
+export type RequestOptions = {
+    // the operation timeout
+    timeout?: number
+}
+
+export type RuleStatusType = "Enabled" | "Disabled"
+
+export type LifecycleRule = {
+    id?: string, // rule id, if not set, OSS will auto create it with random string.
+    prefix: string, // store prefix
+    status: RuleStatusType, // rule status, allow values: Enabled or Disabled
+    days?: number | string, // expire after the days
+    date: string // expire date, e.g.: 2022-10-11T00:00:00.000Z date and days only set one.
+}
+
+export type CORSRule = {
+    allowedOrigin: string | Array<string>, // configure for Access-Control-Allow-Origin header
+    allowedMethod: string | Array<string>, // configure for Access-Control-Allow-Methods header
+    allowedHeader?: string | Array<string>, // configure for Access-Control-Allow-Headers header
+    exposeHeader?: string | Array<string>, // configure for Access-Control-Expose-Headers header
+    maxAgeSeconds?: string | Array<string>, // configure for Access-Control-Max-Age header
+}
+
+export interface NormalSuccessResponse {
+    //response status
+    status: number,
+    // response headers
+    headers: object, // todo the object in detail
+    // response size
+    size: number,
+    //  request total use time (ms)
+    rt: number
+}
+
+export default class OSS {
+    /******************************************* the bucket operations *************************************************/
+    // base operators
+    /**
+     * List buckets in this account.
+     * @param {{prefix?: string; marker?: string; "max-keys"?: string | number} | null} query - query parameters, default is null
+     *   prefix - search buckets using prefix key
+     *   marker - search start from marker, including marker key
+     *   max-keys - max buckets, default is 100, limit to 1000
+     * @param {{timeout?: number}} options - optional parameters
+     *   timeout - the operation timeout
+     * @return {Promise<Array<Bucket>>}
+     */
+    listBuckets(query: { prefix?: string, marker?: string, 'max-keys'?: string | number } | null, options?: { timeout?: number }): Promise<Array<Bucket>>
+
+    /**
+     * Create a new bucket.
+     * @param {string} name -  bucket name If bucket exists and not belong to current account, will throw BucketAlreadyExistsError. If bucket not exists, will create a new bucket and set it's ACL.
+     * @param {{timeout: number; storageClass: StorageType}} options - optional parameters
+     *   timeout - the operation timeout
+     *   StorageClass - the storage type include (Standard,IA,Archive)
+     * @return { Promise<{ bucket: string, res: NormalSuccessResponse }> }
+     */
+    putBucket(name: string, options?: { timeout: number, storageClass: StorageType }): Promise<{ bucket: string, res: NormalSuccessResponse }>
+
+    /**
+     * Use the bucket.
+     * @param {string} name - bucket name
+     */
+    useBucket(name: string) : void
+
+    /**
+     * Delete an empty bucket.
+     * @param {string} name - bucket name If bucket is not empty, will throw BucketNotEmptyError. If bucket is not exists, will throw NoSuchBucketError.
+     * @param {RequestOptions} options
+     * @return {Promise<NormalSuccessResponse>}
+     */
+    deleteBucket(name: string, options?: RequestOptions): Promise<NormalSuccessResponse>
+
+    /**
+     * Get bucket information,include CreationDate、ExtranetEndpoint、IntranetEndpoint、Location、Name、StorageClass、 Owner、AccessControlList
+     * @param {string} name - bucket name
+     * @return {Promise<any>} // todo the official document miss the return type
+     */
+    getBucketInfo(name: string): Promise<any>
+
+    /**
+     * Get bucket location
+     * @param {string} name - bucket name
+     * @return {Promise<any>} // todo the official document miss the return type
+     */
+    getBucketLocation(name: string): Promise<any>
+    // ACL operations
+    /**
+     * Update the bucket ACL.
+     * @param {string} name -  bucket name
+     * @param {ACLType} acl - access control list, current available: public-read-write, public-read and private
+     * @param {RequestOptions} options
+     * @return {Promise<NormalSuccessResponse>}
+     */
+    putBucketACL(name: string, acl: ACLType, options?: RequestOptions): Promise<NormalSuccessResponse>
+
+    /**
+     * Get the bucket ACL.
+     * @param {string} name - bucket name
+     * @param {RequestOptions} options
+     * @return {Promise<{ acl: string, res: NormalSuccessResponse }>}
+     *   acl - acl settings string
+     */
+    getBucketACL(name: string, options?: RequestOptions ): Promise<{ acl: string, res: NormalSuccessResponse }>
+    // logging operations
+    /**
+     * Update the bucket logging settings. Log file will create every one hour and name format: <prefix><bucket>-YYYY-mm-DD-HH-MM-SS-UniqueString.
+     * @param {string} name -  bucket name
+     * @param {string} prefix - prefix path name to store the log files
+     * @param {RequestOptions} options
+     * @return {Promise<NormalSuccessResponse>}
+     */
+    putBucketLogging(name: string, prefix?: string, options?: RequestOptions): Promise<NormalSuccessResponse>
+
+    /**
+     * Get the bucket logging settings.
+     * @param {string} name
+     * @param {RequestOptions} options
+     * @return {Promise<{ enable: boolean, prefix: string | null, res: NormalSuccessResponse }>}
+     */
+    getBucketLogging(name: string, options?: RequestOptions): Promise<{ enable: boolean, prefix: string | null, res: NormalSuccessResponse }>
+
+    /**
+     * Delete the bucket logging settings.
+     * @param {string} name - bucket name
+     * @param {RequestOptions} options
+     * @return {Promise<NormalSuccessResponse>}
+     */
+    deleteBucketLogging(name: string, options?: RequestOptions) : Promise<NormalSuccessResponse>
+    // Website operations
+    /**
+     * Set the bucket as a static website.
+     * @param {string} name - bucket name
+     * @param {{index: string; error?: string}} config
+     *   index - default page, e.g.: index.html
+     *   error - error page, e.g.: 'error.html'
+     * @return {Promise<NormalSuccessResponse>}
+     */
+    putBucketWebsite(name: string, config: { index: string, error?: string }): Promise<NormalSuccessResponse>
+
+    /**
+     * Get the bucket website config.
+     * @param {string} name - bucket name
+     * @param {RequestOptions} options
+     * @return {Promise<{ index: string, error: string, res: NormalSuccessResponse }>}
+     */
+    getBucketWebsite(name: string, options?: RequestOptions): Promise<{ index: string, error: string, res: NormalSuccessResponse }>
+
+    /**
+     * Delete the bucket website config.
+     * @param {string} name - bucket name
+     * @param {RequestOptions} options
+     * @return {Promise<NormalSuccessResponse>}
+     */
+    deleteBucketWebsite(name: string, options?: RequestOptions): Promise<NormalSuccessResponse>
+    // referer operations
+    /**
+     * Set the bucket request Referer white list.
+     * @param {string} name
+     * @param {boolean} allowEmpty - allow empty request referer or not
+     * @param {Array<string>} referers - Referer white list, e.g.: ['https://npm.taobao.org', 'http://cnpmjs.org']
+     * @param {RequestOptions} options
+     * @return {Promise<NormalSuccessResponse>}
+     */
+    putBucketReferer(name: string, allowEmpty: boolean, referers: Array<string>, options?: RequestOptions): Promise<NormalSuccessResponse>
+
+    /**
+     * Get the bucket request Referer white list.
+     * @param {string} name - bucket name
+     * @param {RequestOptions} options
+     * @return {Promise<{ allowEmpty: boolean, referers: Array<string>, res: NormalSuccessResponse }>}
+     */
+    getBucketReferer(name: string, options?: RequestOptions): Promise<{ allowEmpty: boolean, referers: Array<string>, res: NormalSuccessResponse }>
+
+    /**
+     * Delete the bucket request Referer white list.
+     * @param {string} name
+     * @param {RequestOptions} options
+     * @return {Promise<NormalSuccessResponse>}
+     */
+    deleteBucketReferer(name: string, options?: RequestOptions): Promise<NormalSuccessResponse>
+    // lifecycle operations
+    /**
+     * Set the bucket object lifecycle.
+     * @param {string} name
+     * @param {Array<Rule>} rules - rule config list
+     * @param {RequestOptions} options
+     * @return {Promise<NormalSuccessResponse>}
+     */
+    putBucketLifecycle(name: string, rules: Array<LifecycleRule>, options?: RequestOptions): Promise<NormalSuccessResponse>
+
+    /**
+     * Get the bucket object lifecycle.
+     * @param {string} name
+     * @param {RequestOptions} options
+     * @return {Promise<{ rules: Array<Rule>, res: NormalSuccessResponse }>}
+     */
+    getBucketLifecycle(name: string, options?: RequestOptions): Promise<{ rules: Array<LifecycleRule>, res: NormalSuccessResponse }>
+
+    /**
+     * Delete the bucket object lifecycle.
+     * @param {string} name
+     * @param {RequestOptions} options
+     * @return {Promise<NormalSuccessResponse>}
+     */
+    deleteBucketLifecycle(name: string, options?: RequestOptions): Promise<NormalSuccessResponse>
+    // CORS operations
+    /**
+     * Set CORS rules of the bucket object
+     * @param {string} name
+     * @param {Array<CORSRule>} rules
+     * @param {RequestOptions} options
+     * @return {Promise<NormalSuccessResponse>}
+     */
+    putBucketCORS(name: string, rules: Array<CORSRule>, options?: RequestOptions): Promise<NormalSuccessResponse>
+
+    /**
+     * Get CORS rules of the bucket object.
+     * @param {string} name
+     * @return {Promise<{rules: Array<CORSRule>; res: NormalSuccessResponse}>}
+     */
+    getBucketCORS(name: string): Promise<{ rules: Array<CORSRule>, res: NormalSuccessResponse}>
+
+    /**
+     * Delete CORS rules of the bucket object.
+     * @param {string} name
+     * @return {Promise<NormalSuccessResponse>}
+     */
+    deleteBucketCORS(name: string): Promise<NormalSuccessResponse>
+
+    /********************************************************** Object operations ********************************************/
+
+}
diff --git a/types/ali-oss/tsconfig.json b/types/ali-oss/tsconfig.json
new file mode 100644
index 0000000000..a3e68ada2b
--- /dev/null
+++ b/types/ali-oss/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": false,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "ali-oss-tests.ts"
+    ]
+}
diff --git a/types/ali-oss/tslint.json b/types/ali-oss/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/ali-oss/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 3e6f81d1563df1c7a81548935eec22606469a106 Mon Sep 17 00:00:00 2001
From: ptrdu <ptrdu@MacBook-Pro-3.local>
Date: Thu, 27 Sep 2018 11:14:53 +0800
Subject: [PATCH 003/836] FEAT: add function definition, current at object
 uploadPartCopy

---
 types/ali-oss/index.d.ts | 417 +++++++++++++++++++++++++++++++++++++--
 1 file changed, 398 insertions(+), 19 deletions(-)

diff --git a/types/ali-oss/index.d.ts b/types/ali-oss/index.d.ts
index b7c0f35067..85708838d3 100644
--- a/types/ali-oss/index.d.ts
+++ b/types/ali-oss/index.d.ts
@@ -4,6 +4,8 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 3.2.0
 
+// general type
+
 export  type Bucket = {
 
 }
@@ -12,6 +14,8 @@ export type StorageType = "Standard" | "IA" | "Archive"
 
 export type ACLType = "public-read-write" | "public-read" | "and private"
 
+export type HTTPMethods = "GET" | "POST" | "DELETE" | "PUT";
+
 export type RequestOptions = {
     // the operation timeout
     timeout?: number
@@ -35,7 +39,22 @@ export type CORSRule = {
     maxAgeSeconds?: string | Array<string>, // configure for Access-Control-Max-Age header
 }
 
-export interface NormalSuccessResponse {
+export type OwnerType = {
+    id: string,
+    displayName: string
+}
+
+export type ObjectMeta = {
+    name: string, // object name on oss
+    lastModified: string, // object last modified GMT date, e.g.: 2015-02-19T08:39:44.000Z
+    etag: string, // object etag contains ", e.g.: "5B3C1A2E053D763E1B002CC607C5A0FE"
+    type: string, // object type, e.g.: Normal
+    size: number, // object size, e.g.: 344606
+    storageClass: StorageType,
+    owner: OwnerType,
+}
+
+export type NormalSuccessResponse = {
     //response status
     status: number,
     // response headers
@@ -46,36 +65,215 @@ export interface NormalSuccessResponse {
     rt: number
 }
 
+export type UserMeta = {
+    uid: number,
+    pid: number
+}
+
+export type ObjectCallback = {
+    url: string, // After a file is uploaded successfully, the OSS sends a callback request to this URL.
+    host?: string, // The host header value for initiating callback requests.
+    body: string, // The value of the request body when a callback is initiated, for example, key=$(key)&etag=$(etag)&my_var=$(x:my_var).
+    contentType?: string, // The Content-Type of the callback requests initiatiated, It supports application/x-www-form-urlencoded and application/json, and the former is the default value.
+    customValue?: object,
+    headers?: object //  extra headers, detail see RFC 2616
+}
+
+export type ModifyData = {
+    lastModified: string, //  object last modified GMT string
+    etag: string // object etag contains ", e.g.: "5B3C1A2E053D763E1B002CC607C5A0FE"
+}
+
+// parameters type
+export type ListBucketsQueryType = {
+    prefix?: string, // search buckets using prefix key
+    marker?: string, // search start from marker, including marker key
+    'max-keys'?: string | number // max buckets, default is 100, limit to 1000
+}
+
+export type PutBucketOptions = {
+    timeout: number,
+    storageClass: StorageType
+}
+
+export type PutBucketWebsiteConfig = {
+    index: string, // default page, e.g.: index.html
+    error?: string // error page, e.g.: 'error.html'
+}
+
+export type ListObjectsQuery = {
+    prefix?: string, // search object using prefix key
+    marker?: string, // search start from marker, including marker key
+    delimiter?: string, // delimiter search scope e.g. / only search current dir, not including subdir
+    'max-keys': string | number // max objects, default is 100, limit to 1000
+}
+
+export type ListObjectResult = {
+    objects: Array<ObjectMeta>,
+    prefixes: Array<string>,
+    isTruncated: boolean,
+    nextMarker: string,
+    res: NormalSuccessResponse
+}
+
+export type PutObjectOptions = {
+    timeout?: number, // the operation timeout
+    mime?: string, // custom mime, will send with Content-Type entity header
+    meta?: UserMeta, // user meta, will send with x-oss-meta- prefix string e.g.: { uid: 123, pid: 110 }
+    callback: ObjectCallback,
+}
+
+export type PutObjectResult = {
+    name: string,
+    data: object,
+    res: NormalSuccessResponse
+}
+
+export type PutStreamOptions = {
+    contentLength?: number, // the stream length, chunked encoding will be used if absent
+    timeout: number, // the operation timeout
+    mime: string, // custom mime, will send with Content-Type entity header
+    meta: UserMeta,
+    callback: ObjectCallback
+}
+
+export type AppendObjectOptions = {
+    position?: string, // specify the position which is the content length of the latest object
+    timeout?: number, // the operation timeout
+    mime?: string, // custom mime, will send with Content-Type entity header
+    meta?: UserMeta,
+    headers?: object
+}
+
+export type AppendObjectResult = {
+    name: string,
+    url: string, // the url of oss
+    res: NormalSuccessResponse,
+    nextAppendPosition: string, // the next position
+}
+
+export type HeadObjectOptions = {
+    timeout?: number,
+    headers?: object
+}
+
+export type HeadObjectResult = {
+    status: number, // response status, maybe 200 or 304
+    meta: UserMeta,
+    res: NormalSuccessResponse
+}
+
+export type GetObjectOptions = {
+    timeout?: number,
+    process?: string, // image process params, will send with x-oss-process e.g.: {process: 'image/resize,w_200'}
+    headers?: object
+}
+
+export type GetObjectResult = {
+    content?: any, // file content buffer if file parameter is null or ignore
+    res: NormalSuccessResponse
+}
+
+export type GetStreamOptions = {
+    timeout?: number,
+    process?: string, // image process params, will send with x-oss-process e.g.: {process: 'image/resize,w_200'}
+    headers?: object
+}
+
+export type GetStreamResult = {
+    stream?: any, // readable stream instance if response status is not 200, stream will be null.
+    res: NormalSuccessResponse
+}
+
+export type CopyObjectOptions = {
+    timeout?: number,
+    meta?: UserMeta,
+    headers?: object
+}
+
+export type CopyAndPutMetaResult = {
+    data: ModifyData,
+    res: NormalSuccessResponse
+}
+
+export type DeleteMultiOptions = {
+    quite?: boolean // quiet mode or verbose mode, default is false, verbose mode quiet mode: if all objects delete succes, return emtpy response. otherwise return delete error object results. verbose mode: return all object delete results.
+    timeout?: number
+}
+
+export type DeleteMultiResult = {
+    deleted?: Array<string> // deleted object names list
+    res: NormalSuccessResponse
+}
+
+export type ResponseHeaderType = {
+    'content-type'?: string,
+    'content-disposition'? :string,
+    'cache-control'?: string
+}
+
+export type SignatureUrlOptions = {
+    expires?: number, // after expires seconds, the url will become invalid, default is 1800
+    method?: HTTPMethods, // the HTTP method, default is 'GET'
+    'Content-Type'?: string, // set the request content type
+    process?: string,
+    response?: ResponseHeaderType, // set the response headers for download
+    callback?: ObjectCallback
+}
+
+export type GetACLResult = {
+    acl: ACLType,
+    res: NormalSuccessResponse
+}
+
+export type InitMultipartUploadOptions = {
+    timeout?: number,
+    mime?: string, // Mime file type
+    meta?: UserMeta,
+    headers?: object
+}
+
+export type InitMultipartUploadResult = {
+    res: { status: number, headers: object, size: number, rt: number }
+    bucket: string, // bucket name
+    name: string, // object name store on OSS
+    uploadId: string, // upload id, use for uploadPart, completeMultipart
+}
+
+export type UploadPartResult = {
+    name: string,
+    etag: string,
+    res: NormalSuccessResponse
+}
+
 export default class OSS {
+    // the image client
+    static ImageClient: any
     /******************************************* the bucket operations *************************************************/
+
     // base operators
     /**
      * List buckets in this account.
-     * @param {{prefix?: string; marker?: string; "max-keys"?: string | number} | null} query - query parameters, default is null
-     *   prefix - search buckets using prefix key
-     *   marker - search start from marker, including marker key
-     *   max-keys - max buckets, default is 100, limit to 1000
-     * @param {{timeout?: number}} options - optional parameters
+     * @param {ListBucketsQueryType | null} query - query parameters, default is null
+     * @param {RequestOptions} options - optional parameters
      *   timeout - the operation timeout
      * @return {Promise<Array<Bucket>>}
      */
-    listBuckets(query: { prefix?: string, marker?: string, 'max-keys'?: string | number } | null, options?: { timeout?: number }): Promise<Array<Bucket>>
+    listBuckets(query: ListBucketsQueryType | null, options?: RequestOptions): Promise<Array<Bucket>>
 
     /**
      * Create a new bucket.
      * @param {string} name -  bucket name If bucket exists and not belong to current account, will throw BucketAlreadyExistsError. If bucket not exists, will create a new bucket and set it's ACL.
-     * @param {{timeout: number; storageClass: StorageType}} options - optional parameters
-     *   timeout - the operation timeout
-     *   StorageClass - the storage type include (Standard,IA,Archive)
+     * @param {PutBucketOptions} options - optional parameters
      * @return { Promise<{ bucket: string, res: NormalSuccessResponse }> }
      */
-    putBucket(name: string, options?: { timeout: number, storageClass: StorageType }): Promise<{ bucket: string, res: NormalSuccessResponse }>
+    putBucket(name: string, options?: PutBucketOptions): Promise<{ bucket: string, res: NormalSuccessResponse }>
 
     /**
      * Use the bucket.
      * @param {string} name - bucket name
      */
-    useBucket(name: string) : void
+    useBucket(name: string): void
 
     /**
      * Delete an empty bucket.
@@ -98,6 +296,7 @@ export default class OSS {
      * @return {Promise<any>} // todo the official document miss the return type
      */
     getBucketLocation(name: string): Promise<any>
+
     // ACL operations
     /**
      * Update the bucket ACL.
@@ -115,7 +314,8 @@ export default class OSS {
      * @return {Promise<{ acl: string, res: NormalSuccessResponse }>}
      *   acl - acl settings string
      */
-    getBucketACL(name: string, options?: RequestOptions ): Promise<{ acl: string, res: NormalSuccessResponse }>
+    getBucketACL(name: string, options?: RequestOptions): Promise<{ acl: string, res: NormalSuccessResponse }>
+
     // logging operations
     /**
      * Update the bucket logging settings. Log file will create every one hour and name format: <prefix><bucket>-YYYY-mm-DD-HH-MM-SS-UniqueString.
@@ -140,17 +340,16 @@ export default class OSS {
      * @param {RequestOptions} options
      * @return {Promise<NormalSuccessResponse>}
      */
-    deleteBucketLogging(name: string, options?: RequestOptions) : Promise<NormalSuccessResponse>
+    deleteBucketLogging(name: string, options?: RequestOptions): Promise<NormalSuccessResponse>
+
     // Website operations
     /**
      * Set the bucket as a static website.
      * @param {string} name - bucket name
-     * @param {{index: string; error?: string}} config
-     *   index - default page, e.g.: index.html
-     *   error - error page, e.g.: 'error.html'
+     * @param {PutBucketWebsiteConfig} config
      * @return {Promise<NormalSuccessResponse>}
      */
-    putBucketWebsite(name: string, config: { index: string, error?: string }): Promise<NormalSuccessResponse>
+    putBucketWebsite(name: string, config: PutBucketWebsiteConfig): Promise<NormalSuccessResponse>
 
     /**
      * Get the bucket website config.
@@ -167,6 +366,7 @@ export default class OSS {
      * @return {Promise<NormalSuccessResponse>}
      */
     deleteBucketWebsite(name: string, options?: RequestOptions): Promise<NormalSuccessResponse>
+
     // referer operations
     /**
      * Set the bucket request Referer white list.
@@ -193,6 +393,7 @@ export default class OSS {
      * @return {Promise<NormalSuccessResponse>}
      */
     deleteBucketReferer(name: string, options?: RequestOptions): Promise<NormalSuccessResponse>
+
     // lifecycle operations
     /**
      * Set the bucket object lifecycle.
@@ -218,6 +419,7 @@ export default class OSS {
      * @return {Promise<NormalSuccessResponse>}
      */
     deleteBucketLifecycle(name: string, options?: RequestOptions): Promise<NormalSuccessResponse>
+
     // CORS operations
     /**
      * Set CORS rules of the bucket object
@@ -233,7 +435,7 @@ export default class OSS {
      * @param {string} name
      * @return {Promise<{rules: Array<CORSRule>; res: NormalSuccessResponse}>}
      */
-    getBucketCORS(name: string): Promise<{ rules: Array<CORSRule>, res: NormalSuccessResponse}>
+    getBucketCORS(name: string): Promise<{ rules: Array<CORSRule>, res: NormalSuccessResponse }>
 
     /**
      * Delete CORS rules of the bucket object.
@@ -243,5 +445,182 @@ export default class OSS {
     deleteBucketCORS(name: string): Promise<NormalSuccessResponse>
 
     /********************************************************** Object operations ********************************************/
+    /**
+     * List objects in the bucket.
+     * @param {ListObjectsQuery | null} query
+     * @param {RequestOptions} options
+     * @return {Promise<ListObjectResult>}
+     */
+    list(query: ListObjectsQuery | null, options: RequestOptions): Promise<ListObjectResult>
+
+    /**
+     * Add an object to the bucket.
+     * @param {string} name - object name store on OSS
+     * @param file -  {String|Buffer|ReadStream|File(only support Browser)|Blob(only support Browser)} object local path, content buffer or ReadStream content instance use in Node, Blob and html5 File
+     * @param {PutObjectOptions} options - optional parameters
+     * @return {Promise<PutObjectResult>}
+     */
+    put(name: string, file: any, options?: PutObjectOptions): Promise<PutObjectResult>
+
+    /**
+     * Add a stream object to the bucket.
+     * @param {string} name - object name store on OSS
+     * @param stream - object ReadStream content instance
+     * @param {PutStreamOptions} options -  optional parameters
+     * @return {Promise<{name: string; res: NormalSuccessResponse}>}
+     */
+    putStream(name: string, stream: any, options?: PutStreamOptions): Promise<{ name: string, res: NormalSuccessResponse }>
+
+    /**
+     * Append an object to the bucket, it's almost same as put, but it can add content to existing object rather than override it.
+     * @param {string} name
+     * @param file
+     * @param {AppendObjectOptions} options
+     * @return {Promise<AppendObjectResult>}
+     */
+    append(name: string, file: any, options?: AppendObjectOptions): Promise<AppendObjectResult>
+
+    /**
+     * Get the Object url. If provide baseUrl, will use baseUrl instead the default endpoint.
+     * @param {string} name
+     * @param {string} baseUrl
+     * @return {string}
+     */
+    getObjectUrl(name: string, baseUrl?: string): string
+
+    /**
+     * Get the Object url. If provide baseUrl, will use baseUrl instead the default bucket and endpoint. Suggest use generateObjectUrl instead of getObjectUrl.
+     * @param {string} name
+     * @param {string} baseUrl
+     * @return {string}
+     */
+    generateObjectUrl(name: string, baseUrl?: string): string
+
+    /**
+     * Head an object and get the meta info.
+     * @param {string} name
+     * @param {HeadObjectOptions} options
+     * @return {Promise<HeadObjectResult>}
+     */
+    head(name: string, options?: HeadObjectOptions): Promise<HeadObjectResult>
+
+    /**
+     * Get an object from the bucket.
+     * @param {string} name
+     * @param file -  {String|WriteStream} file path or WriteStream instance to store the content If file is null or ignore this parameter, function will return info contains content property.
+     * @param {GetObjectOptions} options
+     * @return {Promise<GetObjectOptions>}
+     */
+    get(name: string, file?: any, options?: GetObjectOptions): Promise<GetObjectResult>
+
+    /**
+     * Get an object read stream.
+     * @param {string} name
+     * @param {GetStreamOptions} options
+     * @return {Promise<GetStreamResult>}
+     */
+    getStream(name?: string, options?: GetStreamOptions): Promise<GetStreamResult>
+
+    /**
+     * Delete an object from the bucket.
+     * @param {string} name
+     * @param {RequestOptions} options
+     * @return {Promise<NormalSuccessResponse>}
+     */
+    delete(name: string, options?: RequestOptions): Promise<NormalSuccessResponse>
+
+    /**
+     * Copy an object from sourceName to name.
+     * @param {string} name - object name store on OSS
+     * @param {string} sourceName -  source object name If sourceName start with /, meaning it's a full name contains the bucket name. e.g.: /otherbucket/logo.png meaning copy otherbucket logn.png object to current bucket.
+     * @param {CopyObjectOptions} options
+     * @return {Promise<CopyAndPutMetaResult>}
+     */
+    copy(name: string, sourceName: string, options?: CopyObjectOptions): Promise<CopyAndPutMetaResult>
+
+    /**
+     * Set an exists object meta.
+     * @param {string} name
+     * @param {UserMeta} meta
+     * @param {RequestOptions} options
+     * @return {Promise<CopyAndPutMetaResult>}
+     */
+    putMeta(name: string, meta: UserMeta, options: RequestOptions): Promise<CopyAndPutMetaResult>
+
+    /**
+     * Delete multi objects in one request.
+     * @param {Array<string>} names - object names, max 1000 objects in once.
+     * @param {DeleteMultiOptions} options
+     * @return {Promise<DeleteMultiResult>}
+     */
+    deleteMulti(names: Array<string>, options?: DeleteMultiOptions): Promise<DeleteMultiResult>
+
+    /**
+     * Create a signature url for download or upload object. When you put object with signatureUrl ,you need to pass Content-Type.Please look at the example.
+     * @param {string} name
+     * @param {SignatureUrlOptions} options
+     * @return {string}
+     */
+    signatureUrl(name: string, options?: SignatureUrlOptions): string
+
+    /**
+     * Set object's ACL.
+     * @param {string} name
+     * @param {ACLType} acl
+     * @param {RequestOptions} options
+     * @return {Promise<NormalSuccessResponse>}
+     */
+    putACL(name: string, acl: ACLType, options?: RequestOptions): Promise<NormalSuccessResponse>
+
+    /**
+     * Get object's ACL.
+     * @param {string} name
+     * @param {RequestOptions} options
+     * @return {Promise<GetACLResult>}
+     */
+    getACL(name:string, options?: RequestOptions): Promise<GetACLResult>
+
+    /**
+     * Restore Object.
+     * @param {string} name
+     * @param {RequestOptions} options
+     * @return {Promise<NormalSuccessResponse>}
+     */
+    restore(name: string, options?: RequestOptions): Promise<NormalSuccessResponse>
+
+    /**
+     *
+     * @param {string} name
+     * @param {InitMultipartUploadOptions} options
+     * @return {Promise<InitMultipartUploadResult>}
+     */
+    initMultipartUpload(name: string, options?: InitMultipartUploadOptions): Promise<InitMultipartUploadResult>
+
+    /**
+     * After initiating a Multipart Upload event, you can upload data in parts based on the specified object name and Upload ID.
+     * @param {string} name - object name
+     * @param {string} uploadId - get by initMultipartUpload api
+     * @param {number} partNo - range is 1-10000, If this range is exceeded, OSS returns the InvalidArgument's error code.
+     * @param file -  is File or FileName, the whole file
+     Multipart Upload requires that the size of any Part other than the last Part is greater than 100KB.
+     In Node you can use File or FileName, but in browser you only can use File.
+     * @param {number} start - part start bytes e.g: 102400
+     * @param {number} end - part end bytes e.g: 204800
+     * @param {RequestOptions} options
+     * @return {Promise<UploadPartResult>}
+     */
+    uploadPart(name: string, uploadId: string, partNo: number, file: any, start: number, end: number, options?: RequestOptions): Promise<UploadPartResult>
+
+    /**
+     * Using Upload Part Copy, you can copy data from an existing object and upload a part of the data. When copying a file larger than 1 GB, you must use the Upload Part Copy method. If you want to copy a file smaller than 1 GB, see Copy Object.
+     * @param {string} name
+     * @param {string} uploadId
+     * @param {number} partNo
+     * @param {string} range
+     * @param {{sourceKey: string; sourceBucketName: string}} sourceData
+     * @param {{timeout?: number; headers?: object}} options
+     * @return {Promise<UploadPartResult>}
+     */
+    uploadPartCopy(name: string, uploadId: string, partNo: number, range: string, sourceData: { sourceKey: string, sourceBucketName: string }, options: { timeout?: number, headers?: object }): Promise<UploadPartResult>
 
 }

From 5992ddd064ff74c68e9c32c13fc823ca31a51744 Mon Sep 17 00:00:00 2001
From: ptrdu <ptrdu@MacBook-Pro-3.local>
Date: Thu, 27 Sep 2018 15:09:50 +0800
Subject: [PATCH 004/836] FEAT: add object operations definitions

---
 types/ali-oss/index.d.ts | 165 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 165 insertions(+)

diff --git a/types/ali-oss/index.d.ts b/types/ali-oss/index.d.ts
index 85708838d3..fc0ff41ae1 100644
--- a/types/ali-oss/index.d.ts
+++ b/types/ali-oss/index.d.ts
@@ -84,6 +84,28 @@ export type ModifyData = {
     etag: string // object etag contains ", e.g.: "5B3C1A2E053D763E1B002CC607C5A0FE"
 }
 
+export type Checkpoint = {
+    file: any, // The file object selected by the user, if the browser is restarted, it needs the user to manually trigger the settings
+    name: string, //  object key
+    fileSize: number,
+    partSize: number,
+    uploadId: string,
+    doneParts: Array<{ number: number, etag: string }>
+}
+
+export type ObjectPart = {
+    PartNumber: number,
+    LastModified: any, // {Date} Time when a part is uploaded.
+    ETag: string,
+    size: number
+}
+
+export type Upload = {
+    name: string,
+    uploadId: string,
+    initiated: any
+}
+
 // parameters type
 export type ListBucketsQueryType = {
     prefix?: string, // search buckets using prefix key
@@ -246,6 +268,89 @@ export type UploadPartResult = {
     res: NormalSuccessResponse
 }
 
+export type CompleteMultipartUploadOptions = {
+    timeout?: number,
+    callback?: ObjectCallback,
+    headers?: object
+}
+
+export type CompleteMultipartUploadResult = {
+    bucket: string,
+    name: string,
+    etag: string,
+    data: object,
+    res: NormalSuccessResponse
+}
+
+export type MultipartUploadOptions = {
+    parallel?: number, // the number of parts to be uploaded in parallel
+    partSize?: number, // the suggested size for each part
+    progress?: Function, // the progress callback called after each successful upload of one part, it will be given three parameters: (percentage {Number}, checkpoint {Object}, res {Object})
+    checkpoint?: Checkpoint, // the checkpoint to resume upload, if this is provided, it will continue the upload from where interrupted, otherwise a new multipart upload will be created.
+    meta?: UserMeta,
+    mime?: string,
+    callback?: ObjectCallback,
+    headers?: object,
+    timeout?: number
+    copyheaders?: object, //  {Object} only uploadPartCopy api used, detail
+}
+
+export type MultipartUploadResult = {
+    bucket: string,
+    name: string,
+    etag: string,
+    data: object,
+    res: NormalSuccessResponse
+}
+
+export type MultipartUploadCopyResult =  {
+    bucket: string,
+    name: string,
+    etag: string,
+    res: NormalSuccessResponse
+}
+
+export type MultipartUploadCopySourceData = {
+    sourceKey: string, // the source object name
+    sourceBucketName: string, // sourceData.  the source bucket name
+    startOffset: number, // data copy start byte offset, e.g: 0
+    endOffset: number // data copy end byte offset, e.g: 102400
+}
+
+export type ListPartsQuery = {
+    'max-parts': number, // The maximum part number in the response of the OSS. default value: 1000.
+    'part-number-marker': number, // Starting position of a specific list. A part is listed only when the part number is greater than the value of this parameter.
+    'encoding-type': string // Specify the encoding of the returned content and the encoding type. Optional value: url
+}
+
+export type ListPartsResult = {
+    uploadId: string,
+    bucket: string,
+    name: string,
+    PartNumberMarker: number,
+    nextPartNumberMarker: number,
+    maxParts: number,
+    isTruncated: boolean,
+    parts: Array<ObjectPart>,
+    res: NormalSuccessResponse
+}
+
+export type ListUploadsQuery = {
+    prefix?: string,
+    'max-uploads'?: number,
+    'key-marker'?: string,
+    'upload-id-marker'?: string
+}
+
+export type ListUploadsResult = {
+    res: NormalSuccessResponse,
+    bucket: string,
+    nextKeyMarker: any,
+    nextUploadIdMarker: any,
+    isTruncated: boolean,
+    uploads: Array<Upload>
+}
+
 export default class OSS {
     // the image client
     static ImageClient: any
@@ -623,4 +728,64 @@ export default class OSS {
      */
     uploadPartCopy(name: string, uploadId: string, partNo: number, range: string, sourceData: { sourceKey: string, sourceBucketName: string }, options: { timeout?: number, headers?: object }): Promise<UploadPartResult>
 
+    /**
+     * After uploading all data parts, you must call the Complete Multipart Upload API to complete Multipart Upload for the entire file.
+     * @param {string} name
+     * @param {string} uploadId
+     * @param {Array<{number: number; etag: string}>} parts
+     * @param {CompleteMultipartUploadOptions} options
+     * @return {Promise<CompleteMultipartUploadResult>}
+     */
+    completeMultipartUpload(name: string, uploadId: string, parts: Array<{ number: number, etag: string }>, options?:CompleteMultipartUploadOptions): Promise<CompleteMultipartUploadResult>
+
+    /**
+     * Upload file with OSS multipart.
+     * this function contains initMultipartUpload, uploadPart, completeMultipartUpload. When you use multipartUpload api，if you encounter problems with ConnectionTimeoutError, you should handle ConnectionTimeoutError in your business code.
+     * How to resolve ConnectionTimeoutError, you can decrease partSize size 、 Increase timeout 、Retry request , or give tips in your business code;
+     * @param {string} name
+     * @param file
+     * @param {MultipartUploadOptions} options
+     * @return {Promise<MultipartUploadResult>}
+     */
+    multipartUpload(name: string, file: any, options: MultipartUploadOptions): Promise<MultipartUploadResult>
+
+    /**
+     * Copy file with OSS multipart.
+     * this function contains head, initMultipartUpload, uploadPartCopy, completeMultipartUpload.
+     * When copying a file larger than 1 GB, you should use the Upload Part Copy method. If you want to copy a file smaller than 1 GB, see Copy Object.
+     * @param {string} name
+     * @param {MultipartUploadCopySourceData} sourceData
+     * @param {MultipartUploadOptions} options
+     * @return {Promise<MultipartUploadCopyResult>}
+     */
+    multipartUploadCopy(name: string, sourceData: MultipartUploadCopySourceData, options?: MultipartUploadOptions): Promise<MultipartUploadCopyResult>
+
+    /**
+     * The ListParts command can be used to list all successfully uploaded parts mapped to a specific upload ID, i.e.: those not completed and not aborted.
+     * @param {string} name
+     * @param {string} uploadId
+     * @param {ListPartsQuery} query
+     * @param {RequestOptions} options
+     * @return {Promise<ListPartsResult>}
+     */
+    listParts(name: string, uploadId: string, query?: ListPartsQuery, options?: RequestOptions): Promise<ListPartsResult>
+
+    /**
+     * List on-going multipart uploads, i.e.: those not completed and not aborted.
+     * @param {ListUploadsQuery} query
+     * @param {RequestOptions} options
+     * @return {Promise<ListUploadsResult>}
+     */
+    listUploads(query: ListUploadsQuery, options?: RequestOptions): Promise<ListUploadsResult>
+
+    /**
+     * Abort a multipart upload for object.
+     * @param {string} name
+     * @param {string} uploadId
+     * @param {RequestOptions} options
+     * @return {Promise<NormalSuccessResponse>}
+     */
+    abortMultipartUpload(name: string, uploadId: string, options?: RequestOptions): Promise<NormalSuccessResponse>
+
+    /************************************************ RTMP Operations *************************************************************/
 }

From eea11d19fe8fb925d07ef1fd4ed19308a2b43ffc Mon Sep 17 00:00:00 2001
From: ptrdu <ptrdu@MacBook-Pro-3.local>
Date: Thu, 27 Sep 2018 16:30:04 +0800
Subject: [PATCH 005/836] FEATURE: add rtmp operations definition

---
 types/ali-oss/ali-oss-tests.ts |   8 +-
 types/ali-oss/index.d.ts       | 257 ++++++++++++++++++++++++++-------
 2 files changed, 213 insertions(+), 52 deletions(-)

diff --git a/types/ali-oss/ali-oss-tests.ts b/types/ali-oss/ali-oss-tests.ts
index 3cf3229da9..82941c1e5e 100644
--- a/types/ali-oss/ali-oss-tests.ts
+++ b/types/ali-oss/ali-oss-tests.ts
@@ -1,3 +1,9 @@
 import OSS from "ali-oss";
 
-const client = new OSS();
+const client = new OSS({
+    accessKeyId: 'your access key',
+    accessKeySecret: 'your access secret',
+    bucket: 'your bucket name',
+    region: 'oss-cn-hangzhou'
+});
+
diff --git a/types/ali-oss/index.d.ts b/types/ali-oss/index.d.ts
index fc0ff41ae1..9f5530db71 100644
--- a/types/ali-oss/index.d.ts
+++ b/types/ali-oss/index.d.ts
@@ -6,7 +6,19 @@
 
 // general type
 
-export  type Bucket = {
+export interface Options {
+    accessKeyId: string, // access secret you create
+    accessKeySecret: string, // access secret you create
+    stsToken?: string, // used by temporary authorization
+    bucket?: string, //  the default bucket you want to access If you don't have any bucket, please use putBucket() create one first.
+    endpoint?: string, // oss region domain. It takes priority over region.
+    region?: string, // the bucket data region location, please see Data Regions, default is oss-cn-hangzhou.
+    internal?: boolean, //  access OSS with aliyun internal network or not, default is false. If your servers are running on aliyun too, you can set true to save lot of money.
+    secure?: boolean, // instruct OSS client to use HTTPS (secure: true) or HTTP (secure: false) protocol.
+    timeout?: string | number // instance level timeout for all operations, default is 60s
+}
+
+export type Bucket = {
 
 }
 
@@ -16,14 +28,14 @@ export type ACLType = "public-read-write" | "public-read" | "and private"
 
 export type HTTPMethods = "GET" | "POST" | "DELETE" | "PUT";
 
-export type RequestOptions = {
+export interface RequestOptions {
     // the operation timeout
     timeout?: number
 }
 
 export type RuleStatusType = "Enabled" | "Disabled"
 
-export type LifecycleRule = {
+export interface LifecycleRule {
     id?: string, // rule id, if not set, OSS will auto create it with random string.
     prefix: string, // store prefix
     status: RuleStatusType, // rule status, allow values: Enabled or Disabled
@@ -31,7 +43,7 @@ export type LifecycleRule = {
     date: string // expire date, e.g.: 2022-10-11T00:00:00.000Z date and days only set one.
 }
 
-export type CORSRule = {
+export interface CORSRule {
     allowedOrigin: string | Array<string>, // configure for Access-Control-Allow-Origin header
     allowedMethod: string | Array<string>, // configure for Access-Control-Allow-Methods header
     allowedHeader?: string | Array<string>, // configure for Access-Control-Allow-Headers header
@@ -39,12 +51,12 @@ export type CORSRule = {
     maxAgeSeconds?: string | Array<string>, // configure for Access-Control-Max-Age header
 }
 
-export type OwnerType = {
+export interface OwnerType {
     id: string,
     displayName: string
 }
 
-export type ObjectMeta = {
+export interface ObjectMeta  {
     name: string, // object name on oss
     lastModified: string, // object last modified GMT date, e.g.: 2015-02-19T08:39:44.000Z
     etag: string, // object etag contains ", e.g.: "5B3C1A2E053D763E1B002CC607C5A0FE"
@@ -54,7 +66,7 @@ export type ObjectMeta = {
     owner: OwnerType,
 }
 
-export type NormalSuccessResponse = {
+export interface NormalSuccessResponse {
     //response status
     status: number,
     // response headers
@@ -65,12 +77,12 @@ export type NormalSuccessResponse = {
     rt: number
 }
 
-export type UserMeta = {
+export interface UserMeta {
     uid: number,
     pid: number
 }
 
-export type ObjectCallback = {
+export interface ObjectCallback {
     url: string, // After a file is uploaded successfully, the OSS sends a callback request to this URL.
     host?: string, // The host header value for initiating callback requests.
     body: string, // The value of the request body when a callback is initiated, for example, key=$(key)&etag=$(etag)&my_var=$(x:my_var).
@@ -79,12 +91,12 @@ export type ObjectCallback = {
     headers?: object //  extra headers, detail see RFC 2616
 }
 
-export type ModifyData = {
+export interface ModifyData {
     lastModified: string, //  object last modified GMT string
     etag: string // object etag contains ", e.g.: "5B3C1A2E053D763E1B002CC607C5A0FE"
 }
 
-export type Checkpoint = {
+export interface Checkpoint  {
     file: any, // The file object selected by the user, if the browser is restarted, it needs the user to manually trigger the settings
     name: string, //  object key
     fileSize: number,
@@ -93,44 +105,58 @@ export type Checkpoint = {
     doneParts: Array<{ number: number, etag: string }>
 }
 
-export type ObjectPart = {
+export interface ObjectPart {
     PartNumber: number,
     LastModified: any, // {Date} Time when a part is uploaded.
     ETag: string,
     size: number
 }
 
-export type Upload = {
+export interface Upload {
     name: string,
     uploadId: string,
     initiated: any
 }
 
+export interface Channel {
+    Name: string,
+    Description: string,
+    Status: string,
+    LastModified: string,
+    PublishUrls: Array<string>,
+    PlayUrls: Array<string>
+}
+
+export interface ChannelHistory {
+    StartTime: string, //
+    EndTime: string,
+    RemoteAddr: string //  the remote addr
+}
 // parameters type
-export type ListBucketsQueryType = {
+export interface ListBucketsQueryType {
     prefix?: string, // search buckets using prefix key
     marker?: string, // search start from marker, including marker key
     'max-keys'?: string | number // max buckets, default is 100, limit to 1000
 }
 
-export type PutBucketOptions = {
+export interface PutBucketOptions {
     timeout: number,
     storageClass: StorageType
 }
 
-export type PutBucketWebsiteConfig = {
+export interface PutBucketWebsiteConfig {
     index: string, // default page, e.g.: index.html
     error?: string // error page, e.g.: 'error.html'
 }
 
-export type ListObjectsQuery = {
+export interface ListObjectsQuery {
     prefix?: string, // search object using prefix key
     marker?: string, // search start from marker, including marker key
     delimiter?: string, // delimiter search scope e.g. / only search current dir, not including subdir
     'max-keys': string | number // max objects, default is 100, limit to 1000
 }
 
-export type ListObjectResult = {
+export interface ListObjectResult {
     objects: Array<ObjectMeta>,
     prefixes: Array<string>,
     isTruncated: boolean,
@@ -138,20 +164,20 @@ export type ListObjectResult = {
     res: NormalSuccessResponse
 }
 
-export type PutObjectOptions = {
+export interface PutObjectOptions {
     timeout?: number, // the operation timeout
     mime?: string, // custom mime, will send with Content-Type entity header
     meta?: UserMeta, // user meta, will send with x-oss-meta- prefix string e.g.: { uid: 123, pid: 110 }
     callback: ObjectCallback,
 }
 
-export type PutObjectResult = {
+export interface PutObjectResult {
     name: string,
     data: object,
     res: NormalSuccessResponse
 }
 
-export type PutStreamOptions = {
+export interface PutStreamOptions {
     contentLength?: number, // the stream length, chunked encoding will be used if absent
     timeout: number, // the operation timeout
     mime: string, // custom mime, will send with Content-Type entity header
@@ -159,7 +185,7 @@ export type PutStreamOptions = {
     callback: ObjectCallback
 }
 
-export type AppendObjectOptions = {
+export interface AppendObjectOptions {
     position?: string, // specify the position which is the content length of the latest object
     timeout?: number, // the operation timeout
     mime?: string, // custom mime, will send with Content-Type entity header
@@ -167,74 +193,74 @@ export type AppendObjectOptions = {
     headers?: object
 }
 
-export type AppendObjectResult = {
+export interface AppendObjectResult {
     name: string,
     url: string, // the url of oss
     res: NormalSuccessResponse,
     nextAppendPosition: string, // the next position
 }
 
-export type HeadObjectOptions = {
+export interface HeadObjectOptions {
     timeout?: number,
     headers?: object
 }
 
-export type HeadObjectResult = {
+export interface HeadObjectResult {
     status: number, // response status, maybe 200 or 304
     meta: UserMeta,
     res: NormalSuccessResponse
 }
 
-export type GetObjectOptions = {
+export interface GetObjectOptions {
     timeout?: number,
     process?: string, // image process params, will send with x-oss-process e.g.: {process: 'image/resize,w_200'}
     headers?: object
 }
 
-export type GetObjectResult = {
+export interface GetObjectResult {
     content?: any, // file content buffer if file parameter is null or ignore
     res: NormalSuccessResponse
 }
 
-export type GetStreamOptions = {
+export interface GetStreamOptions {
     timeout?: number,
     process?: string, // image process params, will send with x-oss-process e.g.: {process: 'image/resize,w_200'}
     headers?: object
 }
 
-export type GetStreamResult = {
+export interface GetStreamResult {
     stream?: any, // readable stream instance if response status is not 200, stream will be null.
     res: NormalSuccessResponse
 }
 
-export type CopyObjectOptions = {
+export interface CopyObjectOptions {
     timeout?: number,
     meta?: UserMeta,
     headers?: object
 }
 
-export type CopyAndPutMetaResult = {
+export interface CopyAndPutMetaResult {
     data: ModifyData,
     res: NormalSuccessResponse
 }
 
-export type DeleteMultiOptions = {
+export interface DeleteMultiOptions {
     quite?: boolean // quiet mode or verbose mode, default is false, verbose mode quiet mode: if all objects delete succes, return emtpy response. otherwise return delete error object results. verbose mode: return all object delete results.
     timeout?: number
 }
 
-export type DeleteMultiResult = {
+export interface DeleteMultiResult {
     deleted?: Array<string> // deleted object names list
     res: NormalSuccessResponse
 }
 
-export type ResponseHeaderType = {
+export interface ResponseHeaderType {
     'content-type'?: string,
     'content-disposition'? :string,
     'cache-control'?: string
 }
 
-export type SignatureUrlOptions = {
+export interface SignatureUrlOptions {
     expires?: number, // after expires seconds, the url will become invalid, default is 1800
     method?: HTTPMethods, // the HTTP method, default is 'GET'
     'Content-Type'?: string, // set the request content type
@@ -243,38 +269,38 @@ export type SignatureUrlOptions = {
     callback?: ObjectCallback
 }
 
-export type GetACLResult = {
+export interface GetACLResult {
     acl: ACLType,
     res: NormalSuccessResponse
 }
 
-export type InitMultipartUploadOptions = {
+export interface InitMultipartUploadOptions {
     timeout?: number,
     mime?: string, // Mime file type
     meta?: UserMeta,
     headers?: object
 }
 
-export type InitMultipartUploadResult = {
+export interface InitMultipartUploadResult {
     res: { status: number, headers: object, size: number, rt: number }
     bucket: string, // bucket name
     name: string, // object name store on OSS
     uploadId: string, // upload id, use for uploadPart, completeMultipart
 }
 
-export type UploadPartResult = {
+export interface UploadPartResult {
     name: string,
     etag: string,
     res: NormalSuccessResponse
 }
 
-export type CompleteMultipartUploadOptions = {
+export interface CompleteMultipartUploadOptions {
     timeout?: number,
     callback?: ObjectCallback,
     headers?: object
 }
 
-export type CompleteMultipartUploadResult = {
+export interface CompleteMultipartUploadResult {
     bucket: string,
     name: string,
     etag: string,
@@ -282,7 +308,7 @@ export type CompleteMultipartUploadResult = {
     res: NormalSuccessResponse
 }
 
-export type MultipartUploadOptions = {
+export interface MultipartUploadOptions {
     parallel?: number, // the number of parts to be uploaded in parallel
     partSize?: number, // the suggested size for each part
     progress?: Function, // the progress callback called after each successful upload of one part, it will be given three parameters: (percentage {Number}, checkpoint {Object}, res {Object})
@@ -295,7 +321,7 @@ export type MultipartUploadOptions = {
     copyheaders?: object, //  {Object} only uploadPartCopy api used, detail
 }
 
-export type MultipartUploadResult = {
+export interface MultipartUploadResult {
     bucket: string,
     name: string,
     etag: string,
@@ -303,27 +329,27 @@ export type MultipartUploadResult = {
     res: NormalSuccessResponse
 }
 
-export type MultipartUploadCopyResult =  {
+export interface MultipartUploadCopyResult {
     bucket: string,
     name: string,
     etag: string,
     res: NormalSuccessResponse
 }
 
-export type MultipartUploadCopySourceData = {
+export interface MultipartUploadCopySourceData {
     sourceKey: string, // the source object name
     sourceBucketName: string, // sourceData.  the source bucket name
     startOffset: number, // data copy start byte offset, e.g: 0
     endOffset: number // data copy end byte offset, e.g: 102400
 }
 
-export type ListPartsQuery = {
+export interface ListPartsQuery {
     'max-parts': number, // The maximum part number in the response of the OSS. default value: 1000.
     'part-number-marker': number, // Starting position of a specific list. A part is listed only when the part number is greater than the value of this parameter.
     'encoding-type': string // Specify the encoding of the returned content and the encoding type. Optional value: url
 }
 
-export type ListPartsResult = {
+export interface ListPartsResult {
     uploadId: string,
     bucket: string,
     name: string,
@@ -335,14 +361,14 @@ export type ListPartsResult = {
     res: NormalSuccessResponse
 }
 
-export type ListUploadsQuery = {
+export interface ListUploadsQuery {
     prefix?: string,
     'max-uploads'?: number,
     'key-marker'?: string,
     'upload-id-marker'?: string
 }
 
-export type ListUploadsResult = {
+export interface ListUploadsResult {
     res: NormalSuccessResponse,
     bucket: string,
     nextKeyMarker: any,
@@ -351,9 +377,62 @@ export type ListUploadsResult = {
     uploads: Array<Upload>
 }
 
+export interface PutChannelConf {
+    Description?: string,
+    Status?: string,
+    Target?: {
+        Type: string,
+        FragDuration: number,
+        FragCount: number,
+        PlaylistName: string
+    }
+}
+
+export interface PutChannelResult {
+    publishUrls: Array<string>,
+    playUrls: Array<string>,
+    res: NormalSuccessResponse
+}
+
+export interface GetChannelResult {
+    Status: string,
+    ConnectedTime?: string,
+    RemoteAddr?: string,
+    Video?: object,
+    Audio?: object,
+    res: NormalSuccessResponse
+}
+
+export interface ListChannelsQuery {
+    prefix: string, // the channel id prefix (returns channels with this prefix)
+    marker: string, // the channle id marker (returns channels after this id)
+    'max-keys ': number // max number of channels to return
+}
+
+export interface ListChannelsResult {
+    channels: Array<Channel>
+    nextMarker: string | null,
+    isTruncated: boolean,
+    res: NormalSuccessResponse
+}
+
+export interface ChannelHistoryResult {
+    records: ChannelHistory,
+    res: NormalSuccessResponse
+}
+
+export interface GetRtmpUrlOptions {
+    expires?: number, // the expire time in seconds of the url
+    params?: object, // the additional paramters for url, e.g.: {playlistName: 'play.m3u8'}
+    timeout?: number // the operation timeout
+}
+
 export default class OSS {
     // the image client
     static ImageClient: any
+
+    constructor(options: Options)
+
     /******************************************* the bucket operations *************************************************/
 
     // base operators
@@ -683,7 +762,7 @@ export default class OSS {
      * @param {RequestOptions} options
      * @return {Promise<GetACLResult>}
      */
-    getACL(name:string, options?: RequestOptions): Promise<GetACLResult>
+    getACL(name: string, options?: RequestOptions): Promise<GetACLResult>
 
     /**
      * Restore Object.
@@ -736,7 +815,7 @@ export default class OSS {
      * @param {CompleteMultipartUploadOptions} options
      * @return {Promise<CompleteMultipartUploadResult>}
      */
-    completeMultipartUpload(name: string, uploadId: string, parts: Array<{ number: number, etag: string }>, options?:CompleteMultipartUploadOptions): Promise<CompleteMultipartUploadResult>
+    completeMultipartUpload(name: string, uploadId: string, parts: Array<{ number: number, etag: string }>, options?: CompleteMultipartUploadOptions): Promise<CompleteMultipartUploadResult>
 
     /**
      * Upload file with OSS multipart.
@@ -788,4 +867,80 @@ export default class OSS {
     abortMultipartUpload(name: string, uploadId: string, options?: RequestOptions): Promise<NormalSuccessResponse>
 
     /************************************************ RTMP Operations *************************************************************/
+    /**
+     * Create a live channel.
+     * @param {string} id
+     * @param {PutChannelConf} conf
+     * @param {RequestOptions} options
+     * @return {Promise<PutChannelResult>}
+     */
+    putChannel(id: string, conf: PutChannelConf, options?: RequestOptions): Promise<PutChannelResult>
+
+    /**
+     * Get live channel info.
+     * @param {string} id
+     * @param {RequestOptions} options
+     * @return {Promise<{data: PutChannelConf; res: NormalSuccessResponse}>}
+     */
+    getChannel(id: string, options?: RequestOptions): Promise<{ data: PutChannelConf, res: NormalSuccessResponse }>
+
+    /**
+     * Delete a live channel.
+     * @param {string} id
+     * @param {RequestOptions} options
+     * @return {Promise<NormalSuccessResponse>}
+     */
+    deleteChannel(id: string, options?: RequestOptions): Promise<NormalSuccessResponse>
+
+    /**
+     * Change the live channel status.
+     * @param {string} id
+     * @param {string} status
+     * @param {RequestOptions} options
+     * @return {Promise<NormalSuccessResponse>}
+     */
+    putChannelStatus(id: string, status?: string, options?: RequestOptions): Promise<NormalSuccessResponse>
+
+    /**
+     * Get the live channel status.
+     * @param {string} id
+     * @param {RequestOptions} options
+     * @return {Promise<GetChannelResult>}
+     */
+    getChannelStatus(id: string, options?: RequestOptions): Promise<GetChannelResult>
+
+    /**
+     * List channels.
+     * @param {ListChannelsQuery} query
+     * @param {RequestOptions} options
+     * @return {Promise<ListChannelsResult>}
+     */
+    listChannels(query: ListChannelsQuery, options?: RequestOptions): Promise<ListChannelsResult>
+
+    /**
+     * Get the live channel history.
+     * @param {string} id
+     * @param {RequestOptions} options
+     * @return {Promise<ChannelHistoryResult>}
+     */
+    getChannelHistory(id: string, options?: RequestOptions): Promise<ChannelHistoryResult>
+
+    /**
+     * Create a VOD playlist for the channel.
+     * @param {string} id
+     * @param {string} name
+     * @param {{startTime: number; endTime: number}} time
+     * @param {RequestOptions} options
+     * @return {Promise<NormalSuccessResponse>}
+     */
+    createVod(id: string, name: string, time: { startTime: number, endTime: number }, options?: RequestOptions): Promise<NormalSuccessResponse>
+
+    /**
+     * Get signatured rtmp url for publishing.
+     * @param {string} channelId
+     * @param {GetRtmpUrlOptions} options
+     * @return {string}
+     */
+    getRtmpUrl(channelId?: string, options?: GetRtmpUrlOptions): string
 }
+

From 8c7758f7efe942e0f68ffa3a769e67b1b06b8e30 Mon Sep 17 00:00:00 2001
From: ptrdu <ptrdu@MacBook-Pro-3.local>
Date: Sat, 29 Sep 2018 15:50:26 +0800
Subject: [PATCH 006/836] FEAT: add ImageClient and cluster

---
 types/ali-oss/Cluster.d.ts     | 64 ++++++++++++++++++++++
 types/ali-oss/ImageClient.d.ts | 99 ++++++++++++++++++++++++++++++++++
 types/ali-oss/ali-oss-tests.ts |  9 ++++
 types/ali-oss/index.d.ts       | 11 +++-
 types/ali-oss/tsconfig.json    |  2 +
 5 files changed, 184 insertions(+), 1 deletion(-)
 create mode 100644 types/ali-oss/Cluster.d.ts
 create mode 100644 types/ali-oss/ImageClient.d.ts

diff --git a/types/ali-oss/Cluster.d.ts b/types/ali-oss/Cluster.d.ts
new file mode 100644
index 0000000000..57ab35719b
--- /dev/null
+++ b/types/ali-oss/Cluster.d.ts
@@ -0,0 +1,64 @@
+import {
+    ACLType,
+    CopyAndPutMetaResult,
+    CopyObjectOptions,
+    DeleteMultiOptions,
+    DeleteMultiResult,
+    GetObjectOptions,
+    GetObjectResult,
+    GetStreamOptions,
+    GetStreamResult,
+    HeadObjectOptions,
+    HeadObjectResult,
+    ListObjectResult,
+    ListObjectsQuery,
+    NormalSuccessResponse,
+    PutObjectOptions,
+    PutObjectResult,
+    PutStreamOptions,
+    RequestOptions,
+    SignatureUrlOptions,
+    UserMeta
+} from "./index";
+
+export interface ClusterType {
+    host: string,
+    accessKeyId: string,
+    accessKeySecret: string
+}
+
+export interface ClusterOptions {
+    clusters: Array<ClusterType>,
+    schedule?: string
+}
+
+
+export class Cluster {
+    constructor(options: ClusterOptions)
+
+    list(query: ListObjectsQuery | null, options: RequestOptions): Promise<ListObjectResult>
+
+    put(name: string, file: any, options?: PutObjectOptions): Promise<PutObjectResult>
+
+    putStream(name: string, stream: any, options?: PutStreamOptions): Promise<{ name: string, res: NormalSuccessResponse }>
+
+    head(name: string, options?: HeadObjectOptions): Promise<HeadObjectResult>
+
+    get(name: string, file?: any, options?: GetObjectOptions): Promise<GetObjectResult>
+
+    getStream(name?: string, options?: GetStreamOptions): Promise<GetStreamResult>
+
+    delete(name: string, options?: RequestOptions): Promise<NormalSuccessResponse>
+
+    copy(name: string, sourceName: string, options?: CopyObjectOptions): Promise<CopyAndPutMetaResult>
+
+    putMeta(name: string, meta: UserMeta, options: RequestOptions): Promise<CopyAndPutMetaResult>
+
+    deleteMulti(names: Array<string>, options?: DeleteMultiOptions): Promise<DeleteMultiResult>
+
+    signatureUrl(name: string, options?: SignatureUrlOptions): string
+
+    putACL(name: string, acl: ACLType, options?: RequestOptions): Promise<NormalSuccessResponse>
+
+    restore(name: string, options?: RequestOptions): Promise<NormalSuccessResponse>
+}
diff --git a/types/ali-oss/ImageClient.d.ts b/types/ali-oss/ImageClient.d.ts
new file mode 100644
index 0000000000..ec6ec9b71a
--- /dev/null
+++ b/types/ali-oss/ImageClient.d.ts
@@ -0,0 +1,99 @@
+import {NormalSuccessResponse, RequestOptions} from "./index";
+
+export interface Options {
+    imageHost: string, // your image service domain that binding to a OSS bucket
+    accessKeyId: string, // access key you create on aliyun console website
+    accessKeySecret: string, // access secret you create
+    bucket: string, //  the default bucket you want to access If you don't have any bucket, please use putBucket() create one first.
+    region?: string, // the bucket data region location, please see Data Regions, default is oss-cn-hangzhou Current available: oss-cn-hangzhou, oss-cn-qingdao, oss-cn-beijing, oss-cn-hongkong and oss-cn-shenzhen
+    internal?: boolean, // access OSS with aliyun internal network or not, default is false If your servers are running on aliyun too, you can set true to save lot of money.
+    timeout?: string | number, // instance level timeout for all operations, default is 60s
+}
+
+export interface ImageGetOptions {
+    timeout?: number,
+    headers?: object
+}
+
+export interface StyleData {
+    Name: string, // style name
+    Content: string, // style content
+    CreateTime: string, // style create time
+    LastModifyTime: string // style last modify time
+}
+export class Client {
+    constructor(options: Options)
+
+    /**
+     * Get an image from the image channel.
+     * @param {string} name
+     * @param file - String|WriteStream} file path or WriteStream instance to store the image If file is null or ignore this parameter, function will return info contains content property.
+     * @param {ImageGetOptions} options
+     * @return {Promise<{content: any; res: NormalSuccessResponse}>}
+     */
+    get(name: string, file?: any, options?: ImageGetOptions): Promise<{ content: any, res: NormalSuccessResponse }>
+
+    /**
+     * Get an image read stream.
+     * @param {string} name
+     * @param {ImageGetOptions} options
+     * @return {Promise<{stream: any; res: NormalSuccessResponse}>}
+     */
+    getStream(name: string, options?: ImageGetOptions): Promise<{ stream: any, res: NormalSuccessResponse }>
+
+    /**
+     * Get a image exif info by image object name from the image channel.
+     * @param {string} name
+     * @param {RequestOptions} options
+     * @return {Promise<{data: object; res: NormalSuccessResponse}>}
+     */
+    getExif(name: string, options?: RequestOptions): Promise<{ data: object, res: NormalSuccessResponse }>
+
+    /**
+     * Get a image info and exif info by image object name from the image channel.
+     * @param {string} name
+     * @param {RequestOptions} options
+     * @return {Promise<{data: object; res: NormalSuccessResponse}>}
+     */
+    getInfo(name: string, options?: RequestOptions): Promise<{ data: object, res: NormalSuccessResponse }>
+
+    /**
+     * todo
+     * @param {string} name
+     * @param {string} style
+     * @param {RequestOptions} options
+     * @return {Promise<{data: object; res: NormalSuccessResponse}>}
+     */
+    putStyle(name: string, style: string, options?: RequestOptions): Promise<{ data: object, res: NormalSuccessResponse }>
+
+    /**
+     * Get a style by name from the image channel.
+     * @param {string} name
+     * @param {RequestOptions} options
+     * @return {Promise<{data: StyleData; res: NormalSuccessResponse}>}
+     */
+    getStyle(name: string, options?: RequestOptions): Promise<{ data: StyleData, res: NormalSuccessResponse}>
+
+    /**
+     * Get all styles from the image channel.
+     * @param {RequestOptions} options
+     * @return {Promise<Array<StyleData>>}
+     */
+    listStyle(options?: RequestOptions): Promise<Array<StyleData>>
+
+    /**
+     * todo
+     * @param {string} styleName
+     * @param {RequestOptions} options
+     * @return {Promise<NormalSuccessResponse>}
+     */
+    deleteStyle(styleName: string, options?: RequestOptions): Promise<NormalSuccessResponse>
+
+    /**
+     * Create a signature url for directly download.
+     * @param {string} name
+     * @param {{expires?: string; timeout?: string}} options
+     * @return {string}
+     */
+    signatureUrl(name: string, options?: { expires?: string, timeout?: string }): string
+}
diff --git a/types/ali-oss/ali-oss-tests.ts b/types/ali-oss/ali-oss-tests.ts
index 82941c1e5e..e441e15577 100644
--- a/types/ali-oss/ali-oss-tests.ts
+++ b/types/ali-oss/ali-oss-tests.ts
@@ -7,3 +7,12 @@ const client = new OSS({
     region: 'oss-cn-hangzhou'
 });
 
+const ImageClient = OSS.ImageClient({
+    imageHost: 'xxxx',
+    accessKeySecret: "xxxx",
+    accessKeyId: 'xxxxxx',
+    bucket: "",
+    internal: false,
+    region: "",
+    timeout: undefined
+})
diff --git a/types/ali-oss/index.d.ts b/types/ali-oss/index.d.ts
index 9f5530db71..1ced1efaf8 100644
--- a/types/ali-oss/index.d.ts
+++ b/types/ali-oss/index.d.ts
@@ -6,6 +6,9 @@
 
 // general type
 
+import * as ImageClientDefinition from './ImageClient'
+import * as ClusterDefinition from "./Cluster"
+
 export interface Options {
     accessKeyId: string, // access secret you create
     accessKeySecret: string, // access secret you create
@@ -427,9 +430,14 @@ export interface GetRtmpUrlOptions {
     timeout?: number // the operation timeout
 }
 
+export interface ObjectInterface {
+    
+}
+
 export default class OSS {
     // the image client
-    static ImageClient: any
+    public static ImageClient: (options: ImageClientDefinition.Options) => ImageClientDefinition.Client
+    public static Cluster: (options: ClusterDefinition.ClusterOptions) => ClusterDefinition.Cluster
 
     constructor(options: Options)
 
@@ -942,5 +950,6 @@ export default class OSS {
      * @return {string}
      */
     getRtmpUrl(channelId?: string, options?: GetRtmpUrlOptions): string
+
 }
 
diff --git a/types/ali-oss/tsconfig.json b/types/ali-oss/tsconfig.json
index a3e68ada2b..b6f46ae8e8 100644
--- a/types/ali-oss/tsconfig.json
+++ b/types/ali-oss/tsconfig.json
@@ -18,6 +18,8 @@
     },
     "files": [
         "index.d.ts",
+        "ImageClient.d.ts",
+        "Cluster.d.ts",
         "ali-oss-tests.ts"
     ]
 }

From c56edf64cc154e9aa4d7efad94f7aa01ee1b585c Mon Sep 17 00:00:00 2001
From: ptrdu <ptrdu@mucheng.local>
Date: Sat, 29 Sep 2018 17:49:53 +0800
Subject: [PATCH 007/836] FEAT: add test

---
 types/ali-oss/ImageClient.d.ts |  8 ++++----
 types/ali-oss/ali-oss-tests.ts | 27 ++++++++++++++++++++++-----
 types/ali-oss/index.d.ts       | 19 +++++++++++--------
 3 files changed, 37 insertions(+), 17 deletions(-)

diff --git a/types/ali-oss/ImageClient.d.ts b/types/ali-oss/ImageClient.d.ts
index ec6ec9b71a..047077904f 100644
--- a/types/ali-oss/ImageClient.d.ts
+++ b/types/ali-oss/ImageClient.d.ts
@@ -1,6 +1,6 @@
-import {NormalSuccessResponse, RequestOptions} from "./index";
+import { NormalSuccessResponse, RequestOptions } from "./index";
 
-export interface Options {
+export interface ImageClientOptions {
     imageHost: string, // your image service domain that binding to a OSS bucket
     accessKeyId: string, // access key you create on aliyun console website
     accessKeySecret: string, // access secret you create
@@ -21,8 +21,8 @@ export interface StyleData {
     CreateTime: string, // style create time
     LastModifyTime: string // style last modify time
 }
-export class Client {
-    constructor(options: Options)
+export class ImageClient {
+    constructor(options: ImageClientOptions)
 
     /**
      * Get an image from the image channel.
diff --git a/types/ali-oss/ali-oss-tests.ts b/types/ali-oss/ali-oss-tests.ts
index e441e15577..a9c39ab199 100644
--- a/types/ali-oss/ali-oss-tests.ts
+++ b/types/ali-oss/ali-oss-tests.ts
@@ -5,14 +5,31 @@ const client = new OSS({
     accessKeySecret: 'your access secret',
     bucket: 'your bucket name',
     region: 'oss-cn-hangzhou'
-});
+})
+
 
 const ImageClient = OSS.ImageClient({
-    imageHost: 'xxxx',
-    accessKeySecret: "xxxx",
-    accessKeyId: 'xxxxxx',
+    imageHost: 'host',
+    accessKeySecret: "secret",
+    accessKeyId: 'id',
     bucket: "",
     internal: false,
     region: "",
-    timeout: undefined
+    timeout: 2000
+})
+
+const cluster = OSS.Cluster({
+    clusters: [
+        {
+            accessKeyId: 'id',
+            accessKeySecret: 'secret',
+            host: ""
+        },
+        {
+            accessKeyId: 'id',
+            accessKeySecret: 'secret',
+            host: ""
+        },
+    ],
+    schedule: 'masterSlave',
 })
diff --git a/types/ali-oss/index.d.ts b/types/ali-oss/index.d.ts
index 1ced1efaf8..0f17bbb142 100644
--- a/types/ali-oss/index.d.ts
+++ b/types/ali-oss/index.d.ts
@@ -8,6 +8,10 @@
 
 import * as ImageClientDefinition from './ImageClient'
 import * as ClusterDefinition from "./Cluster"
+import {ImageClient} from "./ImageClient";
+
+export * from './ImageClient'
+export * from './Cluster'
 
 export interface Options {
     accessKeyId: string, // access secret you create
@@ -22,7 +26,10 @@ export interface Options {
 }
 
 export type Bucket = {
-
+    name: string,
+    region: string,
+    creationDate: string,
+    StorageClass: StorageType
 }
 
 export type StorageType = "Standard" | "IA" | "Archive"
@@ -430,13 +437,9 @@ export interface GetRtmpUrlOptions {
     timeout?: number // the operation timeout
 }
 
-export interface ObjectInterface {
-    
-}
-
 export default class OSS {
     // the image client
-    public static ImageClient: (options: ImageClientDefinition.Options) => ImageClientDefinition.Client
+    public static ImageClient: (options: ImageClientDefinition.ImageClientOptions) => ImageClientDefinition.ImageClient
     public static Cluster: (options: ClusterDefinition.ClusterOptions) => ClusterDefinition.Cluster
 
     constructor(options: Options)
@@ -455,7 +458,8 @@ export default class OSS {
 
     /**
      * Create a new bucket.
-     * @param {string} name -  bucket name If bucket exists and not belong to current account, will throw BucketAlreadyExistsError. If bucket not exists, will create a new bucket and set it's ACL.
+     * @param {string} name -  bucket name If bucket exists and not belong to current account, will throw BucketAlreadyExistsError.
+     * If bucket not exists, will create a new bucket and set it's ACL.
      * @param {PutBucketOptions} options - optional parameters
      * @return { Promise<{ bucket: string, res: NormalSuccessResponse }> }
      */
@@ -952,4 +956,3 @@ export default class OSS {
     getRtmpUrl(channelId?: string, options?: GetRtmpUrlOptions): string
 
 }
-

From 14dda1b33703537649a2e5f019d1de0c74a9148b Mon Sep 17 00:00:00 2001
From: ptrdu <ptrdu@mucheng.local>
Date: Sat, 29 Sep 2018 18:50:18 +0800
Subject: [PATCH 008/836] FIX: fix some used import and the typescript version

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

diff --git a/types/ali-oss/index.d.ts b/types/ali-oss/index.d.ts
index 0f17bbb142..b7eba95d62 100644
--- a/types/ali-oss/index.d.ts
+++ b/types/ali-oss/index.d.ts
@@ -2,13 +2,10 @@
 // Project: https://github.com/ali-sdk/ali-oss
 // Definitions by: Ptrdu <https://github.com/ptrdu>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 3.2.0
-
-// general type
+// TypeScript Version: 2.3
 
 import * as ImageClientDefinition from './ImageClient'
 import * as ClusterDefinition from "./Cluster"
-import {ImageClient} from "./ImageClient";
 
 export * from './ImageClient'
 export * from './Cluster'

From 83d5d18ae729119b39a63f5c6ed3d698507fc48d Mon Sep 17 00:00:00 2001
From: ptrdu <ptrdu@mucheng.local>
Date: Sun, 30 Sep 2018 10:17:52 +0800
Subject: [PATCH 009/836] FIX: fix the tsconfig and tslint error

---
 types/ali-oss/Cluster.d.ts     |  37 +-
 types/ali-oss/ImageClient.d.ts |  72 +--
 types/ali-oss/ali-oss-tests.ts |   7 +-
 types/ali-oss/index.d.ts       | 823 +++++++++++++--------------------
 types/ali-oss/tsconfig.json    |   2 +-
 types/ali-oss/tslint.json      |  78 +---
 6 files changed, 359 insertions(+), 660 deletions(-)

diff --git a/types/ali-oss/Cluster.d.ts b/types/ali-oss/Cluster.d.ts
index 57ab35719b..60886fca36 100644
--- a/types/ali-oss/Cluster.d.ts
+++ b/types/ali-oss/Cluster.d.ts
@@ -22,43 +22,42 @@ import {
 } from "./index";
 
 export interface ClusterType {
-    host: string,
-    accessKeyId: string,
-    accessKeySecret: string
+    host: string;
+    accessKeyId: string;
+    accessKeySecret: string;
 }
 
 export interface ClusterOptions {
-    clusters: Array<ClusterType>,
-    schedule?: string
+    clusters: ClusterType[];
+    schedule?: string;
 }
 
-
 export class Cluster {
     constructor(options: ClusterOptions)
 
-    list(query: ListObjectsQuery | null, options: RequestOptions): Promise<ListObjectResult>
+    list(query: ListObjectsQuery | null, options: RequestOptions): Promise<ListObjectResult>;
 
-    put(name: string, file: any, options?: PutObjectOptions): Promise<PutObjectResult>
+    put(name: string, file: any, options?: PutObjectOptions): Promise<PutObjectResult>;
 
-    putStream(name: string, stream: any, options?: PutStreamOptions): Promise<{ name: string, res: NormalSuccessResponse }>
+    putStream(name: string, stream: any, options?: PutStreamOptions): Promise<{ name: string, res: NormalSuccessResponse }>;
 
-    head(name: string, options?: HeadObjectOptions): Promise<HeadObjectResult>
+    head(name: string, options?: HeadObjectOptions): Promise<HeadObjectResult>;
 
-    get(name: string, file?: any, options?: GetObjectOptions): Promise<GetObjectResult>
+    get(name: string, file?: any, options?: GetObjectOptions): Promise<GetObjectResult>;
 
-    getStream(name?: string, options?: GetStreamOptions): Promise<GetStreamResult>
+    getStream(name?: string, options?: GetStreamOptions): Promise<GetStreamResult>;
 
-    delete(name: string, options?: RequestOptions): Promise<NormalSuccessResponse>
+    delete(name: string, options?: RequestOptions): Promise<NormalSuccessResponse>;
 
-    copy(name: string, sourceName: string, options?: CopyObjectOptions): Promise<CopyAndPutMetaResult>
+    copy(name: string, sourceName: string, options?: CopyObjectOptions): Promise<CopyAndPutMetaResult>;
 
-    putMeta(name: string, meta: UserMeta, options: RequestOptions): Promise<CopyAndPutMetaResult>
+    putMeta(name: string, meta: UserMeta, options: RequestOptions): Promise<CopyAndPutMetaResult>;
 
-    deleteMulti(names: Array<string>, options?: DeleteMultiOptions): Promise<DeleteMultiResult>
+    deleteMulti(names: string[], options?: DeleteMultiOptions): Promise<DeleteMultiResult>;
 
-    signatureUrl(name: string, options?: SignatureUrlOptions): string
+    signatureUrl(name: string, options?: SignatureUrlOptions): string;
 
-    putACL(name: string, acl: ACLType, options?: RequestOptions): Promise<NormalSuccessResponse>
+    putACL(name: string, acl: ACLType, options?: RequestOptions): Promise<NormalSuccessResponse>;
 
-    restore(name: string, options?: RequestOptions): Promise<NormalSuccessResponse>
+    restore(name: string, options?: RequestOptions): Promise<NormalSuccessResponse>;
 }
diff --git a/types/ali-oss/ImageClient.d.ts b/types/ali-oss/ImageClient.d.ts
index 047077904f..850213083c 100644
--- a/types/ali-oss/ImageClient.d.ts
+++ b/types/ali-oss/ImageClient.d.ts
@@ -1,99 +1,71 @@
 import { NormalSuccessResponse, RequestOptions } from "./index";
 
 export interface ImageClientOptions {
-    imageHost: string, // your image service domain that binding to a OSS bucket
-    accessKeyId: string, // access key you create on aliyun console website
-    accessKeySecret: string, // access secret you create
-    bucket: string, //  the default bucket you want to access If you don't have any bucket, please use putBucket() create one first.
-    region?: string, // the bucket data region location, please see Data Regions, default is oss-cn-hangzhou Current available: oss-cn-hangzhou, oss-cn-qingdao, oss-cn-beijing, oss-cn-hongkong and oss-cn-shenzhen
-    internal?: boolean, // access OSS with aliyun internal network or not, default is false If your servers are running on aliyun too, you can set true to save lot of money.
-    timeout?: string | number, // instance level timeout for all operations, default is 60s
+    imageHost: string; // your image service domain that binding to a OSS bucket
+    accessKeyId: string; // access key you create on aliyun console website
+    accessKeySecret: string; // access secret you create
+    bucket: string; //  the default bucket you want to access If you don't have any bucket, please use putBucket() create one first.
+    region?: string; // the bucket data region location, please see Data Regions, default is oss-cn-hangzhou
+    internal?: boolean; // access OSS with aliyun internal network or not, default is false If your servers are running on aliyun too, you can set true to save lot of money.
+    timeout?: string | number; // instance level timeout for all operations, default is 60s
 }
 
 export interface ImageGetOptions {
-    timeout?: number,
-    headers?: object
+    timeout?: number;
+    headers?: object;
 }
 
 export interface StyleData {
-    Name: string, // style name
-    Content: string, // style content
-    CreateTime: string, // style create time
-    LastModifyTime: string // style last modify time
+    Name: string; // style name
+    Content: string; // style content
+    CreateTime: string; // style create time
+    LastModifyTime: string; // style last modify time
 }
 export class ImageClient {
     constructor(options: ImageClientOptions)
 
     /**
      * Get an image from the image channel.
-     * @param {string} name
-     * @param file - String|WriteStream} file path or WriteStream instance to store the image If file is null or ignore this parameter, function will return info contains content property.
-     * @param {ImageGetOptions} options
-     * @return {Promise<{content: any; res: NormalSuccessResponse}>}
      */
-    get(name: string, file?: any, options?: ImageGetOptions): Promise<{ content: any, res: NormalSuccessResponse }>
+    get(name: string, file?: any, options?: ImageGetOptions): Promise<{ content: any, res: NormalSuccessResponse }>;
 
     /**
      * Get an image read stream.
-     * @param {string} name
-     * @param {ImageGetOptions} options
-     * @return {Promise<{stream: any; res: NormalSuccessResponse}>}
      */
-    getStream(name: string, options?: ImageGetOptions): Promise<{ stream: any, res: NormalSuccessResponse }>
+    getStream(name: string, options?: ImageGetOptions): Promise<{ stream: any, res: NormalSuccessResponse }>;
 
     /**
      * Get a image exif info by image object name from the image channel.
-     * @param {string} name
-     * @param {RequestOptions} options
-     * @return {Promise<{data: object; res: NormalSuccessResponse}>}
      */
-    getExif(name: string, options?: RequestOptions): Promise<{ data: object, res: NormalSuccessResponse }>
+    getExif(name: string, options?: RequestOptions): Promise<{ data: object, res: NormalSuccessResponse }>;
 
     /**
      * Get a image info and exif info by image object name from the image channel.
-     * @param {string} name
-     * @param {RequestOptions} options
-     * @return {Promise<{data: object; res: NormalSuccessResponse}>}
      */
-    getInfo(name: string, options?: RequestOptions): Promise<{ data: object, res: NormalSuccessResponse }>
+    getInfo(name: string, options?: RequestOptions): Promise<{ data: object, res: NormalSuccessResponse }>;
 
     /**
      * todo
-     * @param {string} name
-     * @param {string} style
-     * @param {RequestOptions} options
-     * @return {Promise<{data: object; res: NormalSuccessResponse}>}
      */
-    putStyle(name: string, style: string, options?: RequestOptions): Promise<{ data: object, res: NormalSuccessResponse }>
+    putStyle(name: string, style: string, options?: RequestOptions): Promise<{ data: object, res: NormalSuccessResponse }>;
 
     /**
      * Get a style by name from the image channel.
-     * @param {string} name
-     * @param {RequestOptions} options
-     * @return {Promise<{data: StyleData; res: NormalSuccessResponse}>}
      */
-    getStyle(name: string, options?: RequestOptions): Promise<{ data: StyleData, res: NormalSuccessResponse}>
+    getStyle(name: string, options?: RequestOptions): Promise<{ data: StyleData, res: NormalSuccessResponse}>;
 
     /**
      * Get all styles from the image channel.
-     * @param {RequestOptions} options
-     * @return {Promise<Array<StyleData>>}
      */
-    listStyle(options?: RequestOptions): Promise<Array<StyleData>>
+    listStyle(options?: RequestOptions): Promise<StyleData[]>;
 
     /**
      * todo
-     * @param {string} styleName
-     * @param {RequestOptions} options
-     * @return {Promise<NormalSuccessResponse>}
      */
-    deleteStyle(styleName: string, options?: RequestOptions): Promise<NormalSuccessResponse>
+    deleteStyle(styleName: string, options?: RequestOptions): Promise<NormalSuccessResponse>;
 
     /**
      * Create a signature url for directly download.
-     * @param {string} name
-     * @param {{expires?: string; timeout?: string}} options
-     * @return {string}
      */
-    signatureUrl(name: string, options?: { expires?: string, timeout?: string }): string
+    signatureUrl(name: string, options?: { expires?: string, timeout?: string }): string;
 }
diff --git a/types/ali-oss/ali-oss-tests.ts b/types/ali-oss/ali-oss-tests.ts
index a9c39ab199..96f817cca8 100644
--- a/types/ali-oss/ali-oss-tests.ts
+++ b/types/ali-oss/ali-oss-tests.ts
@@ -5,8 +5,7 @@ const client = new OSS({
     accessKeySecret: 'your access secret',
     bucket: 'your bucket name',
     region: 'oss-cn-hangzhou'
-})
-
+});
 
 const ImageClient = OSS.ImageClient({
     imageHost: 'host',
@@ -16,7 +15,7 @@ const ImageClient = OSS.ImageClient({
     internal: false,
     region: "",
     timeout: 2000
-})
+});
 
 const cluster = OSS.Cluster({
     clusters: [
@@ -32,4 +31,4 @@ const cluster = OSS.Cluster({
         },
     ],
     schedule: 'masterSlave',
-})
+});
diff --git a/types/ali-oss/index.d.ts b/types/ali-oss/index.d.ts
index b7eba95d62..c3fa0dd10b 100644
--- a/types/ali-oss/index.d.ts
+++ b/types/ali-oss/index.d.ts
@@ -1,443 +1,443 @@
-// Type definitions for ali-oss 6.0.1
+// Type definitions for ali-oss 6.0
 // Project: https://github.com/ali-sdk/ali-oss
 // Definitions by: Ptrdu <https://github.com/ptrdu>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
-import * as ImageClientDefinition from './ImageClient'
-import * as ClusterDefinition from "./Cluster"
+import * as ImageClientDefinition from './ImageClient';
+import * as ClusterDefinition from "./Cluster";
 
-export * from './ImageClient'
-export * from './Cluster'
+export * from './ImageClient';
+export * from './Cluster';
 
 export interface Options {
-    accessKeyId: string, // access secret you create
-    accessKeySecret: string, // access secret you create
-    stsToken?: string, // used by temporary authorization
-    bucket?: string, //  the default bucket you want to access If you don't have any bucket, please use putBucket() create one first.
-    endpoint?: string, // oss region domain. It takes priority over region.
-    region?: string, // the bucket data region location, please see Data Regions, default is oss-cn-hangzhou.
-    internal?: boolean, //  access OSS with aliyun internal network or not, default is false. If your servers are running on aliyun too, you can set true to save lot of money.
-    secure?: boolean, // instruct OSS client to use HTTPS (secure: true) or HTTP (secure: false) protocol.
-    timeout?: string | number // instance level timeout for all operations, default is 60s
+    accessKeyId: string; // access secret you create
+    accessKeySecret: string; // access secret you create
+    stsToken?: string; // used by temporary authorization
+    bucket?: string; //  the default bucket you want to access If you don't have any bucket, please use putBucket() create one first.
+    endpoint?: string; // oss region domain. It takes priority over region.
+    region?: string; // the bucket data region location, please see Data Regions, default is oss-cn-hangzhou.
+    internal?: boolean; //  access OSS with aliyun internal network or not, default is false. If your servers are running on aliyun too, you can set true to save lot of money.
+    secure?: boolean; // instruct OSS client to use HTTPS (secure: true) or HTTP (secure: false) protocol.
+    timeout?: string | number; // instance level timeout for all operations, default is 60s
 }
 
-export type Bucket = {
-    name: string,
-    region: string,
-    creationDate: string,
-    StorageClass: StorageType
+export interface Bucket {
+    name: string;
+    region: string;
+    creationDate: string;
+    StorageClass: StorageType;
 }
 
-export type StorageType = "Standard" | "IA" | "Archive"
+export type StorageType = "Standard" | "IA" | "Archive";
 
-export type ACLType = "public-read-write" | "public-read" | "and private"
+export type ACLType = "public-read-write" | "public-read" | "and private";
 
 export type HTTPMethods = "GET" | "POST" | "DELETE" | "PUT";
 
 export interface RequestOptions {
     // the operation timeout
-    timeout?: number
+    timeout?: number;
 }
 
-export type RuleStatusType = "Enabled" | "Disabled"
+export type RuleStatusType = "Enabled" | "Disabled";
 
 export interface LifecycleRule {
-    id?: string, // rule id, if not set, OSS will auto create it with random string.
-    prefix: string, // store prefix
-    status: RuleStatusType, // rule status, allow values: Enabled or Disabled
-    days?: number | string, // expire after the days
-    date: string // expire date, e.g.: 2022-10-11T00:00:00.000Z date and days only set one.
+    id?: string; // rule id, if not set, OSS will auto create it with random string.
+    prefix: string; // store prefix
+    status: RuleStatusType; // rule status, allow values: Enabled or Disabled
+    days?: number | string; // expire after the days
+    date: string; // expire date, e.g.: 2022-10-11T00:00:00.000Z date and days only set one.
 }
 
 export interface CORSRule {
-    allowedOrigin: string | Array<string>, // configure for Access-Control-Allow-Origin header
-    allowedMethod: string | Array<string>, // configure for Access-Control-Allow-Methods header
-    allowedHeader?: string | Array<string>, // configure for Access-Control-Allow-Headers header
-    exposeHeader?: string | Array<string>, // configure for Access-Control-Expose-Headers header
-    maxAgeSeconds?: string | Array<string>, // configure for Access-Control-Max-Age header
+    allowedOrigin: string | string[]; // configure for Access-Control-Allow-Origin header
+    allowedMethod: string | string[]; // configure for Access-Control-Allow-Methods header
+    allowedHeader?: string | string[]; // configure for Access-Control-Allow-Headers header
+    exposeHeader?: string | string[]; // configure for Access-Control-Expose-Headers header
+    maxAgeSeconds?: string | string[]; // configure for Access-Control-Max-Age header
 }
 
 export interface OwnerType {
-    id: string,
-    displayName: string
+    id: string;
+    displayName: string;
 }
 
 export interface ObjectMeta  {
-    name: string, // object name on oss
-    lastModified: string, // object last modified GMT date, e.g.: 2015-02-19T08:39:44.000Z
-    etag: string, // object etag contains ", e.g.: "5B3C1A2E053D763E1B002CC607C5A0FE"
-    type: string, // object type, e.g.: Normal
-    size: number, // object size, e.g.: 344606
-    storageClass: StorageType,
-    owner: OwnerType,
+    name: string; // object name on oss
+    lastModified: string; // object last modified GMT date, e.g.: 2015-02-19T08:39:44.000Z
+    etag: string; // object etag contains ", e.g.: "5B3C1A2E053D763E1B002CC607C5A0FE"
+    type: string; // object type, e.g.: Normal
+    size: number; // object size, e.g.: 344606
+    storageClass: StorageType;
+    owner: OwnerType;
 }
 
 export interface NormalSuccessResponse {
-    //response status
-    status: number,
+    // response status
+    status: number;
     // response headers
-    headers: object, // todo the object in detail
+    headers: object; // todo the object in detail
     // response size
-    size: number,
+    size: number;
     //  request total use time (ms)
-    rt: number
+    rt: number;
 }
 
 export interface UserMeta {
-    uid: number,
-    pid: number
+    uid: number;
+    pid: number;
 }
 
 export interface ObjectCallback {
-    url: string, // After a file is uploaded successfully, the OSS sends a callback request to this URL.
-    host?: string, // The host header value for initiating callback requests.
-    body: string, // The value of the request body when a callback is initiated, for example, key=$(key)&etag=$(etag)&my_var=$(x:my_var).
-    contentType?: string, // The Content-Type of the callback requests initiatiated, It supports application/x-www-form-urlencoded and application/json, and the former is the default value.
-    customValue?: object,
-    headers?: object //  extra headers, detail see RFC 2616
+    url: string; // After a file is uploaded successfully, the OSS sends a callback request to this URL.
+    host?: string; // The host header value for initiating callback requests.
+    body: string; // The value of the request body when a callback is initiated, for example, key=$(key)&etag=$(etag)&my_var=$(x:my_var).
+    contentType?: string; // The Content-Type of the callback requests initiatiated, It supports application/x-www-form-urlencoded and application/json, and the former is the default value.
+    customValue?: object;
+    headers?: object; //  extra headers, detail see RFC 2616
 }
 
 export interface ModifyData {
-    lastModified: string, //  object last modified GMT string
-    etag: string // object etag contains ", e.g.: "5B3C1A2E053D763E1B002CC607C5A0FE"
+    lastModified: string; //  object last modified GMT string
+    etag: string; // object etag contains ", e.g.: "5B3C1A2E053D763E1B002CC607C5A0FE"
 }
 
 export interface Checkpoint  {
-    file: any, // The file object selected by the user, if the browser is restarted, it needs the user to manually trigger the settings
-    name: string, //  object key
-    fileSize: number,
-    partSize: number,
-    uploadId: string,
-    doneParts: Array<{ number: number, etag: string }>
+    file: any; // The file object selected by the user, if the browser is restarted, it needs the user to manually trigger the settings
+    name: string; //  object key
+    fileSize: number;
+    partSize: number;
+    uploadId: string;
+    doneParts: Array<{ number: number, etag: string }>;
 }
 
 export interface ObjectPart {
-    PartNumber: number,
-    LastModified: any, // {Date} Time when a part is uploaded.
-    ETag: string,
-    size: number
+    PartNumber: number;
+    LastModified: any; // {Date} Time when a part is uploaded.
+    ETag: string;
+    size: number;
 }
 
 export interface Upload {
-    name: string,
-    uploadId: string,
-    initiated: any
+    name: string;
+    uploadId: string;
+    initiated: any;
 }
 
 export interface Channel {
-    Name: string,
-    Description: string,
-    Status: string,
-    LastModified: string,
-    PublishUrls: Array<string>,
-    PlayUrls: Array<string>
+    Name: string;
+    Description: string;
+    Status: string;
+    LastModified: string;
+    PublishUrls: string[];
+    PlayUrls: string[];
 }
 
 export interface ChannelHistory {
-    StartTime: string, //
-    EndTime: string,
-    RemoteAddr: string //  the remote addr
+    StartTime: string; //
+    EndTime: string;
+    RemoteAddr: string; //  the remote addr
 }
 // parameters type
 export interface ListBucketsQueryType {
-    prefix?: string, // search buckets using prefix key
-    marker?: string, // search start from marker, including marker key
-    'max-keys'?: string | number // max buckets, default is 100, limit to 1000
+    prefix?: string; // search buckets using prefix key
+    marker?: string; // search start from marker, including marker key
+    'max-keys'?: string | number; // max buckets, default is 100, limit to 1000
 }
 
 export interface PutBucketOptions {
-    timeout: number,
-    storageClass: StorageType
+    timeout: number;
+    storageClass: StorageType;
 }
 
 export interface PutBucketWebsiteConfig {
-    index: string, // default page, e.g.: index.html
-    error?: string // error page, e.g.: 'error.html'
+    index: string; // default page, e.g.: index.html
+    error?: string; // error page, e.g.: 'error.html'
 }
 
 export interface ListObjectsQuery {
-    prefix?: string, // search object using prefix key
-    marker?: string, // search start from marker, including marker key
-    delimiter?: string, // delimiter search scope e.g. / only search current dir, not including subdir
-    'max-keys': string | number // max objects, default is 100, limit to 1000
+    prefix?: string; // search object using prefix key
+    marker?: string; // search start from marker, including marker key
+    delimiter?: string; // delimiter search scope e.g. / only search current dir, not including subdir
+    'max-keys': string | number; // max objects, default is 100, limit to 1000
 }
 
 export interface ListObjectResult {
-    objects: Array<ObjectMeta>,
-    prefixes: Array<string>,
-    isTruncated: boolean,
-    nextMarker: string,
-    res: NormalSuccessResponse
+    objects: ObjectMeta[];
+    prefixes: string[];
+    isTruncated: boolean;
+    nextMarker: string;
+    res: NormalSuccessResponse;
 }
 
 export interface PutObjectOptions {
-    timeout?: number, // the operation timeout
-    mime?: string, // custom mime, will send with Content-Type entity header
-    meta?: UserMeta, // user meta, will send with x-oss-meta- prefix string e.g.: { uid: 123, pid: 110 }
-    callback: ObjectCallback,
+    timeout?: number; // the operation timeout
+    mime?: string; // custom mime, will send with Content-Type entity header
+    meta?: UserMeta; // user meta, will send with x-oss-meta- prefix string e.g.: { uid: 123, pid: 110 }
+    callback: ObjectCallback;
 }
 
 export interface PutObjectResult {
-    name: string,
-    data: object,
-    res: NormalSuccessResponse
+    name: string;
+    data: object;
+    res: NormalSuccessResponse;
 }
 
 export interface PutStreamOptions {
-    contentLength?: number, // the stream length, chunked encoding will be used if absent
-    timeout: number, // the operation timeout
-    mime: string, // custom mime, will send with Content-Type entity header
-    meta: UserMeta,
-    callback: ObjectCallback
+    contentLength?: number; // the stream length, chunked encoding will be used if absent
+    timeout: number; // the operation timeout
+    mime: string; // custom mime, will send with Content-Type entity header
+    meta: UserMeta;
+    callback: ObjectCallback;
 }
 
 export interface AppendObjectOptions {
-    position?: string, // specify the position which is the content length of the latest object
-    timeout?: number, // the operation timeout
-    mime?: string, // custom mime, will send with Content-Type entity header
-    meta?: UserMeta,
-    headers?: object
+    position?: string; // specify the position which is the content length of the latest object
+    timeout?: number; // the operation timeout
+    mime?: string; // custom mime, will send with Content-Type entity header
+    meta?: UserMeta;
+    headers?: object;
 }
 
 export interface AppendObjectResult {
-    name: string,
-    url: string, // the url of oss
-    res: NormalSuccessResponse,
-    nextAppendPosition: string, // the next position
+    name: string;
+    url: string; // the url of oss
+    res: NormalSuccessResponse;
+    nextAppendPosition: string; // the next position
 }
 
 export interface HeadObjectOptions {
-    timeout?: number,
-    headers?: object
+    timeout?: number;
+    headers?: object;
 }
 
 export interface HeadObjectResult {
-    status: number, // response status, maybe 200 or 304
-    meta: UserMeta,
-    res: NormalSuccessResponse
+    status: number; // response status, maybe 200 or 304
+    meta: UserMeta;
+    res: NormalSuccessResponse;
 }
 
 export interface GetObjectOptions {
-    timeout?: number,
-    process?: string, // image process params, will send with x-oss-process e.g.: {process: 'image/resize,w_200'}
-    headers?: object
+    timeout?: number;
+    process?: string; // image process params, will send with x-oss-process e.g.: {process: 'image/resize,w_200'}
+    headers?: object;
 }
 
 export interface GetObjectResult {
-    content?: any, // file content buffer if file parameter is null or ignore
-    res: NormalSuccessResponse
+    content?: any; // file content buffer if file parameter is null or ignore
+    res: NormalSuccessResponse;
 }
 
 export interface GetStreamOptions {
-    timeout?: number,
-    process?: string, // image process params, will send with x-oss-process e.g.: {process: 'image/resize,w_200'}
-    headers?: object
+    timeout?: number;
+    process?: string; // image process params, will send with x-oss-process e.g.: {process: 'image/resize,w_200'}
+    headers?: object;
 }
 
 export interface GetStreamResult {
-    stream?: any, // readable stream instance if response status is not 200, stream will be null.
-    res: NormalSuccessResponse
+    stream?: any; // readable stream instance if response status is not 200, stream will be null.
+    res: NormalSuccessResponse;
 }
 
 export interface CopyObjectOptions {
-    timeout?: number,
-    meta?: UserMeta,
-    headers?: object
+    timeout?: number;
+    meta?: UserMeta;
+    headers?: object;
 }
 
 export interface CopyAndPutMetaResult {
-    data: ModifyData,
-    res: NormalSuccessResponse
+    data: ModifyData;
+    res: NormalSuccessResponse;
 }
 
 export interface DeleteMultiOptions {
-    quite?: boolean // quiet mode or verbose mode, default is false, verbose mode quiet mode: if all objects delete succes, return emtpy response. otherwise return delete error object results. verbose mode: return all object delete results.
-    timeout?: number
+    quite?: boolean; // quiet mode or verbose mode, default is false
+    timeout?: number;
 }
 
 export interface DeleteMultiResult {
-    deleted?: Array<string> // deleted object names list
-    res: NormalSuccessResponse
+    deleted?: string[]; // deleted object names list
+    res: NormalSuccessResponse;
 }
 
 export interface ResponseHeaderType {
-    'content-type'?: string,
-    'content-disposition'? :string,
-    'cache-control'?: string
+    'content-type'?: string;
+    'content-disposition'?: string;
+    'cache-control'?: string;
 }
 
 export interface SignatureUrlOptions {
-    expires?: number, // after expires seconds, the url will become invalid, default is 1800
-    method?: HTTPMethods, // the HTTP method, default is 'GET'
-    'Content-Type'?: string, // set the request content type
-    process?: string,
-    response?: ResponseHeaderType, // set the response headers for download
-    callback?: ObjectCallback
+    expires?: number; // after expires seconds, the url will become invalid, default is 1800
+    method?: HTTPMethods; // the HTTP method, default is 'GET'
+    'Content-Type'?: string; // set the request content type
+    process?: string;
+    response?: ResponseHeaderType; // set the response headers for download
+    callback?: ObjectCallback;
 }
 
 export interface GetACLResult {
-    acl: ACLType,
-    res: NormalSuccessResponse
+    acl: ACLType;
+    res: NormalSuccessResponse;
 }
 
 export interface InitMultipartUploadOptions {
-    timeout?: number,
-    mime?: string, // Mime file type
-    meta?: UserMeta,
-    headers?: object
+    timeout?: number;
+    mime?: string; // Mime file type
+    meta?: UserMeta;
+    headers?: object;
 }
 
 export interface InitMultipartUploadResult {
-    res: { status: number, headers: object, size: number, rt: number }
-    bucket: string, // bucket name
-    name: string, // object name store on OSS
-    uploadId: string, // upload id, use for uploadPart, completeMultipart
+    res: { status: number, headers: object, size: number, rt: number };
+    bucket: string; // bucket name
+    name: string; // object name store on OSS
+    uploadId: string; // upload id, use for uploadPart, completeMultipart
 }
 
 export interface UploadPartResult {
-    name: string,
-    etag: string,
-    res: NormalSuccessResponse
+    name: string;
+    etag: string;
+    res: NormalSuccessResponse;
 }
 
 export interface CompleteMultipartUploadOptions {
-    timeout?: number,
-    callback?: ObjectCallback,
-    headers?: object
+    timeout?: number;
+    callback?: ObjectCallback;
+    headers?: object;
 }
 
 export interface CompleteMultipartUploadResult {
-    bucket: string,
-    name: string,
-    etag: string,
-    data: object,
-    res: NormalSuccessResponse
+    bucket: string;
+    name: string;
+    etag: string;
+    data: object;
+    res: NormalSuccessResponse;
 }
 
 export interface MultipartUploadOptions {
-    parallel?: number, // the number of parts to be uploaded in parallel
-    partSize?: number, // the suggested size for each part
-    progress?: Function, // the progress callback called after each successful upload of one part, it will be given three parameters: (percentage {Number}, checkpoint {Object}, res {Object})
-    checkpoint?: Checkpoint, // the checkpoint to resume upload, if this is provided, it will continue the upload from where interrupted, otherwise a new multipart upload will be created.
-    meta?: UserMeta,
-    mime?: string,
-    callback?: ObjectCallback,
-    headers?: object,
-    timeout?: number
-    copyheaders?: object, //  {Object} only uploadPartCopy api used, detail
+    parallel?: number; // the number of parts to be uploaded in parallel
+    partSize?: number; // the suggested size for each part
+    progress?: (...args: any[]) => any; // the progress callback called after each successful upload of one part
+    checkpoint?: Checkpoint; // the checkpoint to resume upload, if this is provided, it will continue the upload from where interrupted, otherwise a new multipart upload will be created.
+    meta?: UserMeta;
+    mime?: string;
+    callback?: ObjectCallback;
+    headers?: object;
+    timeout?: number;
+    copyheaders?: object; //  {Object} only uploadPartCopy api used, detail
 }
 
 export interface MultipartUploadResult {
-    bucket: string,
-    name: string,
-    etag: string,
-    data: object,
-    res: NormalSuccessResponse
+    bucket: string;
+    name: string;
+    etag: string;
+    data: object;
+    res: NormalSuccessResponse;
 }
 
 export interface MultipartUploadCopyResult {
-    bucket: string,
-    name: string,
-    etag: string,
-    res: NormalSuccessResponse
+    bucket: string;
+    name: string;
+    etag: string;
+    res: NormalSuccessResponse;
 }
 
 export interface MultipartUploadCopySourceData {
-    sourceKey: string, // the source object name
-    sourceBucketName: string, // sourceData.  the source bucket name
-    startOffset: number, // data copy start byte offset, e.g: 0
-    endOffset: number // data copy end byte offset, e.g: 102400
+    sourceKey: string; // the source object name
+    sourceBucketName: string; // sourceData.  the source bucket name
+    startOffset: number; // data copy start byte offset, e.g: 0
+    endOffset: number; // data copy end byte offset, e.g: 102400
 }
 
 export interface ListPartsQuery {
-    'max-parts': number, // The maximum part number in the response of the OSS. default value: 1000.
-    'part-number-marker': number, // Starting position of a specific list. A part is listed only when the part number is greater than the value of this parameter.
-    'encoding-type': string // Specify the encoding of the returned content and the encoding type. Optional value: url
+    'max-parts': number; // The maximum part number in the response of the OSS. default value: 1000.
+    'part-number-marker': number; // Starting position of a specific list. A part is listed only when the part number is greater than the value of this parameter.
+    'encoding-type': string; // Specify the encoding of the returned content and the encoding type. Optional value: url
 }
 
 export interface ListPartsResult {
-    uploadId: string,
-    bucket: string,
-    name: string,
-    PartNumberMarker: number,
-    nextPartNumberMarker: number,
-    maxParts: number,
-    isTruncated: boolean,
-    parts: Array<ObjectPart>,
-    res: NormalSuccessResponse
+    uploadId: string;
+    bucket: string;
+    name: string;
+    PartNumberMarker: number;
+    nextPartNumberMarker: number;
+    maxParts: number;
+    isTruncated: boolean;
+    parts: ObjectPart[];
+    res: NormalSuccessResponse;
 }
 
 export interface ListUploadsQuery {
-    prefix?: string,
-    'max-uploads'?: number,
-    'key-marker'?: string,
-    'upload-id-marker'?: string
+    prefix?: string;
+    'max-uploads'?: number;
+    'key-marker'?: string;
+    'upload-id-marker'?: string;
 }
 
 export interface ListUploadsResult {
-    res: NormalSuccessResponse,
-    bucket: string,
-    nextKeyMarker: any,
-    nextUploadIdMarker: any,
-    isTruncated: boolean,
-    uploads: Array<Upload>
+    res: NormalSuccessResponse;
+    bucket: string;
+    nextKeyMarker: any;
+    nextUploadIdMarker: any;
+    isTruncated: boolean;
+    uploads: Upload[];
 }
 
 export interface PutChannelConf {
-    Description?: string,
-    Status?: string,
+    Description?: string;
+    Status?: string;
     Target?: {
         Type: string,
         FragDuration: number,
         FragCount: number,
         PlaylistName: string
-    }
+    };
 }
 
 export interface PutChannelResult {
-    publishUrls: Array<string>,
-    playUrls: Array<string>,
-    res: NormalSuccessResponse
+    publishUrls: string[];
+    playUrls: string[];
+    res: NormalSuccessResponse;
 }
 
 export interface GetChannelResult {
-    Status: string,
-    ConnectedTime?: string,
-    RemoteAddr?: string,
-    Video?: object,
-    Audio?: object,
-    res: NormalSuccessResponse
+    Status: string;
+    ConnectedTime?: string;
+    RemoteAddr?: string;
+    Video?: object;
+    Audio?: object;
+    res: NormalSuccessResponse;
 }
 
 export interface ListChannelsQuery {
-    prefix: string, // the channel id prefix (returns channels with this prefix)
-    marker: string, // the channle id marker (returns channels after this id)
-    'max-keys ': number // max number of channels to return
+    prefix: string; // the channel id prefix (returns channels with this prefix)
+    marker: string; // the channel id marker (returns channels after this id)
+    'max-keys ': number; // max number of channels to return
 }
 
 export interface ListChannelsResult {
-    channels: Array<Channel>
-    nextMarker: string | null,
-    isTruncated: boolean,
-    res: NormalSuccessResponse
+    channels: Channel[];
+    nextMarker: string | null;
+    isTruncated: boolean;
+    res: NormalSuccessResponse;
 }
 
 export interface ChannelHistoryResult {
-    records: ChannelHistory,
-    res: NormalSuccessResponse
+    records: ChannelHistory;
+    res: NormalSuccessResponse;
 }
 
 export interface GetRtmpUrlOptions {
-    expires?: number, // the expire time in seconds of the url
-    params?: object, // the additional paramters for url, e.g.: {playlistName: 'play.m3u8'}
-    timeout?: number // the operation timeout
+    expires?: number; // the expire time in seconds of the url
+    params?: object; // the additional parameters for url, e.g.: {playlistName: 'play.m3u8'}
+    timeout?: number; // the operation timeout
 }
 
 export default class OSS {
     // the image client
-    public static ImageClient: (options: ImageClientDefinition.ImageClientOptions) => ImageClientDefinition.ImageClient
-    public static Cluster: (options: ClusterDefinition.ClusterOptions) => ClusterDefinition.Cluster
+    static ImageClient: (options: ImageClientDefinition.ImageClientOptions) => ImageClientDefinition.ImageClient;
+    static Cluster: (options: ClusterDefinition.ClusterOptions) => ClusterDefinition.Cluster;
 
     constructor(options: Options)
 
@@ -446,510 +446,315 @@ export default class OSS {
     // base operators
     /**
      * List buckets in this account.
-     * @param {ListBucketsQueryType | null} query - query parameters, default is null
-     * @param {RequestOptions} options - optional parameters
-     *   timeout - the operation timeout
-     * @return {Promise<Array<Bucket>>}
      */
-    listBuckets(query: ListBucketsQueryType | null, options?: RequestOptions): Promise<Array<Bucket>>
+    listBuckets(query: ListBucketsQueryType | null, options?: RequestOptions): Promise<Bucket[]>;
 
     /**
      * Create a new bucket.
-     * @param {string} name -  bucket name If bucket exists and not belong to current account, will throw BucketAlreadyExistsError.
-     * If bucket not exists, will create a new bucket and set it's ACL.
-     * @param {PutBucketOptions} options - optional parameters
-     * @return { Promise<{ bucket: string, res: NormalSuccessResponse }> }
      */
-    putBucket(name: string, options?: PutBucketOptions): Promise<{ bucket: string, res: NormalSuccessResponse }>
+    putBucket(name: string, options?: PutBucketOptions): Promise<{ bucket: string, res: NormalSuccessResponse }>;
 
     /**
      * Use the bucket.
-     * @param {string} name - bucket name
      */
-    useBucket(name: string): void
+    useBucket(name: string): void;
 
     /**
      * Delete an empty bucket.
-     * @param {string} name - bucket name If bucket is not empty, will throw BucketNotEmptyError. If bucket is not exists, will throw NoSuchBucketError.
-     * @param {RequestOptions} options
-     * @return {Promise<NormalSuccessResponse>}
      */
-    deleteBucket(name: string, options?: RequestOptions): Promise<NormalSuccessResponse>
+    deleteBucket(name: string, options?: RequestOptions): Promise<NormalSuccessResponse>;
 
     /**
      * Get bucket information,include CreationDate、ExtranetEndpoint、IntranetEndpoint、Location、Name、StorageClass、 Owner、AccessControlList
-     * @param {string} name - bucket name
-     * @return {Promise<any>} // todo the official document miss the return type
      */
-    getBucketInfo(name: string): Promise<any>
+    getBucketInfo(name: string): Promise<any>;
 
     /**
      * Get bucket location
-     * @param {string} name - bucket name
-     * @return {Promise<any>} // todo the official document miss the return type
      */
-    getBucketLocation(name: string): Promise<any>
+    getBucketLocation(name: string): Promise<any>;
 
     // ACL operations
     /**
      * Update the bucket ACL.
-     * @param {string} name -  bucket name
-     * @param {ACLType} acl - access control list, current available: public-read-write, public-read and private
-     * @param {RequestOptions} options
-     * @return {Promise<NormalSuccessResponse>}
      */
-    putBucketACL(name: string, acl: ACLType, options?: RequestOptions): Promise<NormalSuccessResponse>
+    putBucketACL(name: string, acl: ACLType, options?: RequestOptions): Promise<NormalSuccessResponse>;
 
     /**
      * Get the bucket ACL.
-     * @param {string} name - bucket name
-     * @param {RequestOptions} options
-     * @return {Promise<{ acl: string, res: NormalSuccessResponse }>}
      *   acl - acl settings string
      */
-    getBucketACL(name: string, options?: RequestOptions): Promise<{ acl: string, res: NormalSuccessResponse }>
+    getBucketACL(name: string, options?: RequestOptions): Promise<{ acl: string, res: NormalSuccessResponse }>;
 
     // logging operations
     /**
      * Update the bucket logging settings. Log file will create every one hour and name format: <prefix><bucket>-YYYY-mm-DD-HH-MM-SS-UniqueString.
-     * @param {string} name -  bucket name
-     * @param {string} prefix - prefix path name to store the log files
-     * @param {RequestOptions} options
-     * @return {Promise<NormalSuccessResponse>}
      */
-    putBucketLogging(name: string, prefix?: string, options?: RequestOptions): Promise<NormalSuccessResponse>
+    putBucketLogging(name: string, prefix?: string, options?: RequestOptions): Promise<NormalSuccessResponse>;
 
     /**
      * Get the bucket logging settings.
-     * @param {string} name
-     * @param {RequestOptions} options
-     * @return {Promise<{ enable: boolean, prefix: string | null, res: NormalSuccessResponse }>}
      */
-    getBucketLogging(name: string, options?: RequestOptions): Promise<{ enable: boolean, prefix: string | null, res: NormalSuccessResponse }>
+    getBucketLogging(name: string, options?: RequestOptions): Promise<{ enable: boolean, prefix: string | null, res: NormalSuccessResponse }>;
 
     /**
      * Delete the bucket logging settings.
-     * @param {string} name - bucket name
-     * @param {RequestOptions} options
-     * @return {Promise<NormalSuccessResponse>}
      */
-    deleteBucketLogging(name: string, options?: RequestOptions): Promise<NormalSuccessResponse>
+    deleteBucketLogging(name: string, options?: RequestOptions): Promise<NormalSuccessResponse>;
 
     // Website operations
     /**
      * Set the bucket as a static website.
-     * @param {string} name - bucket name
-     * @param {PutBucketWebsiteConfig} config
-     * @return {Promise<NormalSuccessResponse>}
      */
-    putBucketWebsite(name: string, config: PutBucketWebsiteConfig): Promise<NormalSuccessResponse>
+    putBucketWebsite(name: string, config: PutBucketWebsiteConfig): Promise<NormalSuccessResponse>;
 
     /**
      * Get the bucket website config.
-     * @param {string} name - bucket name
-     * @param {RequestOptions} options
-     * @return {Promise<{ index: string, error: string, res: NormalSuccessResponse }>}
      */
-    getBucketWebsite(name: string, options?: RequestOptions): Promise<{ index: string, error: string, res: NormalSuccessResponse }>
+    getBucketWebsite(name: string, options?: RequestOptions): Promise<{ index: string, error: string, res: NormalSuccessResponse }>;
 
     /**
      * Delete the bucket website config.
-     * @param {string} name - bucket name
-     * @param {RequestOptions} options
-     * @return {Promise<NormalSuccessResponse>}
      */
-    deleteBucketWebsite(name: string, options?: RequestOptions): Promise<NormalSuccessResponse>
+    deleteBucketWebsite(name: string, options?: RequestOptions): Promise<NormalSuccessResponse>;
 
     // referer operations
     /**
      * Set the bucket request Referer white list.
-     * @param {string} name
-     * @param {boolean} allowEmpty - allow empty request referer or not
-     * @param {Array<string>} referers - Referer white list, e.g.: ['https://npm.taobao.org', 'http://cnpmjs.org']
-     * @param {RequestOptions} options
-     * @return {Promise<NormalSuccessResponse>}
      */
-    putBucketReferer(name: string, allowEmpty: boolean, referers: Array<string>, options?: RequestOptions): Promise<NormalSuccessResponse>
+    putBucketReferer(name: string, allowEmpty: boolean, referers: string[], options?: RequestOptions): Promise<NormalSuccessResponse>;
 
     /**
      * Get the bucket request Referer white list.
-     * @param {string} name - bucket name
-     * @param {RequestOptions} options
-     * @return {Promise<{ allowEmpty: boolean, referers: Array<string>, res: NormalSuccessResponse }>}
      */
-    getBucketReferer(name: string, options?: RequestOptions): Promise<{ allowEmpty: boolean, referers: Array<string>, res: NormalSuccessResponse }>
+    getBucketReferer(name: string, options?: RequestOptions): Promise<{ allowEmpty: boolean, referers: string[], res: NormalSuccessResponse }>;
 
     /**
      * Delete the bucket request Referer white list.
-     * @param {string} name
-     * @param {RequestOptions} options
-     * @return {Promise<NormalSuccessResponse>}
      */
-    deleteBucketReferer(name: string, options?: RequestOptions): Promise<NormalSuccessResponse>
+    deleteBucketReferer(name: string, options?: RequestOptions): Promise<NormalSuccessResponse>;
 
     // lifecycle operations
     /**
      * Set the bucket object lifecycle.
-     * @param {string} name
-     * @param {Array<Rule>} rules - rule config list
-     * @param {RequestOptions} options
-     * @return {Promise<NormalSuccessResponse>}
      */
-    putBucketLifecycle(name: string, rules: Array<LifecycleRule>, options?: RequestOptions): Promise<NormalSuccessResponse>
+    putBucketLifecycle(name: string, rules: LifecycleRule[], options?: RequestOptions): Promise<NormalSuccessResponse>;
 
     /**
      * Get the bucket object lifecycle.
-     * @param {string} name
-     * @param {RequestOptions} options
-     * @return {Promise<{ rules: Array<Rule>, res: NormalSuccessResponse }>}
      */
-    getBucketLifecycle(name: string, options?: RequestOptions): Promise<{ rules: Array<LifecycleRule>, res: NormalSuccessResponse }>
+    getBucketLifecycle(name: string, options?: RequestOptions): Promise<{ rules: LifecycleRule[], res: NormalSuccessResponse }>;
 
     /**
      * Delete the bucket object lifecycle.
-     * @param {string} name
-     * @param {RequestOptions} options
-     * @return {Promise<NormalSuccessResponse>}
      */
-    deleteBucketLifecycle(name: string, options?: RequestOptions): Promise<NormalSuccessResponse>
+    deleteBucketLifecycle(name: string, options?: RequestOptions): Promise<NormalSuccessResponse>;
 
     // CORS operations
     /**
      * Set CORS rules of the bucket object
-     * @param {string} name
-     * @param {Array<CORSRule>} rules
-     * @param {RequestOptions} options
-     * @return {Promise<NormalSuccessResponse>}
      */
-    putBucketCORS(name: string, rules: Array<CORSRule>, options?: RequestOptions): Promise<NormalSuccessResponse>
+    putBucketCORS(name: string, rules: CORSRule[], options?: RequestOptions): Promise<NormalSuccessResponse>;
 
     /**
      * Get CORS rules of the bucket object.
-     * @param {string} name
-     * @return {Promise<{rules: Array<CORSRule>; res: NormalSuccessResponse}>}
      */
-    getBucketCORS(name: string): Promise<{ rules: Array<CORSRule>, res: NormalSuccessResponse }>
+    getBucketCORS(name: string): Promise<{ rules: CORSRule[], res: NormalSuccessResponse }>;
 
     /**
      * Delete CORS rules of the bucket object.
-     * @param {string} name
-     * @return {Promise<NormalSuccessResponse>}
      */
-    deleteBucketCORS(name: string): Promise<NormalSuccessResponse>
+    deleteBucketCORS(name: string): Promise<NormalSuccessResponse>;
 
     /********************************************************** Object operations ********************************************/
     /**
      * List objects in the bucket.
-     * @param {ListObjectsQuery | null} query
-     * @param {RequestOptions} options
-     * @return {Promise<ListObjectResult>}
      */
-    list(query: ListObjectsQuery | null, options: RequestOptions): Promise<ListObjectResult>
+    list(query: ListObjectsQuery | null, options: RequestOptions): Promise<ListObjectResult>;
 
     /**
      * Add an object to the bucket.
-     * @param {string} name - object name store on OSS
-     * @param file -  {String|Buffer|ReadStream|File(only support Browser)|Blob(only support Browser)} object local path, content buffer or ReadStream content instance use in Node, Blob and html5 File
-     * @param {PutObjectOptions} options - optional parameters
-     * @return {Promise<PutObjectResult>}
      */
-    put(name: string, file: any, options?: PutObjectOptions): Promise<PutObjectResult>
+    put(name: string, file: any, options?: PutObjectOptions): Promise<PutObjectResult>;
 
     /**
      * Add a stream object to the bucket.
-     * @param {string} name - object name store on OSS
-     * @param stream - object ReadStream content instance
-     * @param {PutStreamOptions} options -  optional parameters
-     * @return {Promise<{name: string; res: NormalSuccessResponse}>}
      */
-    putStream(name: string, stream: any, options?: PutStreamOptions): Promise<{ name: string, res: NormalSuccessResponse }>
+    putStream(name: string, stream: any, options?: PutStreamOptions): Promise<{ name: string, res: NormalSuccessResponse }>;
 
     /**
      * Append an object to the bucket, it's almost same as put, but it can add content to existing object rather than override it.
-     * @param {string} name
-     * @param file
-     * @param {AppendObjectOptions} options
-     * @return {Promise<AppendObjectResult>}
      */
-    append(name: string, file: any, options?: AppendObjectOptions): Promise<AppendObjectResult>
+    append(name: string, file: any, options?: AppendObjectOptions): Promise<AppendObjectResult>;
 
     /**
      * Get the Object url. If provide baseUrl, will use baseUrl instead the default endpoint.
-     * @param {string} name
-     * @param {string} baseUrl
-     * @return {string}
      */
-    getObjectUrl(name: string, baseUrl?: string): string
+    getObjectUrl(name: string, baseUrl?: string): string;
 
     /**
      * Get the Object url. If provide baseUrl, will use baseUrl instead the default bucket and endpoint. Suggest use generateObjectUrl instead of getObjectUrl.
-     * @param {string} name
-     * @param {string} baseUrl
-     * @return {string}
      */
-    generateObjectUrl(name: string, baseUrl?: string): string
+    generateObjectUrl(name: string, baseUrl?: string): string;
 
     /**
      * Head an object and get the meta info.
-     * @param {string} name
-     * @param {HeadObjectOptions} options
-     * @return {Promise<HeadObjectResult>}
      */
-    head(name: string, options?: HeadObjectOptions): Promise<HeadObjectResult>
+    head(name: string, options?: HeadObjectOptions): Promise<HeadObjectResult>;
 
     /**
      * Get an object from the bucket.
-     * @param {string} name
-     * @param file -  {String|WriteStream} file path or WriteStream instance to store the content If file is null or ignore this parameter, function will return info contains content property.
-     * @param {GetObjectOptions} options
-     * @return {Promise<GetObjectOptions>}
      */
-    get(name: string, file?: any, options?: GetObjectOptions): Promise<GetObjectResult>
+    get(name: string, file?: any, options?: GetObjectOptions): Promise<GetObjectResult>;
 
     /**
      * Get an object read stream.
-     * @param {string} name
-     * @param {GetStreamOptions} options
-     * @return {Promise<GetStreamResult>}
      */
-    getStream(name?: string, options?: GetStreamOptions): Promise<GetStreamResult>
+    getStream(name?: string, options?: GetStreamOptions): Promise<GetStreamResult>;
 
     /**
      * Delete an object from the bucket.
-     * @param {string} name
-     * @param {RequestOptions} options
-     * @return {Promise<NormalSuccessResponse>}
      */
-    delete(name: string, options?: RequestOptions): Promise<NormalSuccessResponse>
+    delete(name: string, options?: RequestOptions): Promise<NormalSuccessResponse>;
 
     /**
      * Copy an object from sourceName to name.
-     * @param {string} name - object name store on OSS
-     * @param {string} sourceName -  source object name If sourceName start with /, meaning it's a full name contains the bucket name. e.g.: /otherbucket/logo.png meaning copy otherbucket logn.png object to current bucket.
-     * @param {CopyObjectOptions} options
-     * @return {Promise<CopyAndPutMetaResult>}
      */
-    copy(name: string, sourceName: string, options?: CopyObjectOptions): Promise<CopyAndPutMetaResult>
+    copy(name: string, sourceName: string, options?: CopyObjectOptions): Promise<CopyAndPutMetaResult>;
 
     /**
      * Set an exists object meta.
-     * @param {string} name
-     * @param {UserMeta} meta
-     * @param {RequestOptions} options
-     * @return {Promise<CopyAndPutMetaResult>}
      */
-    putMeta(name: string, meta: UserMeta, options: RequestOptions): Promise<CopyAndPutMetaResult>
+    putMeta(name: string, meta: UserMeta, options: RequestOptions): Promise<CopyAndPutMetaResult>;
 
     /**
      * Delete multi objects in one request.
-     * @param {Array<string>} names - object names, max 1000 objects in once.
-     * @param {DeleteMultiOptions} options
-     * @return {Promise<DeleteMultiResult>}
      */
-    deleteMulti(names: Array<string>, options?: DeleteMultiOptions): Promise<DeleteMultiResult>
+    deleteMulti(names: string[], options?: DeleteMultiOptions): Promise<DeleteMultiResult>;
 
     /**
      * Create a signature url for download or upload object. When you put object with signatureUrl ,you need to pass Content-Type.Please look at the example.
-     * @param {string} name
-     * @param {SignatureUrlOptions} options
-     * @return {string}
      */
-    signatureUrl(name: string, options?: SignatureUrlOptions): string
+    signatureUrl(name: string, options?: SignatureUrlOptions): string;
 
     /**
      * Set object's ACL.
-     * @param {string} name
-     * @param {ACLType} acl
-     * @param {RequestOptions} options
-     * @return {Promise<NormalSuccessResponse>}
      */
-    putACL(name: string, acl: ACLType, options?: RequestOptions): Promise<NormalSuccessResponse>
+    putACL(name: string, acl: ACLType, options?: RequestOptions): Promise<NormalSuccessResponse>;
 
     /**
      * Get object's ACL.
-     * @param {string} name
-     * @param {RequestOptions} options
-     * @return {Promise<GetACLResult>}
      */
-    getACL(name: string, options?: RequestOptions): Promise<GetACLResult>
+    getACL(name: string, options?: RequestOptions): Promise<GetACLResult>;
 
     /**
      * Restore Object.
-     * @param {string} name
-     * @param {RequestOptions} options
-     * @return {Promise<NormalSuccessResponse>}
      */
-    restore(name: string, options?: RequestOptions): Promise<NormalSuccessResponse>
+    restore(name: string, options?: RequestOptions): Promise<NormalSuccessResponse>;
 
     /**
-     *
-     * @param {string} name
-     * @param {InitMultipartUploadOptions} options
-     * @return {Promise<InitMultipartUploadResult>}
+     * multi upload
      */
-    initMultipartUpload(name: string, options?: InitMultipartUploadOptions): Promise<InitMultipartUploadResult>
+    initMultipartUpload(name: string, options?: InitMultipartUploadOptions): Promise<InitMultipartUploadResult>;
 
     /**
      * After initiating a Multipart Upload event, you can upload data in parts based on the specified object name and Upload ID.
-     * @param {string} name - object name
-     * @param {string} uploadId - get by initMultipartUpload api
-     * @param {number} partNo - range is 1-10000, If this range is exceeded, OSS returns the InvalidArgument's error code.
-     * @param file -  is File or FileName, the whole file
-     Multipart Upload requires that the size of any Part other than the last Part is greater than 100KB.
-     In Node you can use File or FileName, but in browser you only can use File.
-     * @param {number} start - part start bytes e.g: 102400
-     * @param {number} end - part end bytes e.g: 204800
-     * @param {RequestOptions} options
-     * @return {Promise<UploadPartResult>}
      */
-    uploadPart(name: string, uploadId: string, partNo: number, file: any, start: number, end: number, options?: RequestOptions): Promise<UploadPartResult>
+    uploadPart(name: string, uploadId: string, partNo: number, file: any, start: number, end: number, options?: RequestOptions): Promise<UploadPartResult>;
 
     /**
-     * Using Upload Part Copy, you can copy data from an existing object and upload a part of the data. When copying a file larger than 1 GB, you must use the Upload Part Copy method. If you want to copy a file smaller than 1 GB, see Copy Object.
-     * @param {string} name
-     * @param {string} uploadId
-     * @param {number} partNo
-     * @param {string} range
-     * @param {{sourceKey: string; sourceBucketName: string}} sourceData
-     * @param {{timeout?: number; headers?: object}} options
-     * @return {Promise<UploadPartResult>}
+     * Using Upload Part Copy, you can copy data from an existing object and upload a part of the data.
+     * When copying a file larger than 1 GB, you must use the Upload Part Copy method. If you want to copy a file smaller than 1 GB, see Copy Object.
      */
-    uploadPartCopy(name: string, uploadId: string, partNo: number, range: string, sourceData: { sourceKey: string, sourceBucketName: string }, options: { timeout?: number, headers?: object }): Promise<UploadPartResult>
+    uploadPartCopy(
+        name: string,
+        uploadId: string,
+        partNo: number,
+        range: string,
+        sourceData: { sourceKey: string, sourceBucketName: string },
+        options: { timeout?: number, headers?: object }
+    ): Promise<UploadPartResult>;
 
     /**
      * After uploading all data parts, you must call the Complete Multipart Upload API to complete Multipart Upload for the entire file.
-     * @param {string} name
-     * @param {string} uploadId
-     * @param {Array<{number: number; etag: string}>} parts
-     * @param {CompleteMultipartUploadOptions} options
-     * @return {Promise<CompleteMultipartUploadResult>}
      */
-    completeMultipartUpload(name: string, uploadId: string, parts: Array<{ number: number, etag: string }>, options?: CompleteMultipartUploadOptions): Promise<CompleteMultipartUploadResult>
+    completeMultipartUpload(
+        name: string,
+        uploadId: string,
+        parts: Array<{ number: number, etag: string }>,
+        options?: CompleteMultipartUploadOptions
+    ): Promise<CompleteMultipartUploadResult>;
 
     /**
      * Upload file with OSS multipart.
-     * this function contains initMultipartUpload, uploadPart, completeMultipartUpload. When you use multipartUpload api，if you encounter problems with ConnectionTimeoutError, you should handle ConnectionTimeoutError in your business code.
-     * How to resolve ConnectionTimeoutError, you can decrease partSize size 、 Increase timeout 、Retry request , or give tips in your business code;
-     * @param {string} name
-     * @param file
-     * @param {MultipartUploadOptions} options
-     * @return {Promise<MultipartUploadResult>}
      */
-    multipartUpload(name: string, file: any, options: MultipartUploadOptions): Promise<MultipartUploadResult>
+    multipartUpload(name: string, file: any, options: MultipartUploadOptions): Promise<MultipartUploadResult>;
 
     /**
      * Copy file with OSS multipart.
      * this function contains head, initMultipartUpload, uploadPartCopy, completeMultipartUpload.
      * When copying a file larger than 1 GB, you should use the Upload Part Copy method. If you want to copy a file smaller than 1 GB, see Copy Object.
-     * @param {string} name
-     * @param {MultipartUploadCopySourceData} sourceData
-     * @param {MultipartUploadOptions} options
-     * @return {Promise<MultipartUploadCopyResult>}
      */
-    multipartUploadCopy(name: string, sourceData: MultipartUploadCopySourceData, options?: MultipartUploadOptions): Promise<MultipartUploadCopyResult>
+    multipartUploadCopy(name: string, sourceData: MultipartUploadCopySourceData, options?: MultipartUploadOptions): Promise<MultipartUploadCopyResult>;
 
     /**
      * The ListParts command can be used to list all successfully uploaded parts mapped to a specific upload ID, i.e.: those not completed and not aborted.
-     * @param {string} name
-     * @param {string} uploadId
-     * @param {ListPartsQuery} query
-     * @param {RequestOptions} options
-     * @return {Promise<ListPartsResult>}
      */
-    listParts(name: string, uploadId: string, query?: ListPartsQuery, options?: RequestOptions): Promise<ListPartsResult>
+    listParts(name: string, uploadId: string, query?: ListPartsQuery, options?: RequestOptions): Promise<ListPartsResult>;
 
     /**
      * List on-going multipart uploads, i.e.: those not completed and not aborted.
-     * @param {ListUploadsQuery} query
-     * @param {RequestOptions} options
-     * @return {Promise<ListUploadsResult>}
      */
-    listUploads(query: ListUploadsQuery, options?: RequestOptions): Promise<ListUploadsResult>
+    listUploads(query: ListUploadsQuery, options?: RequestOptions): Promise<ListUploadsResult>;
 
     /**
      * Abort a multipart upload for object.
-     * @param {string} name
-     * @param {string} uploadId
-     * @param {RequestOptions} options
-     * @return {Promise<NormalSuccessResponse>}
      */
-    abortMultipartUpload(name: string, uploadId: string, options?: RequestOptions): Promise<NormalSuccessResponse>
+    abortMultipartUpload(name: string, uploadId: string, options?: RequestOptions): Promise<NormalSuccessResponse>;
 
     /************************************************ RTMP Operations *************************************************************/
     /**
      * Create a live channel.
-     * @param {string} id
-     * @param {PutChannelConf} conf
-     * @param {RequestOptions} options
-     * @return {Promise<PutChannelResult>}
      */
-    putChannel(id: string, conf: PutChannelConf, options?: RequestOptions): Promise<PutChannelResult>
+    putChannel(id: string, conf: PutChannelConf, options?: RequestOptions): Promise<PutChannelResult>;
 
     /**
      * Get live channel info.
-     * @param {string} id
-     * @param {RequestOptions} options
-     * @return {Promise<{data: PutChannelConf; res: NormalSuccessResponse}>}
      */
-    getChannel(id: string, options?: RequestOptions): Promise<{ data: PutChannelConf, res: NormalSuccessResponse }>
+    getChannel(id: string, options?: RequestOptions): Promise<{ data: PutChannelConf, res: NormalSuccessResponse }>;
 
     /**
      * Delete a live channel.
-     * @param {string} id
-     * @param {RequestOptions} options
-     * @return {Promise<NormalSuccessResponse>}
      */
-    deleteChannel(id: string, options?: RequestOptions): Promise<NormalSuccessResponse>
+    deleteChannel(id: string, options?: RequestOptions): Promise<NormalSuccessResponse>;
 
     /**
      * Change the live channel status.
-     * @param {string} id
-     * @param {string} status
-     * @param {RequestOptions} options
-     * @return {Promise<NormalSuccessResponse>}
      */
-    putChannelStatus(id: string, status?: string, options?: RequestOptions): Promise<NormalSuccessResponse>
+    putChannelStatus(id: string, status?: string, options?: RequestOptions): Promise<NormalSuccessResponse>;
 
     /**
      * Get the live channel status.
-     * @param {string} id
-     * @param {RequestOptions} options
-     * @return {Promise<GetChannelResult>}
      */
-    getChannelStatus(id: string, options?: RequestOptions): Promise<GetChannelResult>
+    getChannelStatus(id: string, options?: RequestOptions): Promise<GetChannelResult>;
 
     /**
      * List channels.
-     * @param {ListChannelsQuery} query
-     * @param {RequestOptions} options
-     * @return {Promise<ListChannelsResult>}
      */
-    listChannels(query: ListChannelsQuery, options?: RequestOptions): Promise<ListChannelsResult>
+    listChannels(query: ListChannelsQuery, options?: RequestOptions): Promise<ListChannelsResult>;
 
     /**
      * Get the live channel history.
-     * @param {string} id
-     * @param {RequestOptions} options
-     * @return {Promise<ChannelHistoryResult>}
      */
-    getChannelHistory(id: string, options?: RequestOptions): Promise<ChannelHistoryResult>
+    getChannelHistory(id: string, options?: RequestOptions): Promise<ChannelHistoryResult>;
 
     /**
      * Create a VOD playlist for the channel.
-     * @param {string} id
-     * @param {string} name
-     * @param {{startTime: number; endTime: number}} time
-     * @param {RequestOptions} options
-     * @return {Promise<NormalSuccessResponse>}
      */
-    createVod(id: string, name: string, time: { startTime: number, endTime: number }, options?: RequestOptions): Promise<NormalSuccessResponse>
+    createVod(id: string, name: string, time: { startTime: number, endTime: number }, options?: RequestOptions): Promise<NormalSuccessResponse>;
 
     /**
      * Get signatured rtmp url for publishing.
-     * @param {string} channelId
-     * @param {GetRtmpUrlOptions} options
-     * @return {string}
      */
-    getRtmpUrl(channelId?: string, options?: GetRtmpUrlOptions): string
-
+    getRtmpUrl(channelId?: string, options?: GetRtmpUrlOptions): string;
 }
diff --git a/types/ali-oss/tsconfig.json b/types/ali-oss/tsconfig.json
index b6f46ae8e8..62f030a4fd 100644
--- a/types/ali-oss/tsconfig.json
+++ b/types/ali-oss/tsconfig.json
@@ -6,7 +6,7 @@
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
-        "strictNullChecks": false,
+        "strictNullChecks": true,
         "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [
diff --git a/types/ali-oss/tslint.json b/types/ali-oss/tslint.json
index a41bf5d19a..f93cf8562a 100644
--- a/types/ali-oss/tslint.json
+++ b/types/ali-oss/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 e32ea94e933c8d7d426ef4ad9734fe4a2e8bdbdf Mon Sep 17 00:00:00 2001
From: quas94 <quasar.exe@hotmail.com>
Date: Fri, 28 Sep 2018 17:53:41 +1000
Subject: [PATCH 010/836] Add definitions for Dropbox Chooser

---
 .../dropbox-chooser/dropbox-chooser-tests.ts  | 20 ++++++
 types/dropbox-chooser/index.d.ts              | 66 +++++++++++++++++++
 types/dropbox-chooser/tsconfig.json           | 24 +++++++
 types/dropbox-chooser/tslint.json             |  1 +
 4 files changed, 111 insertions(+)
 create mode 100644 types/dropbox-chooser/dropbox-chooser-tests.ts
 create mode 100644 types/dropbox-chooser/index.d.ts
 create mode 100644 types/dropbox-chooser/tsconfig.json
 create mode 100644 types/dropbox-chooser/tslint.json

diff --git a/types/dropbox-chooser/dropbox-chooser-tests.ts b/types/dropbox-chooser/dropbox-chooser-tests.ts
new file mode 100644
index 0000000000..f0930733f8
--- /dev/null
+++ b/types/dropbox-chooser/dropbox-chooser-tests.ts
@@ -0,0 +1,20 @@
+// Tests for Dropbox Chooser DefinitelyTyped TS definitions
+
+const options: DropboxChooserOptions = {
+  success: (files: ReadonlyArray<DropboxChooserFile>) => {
+    console.log('Success, selected files were:', files);
+  },
+};
+
+const Dropbox = window.Dropbox!;
+Dropbox.choose(options);
+
+const sampleFile: DropboxChooserFile = {
+  id: 'SAMPLE_ID',
+  name: 'HelloBox.jpg',
+  link: 'http://localhost/1.png',
+  bytes: 1024,
+  icon: 'http://localhost/icons/png.png',
+  thumbnailLink: 'http://localhost/thumbnails/1.png',
+  isDir: false,
+};
diff --git a/types/dropbox-chooser/index.d.ts b/types/dropbox-chooser/index.d.ts
new file mode 100644
index 0000000000..8c9db6f72d
--- /dev/null
+++ b/types/dropbox-chooser/index.d.ts
@@ -0,0 +1,66 @@
+// Type definitions for Dropbox Chooser 1.0
+// Project: https://www.dropbox.com/developers/chooser
+// Definitions by: Michael Su <https://github.com/quas94>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare namespace Dropbox {
+    interface DropboxChooser {
+      choose(options: ChooserOptions): void;
+    }
+
+    interface ChooserOptions {
+        // alled when a user selects an item in the Chooser
+        success(files: ReadonlyArray<File>): void;
+
+        // called when the user closes the dialog without selecting a file
+        cancel?(): void;
+
+        // default: 'preview'
+        linkType?: 'preview' | 'direct';
+
+        // default: false
+        multiselect?: boolean;
+
+        // eg. '.png'
+        extensions?: string[];
+
+        // default: false
+        folderselect?: boolean;
+
+        // any positive number
+        sizeLimit?: number;
+    }
+
+    interface File {
+        // Unique ID for the file, compatible with Dropbox API v2.
+        id: string;
+
+        // Name of the file.
+        name: string;
+
+        // URL to access the file, which varies depending on the linkType specified when the
+        // Chooser was triggered.
+        link: string;
+
+        // Size of the file in bytes.
+        bytes: number;
+
+        // URL to a 64x64px icon for the file based on the file's extension.
+        icon: string;
+
+        // A thumbnail URL generated when the user selects images and videos.
+        // If the user didn't select an image or video, no thumbnail will be included.
+        thumbnailLink?: string;
+
+        // whether or not the file is actually a directory
+        isDir: boolean;
+    }
+}
+
+type DropboxChooser = Dropbox.DropboxChooser;
+type DropboxChooserOptions = Dropbox.ChooserOptions;
+type DropboxChooserFile = Dropbox.File;
+
+interface Window {
+    Dropbox?: DropboxChooser;
+}
diff --git a/types/dropbox-chooser/tsconfig.json b/types/dropbox-chooser/tsconfig.json
new file mode 100644
index 0000000000..88fb15cc91
--- /dev/null
+++ b/types/dropbox-chooser/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "dom",
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "dropbox-chooser-tests.ts"
+    ]
+}
diff --git a/types/dropbox-chooser/tslint.json b/types/dropbox-chooser/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/dropbox-chooser/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 38728d9cc8d956d6a1c391a2a0e99a8236923699 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomek=20=C5=81aziuk?= <tlaziuk@gmail.com>
Date: Tue, 16 Oct 2018 13:57:01 +0200
Subject: [PATCH 011/836] description

---
 types/range-parser/index.d.ts    | 4 ++--
 types/range-parser/tsconfig.json | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/types/range-parser/index.d.ts b/types/range-parser/index.d.ts
index a1bcf4c9dc..13d331041a 100644
--- a/types/range-parser/index.d.ts
+++ b/types/range-parser/index.d.ts
@@ -4,11 +4,11 @@
 // 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.
+ *
+ * @returns `-1` when unsatisfiable and `-2` when syntactically invalid, ranges otherwise.
  */
 declare function RangeParser(size: number, str: string, options?: RangeParser.Options): RangeParser.Result | RangeParser.Ranges;
 
diff --git a/types/range-parser/tsconfig.json b/types/range-parser/tsconfig.json
index 15585886a9..dc6de494bf 100644
--- a/types/range-parser/tsconfig.json
+++ b/types/range-parser/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "range-parser-tests.ts"
     ]
-}
\ No newline at end of file
+}

From 6d51909cafaad3b3634ad057bfeb2f7eac011872 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomek=20=C5=81aziuk?= <tlaziuk@gmail.com>
Date: Tue, 16 Oct 2018 14:10:42 +0200
Subject: [PATCH 012/836] --isolatedModules fix

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

diff --git a/types/range-parser/index.d.ts b/types/range-parser/index.d.ts
index 13d331041a..e8e6ae4451 100644
--- a/types/range-parser/index.d.ts
+++ b/types/range-parser/index.d.ts
@@ -27,10 +27,9 @@ declare namespace RangeParser {
          */
         combine?: boolean;
     }
-    const enum Result {
-        invaild = -2,
-        unsatisifiable = -1,
-    }
+    type ResultUnsatisfiable = -1;
+    type ResultInvalid = -2;
+    type Result = ResultUnsatisfiable | ResultInvalid;
 }
 
 export = RangeParser;
diff --git a/types/range-parser/range-parser-tests.ts b/types/range-parser/range-parser-tests.ts
index ec1ffa6e4e..2c18e3f9dc 100644
--- a/types/range-parser/range-parser-tests.ts
+++ b/types/range-parser/range-parser-tests.ts
@@ -2,8 +2,8 @@ import RangeParser = require('range-parser');
 
 declare var console: { assert(b: boolean): void };
 
-console.assert(RangeParser(200, `malformed`) === RangeParser.Result.invaild);
-console.assert(RangeParser(200, `bytes=500-20`) === RangeParser.Result.unsatisifiable);
+console.assert(RangeParser(200, `malformed`) === -2);
+console.assert(RangeParser(200, `bytes=500-20`) === -1);
 
 const range = RangeParser(1000, `bytes=0-499`);
 

From 730393928c0de536fc827c64c72609eac92f11fe Mon Sep 17 00:00:00 2001
From: juwar <juwar@microsoft.com>
Date: Mon, 22 Oct 2018 09:13:40 -0700
Subject: [PATCH 013/836] Add maxFontSize and minFontSize to series that have
 it.

---
 types/highcharts/index.d.ts | 110 +++++++++++++++++++++++++++++++++++-
 1 file changed, 108 insertions(+), 2 deletions(-)

diff --git a/types/highcharts/index.d.ts b/types/highcharts/index.d.ts
index dcde50413d..d3036a869a 100644
--- a/types/highcharts/index.d.ts
+++ b/types/highcharts/index.d.ts
@@ -4644,6 +4644,14 @@ declare namespace Highcharts {
          * allows setting a separate color for the line without altering the fillColor.
          */
         lineColor?: string | Gradient;
+        /**
+         * For area-like series, allow the font size to vary so that small areas get a smaller font size. The default applies this effect to area-like series but not line-like series.
+         */
+        maxFontSize?: number;
+        /**
+         * For area-like series, allow the font size to vary so that small areas get a smaller font size. The default applies this effect to area-like series but not line-like series.
+         */
+        minFontSize?: number;
         /**
          * A separate color for the negative part of the area.
          * @since 3.0
@@ -4742,6 +4750,10 @@ declare namespace Highcharts {
          * @since 2.3.0
          */
         grouping?: boolean;
+        /**
+         * For area-like series, allow the font size to vary so that small areas get a smaller font size. The default applies this effect to area-like series but not line-like series.
+         */
+        maxFontSize?: number;
         /**
          * The maximum allowed pixel width for a column, translated to the height of a bar in a bar chart. This prevents the
          * columns from becoming too wide when there is a small number of points in the chart.
@@ -4749,6 +4761,10 @@ declare namespace Highcharts {
          * @since 4.1.8
          */
         maxPointWidth?: number | null;
+        /**
+         * For area-like series, allow the font size to vary so that small areas get a smaller font size. The default applies this effect to area-like series but not line-like series.
+         */
+        minFontSize?: number;
         /**
          * The minimal height for a column or width for a bar. By default, 0 values are not shown. To visualize a 0 (or
          * close to zero) point, set the minimal point length to a pixel value like 3. In stacked column charts,
@@ -4843,6 +4859,10 @@ declare namespace Highcharts {
          * @since 3.0
          */
         displayNegative?: boolean;
+        /**
+         * For area-like series, allow the font size to vary so that small areas get a smaller font size. The default applies this effect to area-like series but not line-like series.
+         */
+        maxFontSize?: number;
         /**
          * Maximum bubble size. Bubbles will automatically size between the minSize and maxSize to reflect the z value of
          * each bubble. Can be either pixels (when no unit is given), or a percentage of the smallest one of the plot width
@@ -4851,6 +4871,10 @@ declare namespace Highcharts {
          * @since 3.0
          */
         maxSize?: string | number;
+        /**
+         * For area-like series, allow the font size to vary so that small areas get a smaller font size. The default applies this effect to area-like series but not line-like series.
+         */
+        minFontSize?: number;
         /**
          * Minimum bubble size. Bubbles will automatically size between the minSize and maxSize to reflect the z value of
          * each bubble. Can be either pixels (when no unit is given), or a percentage of the smallest one of the plot width
@@ -5136,6 +5160,14 @@ declare namespace Highcharts {
          * Options for the dial or arrow pointer of the gauge.
          */
         dial?: Dial;
+        /**
+         * For area-like series, allow the font size to vary so that small areas get a smaller font size. The default applies this effect to area-like series but not line-like series.
+         */
+        maxFontSize?: number;
+        /**
+         * For area-like series, allow the font size to vary so that small areas get a smaller font size. The default applies this effect to area-like series but not line-like series.
+         */
+        minFontSize?: number;
         /**
          * Allow the dial to overshoot the end of the perimeter axis by this many degrees. Say if the gauge axis goes from 0
          * to 60, a value of 100, or 1000, will show 5 degrees beyond the end of the axis. Defaults to 0.
@@ -5204,6 +5236,10 @@ declare namespace Highcharts {
          * @default 50
          */
         cropTreshold?: number;
+        /**
+         * For area-like series, allow the font size to vary so that small areas get a smaller font size. The default applies this effect to area-like series but not line-like series.
+         */
+        maxFontSize?: number;
         /**
          * The maximum allowed pixel width for a column, translated to the height of a bar in a bar chart. This prevents the
          * columns from becoming too wide when there is a small number of points in the chart.
@@ -5211,6 +5247,10 @@ declare namespace Highcharts {
          * @since 4.1.8
          */
         maxPointWidth?: number | null;
+        /**
+         * For area-like series, allow the font size to vary so that small areas get a smaller font size. The default applies this effect to area-like series but not line-like series.
+         */
+        minFontSize?: number;
         /**
          * The row size - how many Y axis units each heatmap row should span.
          * @default 1
@@ -5229,6 +5269,14 @@ declare namespace Highcharts {
     }
 
     interface LineChart extends SeriesChart {
+        /**
+         * For area-like series, allow the font size to vary so that small areas get a smaller font size. The default applies this effect to area-like series but not line-like series.
+         */
+        maxFontSize?: number;
+        /**
+         * For area-like series, allow the font size to vary so that small areas get a smaller font size. The default applies this effect to area-like series but not line-like series.
+         */
+        minFontSize?: number;
         /**
          * Whether to apply steps to the line. Possible values are left, center and right. Prior to 2.3.5, only left was
          * supported.
@@ -5299,6 +5347,14 @@ declare namespace Highcharts {
          * @since 2.0
          */
         innerSize?: number | string;
+        /**
+         * For area-like series, allow the font size to vary so that small areas get a smaller font size. The default applies this effect to area-like series but not line-like series.
+         */
+        maxFontSize?: number;
+        /**
+         * For area-like series, allow the font size to vary so that small areas get a smaller font size. The default applies this effect to area-like series but not line-like series.
+         */
+        minFontSize?: number;
         /**
          * The minimum size for a pie in response to auto margins. The pie will try to shrink to make room for data labels
          * in side the plot area, but only to this size.
@@ -5346,6 +5402,14 @@ declare namespace Highcharts {
          * @default 0
          */
         lineWidth?: number;
+        /**
+         * For area-like series, allow the font size to vary so that small areas get a smaller font size. The default applies this effect to area-like series but not line-like series.
+         */
+        maxFontSize?: number;
+        /**
+         * For area-like series, allow the font size to vary so that small areas get a smaller font size. The default applies this effect to area-like series but not line-like series.
+         */
+        minFontSize?: number;
     }
 
     interface PyramidChart extends SeriesChart {
@@ -5420,7 +5484,16 @@ declare namespace Highcharts {
         width?: number | string;
     }
 
-    interface ScatterChart extends SeriesChart { }
+    interface ScatterChart extends SeriesChart {
+        /**
+         * For area-like series, allow the font size to vary so that small areas get a smaller font size. The default applies this effect to area-like series but not line-like series.
+         */
+        maxFontSize?: number;
+        /**
+         * For area-like series, allow the font size to vary so that small areas get a smaller font size. The default applies this effect to area-like series but not line-like series.
+         */
+        minFontSize?: number;
+    }
 
     /**
      * A gauge showing values using a filled arc with colors indicating the value. The solid gauge plots values against the
@@ -5456,7 +5529,16 @@ declare namespace Highcharts {
         wrap?: boolean;
     }
 
-    interface SplineChart extends SeriesChart { }
+    interface SplineChart extends SeriesChart {
+        /**
+         * For area-like series, allow the font size to vary so that small areas get a smaller font size. The default applies this effect to area-like series but not line-like series.
+         */
+        maxFontSize?: number;
+        /**
+         * For area-like series, allow the font size to vary so that small areas get a smaller font size. The default applies this effect to area-like series but not line-like series.
+         */
+        minFontSize?: number;
+    }
 
     /**
      * The size of the point shape is determined by its value relative to its siblings values. Requires the module
@@ -5528,6 +5610,10 @@ declare namespace Highcharts {
          * Set options on specific levels. Takes precedence over series options, but not point options.
          */
         levels?: TreeMapLevel[];
+        /**
+         * For area-like series, allow the font size to vary so that small areas get a smaller font size. The default applies this effect to area-like series but not line-like series.
+         */
+        maxFontSize?: number;
         /**
          * The maximum allowed pixel width for a column, translated to the height of a bar in a bar chart. This prevents the
          * columns from becoming too wide when there is a small number of points in the chart.
@@ -5535,6 +5621,10 @@ declare namespace Highcharts {
          * @since 4.1.8
          */
         maxPointWidth?: number | null;
+        /**
+         * For area-like series, allow the font size to vary so that small areas get a smaller font size. The default applies this effect to area-like series but not line-like series.
+         */
+        minFontSize?: number;
         /**
          * The sort index of the point inside the treemap level.
          * @since 4.1.10
@@ -5599,6 +5689,14 @@ declare namespace Highcharts {
          * @since 5.0.12
          */
         exposeElementToA11y?: boolean;
+        /**
+         * For area-like series, allow the font size to vary so that small areas get a smaller font size. The default applies this effect to area-like series but not line-like series.
+         */
+        maxFontSize?: number;
+        /**
+         * For area-like series, allow the font size to vary so that small areas get a smaller font size. The default applies this effect to area-like series but not line-like series.
+         */
+        minFontSize?: number;
         /**
          * This option decides which algorithm is used for placement, and rotation of a word. The choice of algorith is
          * therefore a crucial part of the resulting layout of the wordcloud. It is possible for users to add their own
@@ -5799,6 +5897,14 @@ declare namespace Highcharts {
          * The sequential index of the series in the legend.
          */
         legendIndex?: number;
+        /**
+         * For area-like series, allow the font size to vary so that small areas get a smaller font size. The default applies this effect to area-like series but not line-like series.
+         */
+        maxFontSize?: number;
+        /**
+         * For area-like series, allow the font size to vary so that small areas get a smaller font size. The default applies this effect to area-like series but not line-like series.
+         */
+        minFontSize?: number;
         /**
          * The name of the series as shown in the legend, tooltip etc.
          */

From 7cda494c6987dec64f6ceb59dccb14341d3ea49f Mon Sep 17 00:00:00 2001
From: juwar <juwar@microsoft.com>
Date: Mon, 22 Oct 2018 09:21:02 -0700
Subject: [PATCH 014/836] Update version at top of file.

---
 types/highcharts/index.d.ts | 334 +++++++++++++++++++++++++++---------
 1 file changed, 255 insertions(+), 79 deletions(-)

diff --git a/types/highcharts/index.d.ts b/types/highcharts/index.d.ts
index d3036a869a..7da3ac752d 100644
--- a/types/highcharts/index.d.ts
+++ b/types/highcharts/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Highcharts 5.0.13
+// Type definitions for Highcharts 5.0.32
 // Project: http://www.highcharts.com/
 // Definitions by: Damiano Gambarotto <https://github.com/damianog>
 //                 Dan Lewi Harkestad <https://github.com/baltie>
@@ -292,7 +292,7 @@ declare namespace Highcharts {
          * @default null
          * @since 2.3
          */
-        innerRadius?: number | string  | null;
+        innerRadius?: number | string | null;
         /**
          * Text labels for the plot bands
          */
@@ -494,12 +494,12 @@ declare namespace Highcharts {
         shadow?:
             | boolean
             | {
-            color?: string | Gradient;
-            offsetX?: number;
-            offsetY?: number;
-            opacity?: number;
-            width?: number;
-        };
+                  color?: string | Gradient;
+                  offsetX?: number;
+                  offsetY?: number;
+                  opacity?: number;
+                  width?: number;
+              };
         /**
          * The name of a symbol to use for the border around the label. Symbols are predefined functions on the Renderer object.
          * @default "callout"
@@ -1294,7 +1294,7 @@ declare namespace Highcharts {
          * Use this in cases where a linear gradient between a minColor and maxColor is not sufficient.
          * The stops is an array of tuples, where the first item is a float between 0 and 1 assigning the relative position in the gradient, and the second item is the color.
          */
-        stops?: Array<Array<number|string>>;
+        stops?: Array<Array<number | string>>;
         /**
          * The amount of ticks to draw on the axis. This opens up for aligning the ticks of multiple charts or panes within
          * a chart. This option overrides the tickPixelInterval option.
@@ -1859,7 +1859,9 @@ declare namespace Highcharts {
     interface Gradient {
         linearGradient?: LinearGradient | number[];
         radialGradient?: {
-            cx: number; cy: number; r: number;
+            cx: number;
+            cy: number;
+            r: number;
         };
         stops?: any[][];
         /**
@@ -2015,7 +2017,7 @@ declare namespace Highcharts {
         /**
          * The button stroke width
          */
-        'stroke-width'?: number;
+        "stroke-width"?: number;
         /**
          * The border radius
          */
@@ -3416,7 +3418,7 @@ declare namespace Highcharts {
          * @default ['50%', '50%']
          * @since 2.3.0
          */
-        center?: Array<number|string>;
+        center?: Array<number | string>;
         /**
          * The end angle of the polar X axis or gauge value axis, given in degrees where 0 is north.
          * @default startAngle + 360
@@ -4033,7 +4035,7 @@ declare namespace Highcharts {
         halo?: boolean | Halo;
     }
 
-    interface PieStates extends BarStates, LineStates { }
+    interface PieStates extends BarStates, LineStates {}
 
     interface AreaZone {
         /**
@@ -4682,11 +4684,9 @@ declare namespace Highcharts {
         dataLabels?: RangeDataLabels;
     }
 
-    interface AreaSplineChart extends AreaChart {
-    }
+    interface AreaSplineChart extends AreaChart {}
 
-    interface AreaSplineRangeChart extends AreaRangeChart {
-    }
+    interface AreaSplineRangeChart extends AreaRangeChart {}
 
     interface BarChart extends SeriesChart {
         /**
@@ -4925,8 +4925,7 @@ declare namespace Highcharts {
         zThreshold?: number;
     }
 
-    interface ColumnChart extends BarChart {
-    }
+    interface ColumnChart extends BarChart {}
 
     /**
      * The column range is a cartesian series type with higher and lower Y values along an X axis. Requires
@@ -5874,7 +5873,14 @@ declare namespace Highcharts {
          *            [3, 7, 8]
          *
          */
-        data?: Array<number | [number, number] | [string, number] | [string, number, number] | [number, number, number] | DataPoint>;
+        data?: Array<
+            | number
+            | [number, number]
+            | [string, number]
+            | [string, number, number]
+            | [number, number, number]
+            | DataPoint
+        >;
         /**
          * A description of the series to add to the screen reader information about the series.
          * @since 5.0.0
@@ -5942,31 +5948,73 @@ declare namespace Highcharts {
         zIndex?: number;
     }
 
-    interface SeriesOptions extends IndividualSeriesOptions, SeriesChart { }
+    interface SeriesOptions extends IndividualSeriesOptions, SeriesChart {}
 
-    interface AreaChartSeriesOptions extends IndividualSeriesOptions, AreaChart { }
-    interface AreaRangeChartSeriesOptions extends IndividualSeriesOptions, AreaRangeChart { }
-    interface AreaSplineChartSeriesOptions extends IndividualSeriesOptions, AreaSplineChart { }
-    interface AreaSplineRangeChartSeriesOptions extends IndividualSeriesOptions, AreaSplineRangeChart { }
-    interface BarChartSeriesOptions extends IndividualSeriesOptions, BarChart { }
-    interface BoxPlotChartSeriesOptions extends IndividualSeriesOptions, BoxPlotChart { }
-    interface BubbleChartSeriesOptions extends IndividualSeriesOptions, BubbleChart { }
-    interface ColumnChartSeriesOptions extends IndividualSeriesOptions, ColumnChart { }
-    interface ColumnRangeChartSeriesOptions extends IndividualSeriesOptions, ColumnRangeChart { }
-    interface ErrorBarChartSeriesOptions extends IndividualSeriesOptions, ErrorBarChart { }
-    interface FunnelChartSeriesOptions extends IndividualSeriesOptions, FunnelChart { }
-    interface GaugeChartSeriesOptions extends IndividualSeriesOptions, GaugeChart { }
-    interface HeatMapSeriesOptions extends IndividualSeriesOptions, HeatMapChart { }
-    interface LineChartSeriesOptions extends IndividualSeriesOptions, LineChart { }
-    interface PieChartSeriesOptions extends IndividualSeriesOptions, PieChart { }
-    interface PolygonChartSeriesOptions extends IndividualSeriesOptions, PolygonChart { }
-    interface PyramidChartSeriesOptions extends IndividualSeriesOptions, PyramidChart { }
-    interface ScatterChartSeriesOptions extends IndividualSeriesOptions, ScatterChart { }
-    interface SolidGaugeChartSeriesOptions extends IndividualSeriesOptions, SolidGaugeChart { }
-    interface SplineChartSeriesOptions extends IndividualSeriesOptions, SplineChart { }
-    interface TreeMapChartSeriesOptions extends IndividualSeriesOptions, TreeMapChart { }
-    interface WaterFallChartSeriesOptions extends IndividualSeriesOptions, WaterFallChart { }
-    interface WordCloudChartSeriesOptions extends IndividualSeriesOptions, WordCloudChart { }
+    interface AreaChartSeriesOptions
+        extends IndividualSeriesOptions,
+            AreaChart {}
+    interface AreaRangeChartSeriesOptions
+        extends IndividualSeriesOptions,
+            AreaRangeChart {}
+    interface AreaSplineChartSeriesOptions
+        extends IndividualSeriesOptions,
+            AreaSplineChart {}
+    interface AreaSplineRangeChartSeriesOptions
+        extends IndividualSeriesOptions,
+            AreaSplineRangeChart {}
+    interface BarChartSeriesOptions extends IndividualSeriesOptions, BarChart {}
+    interface BoxPlotChartSeriesOptions
+        extends IndividualSeriesOptions,
+            BoxPlotChart {}
+    interface BubbleChartSeriesOptions
+        extends IndividualSeriesOptions,
+            BubbleChart {}
+    interface ColumnChartSeriesOptions
+        extends IndividualSeriesOptions,
+            ColumnChart {}
+    interface ColumnRangeChartSeriesOptions
+        extends IndividualSeriesOptions,
+            ColumnRangeChart {}
+    interface ErrorBarChartSeriesOptions
+        extends IndividualSeriesOptions,
+            ErrorBarChart {}
+    interface FunnelChartSeriesOptions
+        extends IndividualSeriesOptions,
+            FunnelChart {}
+    interface GaugeChartSeriesOptions
+        extends IndividualSeriesOptions,
+            GaugeChart {}
+    interface HeatMapSeriesOptions
+        extends IndividualSeriesOptions,
+            HeatMapChart {}
+    interface LineChartSeriesOptions
+        extends IndividualSeriesOptions,
+            LineChart {}
+    interface PieChartSeriesOptions extends IndividualSeriesOptions, PieChart {}
+    interface PolygonChartSeriesOptions
+        extends IndividualSeriesOptions,
+            PolygonChart {}
+    interface PyramidChartSeriesOptions
+        extends IndividualSeriesOptions,
+            PyramidChart {}
+    interface ScatterChartSeriesOptions
+        extends IndividualSeriesOptions,
+            ScatterChart {}
+    interface SolidGaugeChartSeriesOptions
+        extends IndividualSeriesOptions,
+            SolidGaugeChart {}
+    interface SplineChartSeriesOptions
+        extends IndividualSeriesOptions,
+            SplineChart {}
+    interface TreeMapChartSeriesOptions
+        extends IndividualSeriesOptions,
+            TreeMapChart {}
+    interface WaterFallChartSeriesOptions
+        extends IndividualSeriesOptions,
+            WaterFallChart {}
+    interface WordCloudChartSeriesOptions
+        extends IndividualSeriesOptions,
+            WordCloudChart {}
 
     interface DataPoint {
         /**
@@ -6321,7 +6369,12 @@ declare namespace Highcharts {
          *
          * @default null
          */
-        crosshairs?: boolean | [boolean, boolean] | CrosshairObject | [CrosshairObject, CrosshairObject] | null;
+        crosshairs?:
+            | boolean
+            | [boolean, boolean]
+            | CrosshairObject
+            | [CrosshairObject, CrosshairObject]
+            | null;
         /**
          * Enable or disable the tooltip.
          * @default true
@@ -6380,7 +6433,11 @@ declare namespace Highcharts {
          * The return should be an object containing x and y values, for example { x: 100, y: 100 }.
          * @since 2.2.4
          */
-        positioner?(labelWidth: number, labelHeight: number, point: PlotPoint): { x: number; y: number; };
+        positioner?(
+            labelWidth: number,
+            labelHeight: number,
+            point: PlotPoint
+        ): { x: number; y: number };
         /**
          * Whether to apply a drop shadow to the tooltip.
          * @default true
@@ -6751,7 +6808,13 @@ declare namespace Highcharts {
          * The animation can also be a configuration object with properties duration and easing.
          * @since 1.2.0
          */
-        setExtremes(min?: number, max?: number, redraw?: boolean, animation?: boolean | Animation, eventArguments?: any): void;
+        setExtremes(
+            min?: number,
+            max?: number,
+            redraw?: boolean,
+            animation?: boolean | Animation,
+            eventArguments?: any
+        ): void;
         /**
          * Update the title of the axis after render time.
          * @param title  The new title options on the same format as given in xAxis.title.
@@ -6800,7 +6863,12 @@ declare namespace Highcharts {
          * The animation can also be a configuration object with properties duration and easing.
          * @since 3.0
          */
-        addAxis(options: AxisOptions, isX?: boolean, redraw?: boolean, animation?: boolean | Animation): AxisObject;
+        addAxis(
+            options: AxisOptions,
+            isX?: boolean,
+            redraw?: boolean,
+            animation?: boolean | Animation
+        ): AxisObject;
         /**
          * Set a new credits label for the chart.
          * @param A configuration object for the credits as defined at credits.
@@ -6815,7 +6883,11 @@ declare namespace Highcharts {
          * @param [boolean] redraw
          * @since 1.2.0
          */
-        addSeries<T extends IndividualSeriesOptions>(options: T, redraw?: boolean, animation?: boolean | Animation): SeriesObject;
+        addSeries<T extends IndividualSeriesOptions>(
+            options: T,
+            redraw?: boolean,
+            animation?: boolean | Animation
+        ): SeriesObject;
         /**
          * Add a series to the chart as drilldown from a specific point in the parent series. This method is used for async
          * drilldown, when clicking a point in a series should result in loading and displaying a more high-resolution
@@ -6824,7 +6896,10 @@ declare namespace Highcharts {
          * @param seriesOptions The series options, as documented under plotOptions.series and under the plotOptions for each series type.
          * @since 3.0.8
          */
-        addSeriesAsDrilldown(point: PointObject, seriesOptions: IndividualSeriesOptions): void;
+        addSeriesAsDrilldown(
+            point: PointObject,
+            seriesOptions: IndividualSeriesOptions
+        ): void;
         chartHeight?: number;
         chartWidth?: number;
         /**
@@ -6898,7 +6973,10 @@ declare namespace Highcharts {
          * exported chart. Same as the exportChart params.
          * @since 2.0
          */
-        exportChartLocal(options: ExportingOptions, chartOptions: Options): void;
+        exportChartLocal(
+            options: ExportingOptions,
+            chartOptions: Options
+        ): void;
         /**
          * Get an axis, series or point by its id as given in the configuration options.
          * @param  id The id of the axis, series or point to get.
@@ -6975,7 +7053,11 @@ declare namespace Highcharts {
          * @param animation Defaults to true. When true, the resize will be animated with default animation options.
          *  The animation can also be a configuration object with properties duration and easing.
          */
-        setSize(width: number, height: number, animation?: boolean | Animation): void;
+        setSize(
+            width: number,
+            height: number,
+            animation?: boolean | Animation
+        ): void;
         /**
          * Set a new title or subtitle for the chart
          * @param title A configuration object for the new title as defined at #title.
@@ -6983,7 +7065,11 @@ declare namespace Highcharts {
          * @param [boolean] redraw Whether to redraw the chart. Defaults to true.
          * @since 2.1.0
          */
-        setTitle(title: TitleOptions, subtitle?: SubtitleOptions, redraw?: boolean): void;
+        setTitle(
+            title: TitleOptions,
+            subtitle?: SubtitleOptions,
+            redraw?: boolean
+        ): void;
         /**
          * Dim the chart's plot area and show a loading label text. Options for the loading screen are defined at
          * options.loading. A custom text can be given as a parameter for loading.
@@ -7015,7 +7101,12 @@ declare namespace Highcharts {
          * @param [(boolean | AnimationOptions)] animation Whether to apply animation, and optionally animation configuration.
          * @since 5.0.0
          */
-        update(options: Options, redraw?: boolean, oneToOne?: boolean, animation?: boolean | AnimationOptions): void;
+        update(
+            options: Options,
+            redraw?: boolean,
+            oneToOne?: boolean,
+            animation?: boolean | AnimationOptions
+        ): void;
         /**
          * This method is deprecated as of 2.0.1. Updating the chart position after a move operation is no longer necessary.
          * @since 1.2.5
@@ -7052,7 +7143,10 @@ declare namespace Highcharts {
          * and in these cases the chart object will not be finished directly after callingnew Highcharts.Chart().
          * s a consequence, code that relies on the newly built Chart object should always run in the callback. Defining a chart.event.load handler is equivalent.
          */
-        new (options: Options, callback: (chart: ChartObject) => void): ChartObject;
+        new (
+            options: Options,
+            callback: (chart: ChartObject) => void
+        ): ChartObject;
         /**
          * This is the constructor for creating a new chart object.
          * @param renderTo The id or a reference to a DOM element where the chart should be rendered (since v4.2.0).
@@ -7068,7 +7162,11 @@ declare namespace Highcharts {
          * and in these cases the chart object will not be finished directly after callingnew Highcharts.Chart().
          * As a consequence, code that relies on the newly built Chart object should always run in the callback. Defining a chart.event.load handler is equivalent.
          */
-        new (renderTo: string | HTMLElement, options: Options, callback: (chart: ChartObject) => void): ChartObject;
+        new (
+            renderTo: string | HTMLElement,
+            options: Options,
+            callback: (chart: ChartObject) => void
+        ): ChartObject;
     }
 
     /**
@@ -7121,7 +7219,7 @@ declare namespace Highcharts {
          * @return An object containing x, y, width and height values for the element.
          * @since 2.0
          */
-        getBBox(): { x: number; y: number; height: number; width: number; };
+        getBBox(): { x: number; y: number; height: number; width: number };
         /**
          * Apply an event handler to the element
          * @param eventType The event type to attach, for example 'click', 'mouseover', 'touch'.
@@ -7160,7 +7258,14 @@ declare namespace Highcharts {
          * @param  end The ending angle of the arc in radians, where 0 is to the right and -Math.PI/2 is up.
          * @since 2.0
          */
-        arc(centerX: number, centerY: number, outerRadius: number, innerRadius: number, start: number, end: number): ElementObject;
+        arc(
+            centerX: number,
+            centerY: number,
+            outerRadius: number,
+            innerRadius: number,
+            start: number,
+            end: number
+        ): ElementObject;
         /**
          * Draw circle on the renderer canvas.
          * @param  centerX The x position of the circle's center in the SVG element.
@@ -7200,7 +7305,13 @@ declare namespace Highcharts {
          * @param  height The height of the image.
          * @since 2.0
          */
-        image(source: string, x: number, y: number, width: number, height: number): ElementObject;
+        image(
+            source: string,
+            x: number,
+            y: number,
+            width: number,
+            height: number
+        ): ElementObject;
         /**
          * Draw a label, which is an extended text element with support for border and background. Highcharts creates a g
          * element with a text and a path or rect inside, to make it behave somewhat like a HTML div. Border and background
@@ -7218,7 +7329,17 @@ declare namespace Highcharts {
          * @param  [string] className A class name for the g element surrounding the label.
          * @since 2.0
          */
-        label(str: string, x: number, y: number, shape?: string, anchorX?: number, anchorY?: number, useHTML?: boolean, baseline?: boolean, className?: string): ElementObject;
+        label(
+            str: string,
+            x: number,
+            y: number,
+            shape?: string,
+            anchorX?: number,
+            anchorY?: number,
+            useHTML?: boolean,
+            baseline?: boolean,
+            className?: string
+        ): ElementObject;
         /**
          * Add a path based on SVG's path commands. In SVG capable browsers all path commands are supported, but in VML only
          * a subset is supported: absolute moveTo (M), absolute lineTo (L), absolute curveTo (C) and close (Z).
@@ -7234,7 +7355,13 @@ declare namespace Highcharts {
          * @param  cornerRadius The corner radius of all the rectangle's corners.
          * @since 2.0
          */
-        rect(x: number, y: number, width: number, height: number, cornerRadius: number): ElementObject;
+        rect(
+            x: number,
+            y: number,
+            width: number,
+            height: number,
+            cornerRadius: number
+        ): ElementObject;
         /**
          * Draw text. The text can contain a subset of HTML, like spans and anchors and some basic text styling of these.
          * For more advanced features like border and background, use label instead.
@@ -7262,7 +7389,11 @@ declare namespace Highcharts {
     }
 
     interface Renderer {
-        new (parentNode: HTMLElement, width: number, height: number): RendererObject;
+        new (
+            parentNode: HTMLElement,
+            width: number,
+            height: number
+        ): RendererObject;
     }
 
     interface Static {
@@ -7274,12 +7405,19 @@ declare namespace Highcharts {
          * As Highcharts.Chart, but without need for the new keyword.
          * @since 4.2.0
          */
-        chart(options: Options, callback?: (chart: ChartObject) => void): ChartObject;
+        chart(
+            options: Options,
+            callback?: (chart: ChartObject) => void
+        ): ChartObject;
         /**
          * As Highcharts.Chart, but without need for the new keyword.
          * @since 4.2.0
          */
-        chart(renderTo: string | HTMLElement, options: Options, callback?: (chart: ChartObject) => void): ChartObject;
+        chart(
+            renderTo: string | HTMLElement,
+            options: Options,
+            callback?: (chart: ChartObject) => void
+        ): ChartObject;
         /**
          * An array containing the current chart objects in the page. A chart's position in the array is preserved
          * throughout the page's lifetime. When a chart is destroyed, the array item becomes undefined.
@@ -7318,7 +7456,12 @@ declare namespace Highcharts {
          * @param  decimalPoint The decimal point. Defaults to '.' or to the string specified globally in options.lang.decimalPoint.
          * @param  thousandsSep The thousands separator. Defaults to ' ' or to the string specified globally in options.lang.thousandsSep.
          */
-        numberFormat(value: number, decimals?: number, decimalPoint?: string, thousandsSep?: string): string;
+        numberFormat(
+            value: number,
+            decimals?: number,
+            decimalPoint?: string,
+            thousandsSep?: string
+        ): string;
         /**
          * Sets the options globally for all charts created after this has been called. Takes an options JavaScript object
          * structure as the argument. These options are merged with the default options and the result is returned.
@@ -7343,7 +7486,11 @@ declare namespace Highcharts {
          * @param type The type of behavior you are extending.
          * @param cb The function that executes when the behavior occurs.
          */
-        wrap(prototype: any, type: string, cb: (proceed: Function, ...args: any[]) => void): void;
+        wrap(
+            prototype: any,
+            type: string,
+            cb: (proceed: Function, ...args: any[]) => void
+        ): void;
 
         /**
          * Add an event listener.
@@ -7356,9 +7503,11 @@ declare namespace Highcharts {
          * @param cb      The function callback to execute when the event is fired.
          * @returns A callback function to remove the added event.
          */
-        addEvent(element: HTMLElement | ElementObject | object,
-                 type: string,
-                 cb: (evt: Event) => void): () => void;
+        addEvent(
+            element: HTMLElement | ElementObject | object,
+            type: string,
+            cb: (evt: Event) => void
+        ): () => void;
 
         /**
          * Fire an event that was registered with
@@ -7370,10 +7519,12 @@ declare namespace Highcharts {
          * @param eventArguments  Custom event arguments that are passed on as an argument to the event handler.
          * @param defaultFunction The default function to execute if the other listeners haven't returned false.
          */
-        fireEvent(element: HTMLElement | ElementObject | object,
-                  type: string,
-                  eventArguments?: any,
-                  defaultFunction?: () => void): void;
+        fireEvent(
+            element: HTMLElement | ElementObject | object,
+            type: string,
+            eventArguments?: any,
+            defaultFunction?: () => void
+        ): void;
 
         distribute(array: any[], value: number): void;
 
@@ -7443,7 +7594,11 @@ declare namespace Highcharts {
          * The animation can also be a configuration object with properties duration and easing.
          * @since 1.2.0
          */
-        slice(sliced?: boolean, redraw?: boolean, animation?: boolean | Animation): void;
+        slice(
+            sliced?: boolean,
+            redraw?: boolean,
+            animation?: boolean | Animation
+        ): void;
         /**
          * The total of a stack for stacked series, or pie in pie charts.
          */
@@ -7459,7 +7614,11 @@ declare namespace Highcharts {
          * The animation can also be a configuration object with properties duration and easing.
          * @since 1.2.0
          */
-        update(options: number | [number, number] | DataPoint, redraw?: boolean, animation?: boolean | Animation): void;
+        update(
+            options: number | [number, number] | DataPoint,
+            redraw?: boolean,
+            animation?: boolean | Animation
+        ): void;
         /**
          * The x value for the point.
          * @since 1.2.0
@@ -7500,7 +7659,12 @@ declare namespace Highcharts {
          * Use this option for live charts monitoring a value over time.
          * @since 1.2.0
          */
-        addPoint(options: number | [number, number] | DataPoint, redraw?: boolean, shift?: boolean, animation?: boolean | Animation): void;
+        addPoint(
+            options: number | [number, number] | DataPoint,
+            redraw?: boolean,
+            shift?: boolean,
+            animation?: boolean | Animation
+        ): void;
         /**
          * Read only. The chart that the series belongs to.
          * @since 1.2.0
@@ -7544,7 +7708,11 @@ declare namespace Highcharts {
          * The animation can also be a configuration object with properties duration and easing.
          * @since 4.1.0
          */
-        removePoint(index: number, redraw?: boolean, animation?: boolean | Animation): void;
+        removePoint(
+            index: number,
+            redraw?: boolean,
+            animation?: boolean | Animation
+        ): void;
         /**
          * Select or unselect the series. This means its selected property is set,the checkbox in the legend is toggled and
          * when selected, the series is returned in the chart.getSelectedSeries() method.
@@ -7569,7 +7737,12 @@ declare namespace Highcharts {
          * This option prevents this, and makes setData behave like it did prior to Highcharts 3.0.10.
          * @since 1.2.0
          */
-        setData(data: number[] | number[][] | DataPoint[], redraw?: boolean, animation?: boolean | Animation, updatePoints?: boolean): void;
+        setData(
+            data: number[] | number[][] | DataPoint[],
+            redraw?: boolean,
+            animation?: boolean | Animation,
+            updatePoints?: boolean
+        ): void;
         /**
          * A utility function to show or hide the series with an optional redraw.
          * @param [boolean] visible - Whether to show or hide the series. If undefined, the visibility is toggled.
@@ -7656,7 +7829,10 @@ declare global {
          * @param callback Callback function used to manipulate the constructed chart instance
          * @return current {JQuery} selector the current JQuery selector
          */
-        highcharts(options: Highcharts.Options, callback: (chart: Highcharts.ChartObject) => void): JQuery;
+        highcharts(
+            options: Highcharts.Options,
+            callback: (chart: Highcharts.ChartObject) => void
+        ): JQuery;
     }
 }
 

From 2083505b395c2742083e085386ea96a503eb70af Mon Sep 17 00:00:00 2001
From: juwar <juwar@microsoft.com>
Date: Mon, 22 Oct 2018 09:31:35 -0700
Subject: [PATCH 015/836] Revert the formatting

---
 types/highcharts/index.d.ts | 332 +++++++++---------------------------
 1 file changed, 78 insertions(+), 254 deletions(-)

diff --git a/types/highcharts/index.d.ts b/types/highcharts/index.d.ts
index 7da3ac752d..644dc1a169 100644
--- a/types/highcharts/index.d.ts
+++ b/types/highcharts/index.d.ts
@@ -292,7 +292,7 @@ declare namespace Highcharts {
          * @default null
          * @since 2.3
          */
-        innerRadius?: number | string | null;
+        innerRadius?: number | string  | null;
         /**
          * Text labels for the plot bands
          */
@@ -494,12 +494,12 @@ declare namespace Highcharts {
         shadow?:
             | boolean
             | {
-                  color?: string | Gradient;
-                  offsetX?: number;
-                  offsetY?: number;
-                  opacity?: number;
-                  width?: number;
-              };
+            color?: string | Gradient;
+            offsetX?: number;
+            offsetY?: number;
+            opacity?: number;
+            width?: number;
+        };
         /**
          * The name of a symbol to use for the border around the label. Symbols are predefined functions on the Renderer object.
          * @default "callout"
@@ -1294,7 +1294,7 @@ declare namespace Highcharts {
          * Use this in cases where a linear gradient between a minColor and maxColor is not sufficient.
          * The stops is an array of tuples, where the first item is a float between 0 and 1 assigning the relative position in the gradient, and the second item is the color.
          */
-        stops?: Array<Array<number | string>>;
+        stops?: Array<Array<number|string>>;
         /**
          * The amount of ticks to draw on the axis. This opens up for aligning the ticks of multiple charts or panes within
          * a chart. This option overrides the tickPixelInterval option.
@@ -1859,9 +1859,7 @@ declare namespace Highcharts {
     interface Gradient {
         linearGradient?: LinearGradient | number[];
         radialGradient?: {
-            cx: number;
-            cy: number;
-            r: number;
+            cx: number; cy: number; r: number;
         };
         stops?: any[][];
         /**
@@ -2017,7 +2015,7 @@ declare namespace Highcharts {
         /**
          * The button stroke width
          */
-        "stroke-width"?: number;
+        'stroke-width'?: number;
         /**
          * The border radius
          */
@@ -3418,7 +3416,7 @@ declare namespace Highcharts {
          * @default ['50%', '50%']
          * @since 2.3.0
          */
-        center?: Array<number | string>;
+        center?: Array<number|string>;
         /**
          * The end angle of the polar X axis or gauge value axis, given in degrees where 0 is north.
          * @default startAngle + 360
@@ -4035,7 +4033,7 @@ declare namespace Highcharts {
         halo?: boolean | Halo;
     }
 
-    interface PieStates extends BarStates, LineStates {}
+    interface PieStates extends BarStates, LineStates { }
 
     interface AreaZone {
         /**
@@ -4684,9 +4682,11 @@ declare namespace Highcharts {
         dataLabels?: RangeDataLabels;
     }
 
-    interface AreaSplineChart extends AreaChart {}
+    interface AreaSplineChart extends AreaChart {
+    }
 
-    interface AreaSplineRangeChart extends AreaRangeChart {}
+    interface AreaSplineRangeChart extends AreaRangeChart {
+    }
 
     interface BarChart extends SeriesChart {
         /**
@@ -4925,7 +4925,8 @@ declare namespace Highcharts {
         zThreshold?: number;
     }
 
-    interface ColumnChart extends BarChart {}
+    interface ColumnChart extends BarChart {
+    }
 
     /**
      * The column range is a cartesian series type with higher and lower Y values along an X axis. Requires
@@ -5873,14 +5874,7 @@ declare namespace Highcharts {
          *            [3, 7, 8]
          *
          */
-        data?: Array<
-            | number
-            | [number, number]
-            | [string, number]
-            | [string, number, number]
-            | [number, number, number]
-            | DataPoint
-        >;
+        data?: Array<number | [number, number] | [string, number] | [string, number, number] | [number, number, number] | DataPoint>;
         /**
          * A description of the series to add to the screen reader information about the series.
          * @since 5.0.0
@@ -5948,73 +5942,31 @@ declare namespace Highcharts {
         zIndex?: number;
     }
 
-    interface SeriesOptions extends IndividualSeriesOptions, SeriesChart {}
+    interface SeriesOptions extends IndividualSeriesOptions, SeriesChart { }
 
-    interface AreaChartSeriesOptions
-        extends IndividualSeriesOptions,
-            AreaChart {}
-    interface AreaRangeChartSeriesOptions
-        extends IndividualSeriesOptions,
-            AreaRangeChart {}
-    interface AreaSplineChartSeriesOptions
-        extends IndividualSeriesOptions,
-            AreaSplineChart {}
-    interface AreaSplineRangeChartSeriesOptions
-        extends IndividualSeriesOptions,
-            AreaSplineRangeChart {}
-    interface BarChartSeriesOptions extends IndividualSeriesOptions, BarChart {}
-    interface BoxPlotChartSeriesOptions
-        extends IndividualSeriesOptions,
-            BoxPlotChart {}
-    interface BubbleChartSeriesOptions
-        extends IndividualSeriesOptions,
-            BubbleChart {}
-    interface ColumnChartSeriesOptions
-        extends IndividualSeriesOptions,
-            ColumnChart {}
-    interface ColumnRangeChartSeriesOptions
-        extends IndividualSeriesOptions,
-            ColumnRangeChart {}
-    interface ErrorBarChartSeriesOptions
-        extends IndividualSeriesOptions,
-            ErrorBarChart {}
-    interface FunnelChartSeriesOptions
-        extends IndividualSeriesOptions,
-            FunnelChart {}
-    interface GaugeChartSeriesOptions
-        extends IndividualSeriesOptions,
-            GaugeChart {}
-    interface HeatMapSeriesOptions
-        extends IndividualSeriesOptions,
-            HeatMapChart {}
-    interface LineChartSeriesOptions
-        extends IndividualSeriesOptions,
-            LineChart {}
-    interface PieChartSeriesOptions extends IndividualSeriesOptions, PieChart {}
-    interface PolygonChartSeriesOptions
-        extends IndividualSeriesOptions,
-            PolygonChart {}
-    interface PyramidChartSeriesOptions
-        extends IndividualSeriesOptions,
-            PyramidChart {}
-    interface ScatterChartSeriesOptions
-        extends IndividualSeriesOptions,
-            ScatterChart {}
-    interface SolidGaugeChartSeriesOptions
-        extends IndividualSeriesOptions,
-            SolidGaugeChart {}
-    interface SplineChartSeriesOptions
-        extends IndividualSeriesOptions,
-            SplineChart {}
-    interface TreeMapChartSeriesOptions
-        extends IndividualSeriesOptions,
-            TreeMapChart {}
-    interface WaterFallChartSeriesOptions
-        extends IndividualSeriesOptions,
-            WaterFallChart {}
-    interface WordCloudChartSeriesOptions
-        extends IndividualSeriesOptions,
-            WordCloudChart {}
+    interface AreaChartSeriesOptions extends IndividualSeriesOptions, AreaChart { }
+    interface AreaRangeChartSeriesOptions extends IndividualSeriesOptions, AreaRangeChart { }
+    interface AreaSplineChartSeriesOptions extends IndividualSeriesOptions, AreaSplineChart { }
+    interface AreaSplineRangeChartSeriesOptions extends IndividualSeriesOptions, AreaSplineRangeChart { }
+    interface BarChartSeriesOptions extends IndividualSeriesOptions, BarChart { }
+    interface BoxPlotChartSeriesOptions extends IndividualSeriesOptions, BoxPlotChart { }
+    interface BubbleChartSeriesOptions extends IndividualSeriesOptions, BubbleChart { }
+    interface ColumnChartSeriesOptions extends IndividualSeriesOptions, ColumnChart { }
+    interface ColumnRangeChartSeriesOptions extends IndividualSeriesOptions, ColumnRangeChart { }
+    interface ErrorBarChartSeriesOptions extends IndividualSeriesOptions, ErrorBarChart { }
+    interface FunnelChartSeriesOptions extends IndividualSeriesOptions, FunnelChart { }
+    interface GaugeChartSeriesOptions extends IndividualSeriesOptions, GaugeChart { }
+    interface HeatMapSeriesOptions extends IndividualSeriesOptions, HeatMapChart { }
+    interface LineChartSeriesOptions extends IndividualSeriesOptions, LineChart { }
+    interface PieChartSeriesOptions extends IndividualSeriesOptions, PieChart { }
+    interface PolygonChartSeriesOptions extends IndividualSeriesOptions, PolygonChart { }
+    interface PyramidChartSeriesOptions extends IndividualSeriesOptions, PyramidChart { }
+    interface ScatterChartSeriesOptions extends IndividualSeriesOptions, ScatterChart { }
+    interface SolidGaugeChartSeriesOptions extends IndividualSeriesOptions, SolidGaugeChart { }
+    interface SplineChartSeriesOptions extends IndividualSeriesOptions, SplineChart { }
+    interface TreeMapChartSeriesOptions extends IndividualSeriesOptions, TreeMapChart { }
+    interface WaterFallChartSeriesOptions extends IndividualSeriesOptions, WaterFallChart { }
+    interface WordCloudChartSeriesOptions extends IndividualSeriesOptions, WordCloudChart { }
 
     interface DataPoint {
         /**
@@ -6369,12 +6321,7 @@ declare namespace Highcharts {
          *
          * @default null
          */
-        crosshairs?:
-            | boolean
-            | [boolean, boolean]
-            | CrosshairObject
-            | [CrosshairObject, CrosshairObject]
-            | null;
+        crosshairs?: boolean | [boolean, boolean] | CrosshairObject | [CrosshairObject, CrosshairObject] | null;
         /**
          * Enable or disable the tooltip.
          * @default true
@@ -6433,11 +6380,7 @@ declare namespace Highcharts {
          * The return should be an object containing x and y values, for example { x: 100, y: 100 }.
          * @since 2.2.4
          */
-        positioner?(
-            labelWidth: number,
-            labelHeight: number,
-            point: PlotPoint
-        ): { x: number; y: number };
+        positioner?(labelWidth: number, labelHeight: number, point: PlotPoint): { x: number; y: number; };
         /**
          * Whether to apply a drop shadow to the tooltip.
          * @default true
@@ -6808,13 +6751,7 @@ declare namespace Highcharts {
          * The animation can also be a configuration object with properties duration and easing.
          * @since 1.2.0
          */
-        setExtremes(
-            min?: number,
-            max?: number,
-            redraw?: boolean,
-            animation?: boolean | Animation,
-            eventArguments?: any
-        ): void;
+        setExtremes(min?: number, max?: number, redraw?: boolean, animation?: boolean | Animation, eventArguments?: any): void;
         /**
          * Update the title of the axis after render time.
          * @param title  The new title options on the same format as given in xAxis.title.
@@ -6863,12 +6800,7 @@ declare namespace Highcharts {
          * The animation can also be a configuration object with properties duration and easing.
          * @since 3.0
          */
-        addAxis(
-            options: AxisOptions,
-            isX?: boolean,
-            redraw?: boolean,
-            animation?: boolean | Animation
-        ): AxisObject;
+        addAxis(options: AxisOptions, isX?: boolean, redraw?: boolean, animation?: boolean | Animation): AxisObject;
         /**
          * Set a new credits label for the chart.
          * @param A configuration object for the credits as defined at credits.
@@ -6883,11 +6815,7 @@ declare namespace Highcharts {
          * @param [boolean] redraw
          * @since 1.2.0
          */
-        addSeries<T extends IndividualSeriesOptions>(
-            options: T,
-            redraw?: boolean,
-            animation?: boolean | Animation
-        ): SeriesObject;
+        addSeries<T extends IndividualSeriesOptions>(options: T, redraw?: boolean, animation?: boolean | Animation): SeriesObject;
         /**
          * Add a series to the chart as drilldown from a specific point in the parent series. This method is used for async
          * drilldown, when clicking a point in a series should result in loading and displaying a more high-resolution
@@ -6896,10 +6824,7 @@ declare namespace Highcharts {
          * @param seriesOptions The series options, as documented under plotOptions.series and under the plotOptions for each series type.
          * @since 3.0.8
          */
-        addSeriesAsDrilldown(
-            point: PointObject,
-            seriesOptions: IndividualSeriesOptions
-        ): void;
+        addSeriesAsDrilldown(point: PointObject, seriesOptions: IndividualSeriesOptions): void;
         chartHeight?: number;
         chartWidth?: number;
         /**
@@ -6973,10 +6898,7 @@ declare namespace Highcharts {
          * exported chart. Same as the exportChart params.
          * @since 2.0
          */
-        exportChartLocal(
-            options: ExportingOptions,
-            chartOptions: Options
-        ): void;
+        exportChartLocal(options: ExportingOptions, chartOptions: Options): void;
         /**
          * Get an axis, series or point by its id as given in the configuration options.
          * @param  id The id of the axis, series or point to get.
@@ -7053,11 +6975,7 @@ declare namespace Highcharts {
          * @param animation Defaults to true. When true, the resize will be animated with default animation options.
          *  The animation can also be a configuration object with properties duration and easing.
          */
-        setSize(
-            width: number,
-            height: number,
-            animation?: boolean | Animation
-        ): void;
+        setSize(width: number, height: number, animation?: boolean | Animation): void;
         /**
          * Set a new title or subtitle for the chart
          * @param title A configuration object for the new title as defined at #title.
@@ -7065,11 +6983,7 @@ declare namespace Highcharts {
          * @param [boolean] redraw Whether to redraw the chart. Defaults to true.
          * @since 2.1.0
          */
-        setTitle(
-            title: TitleOptions,
-            subtitle?: SubtitleOptions,
-            redraw?: boolean
-        ): void;
+        setTitle(title: TitleOptions, subtitle?: SubtitleOptions, redraw?: boolean): void;
         /**
          * Dim the chart's plot area and show a loading label text. Options for the loading screen are defined at
          * options.loading. A custom text can be given as a parameter for loading.
@@ -7101,12 +7015,7 @@ declare namespace Highcharts {
          * @param [(boolean | AnimationOptions)] animation Whether to apply animation, and optionally animation configuration.
          * @since 5.0.0
          */
-        update(
-            options: Options,
-            redraw?: boolean,
-            oneToOne?: boolean,
-            animation?: boolean | AnimationOptions
-        ): void;
+        update(options: Options, redraw?: boolean, oneToOne?: boolean, animation?: boolean | AnimationOptions): void;
         /**
          * This method is deprecated as of 2.0.1. Updating the chart position after a move operation is no longer necessary.
          * @since 1.2.5
@@ -7143,10 +7052,7 @@ declare namespace Highcharts {
          * and in these cases the chart object will not be finished directly after callingnew Highcharts.Chart().
          * s a consequence, code that relies on the newly built Chart object should always run in the callback. Defining a chart.event.load handler is equivalent.
          */
-        new (
-            options: Options,
-            callback: (chart: ChartObject) => void
-        ): ChartObject;
+        new (options: Options, callback: (chart: ChartObject) => void): ChartObject;
         /**
          * This is the constructor for creating a new chart object.
          * @param renderTo The id or a reference to a DOM element where the chart should be rendered (since v4.2.0).
@@ -7162,11 +7068,7 @@ declare namespace Highcharts {
          * and in these cases the chart object will not be finished directly after callingnew Highcharts.Chart().
          * As a consequence, code that relies on the newly built Chart object should always run in the callback. Defining a chart.event.load handler is equivalent.
          */
-        new (
-            renderTo: string | HTMLElement,
-            options: Options,
-            callback: (chart: ChartObject) => void
-        ): ChartObject;
+        new (renderTo: string | HTMLElement, options: Options, callback: (chart: ChartObject) => void): ChartObject;
     }
 
     /**
@@ -7219,7 +7121,7 @@ declare namespace Highcharts {
          * @return An object containing x, y, width and height values for the element.
          * @since 2.0
          */
-        getBBox(): { x: number; y: number; height: number; width: number };
+        getBBox(): { x: number; y: number; height: number; width: number; };
         /**
          * Apply an event handler to the element
          * @param eventType The event type to attach, for example 'click', 'mouseover', 'touch'.
@@ -7258,14 +7160,7 @@ declare namespace Highcharts {
          * @param  end The ending angle of the arc in radians, where 0 is to the right and -Math.PI/2 is up.
          * @since 2.0
          */
-        arc(
-            centerX: number,
-            centerY: number,
-            outerRadius: number,
-            innerRadius: number,
-            start: number,
-            end: number
-        ): ElementObject;
+        arc(centerX: number, centerY: number, outerRadius: number, innerRadius: number, start: number, end: number): ElementObject;
         /**
          * Draw circle on the renderer canvas.
          * @param  centerX The x position of the circle's center in the SVG element.
@@ -7305,13 +7200,7 @@ declare namespace Highcharts {
          * @param  height The height of the image.
          * @since 2.0
          */
-        image(
-            source: string,
-            x: number,
-            y: number,
-            width: number,
-            height: number
-        ): ElementObject;
+        image(source: string, x: number, y: number, width: number, height: number): ElementObject;
         /**
          * Draw a label, which is an extended text element with support for border and background. Highcharts creates a g
          * element with a text and a path or rect inside, to make it behave somewhat like a HTML div. Border and background
@@ -7329,17 +7218,7 @@ declare namespace Highcharts {
          * @param  [string] className A class name for the g element surrounding the label.
          * @since 2.0
          */
-        label(
-            str: string,
-            x: number,
-            y: number,
-            shape?: string,
-            anchorX?: number,
-            anchorY?: number,
-            useHTML?: boolean,
-            baseline?: boolean,
-            className?: string
-        ): ElementObject;
+        label(str: string, x: number, y: number, shape?: string, anchorX?: number, anchorY?: number, useHTML?: boolean, baseline?: boolean, className?: string): ElementObject;
         /**
          * Add a path based on SVG's path commands. In SVG capable browsers all path commands are supported, but in VML only
          * a subset is supported: absolute moveTo (M), absolute lineTo (L), absolute curveTo (C) and close (Z).
@@ -7355,13 +7234,7 @@ declare namespace Highcharts {
          * @param  cornerRadius The corner radius of all the rectangle's corners.
          * @since 2.0
          */
-        rect(
-            x: number,
-            y: number,
-            width: number,
-            height: number,
-            cornerRadius: number
-        ): ElementObject;
+        rect(x: number, y: number, width: number, height: number, cornerRadius: number): ElementObject;
         /**
          * Draw text. The text can contain a subset of HTML, like spans and anchors and some basic text styling of these.
          * For more advanced features like border and background, use label instead.
@@ -7389,11 +7262,7 @@ declare namespace Highcharts {
     }
 
     interface Renderer {
-        new (
-            parentNode: HTMLElement,
-            width: number,
-            height: number
-        ): RendererObject;
+        new (parentNode: HTMLElement, width: number, height: number): RendererObject;
     }
 
     interface Static {
@@ -7405,19 +7274,12 @@ declare namespace Highcharts {
          * As Highcharts.Chart, but without need for the new keyword.
          * @since 4.2.0
          */
-        chart(
-            options: Options,
-            callback?: (chart: ChartObject) => void
-        ): ChartObject;
+        chart(options: Options, callback?: (chart: ChartObject) => void): ChartObject;
         /**
          * As Highcharts.Chart, but without need for the new keyword.
          * @since 4.2.0
          */
-        chart(
-            renderTo: string | HTMLElement,
-            options: Options,
-            callback?: (chart: ChartObject) => void
-        ): ChartObject;
+        chart(renderTo: string | HTMLElement, options: Options, callback?: (chart: ChartObject) => void): ChartObject;
         /**
          * An array containing the current chart objects in the page. A chart's position in the array is preserved
          * throughout the page's lifetime. When a chart is destroyed, the array item becomes undefined.
@@ -7456,12 +7318,7 @@ declare namespace Highcharts {
          * @param  decimalPoint The decimal point. Defaults to '.' or to the string specified globally in options.lang.decimalPoint.
          * @param  thousandsSep The thousands separator. Defaults to ' ' or to the string specified globally in options.lang.thousandsSep.
          */
-        numberFormat(
-            value: number,
-            decimals?: number,
-            decimalPoint?: string,
-            thousandsSep?: string
-        ): string;
+        numberFormat(value: number, decimals?: number, decimalPoint?: string, thousandsSep?: string): string;
         /**
          * Sets the options globally for all charts created after this has been called. Takes an options JavaScript object
          * structure as the argument. These options are merged with the default options and the result is returned.
@@ -7486,11 +7343,7 @@ declare namespace Highcharts {
          * @param type The type of behavior you are extending.
          * @param cb The function that executes when the behavior occurs.
          */
-        wrap(
-            prototype: any,
-            type: string,
-            cb: (proceed: Function, ...args: any[]) => void
-        ): void;
+        wrap(prototype: any, type: string, cb: (proceed: Function, ...args: any[]) => void): void;
 
         /**
          * Add an event listener.
@@ -7503,11 +7356,9 @@ declare namespace Highcharts {
          * @param cb      The function callback to execute when the event is fired.
          * @returns A callback function to remove the added event.
          */
-        addEvent(
-            element: HTMLElement | ElementObject | object,
-            type: string,
-            cb: (evt: Event) => void
-        ): () => void;
+        addEvent(element: HTMLElement | ElementObject | object,
+                 type: string,
+                 cb: (evt: Event) => void): () => void;
 
         /**
          * Fire an event that was registered with
@@ -7519,12 +7370,10 @@ declare namespace Highcharts {
          * @param eventArguments  Custom event arguments that are passed on as an argument to the event handler.
          * @param defaultFunction The default function to execute if the other listeners haven't returned false.
          */
-        fireEvent(
-            element: HTMLElement | ElementObject | object,
-            type: string,
-            eventArguments?: any,
-            defaultFunction?: () => void
-        ): void;
+        fireEvent(element: HTMLElement | ElementObject | object,
+                  type: string,
+                  eventArguments?: any,
+                  defaultFunction?: () => void): void;
 
         distribute(array: any[], value: number): void;
 
@@ -7594,11 +7443,7 @@ declare namespace Highcharts {
          * The animation can also be a configuration object with properties duration and easing.
          * @since 1.2.0
          */
-        slice(
-            sliced?: boolean,
-            redraw?: boolean,
-            animation?: boolean | Animation
-        ): void;
+        slice(sliced?: boolean, redraw?: boolean, animation?: boolean | Animation): void;
         /**
          * The total of a stack for stacked series, or pie in pie charts.
          */
@@ -7614,11 +7459,7 @@ declare namespace Highcharts {
          * The animation can also be a configuration object with properties duration and easing.
          * @since 1.2.0
          */
-        update(
-            options: number | [number, number] | DataPoint,
-            redraw?: boolean,
-            animation?: boolean | Animation
-        ): void;
+        update(options: number | [number, number] | DataPoint, redraw?: boolean, animation?: boolean | Animation): void;
         /**
          * The x value for the point.
          * @since 1.2.0
@@ -7659,12 +7500,7 @@ declare namespace Highcharts {
          * Use this option for live charts monitoring a value over time.
          * @since 1.2.0
          */
-        addPoint(
-            options: number | [number, number] | DataPoint,
-            redraw?: boolean,
-            shift?: boolean,
-            animation?: boolean | Animation
-        ): void;
+        addPoint(options: number | [number, number] | DataPoint, redraw?: boolean, shift?: boolean, animation?: boolean | Animation): void;
         /**
          * Read only. The chart that the series belongs to.
          * @since 1.2.0
@@ -7708,11 +7544,7 @@ declare namespace Highcharts {
          * The animation can also be a configuration object with properties duration and easing.
          * @since 4.1.0
          */
-        removePoint(
-            index: number,
-            redraw?: boolean,
-            animation?: boolean | Animation
-        ): void;
+        removePoint(index: number, redraw?: boolean, animation?: boolean | Animation): void;
         /**
          * Select or unselect the series. This means its selected property is set,the checkbox in the legend is toggled and
          * when selected, the series is returned in the chart.getSelectedSeries() method.
@@ -7737,12 +7569,7 @@ declare namespace Highcharts {
          * This option prevents this, and makes setData behave like it did prior to Highcharts 3.0.10.
          * @since 1.2.0
          */
-        setData(
-            data: number[] | number[][] | DataPoint[],
-            redraw?: boolean,
-            animation?: boolean | Animation,
-            updatePoints?: boolean
-        ): void;
+        setData(data: number[] | number[][] | DataPoint[], redraw?: boolean, animation?: boolean | Animation, updatePoints?: boolean): void;
         /**
          * A utility function to show or hide the series with an optional redraw.
          * @param [boolean] visible - Whether to show or hide the series. If undefined, the visibility is toggled.
@@ -7829,10 +7656,7 @@ declare global {
          * @param callback Callback function used to manipulate the constructed chart instance
          * @return current {JQuery} selector the current JQuery selector
          */
-        highcharts(
-            options: Highcharts.Options,
-            callback: (chart: Highcharts.ChartObject) => void
-        ): JQuery;
+        highcharts(options: Highcharts.Options, callback: (chart: Highcharts.ChartObject) => void): JQuery;
     }
 }
 

From 38983e317ac39a234d6bc4106f7f4d0767211800 Mon Sep 17 00:00:00 2001
From: AzSiAz <slider.perso@live.fr>
Date: Mon, 22 Oct 2018 19:58:14 +0200
Subject: [PATCH 016/836] Add overloading to `get` method

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

diff --git a/types/cheerio/index.d.ts b/types/cheerio/index.d.ts
index cb8031705e..7f76146257 100644
--- a/types/cheerio/index.d.ts
+++ b/types/cheerio/index.d.ts
@@ -1,6 +1,6 @@
 // Type definitions for Cheerio v0.22.0
 // Project: https://github.com/cheeriojs/cheerio
-// Definitions by: Bret Little <https://github.com/blittle>, VILIC VANE <http://vilic.info>, Wayne Maurer <https://github.com/wmaurer>, Umar Nizamani <https://github.com/umarniz>, LiJinyao <https://github.com/LiJinyao>, Chennakrishna <https://github.com/chennakrishna8>
+// Definitions by: Bret Little <https://github.com/blittle>, VILIC VANE <http://vilic.info>, Wayne Maurer <https://github.com/wmaurer>, Umar Nizamani <https://github.com/umarniz>, LiJinyao <https://github.com/LiJinyao>, Chennakrishna <https://github.com/chennakrishna8>, AzSiAz <https://github.com/AzSiAz>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 interface Cheerio {
@@ -112,8 +112,10 @@ interface Cheerio {
     eq(index: number): Cheerio;
 
     get(): string[];
+    get<T>(): T[];
     get(): CheerioElement[];
     get(index: number): CheerioElement;
+    get<T>(index: number): T;
 
     index(): number;
     index(selector: string): number;

From a8b6dfd99e9637403c2204d0f2fe8e53f9c8eed3 Mon Sep 17 00:00:00 2001
From: AzSiAz <slider.perso@live.fr>
Date: Mon, 22 Oct 2018 20:10:40 +0200
Subject: [PATCH 017/836] Revert "Add overloading to `get` method"

This reverts commit 38983e317ac39a234d6bc4106f7f4d0767211800.
---
 types/cheerio/index.d.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/types/cheerio/index.d.ts b/types/cheerio/index.d.ts
index 7f76146257..5f8b89fe60 100644
--- a/types/cheerio/index.d.ts
+++ b/types/cheerio/index.d.ts
@@ -112,10 +112,8 @@ interface Cheerio {
     eq(index: number): Cheerio;
 
     get(): string[];
-    get<T>(): T[];
     get(): CheerioElement[];
     get(index: number): CheerioElement;
-    get<T>(index: number): T;
 
     index(): number;
     index(selector: string): number;

From 023af83ed4d02ef61234532448ac49d8c27dad5b Mon Sep 17 00:00:00 2001
From: AzSiAz <slider.perso@live.fr>
Date: Mon, 22 Oct 2018 20:11:22 +0200
Subject: [PATCH 018/836] Add correct overloading to `get` method

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

diff --git a/types/cheerio/index.d.ts b/types/cheerio/index.d.ts
index 5f8b89fe60..b04e0f009d 100644
--- a/types/cheerio/index.d.ts
+++ b/types/cheerio/index.d.ts
@@ -111,6 +111,7 @@ interface Cheerio {
 
     eq(index: number): Cheerio;
 
+	get(): any[]
     get(): string[];
     get(): CheerioElement[];
     get(index: number): CheerioElement;

From f482096dc54638fb2211d673d762f3d051fa271e Mon Sep 17 00:00:00 2001
From: Boris Sergeyev <surgeboris@gmail.com>
Date: Sat, 3 Nov 2018 19:20:07 +0100
Subject: [PATCH 019/836] [react-redux] implemented proper typings for thunk
 action creators in TDispatchProps

---
 types/react-redux/index.d.ts            | 38 +++++++++++++++++++++----
 types/react-redux/react-redux-tests.tsx | 23 +++++++++++++++
 2 files changed, 55 insertions(+), 6 deletions(-)

diff --git a/types/react-redux/index.d.ts b/types/react-redux/index.d.ts
index 5cbde2e8db..0676941ce9 100644
--- a/types/react-redux/index.d.ts
+++ b/types/react-redux/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for react-redux 6.0.4
+// Type definitions for react-redux 6.0.5
 // Project: https://github.com/reduxjs/react-redux
 // Definitions by: Qubo <https://github.com/tkqubo>,
 //                 Kenzie Togami <https://github.com/kenzierocks>,
@@ -11,6 +11,7 @@
 //                 Valentin Descamps <https://github.com/val1984>
 //                 Johann Rakotoharisoa <https://github.com/jrakotoharisoa>
 //                 Anatoli Papirovski <https://github.com/apapirovski>
+//                 Boris Sergeyev <https://github.com/surgeboris>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 
@@ -102,7 +103,7 @@ type ConnectedComponentClass<C, P> = ComponentClass<JSX.LibraryManagedAttributes
 // Will not pass through the injected props if they are passed in during
 // render. Also adds new prop requirements from TNeedsProps.
 export interface InferableComponentEnhancerWithProps<TInjectedProps, TNeedsProps> {
-	<C extends ComponentType<Matching<TInjectedProps, GetProps<C>>>>(
+    <C extends ComponentType<Matching<TInjectedProps, GetProps<C>>>>(
 		component: C
 	): ConnectedComponentClass<C, Omit<GetProps<C>, keyof Shared<TInjectedProps, GetProps<C>>> & TNeedsProps>
 }
@@ -113,6 +114,19 @@ export interface InferableComponentEnhancerWithProps<TInjectedProps, TNeedsProps
 export type InferableComponentEnhancer<TInjectedProps> =
     InferableComponentEnhancerWithProps<TInjectedProps, {}>
 
+// redux-thunk middleware returns thunk's return value from dispatch call
+type WithThunkActionCreators<TDispatchProps> =
+    TDispatchProps extends object
+    ? {
+        [C in keyof TDispatchProps]: C extends (...args: any[]) => any
+            ? ReturnType<C> extends (...args: any[]) => any
+                ? ReturnType<ReturnType<C>>
+                : C
+            : never
+    }
+    : TDispatchProps
+
+
 /**
  * Connects a React component to a Redux store.
  *
@@ -142,12 +156,18 @@ export interface Connect {
     <no_state = {}, TDispatchProps = {}, TOwnProps = {}>(
         mapStateToProps: null | undefined,
         mapDispatchToProps: MapDispatchToPropsParam<TDispatchProps, TOwnProps>
-    ): InferableComponentEnhancerWithProps<TDispatchProps, TOwnProps>;
+    ): InferableComponentEnhancerWithProps<
+        WithThunkActionCreators<TDispatchProps>,
+        TOwnProps
+    >;
 
     <TStateProps = {}, TDispatchProps = {}, TOwnProps = {}, State = {}>(
         mapStateToProps: MapStateToPropsParam<TStateProps, TOwnProps, State>,
         mapDispatchToProps: MapDispatchToPropsParam<TDispatchProps, TOwnProps>
-    ): InferableComponentEnhancerWithProps<TStateProps & TDispatchProps, TOwnProps>;
+    ): InferableComponentEnhancerWithProps<
+        TStateProps & WithThunkActionCreators<TDispatchProps>,
+        TOwnProps
+    >;
 
     <TStateProps = {}, no_dispatch = {}, TOwnProps = {}, TMergedProps = {}, State = {}>(
         mapStateToProps: MapStateToPropsParam<TStateProps, TOwnProps, State>,
@@ -185,14 +205,20 @@ export interface Connect {
         mapDispatchToProps: MapDispatchToPropsParam<TDispatchProps, TOwnProps>,
         mergeProps: null | undefined,
         options: Options<{}, TStateProps, TOwnProps>
-    ): InferableComponentEnhancerWithProps<TDispatchProps, TOwnProps>;
+    ): InferableComponentEnhancerWithProps<
+        WithThunkActionCreators<TDispatchProps>,
+        TOwnProps
+    >;
 
     <TStateProps = {}, TDispatchProps = {}, TOwnProps = {}, State = {}>(
         mapStateToProps: MapStateToPropsParam<TStateProps, TOwnProps, State>,
         mapDispatchToProps: MapDispatchToPropsParam<TDispatchProps, TOwnProps>,
         mergeProps: null | undefined,
         options: Options<State, TStateProps, TOwnProps>
-    ): InferableComponentEnhancerWithProps<TStateProps & TDispatchProps, TOwnProps>;
+    ): InferableComponentEnhancerWithProps<
+        TStateProps & WithThunkActionCreators<TDispatchProps>,
+        TOwnProps
+    >;
 
     <TStateProps = {}, TDispatchProps = {}, TOwnProps = {}, TMergedProps = {}, State = {}>(
         mapStateToProps: MapStateToPropsParam<TStateProps, TOwnProps, State>,
diff --git a/types/react-redux/react-redux-tests.tsx b/types/react-redux/react-redux-tests.tsx
index 3b25b25843..a5f8c2b4f7 100644
--- a/types/react-redux/react-redux-tests.tsx
+++ b/types/react-redux/react-redux-tests.tsx
@@ -99,6 +99,29 @@ namespace MapDispatch {
     const verifyUndefined = <TestUndefined foo='bar' />
 }
 
+namespace MapDispatchWithThunkActionCreators {
+    interface OwnProps { foo: string }
+    interface DispatchProps {
+        onClick(): void,
+        thunkAction(): Promise<void>
+    }
+
+    class TestComponent extends Component<OwnProps & DispatchProps> {}
+
+    const mapDispatchToProps = () => ({
+        onClick: () => {},
+        thunkAction: () => async () => {}
+    })
+
+    const Test = connect(
+        null,
+        mapDispatchToProps,
+    )(TestComponent)
+
+    const verify = <Test foo='bar' />
+}
+
+
 namespace MapStateAndDispatchObject {
     interface ClickPayload { count: number }
     const onClick: ActionCreator<ClickPayload> = () => ({ count: 1 });

From 57ba1bcd755c8bc2aac0e74dadc50215d9127bed Mon Sep 17 00:00:00 2001
From: Boris Sergeyev <surgeboris@gmail.com>
Date: Mon, 5 Nov 2018 23:09:07 +0100
Subject: [PATCH 020/836] [react-redux] fixed error in typings for thunk action
 creators

As noted in https://github.com/DefinitelyTyped/DefinitelyTyped/pull/30255#issuecomment-435814014
the key was used where value was expected. The test didn't catched that because
`never` does not interact with `Shared` higher-order type in a way
that I've expected. So I've avoided using `never` and edited test a bit.
---
 types/react-redux/index.d.ts            | 20 +++++++++++---------
 types/react-redux/react-redux-tests.tsx |  9 ++++-----
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/types/react-redux/index.d.ts b/types/react-redux/index.d.ts
index 0676941ce9..d1889b54fe 100644
--- a/types/react-redux/index.d.ts
+++ b/types/react-redux/index.d.ts
@@ -114,17 +114,19 @@ export interface InferableComponentEnhancerWithProps<TInjectedProps, TNeedsProps
 export type InferableComponentEnhancer<TInjectedProps> =
     InferableComponentEnhancerWithProps<TInjectedProps, {}>
 
+type HandleThunkActionCreator<TActionCreator> =
+    TActionCreator extends (...args: any[]) => (...args: any[]) => any
+        ? ReturnType<TActionCreator>
+        : TActionCreator
+
 // redux-thunk middleware returns thunk's return value from dispatch call
+// https://github.com/reduxjs/redux-thunk#composition
 type WithThunkActionCreators<TDispatchProps> =
-    TDispatchProps extends object
-    ? {
-        [C in keyof TDispatchProps]: C extends (...args: any[]) => any
-            ? ReturnType<C> extends (...args: any[]) => any
-                ? ReturnType<ReturnType<C>>
-                : C
-            : never
-    }
-    : TDispatchProps
+    TDispatchProps extends { [key: string]: any }
+        ? {
+            [C in keyof TDispatchProps]: HandleThunkActionCreator<TDispatchProps[C]>
+        }
+        : TDispatchProps
 
 
 /**
diff --git a/types/react-redux/react-redux-tests.tsx b/types/react-redux/react-redux-tests.tsx
index a5f8c2b4f7..a2fad70440 100644
--- a/types/react-redux/react-redux-tests.tsx
+++ b/types/react-redux/react-redux-tests.tsx
@@ -99,14 +99,13 @@ namespace MapDispatch {
     const verifyUndefined = <TestUndefined foo='bar' />
 }
 
+
 namespace MapDispatchWithThunkActionCreators {
-    interface OwnProps { foo: string }
-    interface DispatchProps {
+    class TestComponent extends Component<{
+        foo: string,
         onClick(): void,
         thunkAction(): Promise<void>
-    }
-
-    class TestComponent extends Component<OwnProps & DispatchProps> {}
+    }>{}
 
     const mapDispatchToProps = () => ({
         onClick: () => {},

From c592ba0099f5e689e5cbcd5d610df578633c6ef1 Mon Sep 17 00:00:00 2001
From: Hasan Oezdemir <Hasan.Oezdemir@oebb.at>
Date: Tue, 6 Nov 2018 11:58:04 +0100
Subject: [PATCH 021/836] redis-rate-limiter: update version to 1.2.0 to
 provide new options

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

diff --git a/types/redis-rate-limiter/index.d.ts b/types/redis-rate-limiter/index.d.ts
index 6e36f60f3e..45495ad874 100644
--- a/types/redis-rate-limiter/index.d.ts
+++ b/types/redis-rate-limiter/index.d.ts
@@ -1,6 +1,7 @@
-// Type definitions for redis-rate-limiter 1.0.3
+// Type definitions for redis-rate-limiter 1.2.0
 // Project: https://github.com/TabDigital/redis-rate-limiter
 // Definitions by: Seth Westphal <https://github.com/westy92>
+//                 Hasan Oezdemir <https://github.com/nodify-at>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -20,6 +21,8 @@ declare namespace RedisRateLimiter {
         window?: number;
         limit?: number;
         rate?: string;
+        deleteImmediatelyIfRaceCondition?: boolean;
+        onPossibleRaceCondition?: (key: string) => void;
     }
 
     export interface Response {
@@ -31,4 +34,4 @@ declare namespace RedisRateLimiter {
     }
 }
 
-export = RedisRateLimiter;
\ No newline at end of file
+export = RedisRateLimiter;
diff --git a/types/redis-rate-limiter/redis-rate-limiter-tests.ts b/types/redis-rate-limiter/redis-rate-limiter-tests.ts
index a121d28477..98cb34a4e0 100644
--- a/types/redis-rate-limiter/redis-rate-limiter-tests.ts
+++ b/types/redis-rate-limiter/redis-rate-limiter-tests.ts
@@ -30,7 +30,9 @@ limit(request, function(err, rate) {
 var middleware = rateLimiter.middleware({
   redis: redisClient,
   key: 'ip',
-  rate: '100/minute'
+  rate: '100/minute',
+  deleteImmediatelyIfRaceCondition: true,
+  onPossibleRaceCondition: key => console.log(`A race condition has been detected for <${key}>!`)
 });
 
 var app = express();

From feac0654fa67b2692dfe156420acb0396f98c446 Mon Sep 17 00:00:00 2001
From: Chris O'Toole <chris@ignitenet.com>
Date: Wed, 7 Nov 2018 10:09:01 -0500
Subject: [PATCH 022/836] Add "onChildMouseDown" "onChildMouseUp", and
 "onChildMouseMove" to google-map-react definitions

---
 package.json                      | 2 +-
 types/google-map-react/index.d.ts | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 09fe064d48..2bd57a4c7c 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "private": true,
     "name": "definitely-typed",
-    "version": "0.0.3",
+    "version": "0.0.4",
     "homepage": "https://github.com/DefinitelyTyped/DefinitelyTyped",
     "repository": {
         "type": "git",
diff --git a/types/google-map-react/index.d.ts b/types/google-map-react/index.d.ts
index a917ae426e..56686c94c1 100644
--- a/types/google-map-react/index.d.ts
+++ b/types/google-map-react/index.d.ts
@@ -131,6 +131,9 @@ export interface Props {
   onChildClick?(hoverKey: any, childProps: any): void;
   onChildMouseEnter?(hoverKey: any, childProps: any): void;
   onChildMouseLeave?(hoverKey: any, childProps: any): void;
+  onChildMouseDown?(childKey: any, childProps: any, mouse: any): void;
+  onChildMouseUp?(childKey: any, childProps: any, mouse: any): void;
+  onChildMouseMove?(childKey: any, childProps: any, mouse: any): void;
   onDrag?(args: any): void;
   onZoomAnimationStart?(args: any): void;
   onZoomAnimationEnd?(args: any): void;

From 9e043b0469ce0afba60c188fe666d92d7ff87799 Mon Sep 17 00:00:00 2001
From: tzachshabtay <tzachshabtay@gmail.com>
Date: Wed, 7 Nov 2018 10:40:10 -0500
Subject: [PATCH 023/836] Update bearer-strategy.d.ts

---
 types/passport-azure-ad/bearer-strategy.d.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/types/passport-azure-ad/bearer-strategy.d.ts b/types/passport-azure-ad/bearer-strategy.d.ts
index 30751720f3..6ea48809c1 100644
--- a/types/passport-azure-ad/bearer-strategy.d.ts
+++ b/types/passport-azure-ad/bearer-strategy.d.ts
@@ -21,7 +21,7 @@ export interface IBearerStrategyOptionWithRequest extends IBearerStrategyOption
     passReqToCallback: true;
 }
 
-export class BearerStrategy extends passport.Strategy {
+export class BearerStrategy implements passport.Strategy {
     constructor(
         options: IBearerStrategyOptionWithRequest,
         verify: VerifyBearerFunctionWithReq
@@ -31,4 +31,4 @@ export class BearerStrategy extends passport.Strategy {
     name: string;
 
     authenticate(req: Request, options?: object): void;
-}
\ No newline at end of file
+}

From 66d61a566b42a2e67b397d57f146771f94daed02 Mon Sep 17 00:00:00 2001
From: tzachshabtay <tzachshabtay@gmail.com>
Date: Wed, 7 Nov 2018 10:40:41 -0500
Subject: [PATCH 024/836] Update oidc-strategy.d.ts

---
 types/passport-azure-ad/oidc-strategy.d.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/types/passport-azure-ad/oidc-strategy.d.ts b/types/passport-azure-ad/oidc-strategy.d.ts
index ac4d984ea2..672694d5a9 100644
--- a/types/passport-azure-ad/oidc-strategy.d.ts
+++ b/types/passport-azure-ad/oidc-strategy.d.ts
@@ -52,7 +52,7 @@ export type VerifyOIDCFunctionWithReq =
     ((req: Request, iss: string, sub: string, profile: IProfile, access_token: string, refresh_token: string, params: any, done: VerifyCallback) => void) |
     ((req: Request, iss: string, sub: string, profile: IProfile, jwtClaims: any, access_token: string, refresh_token: string, params: any, done: VerifyCallback) => void);
 
-export class OIDCStrategy extends passport.Strategy {
+export class OIDCStrategy implements passport.Strategy {
     constructor(
         options: IOIDCStrategyOptionWithRequest,
         verify: VerifyOIDCFunction
@@ -62,4 +62,4 @@ export class OIDCStrategy extends passport.Strategy {
     name: string;
 
     authenticate(req: Request, options?: object): void;
-}
\ No newline at end of file
+}

From 202f4ee2dd0603bc665629d5f6c1c37ae3868dd6 Mon Sep 17 00:00:00 2001
From: Jeff Held <jheld135@gmail.com>
Date: Thu, 8 Nov 2018 16:49:37 -0600
Subject: [PATCH 025/836] detox: create tests folder, add test for importing
 Detox module

---
 types/detox/detox-tests.ts                    | 31 --------------
 types/detox/tests/detox-globals-tests.ts      | 40 ++++++++++++++++++
 .../detox/tests/detox-import-modules-tests.ts | 42 +++++++++++++++++++
 types/detox/tsconfig.json                     | 11 ++---
 4 files changed, 86 insertions(+), 38 deletions(-)
 delete mode 100644 types/detox/detox-tests.ts
 create mode 100644 types/detox/tests/detox-globals-tests.ts
 create mode 100644 types/detox/tests/detox-import-modules-tests.ts

diff --git a/types/detox/detox-tests.ts b/types/detox/detox-tests.ts
deleted file mode 100644
index 58fe5c1912..0000000000
--- a/types/detox/detox-tests.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-declare var describe: (test: string, callback: () => void) => void;
-declare var beforeAll: (callback: () => void) => void;
-declare var afterAll: (callback: () => void) => void;
-declare var test: (test: string, callback: () => void) => void;
-
-describe('Test', () => {
-    beforeAll(async () => {
-        await device.reloadReactNative();
-    });
-
-    afterAll(async () => {
-        await element(by.id('element')).clearText();
-    });
-
-    test('Test', async () => {
-        await element(by.id('element')).replaceText('text');
-        await element(by.id('element')).tap();
-        await element(by.id('element')).scroll(50, 'down');
-        await element(by.id('scrollView')).scrollTo('bottom');
-        await expect(element(by.id('element')).atIndex(0)).toNotExist();
-        await element(by.id('scrollView')).swipe('down', 'fast');
-        await element(by.type('UIPickerView')).setColumnToValue(1, "6");
-
-        await expect(element(by.id('element').withAncestor(by.id('parent_element')))).toNotExist();
-        await expect(element(by.id('element').withDescendant(by.id('child_element')))).toNotExist();
-
-        await waitFor(element(by.id('element'))).toBeVisible().withTimeout(2000);
-        await device.pressBack();
-        await waitFor(element(by.text('Text5'))).toBeVisible().whileElement(by.id('ScrollView630')).scroll(50, 'down');
-    });
-});
diff --git a/types/detox/tests/detox-globals-tests.ts b/types/detox/tests/detox-globals-tests.ts
new file mode 100644
index 0000000000..42415c548d
--- /dev/null
+++ b/types/detox/tests/detox-globals-tests.ts
@@ -0,0 +1,40 @@
+declare var describe: (test: string, callback: () => void) => void;
+declare var beforeAll: (callback: () => void) => void;
+declare var afterAll: (callback: () => void) => void;
+declare var test: (test: string, callback: () => void) => void;
+
+describe("Test", () => {
+    beforeAll(async () => {
+        await device.reloadReactNative();
+    });
+
+    afterAll(async () => {
+        await element(by.id("element")).clearText();
+    });
+
+    test("Test", async () => {
+        await element(by.id("element")).replaceText("text");
+        await element(by.id("element")).tap();
+        await element(by.id("element")).scroll(50, "down");
+        await element(by.id("scrollView")).scrollTo("bottom");
+        await expect(element(by.id("element")).atIndex(0)).toNotExist();
+        await element(by.id("scrollView")).swipe("down", "fast");
+        await element(by.type("UIPickerView")).setColumnToValue(1, "6");
+
+        await expect(
+            element(by.id("element").withAncestor(by.id("parent_element")))
+        ).toNotExist();
+        await expect(
+            element(by.id("element").withDescendant(by.id("child_element")))
+        ).toNotExist();
+
+        await waitFor(element(by.id("element")))
+            .toBeVisible()
+            .withTimeout(2000);
+        await device.pressBack();
+        await waitFor(element(by.text("Text5")))
+            .toBeVisible()
+            .whileElement(by.id("ScrollView630"))
+            .scroll(50, "down");
+    });
+});
diff --git a/types/detox/tests/detox-import-modules-tests.ts b/types/detox/tests/detox-import-modules-tests.ts
new file mode 100644
index 0000000000..318569c03d
--- /dev/null
+++ b/types/detox/tests/detox-import-modules-tests.ts
@@ -0,0 +1,42 @@
+declare var describe: (test: string, callback: () => void) => void;
+declare var beforeAll: (callback: () => void) => void;
+declare var afterAll: (callback: () => void) => void;
+declare var test: (test: string, callback: () => void) => void;
+
+import { by, device, element, expect, waitFor } from "detox";
+
+describe("Test", () => {
+    beforeAll(async () => {
+        await device.reloadReactNative();
+    });
+
+    afterAll(async () => {
+        await element(by.id("element")).clearText();
+    });
+
+    test("Test", async () => {
+        await element(by.id("element")).replaceText("text");
+        await element(by.id("element")).tap();
+        await element(by.id("element")).scroll(50, "down");
+        await element(by.id("scrollView")).scrollTo("bottom");
+        await expect(element(by.id("element")).atIndex(0)).toNotExist();
+        await element(by.id("scrollView")).swipe("down", "fast");
+        await element(by.type("UIPickerView")).setColumnToValue(1, "6");
+
+        await expect(
+            element(by.id("element").withAncestor(by.id("parent_element")))
+        ).toNotExist();
+        await expect(
+            element(by.id("element").withDescendant(by.id("child_element")))
+        ).toNotExist();
+
+        await waitFor(element(by.id("element")))
+            .toBeVisible()
+            .withTimeout(2000);
+        await device.pressBack();
+        await waitFor(element(by.text("Text5")))
+            .toBeVisible()
+            .whileElement(by.id("ScrollView630"))
+            .scroll(50, "down");
+    });
+});
diff --git a/types/detox/tsconfig.json b/types/detox/tsconfig.json
index 2d1a22fb79..3eb7524be2 100644
--- a/types/detox/tsconfig.json
+++ b/types/detox/tsconfig.json
@@ -1,24 +1,21 @@
 {
     "compilerOptions": {
         "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
+        "lib": ["es6"],
         "target": "ES2015",
         "noImplicitAny": true,
         "noImplicitThis": true,
         "strictNullChecks": true,
         "strictFunctionTypes": true,
         "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
+        "typeRoots": ["../"],
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
     },
     "files": [
         "index.d.ts",
-        "detox-tests.ts"
+        "tests/detox-globals-tests.ts",
+        "tests/detox-import-modules-tests.ts"
     ]
 }

From 45a0c57ef040ed95fa5994b05a2a5c32778706fc Mon Sep 17 00:00:00 2001
From: Jeff Held <jheld135@gmail.com>
Date: Thu, 8 Nov 2018 16:49:42 -0600
Subject: [PATCH 026/836] detox: follow global-modifying dts example

---
 types/detox/index.d.ts | 821 +++++++++++++++++++++--------------------
 1 file changed, 416 insertions(+), 405 deletions(-)

diff --git a/types/detox/index.d.ts b/types/detox/index.d.ts
index 7ef085e25d..f9baa99f6e 100644
--- a/types/detox/index.d.ts
+++ b/types/detox/index.d.ts
@@ -3,418 +3,429 @@
 // Definitions by: Tareq El-Masri <https://github.com/TareqElMasri>, Steve Chun <https://github.com/stevechun>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare const detox: Detox.Detox;
-declare const device: Detox.Device;
-declare const element: Detox.Element;
-declare const waitFor: Detox.WaitFor;
-declare const expect: Detox.Expect<Detox.Expect<any>>;
-declare const by: Detox.Matchers;
+declare global {
+    const detox: Detox.Detox;
+    const device: Detox.Device;
+    const element: Detox.Element;
+    const waitFor: Detox.WaitFor;
+    const expect: Detox.Expect<Detox.Expect<any>>;
+    const by: Detox.Matchers;
 
-declare namespace Detox {
-    interface Detox {
-        /**
-         * The setup phase happens inside detox.init(). This is the phase where detox reads its configuration, starts a server, loads its expection library and starts a simulator
-         * @param config
-         * @param options
-         * @example const config = require('../package.json').detox;
-         *
-         * before(async () => {
-         *      await detox.init(config);
-         * });
-         */
-        init(config: any, options?: DetoxInitOptions): Promise<void>;
-        /**
-         * Artifacts currently include only logs from the app process before each task
-         * @param args
-         */
-        beforeEach(...args: any[]): Promise<void>;
-        /**
-         * Artifacts currently include only logs from the app process after each task
-         * @param args
-         */
-        afterEach(...args: any[]): Promise<void>;
-        /**
-         * The cleanup phase should happen after all the tests have finished. This is the phase where detox-server shuts down.
-         * @example after(async () => {
-         *  await detox.cleanup();
-         * });
-         */
-        cleanup(): Promise<void>;
-    }
-    interface Device {
-        /**
-         * Launch the app
-         * @param config
-         * @example // Terminate the app and launch it again. If set to false, the simulator will try to bring app from background,
-         * // if the app isn't running, it will launch a new instance. default is false
-         * await device.launchApp({newInstance: true});
-         * // Grant or deny runtime permissions for your application.
-         * await device.launchApp({permissions: {calendar: 'YES'}});
-         * // Mock opening the app from URL to test your app's deep link handling mechanism.
-         * await device.launchApp({url: url});
-         */
-        launchApp(config: DeviceLanchAppConfig): Promise<void>;
-        /**
-         * By default, terminateApp() with no params will terminate the app
-         * To terminate another app, specify its bundle id
-         * @param bundle
-         * @example await device.terminateApp('other.bundle.id');
-         */
-        terminateApp(bundle?: string): Promise<void>;
-        /**
-         * Send application to background by bringing com.apple.springboard to the foreground.
-         * Combining sendToHome() with launchApp({newInstance: false}) will simulate app coming back from background.
-         * @example await device.sendToHome();
-         * await device.launchApp({newInstance: false});
-         */
-        sendToHome(): Promise<void>;
-        /**
-         * If this is a React Native app, reload the React Native JS bundle. This action is much faster than device.launchApp(), and can be used if you just need to reset your React Native logic.
-         * @example await device.reloadReactNative()
-         */
-        reloadReactNative(): Promise<void>;
-        /**
-         * By default, installApp() with no params will install the app file defined in the current configuration.
-         * To install another app, specify its path
-         * @param path
-         * @example await device.installApp('path/to/other/app');
-         */
-        installApp(path?: any): Promise<void>;
-        /**
-         * By default, uninstallApp() with no params will uninstall the app defined in the current configuration.
-         * To uninstall another app, specify its bundle id
-         * @param bundle
-         * @example await device.installApp('other.bundle.id');
-         */
-        uninstallApp(bundle?: string): Promise<void>;
-        /**
-         * Mock opening the app from URL. sourceApp is an optional parameter to specify source application bundle id.
-         * @param url
-         */
-        openURL(url: {url: string, sourceApp?: string}): Promise<void>;
-        /**
-         * Mock handling of received user notification when app is in foreground.
-         * @param params
-         */
-        sendUserNotification(...params: any[]): Promise<void>;
-        /**
-         * Mock handling of received user activity when app is in foreground.
-         * @param params
-         */
-        sendUserActivity(...params: any[]): Promise<void>;
-        /**
-         * Takes "portrait" or "landscape" and rotates the device to the given orientation. Currently only available in the iOS Simulator.
-         * @param orientation
-         */
-        setOrientation(orientation: Orientation): Promise<void>;
-        /**
-         * Note: setLocation is dependent on fbsimctl. if fbsimctl is not installed, the command will fail, it must be installed. Sets the simulator location to the given latitude and longitude.
-         * @param lat
-         * @param lon
-         * @example await device.setLocation(32.0853, 34.7818);
-         */
-        setLocation(lat: number, lon: number): Promise<void>;
-        /**
-         * Disable EarlGrey's network synchronization mechanism on preffered endpoints. Usful if you want to on skip over synchronizing on certain URLs.
-         * @param urls
-         * @example await device.setURLBlacklist(['.*127.0.0.1.*']);
-         */
-        setURLBlacklist(urls: string[]): Promise<void>;
-        /**
-         * Enable EarlGrey's synchronization mechanism (enabled by default). This is being reset on every new instance of the app.
-         * @example await device.enableSynchronization();
-         */
-        enableSynchronization(): Promise<void>;
-        /**
-         * Disable EarlGrey's synchronization mechanism (enabled by default) This is being reset on every new instance of the app.
-         * @example await device.disableSynchronization();
-         */
-        disableSynchronization(): Promise<void>;
-        /**
-         * Resets the Simulator to clean state (like the Simulator > Reset Content and Settings... menu item), especially removing previously set permissions.
-         * @example await device.resetContentAndSettings();
-         */
-        resetContentAndSettings(): Promise<void>;
-        /**
-         * Returns the current device, ios or android.
-         * @example if (device.getPlatform() === 'ios') {
-         *     await expect(loopSwitch).toHaveValue('1');
-         * }
-         */
-        getPlatform(): "ios" | "android";
-        /**
-         * Simulate press back button (Android Only)
-         */
-        pressBack(): Promise<void>;
-        /**
-         * Simulate shake (iOS Only)
-         */
-        shake(): Promise<void>;
-    }
+    namespace Detox {
+        interface Detox {
+            /**
+             * The setup phase happens inside detox.init(). This is the phase where detox reads its configuration, starts a server, loads its expection library and starts a simulator
+             * @param config
+             * @param options
+             * @example const config = require('../package.json').detox;
+             *
+             * before(async () => {
+             *      await detox.init(config);
+             * });
+             */
+            init(config: any, options?: DetoxInitOptions): Promise<void>;
+            /**
+             * Artifacts currently include only logs from the app process before each task
+             * @param args
+             */
+            beforeEach(...args: any[]): Promise<void>;
+            /**
+             * Artifacts currently include only logs from the app process after each task
+             * @param args
+             */
+            afterEach(...args: any[]): Promise<void>;
+            /**
+             * The cleanup phase should happen after all the tests have finished. This is the phase where detox-server shuts down.
+             * @example after(async () => {
+             *  await detox.cleanup();
+             * });
+             */
+            cleanup(): Promise<void>;
+        }
+        interface Device {
+            /**
+             * Launch the app
+             * @param config
+             * @example // Terminate the app and launch it again. If set to false, the simulator will try to bring app from background,
+             * // if the app isn't running, it will launch a new instance. default is false
+             * await device.launchApp({newInstance: true});
+             * // Grant or deny runtime permissions for your application.
+             * await device.launchApp({permissions: {calendar: 'YES'}});
+             * // Mock opening the app from URL to test your app's deep link handling mechanism.
+             * await device.launchApp({url: url});
+             */
+            launchApp(config: DeviceLanchAppConfig): Promise<void>;
+            /**
+             * By default, terminateApp() with no params will terminate the app
+             * To terminate another app, specify its bundle id
+             * @param bundle
+             * @example await device.terminateApp('other.bundle.id');
+             */
+            terminateApp(bundle?: string): Promise<void>;
+            /**
+             * Send application to background by bringing com.apple.springboard to the foreground.
+             * Combining sendToHome() with launchApp({newInstance: false}) will simulate app coming back from background.
+             * @example await device.sendToHome();
+             * await device.launchApp({newInstance: false});
+             */
+            sendToHome(): Promise<void>;
+            /**
+             * If this is a React Native app, reload the React Native JS bundle. This action is much faster than device.launchApp(), and can be used if you just need to reset your React Native logic.
+             * @example await device.reloadReactNative()
+             */
+            reloadReactNative(): Promise<void>;
+            /**
+             * By default, installApp() with no params will install the app file defined in the current configuration.
+             * To install another app, specify its path
+             * @param path
+             * @example await device.installApp('path/to/other/app');
+             */
+            installApp(path?: any): Promise<void>;
+            /**
+             * By default, uninstallApp() with no params will uninstall the app defined in the current configuration.
+             * To uninstall another app, specify its bundle id
+             * @param bundle
+             * @example await device.installApp('other.bundle.id');
+             */
+            uninstallApp(bundle?: string): Promise<void>;
+            /**
+             * Mock opening the app from URL. sourceApp is an optional parameter to specify source application bundle id.
+             * @param url
+             */
+            openURL(url: { url: string; sourceApp?: string }): Promise<void>;
+            /**
+             * Mock handling of received user notification when app is in foreground.
+             * @param params
+             */
+            sendUserNotification(...params: any[]): Promise<void>;
+            /**
+             * Mock handling of received user activity when app is in foreground.
+             * @param params
+             */
+            sendUserActivity(...params: any[]): Promise<void>;
+            /**
+             * Takes "portrait" or "landscape" and rotates the device to the given orientation. Currently only available in the iOS Simulator.
+             * @param orientation
+             */
+            setOrientation(orientation: Orientation): Promise<void>;
+            /**
+             * Note: setLocation is dependent on fbsimctl. if fbsimctl is not installed, the command will fail, it must be installed. Sets the simulator location to the given latitude and longitude.
+             * @param lat
+             * @param lon
+             * @example await device.setLocation(32.0853, 34.7818);
+             */
+            setLocation(lat: number, lon: number): Promise<void>;
+            /**
+             * Disable EarlGrey's network synchronization mechanism on preffered endpoints. Usful if you want to on skip over synchronizing on certain URLs.
+             * @param urls
+             * @example await device.setURLBlacklist(['.*127.0.0.1.*']);
+             */
+            setURLBlacklist(urls: string[]): Promise<void>;
+            /**
+             * Enable EarlGrey's synchronization mechanism (enabled by default). This is being reset on every new instance of the app.
+             * @example await device.enableSynchronization();
+             */
+            enableSynchronization(): Promise<void>;
+            /**
+             * Disable EarlGrey's synchronization mechanism (enabled by default) This is being reset on every new instance of the app.
+             * @example await device.disableSynchronization();
+             */
+            disableSynchronization(): Promise<void>;
+            /**
+             * Resets the Simulator to clean state (like the Simulator > Reset Content and Settings... menu item), especially removing previously set permissions.
+             * @example await device.resetContentAndSettings();
+             */
+            resetContentAndSettings(): Promise<void>;
+            /**
+             * Returns the current device, ios or android.
+             * @example if (device.getPlatform() === 'ios') {
+             *     await expect(loopSwitch).toHaveValue('1');
+             * }
+             */
+            getPlatform(): "ios" | "android";
+            /**
+             * Simulate press back button (Android Only)
+             */
+            pressBack(): Promise<void>;
+            /**
+             * Simulate shake (iOS Only)
+             */
+            shake(): Promise<void>;
+        }
 
-    type DetoxAny = Element & Actions<any> & WaitFor;
+        type DetoxAny = Element & Actions<any> & WaitFor;
 
-    interface Element {
-        (by: Matchers): DetoxAny;
+        interface Element {
+            (by: Matchers): DetoxAny;
 
-        /**
-         * Choose from multiple elements matching the same matcher using index
-         * @param index
-         * @example await element(by.text('Product')).atIndex(2);
-         */
-        atIndex(index: number): DetoxAny;
-    }
-    interface Matchers {
-        (by: Matchers): Matchers;
+            /**
+             * Choose from multiple elements matching the same matcher using index
+             * @param index
+             * @example await element(by.text('Product')).atIndex(2);
+             */
+            atIndex(index: number): DetoxAny;
+        }
+        interface Matchers {
+            (by: Matchers): Matchers;
 
-        /**
-         * by.id will match an id that is given to the view via testID prop.
-         * @param id
-         * @example // In a React Native component add testID like so:
-         * <TouchableOpacity testID={'tap_me'}>
-         * // Then match with by.id:
-         * await element(by.id('tap_me'));
-         */
-        id(id: string): Matchers;
-        /**
-         * Find an element by text, useful for text fields, buttons.
-         * @param text
-         * @example await element(by.text('Tap Me'));
-         */
-        text(text: string): Matchers;
-        /**
-         * Find an element by accessibilityLabel on iOS, or by contentDescription on Android.
-         * @param label
-         * @example await element(by.label('Welcome'));
-         */
-        label(label: string): Matchers;
-        /**
-         * Find an element by native view type.
-         * @param nativeViewType
-         * @example await element(by.type('RCTImageView'));
-         */
-        type(nativeViewType: string): Matchers;
-        /**
-         * Find an element with an accessibility trait. (iOS only)
-         * @example await element(by.traits(['button']));
-         */
-        traits(traits: string[]): Matchers;
-        /**
-         * Find an element by a matcher with a parent matcher
-         * @param parentBy
-         * @example await element(by.id('Grandson883').withAncestor(by.id('Son883')));
-         */
-        withAncestor(parentBy: Matchers): Matchers;
-        /**
-         * Find an element by a matcher with a child matcher
-         * @param childBy
-         * @example await element(by.id('Son883').withDescendant(by.id('Grandson883')));
-         */
-        withDescendant(childBy: Matchers): Matchers;
-        /**
-         * Find an element by multiple matchers
-         * @param by
-         * @example await element(by.text('Product').and(by.id('product_name'));
-         */
-        and(by: Matchers): Matchers;
-    }
-    interface Expect<R> {
-        (element: Element): Expect<any>;
-        /**
-         * Expect the view to be at least 75% visible.
-         * @example await expect(element(by.id('UniqueId204'))).toBeVisible();
-         */
-        toBeVisible(): R;
-        /**
-         * Expect the view to not be visible.
-         * @example await expect(element(by.id('UniqueId205'))).toBeNotVisible();
-         */
-        toBeNotVisible(): R;
-        /**
-         * Expect the view to exist in the UI hierarchy.
-         * @example await expect(element(by.id('UniqueId205'))).toExist();
-         */
-        toExist(): R;
-        /**
-         * Expect the view to not exist in the UI hierarchy.
-         * @example await expect(element(by.id('RandomJunk959'))).toNotExist();
-         */
-        toNotExist(): R;
-        /**
-         * In React Native apps, expect UI component of type <Text> to have text.
-         * In native iOS apps, expect UI elements of type UIButton, UILabel, UITextField or UITextViewIn to have inputText with text.
-         * @param text
-         * @example await expect(element(by.id('UniqueId204'))).toHaveText('I contain some text');
-         */
-        toHaveText(text: string): R;
-        /**
-         * It searches by accessibilityLabel on iOS, or by contentDescription on Android.
-         * In React Native it can be set for both platforms by defining an accessibilityLabel on the view.
-         * @param label
-         * @example await expect(element(by.id('UniqueId204'))).toHaveLabel('Done');
-         */
-        toHaveLabel(label: string): R;
-        /**
-         * In React Native apps, expect UI component to have testID with that id.
-         * In native iOS apps, expect UI element to have accesibilityIdentifier with that id.
-         * @param id
-         * @example await expect(element(by.text('I contain some text'))).toHaveId('UniqueId204');
-         */
-        toHaveId(id: string): R;
-        /**
-         * Expect components like a Switch to have a value ('0' for off, '1' for on).
-         * @param value
-         * @example await expect(element(by.id('UniqueId533'))).toHaveValue('0');
-         */
-        toHaveValue(value: any): R;
-    }
-    interface WaitFor {
-        /**
-         * This API polls using the given expectation continuously until the expectation is met. Use manual synchronization with waitFor only as a last resort.
-         * NOTE: Every waitFor call must set a timeout using withTimeout(). Calling waitFor without setting a timeout will do nothing.
-         * @example await waitFor(element(by.id('UniqueId336'))).toExist().withTimeout(2000);
-         */
-        (element: Element): Expect<WaitFor>;
-        /**
-         * Waits for the condition to be met until the specified time (millis) have elapsed.
-         * @param millis number
-         * @example await waitFor(element(by.id('UniqueId336'))).toExist().withTimeout(2000);
-         */
-        withTimeout(millis: number): Promise<void>;
-        /**
-         * Performs the action repeatedly on the element until an expectation is met
-         * @param by
-         * @example await waitFor(element(by.text('Text5'))).toBeVisible().whileElement(by.id('ScrollView630')).scroll(50, 'down');
-         */
-        whileElement(by: Matchers): DetoxAny;
-    }
-    interface Actions<R> {
-        /**
-         * Simulate tap on an element
-         * @example await element(by.id('tappable')).tap();
-         */
-        tap(): Promise<Actions<R>>;
-        /**
-         * Simulate long press on an element
-         * @example await element(by.id('tappable')).longPress();
-         */
-        longPress(): Promise<Actions<R>>;
-        /**
-         * Simulate multiple taps on an element.
-         * @param times number
-         * @example await element(by.id('tappable')).multiTap(3);
-         */
-        multiTap(times: number): Promise<Actions<R>>;
-        /**
-         * Simulate tap at a specific point on an element.
-         * Note: The point coordinates are relative to the matched element and the element size could changes on different devices or even when changing the device font size.
-         * @param point
-         * @example await element(by.id('tappable')).tapAtPoint({ x:5, y:10 });
-         */
-        tapAtPoint(point: { x: number, y: number }): Promise<Actions<R>>;
-        /**
-         * Use the builtin keyboard to type text into a text field.
-         * @param text
-         * @example await element(by.id('textField')).typeText('passcode');
-         */
-        typeText(text: string): Promise<Actions<R>>;
-        /**
-         * Paste text into a text field.
-         * @param text
-         * @example await element(by.id('textField')).replaceText('passcode again');
-         */
-        replaceText(text: string): Promise<Actions<R>>;
-        /**
-         * Clear text from a text field.
-         * @example await element(by.id('textField')).clearText();
-         */
-        clearText(): Promise<Actions<R>>;
-        /**
-         *
-         * @param pixels
-         * @param direction
-         * @example
-         * await element(by.id('scrollView')).scroll(100, 'down');
-         * await element(by.id('scrollView')).scroll(100, 'up');
-         */
-        scroll(pixels: number, direction: Direction): Promise<Actions<R>>;
-        /**
-         * Scroll to edge.
-         * @param edge
-         * @example await element(by.id('scrollView')).scrollTo('bottom');
-         * await element(by.id('scrollView')).scrollTo('top');
-         */
-        scrollTo(edge: Direction): Promise<Actions<R>>;
-        /**
-         *
-         * @param direction
-         * @param speed
-         * @param percentage
-         * @example await element(by.id('scrollView')).swipe('down');
-         * await element(by.id('scrollView')).swipe('down', 'fast');
-         * await element(by.id('scrollView')).swipe('down', 'fast', 0.5);
-         */
-        swipe(direction: Direction, speed?: Speed, percentage?: number): Promise<Actions<R>>;
-        /**
-         * (iOS Only) column - number of datepicker column (starts from 0) value - string value in setted column (must be correct)
-         * @param column
-         * @param value
-         * @example await expect(element(by.type('UIPickerView'))).toBeVisible();
-         * await element(by.type('UIPickerView')).setColumnToValue(1,"6");
-         * await element(by.type('UIPickerView')).setColumnToValue(2,"34");
-         */
-        setColumnToValue(column: number, value: string): Promise<Actions<R>>;
-    }
+            /**
+             * by.id will match an id that is given to the view via testID prop.
+             * @param id
+             * @example // In a React Native component add testID like so:
+             * <TouchableOpacity testID={'tap_me'}>
+             * // Then match with by.id:
+             * await element(by.id('tap_me'));
+             */
+            id(id: string): Matchers;
+            /**
+             * Find an element by text, useful for text fields, buttons.
+             * @param text
+             * @example await element(by.text('Tap Me'));
+             */
+            text(text: string): Matchers;
+            /**
+             * Find an element by accessibilityLabel on iOS, or by contentDescription on Android.
+             * @param label
+             * @example await element(by.label('Welcome'));
+             */
+            label(label: string): Matchers;
+            /**
+             * Find an element by native view type.
+             * @param nativeViewType
+             * @example await element(by.type('RCTImageView'));
+             */
+            type(nativeViewType: string): Matchers;
+            /**
+             * Find an element with an accessibility trait. (iOS only)
+             * @example await element(by.traits(['button']));
+             */
+            traits(traits: string[]): Matchers;
+            /**
+             * Find an element by a matcher with a parent matcher
+             * @param parentBy
+             * @example await element(by.id('Grandson883').withAncestor(by.id('Son883')));
+             */
+            withAncestor(parentBy: Matchers): Matchers;
+            /**
+             * Find an element by a matcher with a child matcher
+             * @param childBy
+             * @example await element(by.id('Son883').withDescendant(by.id('Grandson883')));
+             */
+            withDescendant(childBy: Matchers): Matchers;
+            /**
+             * Find an element by multiple matchers
+             * @param by
+             * @example await element(by.text('Product').and(by.id('product_name'));
+             */
+            and(by: Matchers): Matchers;
+        }
+        interface Expect<R> {
+            (element: Element): Expect<any>;
+            /**
+             * Expect the view to be at least 75% visible.
+             * @example await expect(element(by.id('UniqueId204'))).toBeVisible();
+             */
+            toBeVisible(): R;
+            /**
+             * Expect the view to not be visible.
+             * @example await expect(element(by.id('UniqueId205'))).toBeNotVisible();
+             */
+            toBeNotVisible(): R;
+            /**
+             * Expect the view to exist in the UI hierarchy.
+             * @example await expect(element(by.id('UniqueId205'))).toExist();
+             */
+            toExist(): R;
+            /**
+             * Expect the view to not exist in the UI hierarchy.
+             * @example await expect(element(by.id('RandomJunk959'))).toNotExist();
+             */
+            toNotExist(): R;
+            /**
+             * In React Native apps, expect UI component of type <Text> to have text.
+             * In native iOS apps, expect UI elements of type UIButton, UILabel, UITextField or UITextViewIn to have inputText with text.
+             * @param text
+             * @example await expect(element(by.id('UniqueId204'))).toHaveText('I contain some text');
+             */
+            toHaveText(text: string): R;
+            /**
+             * It searches by accessibilityLabel on iOS, or by contentDescription on Android.
+             * In React Native it can be set for both platforms by defining an accessibilityLabel on the view.
+             * @param label
+             * @example await expect(element(by.id('UniqueId204'))).toHaveLabel('Done');
+             */
+            toHaveLabel(label: string): R;
+            /**
+             * In React Native apps, expect UI component to have testID with that id.
+             * In native iOS apps, expect UI element to have accesibilityIdentifier with that id.
+             * @param id
+             * @example await expect(element(by.text('I contain some text'))).toHaveId('UniqueId204');
+             */
+            toHaveId(id: string): R;
+            /**
+             * Expect components like a Switch to have a value ('0' for off, '1' for on).
+             * @param value
+             * @example await expect(element(by.id('UniqueId533'))).toHaveValue('0');
+             */
+            toHaveValue(value: any): R;
+        }
+        interface WaitFor {
+            /**
+             * This API polls using the given expectation continuously until the expectation is met. Use manual synchronization with waitFor only as a last resort.
+             * NOTE: Every waitFor call must set a timeout using withTimeout(). Calling waitFor without setting a timeout will do nothing.
+             * @example await waitFor(element(by.id('UniqueId336'))).toExist().withTimeout(2000);
+             */
+            (element: Element): Expect<WaitFor>;
+            /**
+             * Waits for the condition to be met until the specified time (millis) have elapsed.
+             * @param millis number
+             * @example await waitFor(element(by.id('UniqueId336'))).toExist().withTimeout(2000);
+             */
+            withTimeout(millis: number): Promise<void>;
+            /**
+             * Performs the action repeatedly on the element until an expectation is met
+             * @param by
+             * @example await waitFor(element(by.text('Text5'))).toBeVisible().whileElement(by.id('ScrollView630')).scroll(50, 'down');
+             */
+            whileElement(by: Matchers): DetoxAny;
+        }
+        interface Actions<R> {
+            /**
+             * Simulate tap on an element
+             * @example await element(by.id('tappable')).tap();
+             */
+            tap(): Promise<Actions<R>>;
+            /**
+             * Simulate long press on an element
+             * @example await element(by.id('tappable')).longPress();
+             */
+            longPress(): Promise<Actions<R>>;
+            /**
+             * Simulate multiple taps on an element.
+             * @param times number
+             * @example await element(by.id('tappable')).multiTap(3);
+             */
+            multiTap(times: number): Promise<Actions<R>>;
+            /**
+             * Simulate tap at a specific point on an element.
+             * Note: The point coordinates are relative to the matched element and the element size could changes on different devices or even when changing the device font size.
+             * @param point
+             * @example await element(by.id('tappable')).tapAtPoint({ x:5, y:10 });
+             */
+            tapAtPoint(point: { x: number; y: number }): Promise<Actions<R>>;
+            /**
+             * Use the builtin keyboard to type text into a text field.
+             * @param text
+             * @example await element(by.id('textField')).typeText('passcode');
+             */
+            typeText(text: string): Promise<Actions<R>>;
+            /**
+             * Paste text into a text field.
+             * @param text
+             * @example await element(by.id('textField')).replaceText('passcode again');
+             */
+            replaceText(text: string): Promise<Actions<R>>;
+            /**
+             * Clear text from a text field.
+             * @example await element(by.id('textField')).clearText();
+             */
+            clearText(): Promise<Actions<R>>;
+            /**
+             *
+             * @param pixels
+             * @param direction
+             * @example
+             * await element(by.id('scrollView')).scroll(100, 'down');
+             * await element(by.id('scrollView')).scroll(100, 'up');
+             */
+            scroll(pixels: number, direction: Direction): Promise<Actions<R>>;
+            /**
+             * Scroll to edge.
+             * @param edge
+             * @example await element(by.id('scrollView')).scrollTo('bottom');
+             * await element(by.id('scrollView')).scrollTo('top');
+             */
+            scrollTo(edge: Direction): Promise<Actions<R>>;
+            /**
+             *
+             * @param direction
+             * @param speed
+             * @param percentage
+             * @example await element(by.id('scrollView')).swipe('down');
+             * await element(by.id('scrollView')).swipe('down', 'fast');
+             * await element(by.id('scrollView')).swipe('down', 'fast', 0.5);
+             */
+            swipe(
+                direction: Direction,
+                speed?: Speed,
+                percentage?: number
+            ): Promise<Actions<R>>;
+            /**
+             * (iOS Only) column - number of datepicker column (starts from 0) value - string value in setted column (must be correct)
+             * @param column
+             * @param value
+             * @example await expect(element(by.type('UIPickerView'))).toBeVisible();
+             * await element(by.type('UIPickerView')).setColumnToValue(1,"6");
+             * await element(by.type('UIPickerView')).setColumnToValue(2,"34");
+             */
+            setColumnToValue(
+                column: number,
+                value: string
+            ): Promise<Actions<R>>;
+        }
 
-    type Direction = "left" | "right" | "top" | "bottom" | "up" | "down";
-    type Orientation = "portrait" | "landscape";
-    type Speed = "fast" | "slow";
+        type Direction = "left" | "right" | "top" | "bottom" | "up" | "down";
+        type Orientation = "portrait" | "landscape";
+        type Speed = "fast" | "slow";
 
-    interface DetoxInitOptions {
-        /**
-         * Detox exports device, expect, element, by and waitFor as globals by default, if you want to control their initialization manually, set init detox with initGlobals set to false.
-         * This is useful when during E2E tests you also need to run regular expectations in node. jest Expect for instance, will not be overriden by Detox when this option is used.
-         */
-        initGlobals?: boolean;
-        /**
-         * By default await detox.init(config); will launch the installed app. If you wish to control when your app is launched, add {launchApp: false} param to your init.
-         */
-        launchApp?: boolean;
-    }
+        interface DetoxInitOptions {
+            /**
+             * Detox exports device, expect, element, by and waitFor as globals by default, if you want to control their initialization manually, set init detox with initGlobals set to false.
+             * This is useful when during E2E tests you also need to run regular expectations in node. jest Expect for instance, will not be overriden by Detox when this option is used.
+             */
+            initGlobals?: boolean;
+            /**
+             * By default await detox.init(config); will launch the installed app. If you wish to control when your app is launched, add {launchApp: false} param to your init.
+             */
+            launchApp?: boolean;
+        }
 
-    interface DeviceLanchAppConfig {
-        /**
-         * Restart the app
-         * Terminate the app and launch it again. If set to false, the simulator will try to bring app from background, if the app isn't running, it will launch a new instance. default is false
-         */
-        newInstance?: boolean;
-        /**
-         * Set runtime permissions
-         * Grant or deny runtime permissions for your application.
-         */
-        permissions?: any;
-        /**
-         * Launch from URL
-         * Mock opening the app from URL to test your app's deep link handling mechanism.
-         */
-        url?: any;
-        /**
-         * Launch with user notifications
-         */
-        userNotification?: any;
-        /**
-         * Launch with user activity
-         */
-        userActivity?: any;
-        /**
-         * Launch into a fresh installation
-         * A flag that enables relaunching into a fresh installation of the app (it will uninstall and install the binary again), default is false.
-         */
-        delete?: boolean;
-        /**
-         * Detox can start the app with additional launch arguments
-         * The added launchArgs will be passed through the launch command to the device and be accessible via [[NSProcessInfo processInfo] arguments]
-         */
-        launchArgs?: any;
+        interface DeviceLanchAppConfig {
+            /**
+             * Restart the app
+             * Terminate the app and launch it again. If set to false, the simulator will try to bring app from background, if the app isn't running, it will launch a new instance. default is false
+             */
+            newInstance?: boolean;
+            /**
+             * Set runtime permissions
+             * Grant or deny runtime permissions for your application.
+             */
+            permissions?: any;
+            /**
+             * Launch from URL
+             * Mock opening the app from URL to test your app's deep link handling mechanism.
+             */
+            url?: any;
+            /**
+             * Launch with user notifications
+             */
+            userNotification?: any;
+            /**
+             * Launch with user activity
+             */
+            userActivity?: any;
+            /**
+             * Launch into a fresh installation
+             * A flag that enables relaunching into a fresh installation of the app (it will uninstall and install the binary again), default is false.
+             */
+            delete?: boolean;
+            /**
+             * Detox can start the app with additional launch arguments
+             * The added launchArgs will be passed through the launch command to the device and be accessible via [[NSProcessInfo processInfo] arguments]
+             */
+            launchArgs?: any;
+        }
     }
 }
+
+export { by, detox, device, element, expect, waitFor };

From 700298f03a177fd488245bd0d0a77212085cb0d3 Mon Sep 17 00:00:00 2001
From: Jeff Held <jheld135@gmail.com>
Date: Thu, 8 Nov 2018 17:11:01 -0600
Subject: [PATCH 027/836] detox: add jest adapter definitions

---
 types/detox/runners/jest/adapters/index.d.ts |  9 +++++++
 types/detox/tests/detox-jest-setup-tests.ts  | 28 ++++++++++++++++++++
 types/detox/tsconfig.json                    |  4 ++-
 3 files changed, 40 insertions(+), 1 deletion(-)
 create mode 100644 types/detox/runners/jest/adapters/index.d.ts
 create mode 100644 types/detox/tests/detox-jest-setup-tests.ts

diff --git a/types/detox/runners/jest/adapters/index.d.ts b/types/detox/runners/jest/adapters/index.d.ts
new file mode 100644
index 0000000000..ca195ae744
--- /dev/null
+++ b/types/detox/runners/jest/adapters/index.d.ts
@@ -0,0 +1,9 @@
+interface DetoxJestAdapter {
+    detox: Detox.Detox;
+    beforeEach: () => Promise<void>;
+    afterAll: () => Promise<void>;
+}
+
+declare const adapter: DetoxJestAdapter;
+
+export default adapter;
diff --git a/types/detox/tests/detox-jest-setup-tests.ts b/types/detox/tests/detox-jest-setup-tests.ts
new file mode 100644
index 0000000000..002b5605bb
--- /dev/null
+++ b/types/detox/tests/detox-jest-setup-tests.ts
@@ -0,0 +1,28 @@
+declare var beforeAll: (callback: () => void) => void;
+declare var beforeEach: (callback: () => void) => void;
+declare var afterAll: (callback: () => void) => void;
+
+import adapter from "detox/runners/jest/adapters";
+
+// Normally the Detox configuration from the project's package.json like so:
+// const config = require("./package.json").detox;
+declare const config: any;
+
+beforeAll(async () => {
+    await detox.init(config);
+
+    const initOptions: Detox.DetoxInitOptions = {
+        initGlobals: false,
+        launchApp: false,
+    };
+    await detox.init(config, initOptions);
+});
+
+beforeEach(async () => {
+    await adapter.beforeEach();
+});
+
+afterAll(async () => {
+    await adapter.afterAll();
+    await detox.cleanup();
+});
diff --git a/types/detox/tsconfig.json b/types/detox/tsconfig.json
index 3eb7524be2..9440443222 100644
--- a/types/detox/tsconfig.json
+++ b/types/detox/tsconfig.json
@@ -15,7 +15,9 @@
     },
     "files": [
         "index.d.ts",
+        "runners/jest/adapters/index.d.ts",
         "tests/detox-globals-tests.ts",
-        "tests/detox-import-modules-tests.ts"
+        "tests/detox-import-modules-tests.ts",
+        "tests/detox-jest-setup-tests.ts"
     ]
 }

From f627c9caf605e2c6bd920b79d87b17fd34a21c0b Mon Sep 17 00:00:00 2001
From: Jeff Held <jheld135@gmail.com>
Date: Thu, 8 Nov 2018 17:11:13 -0600
Subject: [PATCH 028/836] detox: add mocha adapter definitions

---
 types/detox/runners/mocha/adapters/index.d.ts |  9 ++++++
 .../detox-global-tests.ts}                    |  0
 .../{tests => test}/detox-jest-setup-tests.ts |  0
 types/detox/test/detox-mocha-setup-tests.ts   | 32 +++++++++++++++++++
 .../detox-module-tests.ts}                    |  0
 types/detox/tsconfig.json                     |  8 +++--
 6 files changed, 46 insertions(+), 3 deletions(-)
 create mode 100644 types/detox/runners/mocha/adapters/index.d.ts
 rename types/detox/{tests/detox-globals-tests.ts => test/detox-global-tests.ts} (100%)
 rename types/detox/{tests => test}/detox-jest-setup-tests.ts (100%)
 create mode 100644 types/detox/test/detox-mocha-setup-tests.ts
 rename types/detox/{tests/detox-import-modules-tests.ts => test/detox-module-tests.ts} (100%)

diff --git a/types/detox/runners/mocha/adapters/index.d.ts b/types/detox/runners/mocha/adapters/index.d.ts
new file mode 100644
index 0000000000..8e13b3bc01
--- /dev/null
+++ b/types/detox/runners/mocha/adapters/index.d.ts
@@ -0,0 +1,9 @@
+interface DetoxMochaAdapter {
+    detox: Detox.Detox;
+    beforeEach: (context: any) => Promise<void>;
+    afterEach: (context: any) => Promise<void>;
+}
+
+declare const adapter: DetoxMochaAdapter;
+
+export default adapter;
diff --git a/types/detox/tests/detox-globals-tests.ts b/types/detox/test/detox-global-tests.ts
similarity index 100%
rename from types/detox/tests/detox-globals-tests.ts
rename to types/detox/test/detox-global-tests.ts
diff --git a/types/detox/tests/detox-jest-setup-tests.ts b/types/detox/test/detox-jest-setup-tests.ts
similarity index 100%
rename from types/detox/tests/detox-jest-setup-tests.ts
rename to types/detox/test/detox-jest-setup-tests.ts
diff --git a/types/detox/test/detox-mocha-setup-tests.ts b/types/detox/test/detox-mocha-setup-tests.ts
new file mode 100644
index 0000000000..3f502d1391
--- /dev/null
+++ b/types/detox/test/detox-mocha-setup-tests.ts
@@ -0,0 +1,32 @@
+// tslint:disable:only-arrow-functions
+
+declare var before: (callback: () => void) => void;
+declare var beforeEach: (callback: () => void) => void;
+declare var after: (callback: () => void) => void;
+declare var afterEach: (callback: () => void) => void;
+
+import adapter from "detox/runners/mocha/adapters";
+
+// Normally the Detox configuration from the project's package.json like so:
+// const config = require("./package.json").detox;
+declare const config: any;
+
+// Normally, the beforeEach and afterEach function should take `this` as its argument,
+// but `this` cannot be used since it doesn't have a type signature (and therefore always implicltly any)
+declare const context: any;
+
+before(async function() {
+    await detox.init(config);
+});
+
+beforeEach(async function() {
+    await adapter.beforeEach(context);
+});
+
+afterEach(async function() {
+    await adapter.afterEach(context);
+});
+
+after(async function() {
+    await detox.cleanup();
+});
diff --git a/types/detox/tests/detox-import-modules-tests.ts b/types/detox/test/detox-module-tests.ts
similarity index 100%
rename from types/detox/tests/detox-import-modules-tests.ts
rename to types/detox/test/detox-module-tests.ts
diff --git a/types/detox/tsconfig.json b/types/detox/tsconfig.json
index 9440443222..7be4d3bb9e 100644
--- a/types/detox/tsconfig.json
+++ b/types/detox/tsconfig.json
@@ -16,8 +16,10 @@
     "files": [
         "index.d.ts",
         "runners/jest/adapters/index.d.ts",
-        "tests/detox-globals-tests.ts",
-        "tests/detox-import-modules-tests.ts",
-        "tests/detox-jest-setup-tests.ts"
+        "runners/mocha/adapters/index.d.ts",
+        "test/detox-global-tests.ts",
+        "test/detox-module-tests.ts",
+        "test/detox-jest-setup-tests.ts",
+        "test/detox-mocha-setup-tests.ts"
     ]
 }

From 53db0897816810df904fbbbbda46fef65a1c1e1a Mon Sep 17 00:00:00 2001
From: Yann Normand <yann.normand@gmail.com>
Date: Fri, 9 Nov 2018 15:14:19 +1000
Subject: [PATCH 029/836] add a new generic for resource type

---
 types/react-big-calendar/index.d.ts           | 28 +++++++--------
 .../react-big-calendar-tests.tsx              | 35 ++++++++++++++++---
 2 files changed, 44 insertions(+), 19 deletions(-)

diff --git a/types/react-big-calendar/index.d.ts b/types/react-big-calendar/index.d.ts
index bbfd7047ec..eba901bfc9 100644
--- a/types/react-big-calendar/index.d.ts
+++ b/types/react-big-calendar/index.d.ts
@@ -171,19 +171,19 @@ export class DateLocalizer {
     format(value: FormatInput, format: string, culture: Culture): string;
 }
 
-export interface BigCalendarProps<T extends Event = Event> extends React.Props<BigCalendar<T>> {
+export interface BigCalendarProps<TEvent extends Event = Event, TResource extends object = object> extends React.Props<BigCalendar<TEvent, TResource>> {
     localizer: DateLocalizer;
 
     date?: stringOrDate;
     now?: Date;
     view?: View;
-    events?: T[];
+    events?: TEvent[];
     onNavigate?: (newDate: Date, action: Navigate) => void;
     onView?: (view: View) => void;
     onDrillDown?: (date: Date, view: View) => void;
     onSelectSlot?: (slotInfo: { start: stringOrDate, end: stringOrDate, slots: Date[] | string[], action: 'select' | 'click' | 'doubleClick' }) => void;
-    onDoubleClickEvent?: (event: T, e: React.SyntheticEvent<HTMLElement>) => void;
-    onSelectEvent?: (event: T, e: React.SyntheticEvent<HTMLElement>) => void;
+    onDoubleClickEvent?: (event: TEvent, e: React.SyntheticEvent<HTMLElement>) => void;
+    onSelectEvent?: (event: TEvent, e: React.SyntheticEvent<HTMLElement>) => void;
     onSelecting?: (range: { start: stringOrDate, end: stringOrDate }) => boolean | undefined | null;
     selected?: any;
     views?: View[] | {
@@ -202,7 +202,7 @@ export interface BigCalendarProps<T extends Event = Event> extends React.Props<B
     step?: number;
     timeslots?: number;
     rtl?: boolean;
-    eventPropGetter?: (event: T, start: stringOrDate, end: stringOrDate, isSelected: boolean) => { className?: string, style?: React.CSSProperties };
+    eventPropGetter?: (event: TEvent, start: stringOrDate, end: stringOrDate, isSelected: boolean) => { className?: string, style?: React.CSSProperties };
     slotPropGetter?: (date: Date) => { className?: string, style?: object };
     dayPropGetter?: (date: Date) => { className?: string, style?: object };
     showMultiDayTimes?: boolean;
@@ -213,14 +213,14 @@ export interface BigCalendarProps<T extends Event = Event> extends React.Props<B
     formats?: Formats;
     components?: Components;
     messages?: Messages;
-    titleAccessor?: keyof T | ((event: T) => string);
-    allDayAccessor?: keyof T | ((event: T) => boolean);
-    startAccessor?: keyof T | ((event: T) => Date);
-    endAccessor?: keyof T | ((event: T) => Date);
-    resourceAccessor?: keyof T | ((event: T) => any);
-    resources?: any[];
-    resourceIdAccessor?: keyof T | ((event: T) => any);
-    resourceTitleAccessor?: keyof T | ((event: T) => string);
+    titleAccessor?: keyof TEvent | ((event: TEvent) => string);
+    allDayAccessor?: keyof TEvent | ((event: TEvent) => boolean);
+    startAccessor?: keyof TEvent | ((event: TEvent) => Date);
+    endAccessor?: keyof TEvent | ((event: TEvent) => Date);
+    resourceAccessor?: keyof TEvent | ((event: TEvent) => any);
+    resources?: TResource[];
+    resourceIdAccessor?: keyof TResource | ((resource: TResource) => any);
+    resourceTitleAccessor?: keyof TResource | ((resource: TResource) => string);
     defaultView?: View;
     defaultDate?: Date;
     className?: string;
@@ -237,7 +237,7 @@ export interface MoveOptions {
     today: Date;
 }
 
-export default class BigCalendar<T extends Event = Event> extends React.Component<BigCalendarProps<T>> {
+export default class BigCalendar<TEvent extends Event = Event, TResource extends object = object> extends React.Component<BigCalendarProps<TEvent, TResource>> {
     components: {
         dateCellWrapper: React.ComponentType,
         dayWrapper: React.ComponentType,
diff --git a/types/react-big-calendar/react-big-calendar-tests.tsx b/types/react-big-calendar/react-big-calendar-tests.tsx
index e1b561901e..e50858c546 100644
--- a/types/react-big-calendar/react-big-calendar-tests.tsx
+++ b/types/react-big-calendar/react-big-calendar-tests.tsx
@@ -17,13 +17,25 @@ class CalendarEvent {
     start: Date;
     end: Date;
     desc: string;
+    resourceId?: string;
 
-    constructor(_title: string, _start: Date, _end: Date, _allDay?: boolean, _desc?: string) {
+    constructor(_title: string, _start: Date, _end: Date, _allDay?: boolean, _desc?: string, _resourceId?: string) {
         this.title = _title;
         this.allDay = _allDay || false;
         this.start = _start;
         this.end = _end;
         this.desc = _desc || '';
+        this.resourceId = _resourceId;
+    }
+}
+
+class CalendarResource {
+    title: string;
+    id: string;
+
+    constructor(id: string, title: string) {
+        this.id = id;
+        this.title = title;
     }
 }
 
@@ -51,10 +63,10 @@ class CalendarEvent {
 {
     // Full API Example Test - based on API Documentation
     // http://intljusticemission.github.io/react-big-calendar/examples/index.html#api
-    class FullAPIExample extends React.Component<BigCalendarProps<CalendarEvent>> {
+    class FullAPIExample extends React.Component<BigCalendarProps<CalendarEvent, CalendarResource>> {
         render() {
             return (
-                <BigCalendar
+                <BigCalendar<CalendarEvent, CalendarResource>
                     {...this.props}
                     date={new Date()}
                     view={'day'}
@@ -81,9 +93,9 @@ class CalendarEvent {
                     rtl={true}
                     eventPropGetter={(event, start, end, isSelected) => ({ className: 'some-class' })}
                     titleAccessor={'title'}
-                    allDayAccessor={(event: any) => !!event.allDay}
+                    allDayAccessor={(event: CalendarEvent) => !!event.allDay}
                     startAccessor={'start'}
-                    endAccessor={(event: any) => event.end || event.start}
+                    endAccessor={(event: CalendarEvent) => event.end || event.start}
                     min={new Date()}
                     max={new Date()}
                     scrollToTime={new Date()}
@@ -106,6 +118,10 @@ class CalendarEvent {
                     dayPropGetter={customDayPropGetter}
                     slotPropGetter={customSlotPropGetter}
                     defaultDate={new Date()}
+                    resources={getResources()}
+                    resourceAccessor={event => event.resourceId}
+                    resourceIdAccessor={resource => resource.id}
+                    resourceTitleAccessor={resource => resource.title}
                 />
             );
         }
@@ -130,10 +146,19 @@ function getEvents(): CalendarEvent[] {
         new CalendarEvent('Happy Hour', new Date(2015, 3, 12, 17, 0, 0, 0), new Date(2015, 3, 12, 17, 30, 0, 0), undefined, 'Most important meal of the day'),
         new CalendarEvent('Dinner', new Date(2015, 3, 12, 20, 0, 0, 0), new Date(2015, 3, 12, 21, 0, 0, 0)),
         new CalendarEvent('Birthday Party', new Date(2015, 3, 13, 7, 0, 0), new Date(2015, 3, 13, 10, 30, 0)),
+        new CalendarEvent('Alice\'s break', new Date(2015, 3, 14, 20, 0, 0, 0), new Date(2015, 3, 14, 21, 0, 0, 0), undefined, undefined, "alice"),
+        new CalendarEvent('Bob\'s break', new Date(2015, 3, 15, 7, 0, 0), new Date(2015, 3, 15, 10, 30, 0), undefined, undefined, "bob"),
     ];
     return events;
 }
 
+function getResources(): CalendarResource[] {
+    return [
+        new CalendarResource('alice', 'Alice'),
+        new CalendarResource('bob', 'Bob')
+    ];
+}
+
 class EventAgenda extends React.Component<any, any> {
     render() {
         // const { label } = this.props;

From fe1169f35d5b0b9f577674f6c1ea0e34f58871af Mon Sep 17 00:00:00 2001
From: Yann Normand <yann.normand@gmail.com>
Date: Fri, 9 Nov 2018 16:30:58 +1000
Subject: [PATCH 030/836] upgrade to TypeScript Version 2.9

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

diff --git a/types/react-big-calendar/index.d.ts b/types/react-big-calendar/index.d.ts
index eba901bfc9..e7faf76ff4 100644
--- a/types/react-big-calendar/index.d.ts
+++ b/types/react-big-calendar/index.d.ts
@@ -6,7 +6,7 @@
 //                 Sebastian Silbermann <https://github.com/eps1lon>
 //                 Paul Potsides <https://github.com/strongpauly>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.8
+// TypeScript Version: 2.9
 import { Validator } from 'prop-types';
 import * as React from 'react';
 

From 6ffd9f2bc60165a597b34cc1ea55ee823fccc851 Mon Sep 17 00:00:00 2001
From: Yann Normand <yann.normand@gmail.com>
Date: Fri, 9 Nov 2018 16:33:24 +1000
Subject: [PATCH 031/836] fix onNavigate function

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

diff --git a/types/react-big-calendar/index.d.ts b/types/react-big-calendar/index.d.ts
index e7faf76ff4..0e7da106c2 100644
--- a/types/react-big-calendar/index.d.ts
+++ b/types/react-big-calendar/index.d.ts
@@ -178,7 +178,7 @@ export interface BigCalendarProps<TEvent extends Event = Event, TResource extend
     now?: Date;
     view?: View;
     events?: TEvent[];
-    onNavigate?: (newDate: Date, action: Navigate) => void;
+    onNavigate?: (newDate: Date, view: View, action: Navigate) => void;
     onView?: (view: View) => void;
     onDrillDown?: (date: Date, view: View) => void;
     onSelectSlot?: (slotInfo: { start: stringOrDate, end: stringOrDate, slots: Date[] | string[], action: 'select' | 'click' | 'doubleClick' }) => void;
diff --git a/types/react-big-calendar/react-big-calendar-tests.tsx b/types/react-big-calendar/react-big-calendar-tests.tsx
index e50858c546..4b80e8a72c 100644
--- a/types/react-big-calendar/react-big-calendar-tests.tsx
+++ b/types/react-big-calendar/react-big-calendar-tests.tsx
@@ -71,7 +71,7 @@ class CalendarResource {
                     date={new Date()}
                     view={'day'}
                     events={getEvents()}
-                    onNavigate={(newDate: Date, action: Navigate) => { }}
+                    onNavigate={(newDate: Date, view: View, action: Navigate) => { }}
                     onView={(view: View) => { }}
                     onSelectSlot={(slotInfo) => {
                         const start = slotInfo.start;

From 6b5b0a2e98842748c516478c4da99c528481f8e8 Mon Sep 17 00:00:00 2001
From: Ville Saarinen <ville.saarinen@gmail.com>
Date: Fri, 9 Nov 2018 09:31:59 +0200
Subject: [PATCH 032/836] Add missing afterVisibleChange and id props

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

diff --git a/types/rc-tooltip/index.d.ts b/types/rc-tooltip/index.d.ts
index e752404f21..4e07ca484a 100644
--- a/types/rc-tooltip/index.d.ts
+++ b/types/rc-tooltip/index.d.ts
@@ -1,7 +1,8 @@
-// Type definitions for rc-tooltip v3.4.2
+// Type definitions for rc-tooltip v3.7.3
 // Project: https://github.com/react-component/tooltip
 // Definitions by: rhysd <https://rhysd.github.io>
 //                 ahstro <http://ahst.ro>
+//                 vsaarinen <https://github.com/vsaarinen>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 
@@ -24,6 +25,7 @@ declare namespace RCTooltip {
 		prefixCls?: string;
 		transitionName?: string;
 		onVisibleChange?: (visible?: boolean) => void;
+		afterVisibleChange?: (visible?: boolean) => void;
 		visible?: boolean;
 		defaultVisible?: boolean;
 		placement?: Placement | Object;
@@ -33,6 +35,7 @@ declare namespace RCTooltip {
 		arrowContent?: React.ReactNode;
 		getTooltipContainer?: () => Element;
 		destroyTooltipOnHide?: boolean;
+		id?: string;
 	}
 }
 
diff --git a/types/rc-tooltip/rc-tooltip-tests.tsx b/types/rc-tooltip/rc-tooltip-tests.tsx
index 06b230a55b..7219d8579b 100644
--- a/types/rc-tooltip/rc-tooltip-tests.tsx
+++ b/types/rc-tooltip/rc-tooltip-tests.tsx
@@ -28,12 +28,14 @@ ReactDOM.render(
         prefixCls="my-"
         transitionName="cool-transition"
         onVisibleChange={() => console.log('visible changed')}
+        afterVisibleChange={() => console.log('after visible changed')}
         visible
         defaultVisible
         onPopupAlign={(popup, align) => console.log('aligned:', popup, align)}
         arrowContent={<div className="arrow"/>}
         getTooltipContainer={() => document.querySelector('.foo')}
         destroyTooltipOnHide
+        id="tooltip-id"
     >
         <a href='#'>hover</a>
     </Tooltip>,

From 2da271b8032d72f85f40f04b2f7cf1c79ef56586 Mon Sep 17 00:00:00 2001
From: Alexaner T <alexander.v.tarasyuk@gmail.com>
Date: Fri, 9 Nov 2018 11:59:45 +0200
Subject: [PATCH 033/836] add @types for nise package

---
 types/nise/index.d.ts    | 291 +++++++++++++++++++++++++++++++++++++++
 types/nise/nise-tests.ts |  56 ++++++++
 types/nise/tsconfig.json |  20 +++
 types/nise/tslint.json   |   6 +
 4 files changed, 373 insertions(+)
 create mode 100644 types/nise/index.d.ts
 create mode 100644 types/nise/nise-tests.ts
 create mode 100644 types/nise/tsconfig.json
 create mode 100644 types/nise/tslint.json

diff --git a/types/nise/index.d.ts b/types/nise/index.d.ts
new file mode 100644
index 0000000000..d01ad3303d
--- /dev/null
+++ b/types/nise/index.d.ts
@@ -0,0 +1,291 @@
+// Type definitions for nise 1.4
+// Project: https://github.com/sinonjs/nise#readme
+// Definitions by: Alexander T. <https://github.com/a-tarasyuk>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
+
+declare namespace Nise {
+    interface FakeUploadProgress {
+        eventListeners: {
+            progress: any[];
+            load: any[];
+            abort: any[];
+            error: any[];
+        };
+
+        addEventListener(event: string, listener: (e: Event) => any): void;
+        removeEventListener(event: string, listener: (e: Event) => any): void;
+        dispatchEvent(event: Event): void;
+    }
+
+    interface FakeXMLHttpRequest {
+        /**
+         * The URL set on the request object.
+         */
+        url: string;
+        /**
+         * The request method as a string.
+         */
+        method: string;
+        /**
+         * An object of all request headers, i.e.:
+         */
+        requestHeaders: any;
+        /**
+         * The request body
+         */
+        requestBody: string;
+        /**
+         * The request’s status code.
+         * undefined if the request has not been handled (see respond below)
+         */
+        status: number;
+        /**
+         * Only populated if the respond method is called (see below).
+         */
+        statusText: string;
+        /**
+         * Whether or not the request is asynchronous.
+         */
+        async: boolean;
+        /**
+         * Username, if any.
+         */
+        username: string;
+        /**
+         * Password, if any.
+         */
+        password: string;
+        withCredentials: boolean;
+        upload: FakeUploadProgress;
+        /**
+         * When using respond, this property is populated with a parsed document if response headers indicate as much (see the spec)
+         */
+        responseXML: Document;
+        /**
+         * The value of the given response header, if the request has been responded to (see respond).
+         * @param header
+         */
+        getResponseHeader(header: string): string;
+        /**
+         * All response headers as an object.
+         */
+        getAllResponseHeaders(): any;
+
+        /**
+         * Sets response headers (e.g. { "Content-Type": "text/html", ... }, updates the readyState property and fires onreadystatechange.
+         * @param headers
+         */
+        setResponseHeaders(headers: any): void;
+        /**
+         * Sets the respond body, updates the readyState property and fires onreadystatechange.
+         * Additionally, populates responseXML with a parsed document if response headers indicate as much.
+         */
+        setResponseBody(body: string): void;
+        /**
+         * Calls the above three methods.
+         */
+        respond(status: number, headers?: any, body?: string): void;
+        autoRespond(ms: number): void;
+        /**
+         * Simulates a network error on the request. The onerror handler will be called and the status will be 0.
+         */
+        error(): void;
+
+        onloadstart(e: Event): void;
+        onprogress(e: Event): void;
+        ontimeout(e: Event): void;
+        onloadend(e: Event): void;
+        onerror(e: Event): void;
+        onabort(e: Event): void;
+        onload(e: Event): void;
+    }
+
+    interface FakeServerOptions {
+        /**
+         * When set to true, causes the server to automatically respond to incoming requests after a timeout.
+         * The default timeout is 10ms but you can control it through the autoRespondAfter property.
+         * Note that this feature is intended to help during mockup development, and is not suitable for use in tests.
+         */
+        autoRespond: boolean;
+        /**
+         * When autoRespond is true, respond to requests after this number of milliseconds. Default is 10.
+         */
+        autoRespondAfter: number;
+        /**
+         * If set to true, server will find _method parameter in POST body and recognize that as the actual method.
+         * Supports a pattern common to Ruby on Rails applications. For custom HTTP method faking, override server.getHTTPMethod(request).
+         */
+        fakeHTTPMethods: boolean;
+        /**
+         * If set, the server will respond to every request immediately and synchronously.
+         * This is ideal for faking the server from within a test without having to call server.respond() after each request made in that test.
+         * As this is synchronous and immediate, this is not suitable for simulating actual network latency in tests or mockups.
+         * To simulate network latency with automatic responses, see server.autoRespond and server.autoRespondAfter.
+         */
+        respondImmediately: boolean;
+    }
+
+    interface FakeServer extends FakeServerOptions {
+        lastRequest: FakeXMLHttpRequest | undefined;
+        firstRequest: FakeXMLHttpRequest | undefined;
+        secondRequest: FakeXMLHttpRequest | undefined;
+        thirdRequest: FakeXMLHttpRequest | undefined;
+
+        /**
+         * Used internally to determine the HTTP method used with the provided request.
+         * By default this method simply returns request.method.
+         * When server.fakeHTTPMethods is true, the method will return the value of the _method parameter if the method is “POST”.
+         * This method can be overridden to provide custom behavior.
+         * @param request
+         */
+        getHTTPMethod(request: FakeXMLHttpRequest): string;
+
+        /**
+         * You can inspect the server.requests to verify request ordering, find unmatched requests or check that no requests has been done.
+         * server.requests is an array of all the FakeXMLHttpRequest objects that have been created.
+         */
+        requests: FakeXMLHttpRequest[];
+
+        /**
+         * Causes the server to respond to any request not matched by another response with the provided data. The default catch-all response is [404, {}, ""].
+         * A String representing the response body
+         * An Array with status, headers and response body, e.g. [200, { "Content-Type": "text/html", "Content-Length": 2 }, "OK"]
+         * A Function.
+         * Default status is 200 and default headers are none.
+         * When the response is a Function, it will be passed the request object. You must manually call respond on it to complete the request.
+         * @param body A String representing the response body
+         */
+        respondWith(body: string): void;
+        /**
+         * Causes the server to respond to any request not matched by another response with the provided data. The default catch-all response is [404, {}, ""].
+         * Default status is 200 and default headers are none.
+         * When the response is a Function, it will be passed the request object. You must manually call respond on it to complete the request.
+         * @param response An Array with status, headers and response body, e.g. [200, { "Content-Type": "text/html", "Content-Length": 2 }, "OK"]
+         */
+        respondWith(response: any[]): void;
+        /**
+         * Causes the server to respond to any request not matched by another response with the provided data. The default catch-all response is [404, {}, ""].
+         * Default status is 200 and default headers are none.
+         * When the response is a Function, it will be passed the request object. You must manually call respond on it to complete the request.
+         * @param fn A Function.
+         */
+        respondWith(fn: (xhr: FakeXMLHttpRequest) => void): void;
+        /**
+         * Responds to all requests to given URL, e.g. /posts/1.
+         */
+        respondWith(url: string, body: string): void;
+        /**
+         * Responds to all requests to given URL, e.g. /posts/1.
+         */
+        respondWith(url: string, response: any[]): void;
+        /**
+         * Responds to all requests to given URL, e.g. /posts/1.
+         */
+        respondWith(url: string, fn: (xhr: FakeXMLHttpRequest) => void): void;
+        /**
+         * Responds to all method requests to the given URL with the given response.
+         * method is an HTTP verb.
+         */
+        respondWith(method: string, url: string, body: string): void;
+        /**
+         * Responds to all method requests to the given URL with the given response.
+         * method is an HTTP verb.
+         */
+        respondWith(method: string, url: string, response: any[]): void;
+        /**
+         * Responds to all method requests to the given URL with the given response.
+         * method is an HTTP verb.
+         */
+        respondWith(method: string, url: string, fn: (xhr: FakeXMLHttpRequest) => void): void;
+        /**
+         * URL may be a regular expression, e.g. /\\/post\\//\\d+
+         * If the response is a Function, it will be passed any capture groups from the regular expression along with the XMLHttpRequest object:
+         */
+        respondWith(url: RegExp, body: string): void;
+        /**
+         * URL may be a regular expression, e.g. /\\/post\\//\\d+
+         * If the response is a Function, it will be passed any capture groups from the regular expression along with the XMLHttpRequest object:
+         */
+        respondWith(url: RegExp, response: any[]): void;
+        /**
+         * URL may be a regular expression, e.g. /\\/post\\//\\d+
+         * If the response is a Function, it will be passed any capture groups from the regular expression along with the XMLHttpRequest object:
+         */
+        respondWith(url: RegExp, fn: (xhr: FakeXMLHttpRequest) => void): void;
+        /**
+         * Responds to all method requests to URLs matching the regular expression.
+         */
+        respondWith(method: string, url: RegExp, body: string): void;
+        /**
+         * Responds to all method requests to URLs matching the regular expression.
+         */
+        respondWith(method: string, url: RegExp, response: any[]): void;
+        /**
+         * Responds to all method requests to URLs matching the regular expression.
+         */
+        respondWith(method: string, url: RegExp, fn: (xhr: FakeXMLHttpRequest) => void): void;
+        respondWith(...args: any[]): void;
+
+        /**
+         * Causes all queued asynchronous requests to receive a response.
+         * If none of the responses added through respondWith match, the default response is [404, {}, ""].
+         * Synchronous requests are responded to immediately, so make sure to call respondWith upfront.
+         * If called with arguments, respondWith will be called with those arguments before responding to requests.
+         */
+        respond(): void;
+        restore(): void;
+
+        getRequest(): FakeXMLHttpRequest | undefined;
+        reset(): void;
+        resetBehavior(): void;
+        resetHistory(): void;
+    }
+
+    interface FakeXMLHttpRequestStatic {
+        new(): FakeXMLHttpRequest;
+        /**
+         * Default false.
+         * When set to true, Sinon will check added filters if certain requests should be “unfaked”
+         */
+        useFilters: boolean;
+        /**
+         * Add a filter that will decide whether or not to fake a request.
+         * The filter will be called when xhr.open is called, with the exact same arguments (method, url, async, username, password).
+         * If the filter returns true, the request will not be faked.
+         * @param filter
+         */
+        addFilter(filter: (method: string, url: string, async: boolean, username: string, password: string) => boolean): void;
+        /**
+         * By assigning a function to the onCreate property of the returned object from useFakeXMLHttpRequest()
+         * you can subscribe to newly created FakeXMLHttpRequest objects. See below for the fake xhr object API.
+         * Using this observer means you can still reach objects created by e.g. jQuery.ajax (or other abstractions/frameworks).
+         * @param xhr
+         */
+        onCreate(xhr: FakeXMLHttpRequest): void;
+        /**
+         * Restore original function(s).
+         */
+        restore(): void;
+    }
+
+    interface FakeServerStatic {
+        create(options?: Partial<FakeServerOptions>): FakeServer;
+    }
+
+    interface FakeXHR {
+        useFakeXMLHttpRequest(): FakeXMLHttpRequestStatic;
+        FakeXMLHttpRequest: FakeXMLHttpRequestStatic;
+    }
+
+    interface API {
+        fakeServerWithClock: FakeServerStatic;
+        fakeServer: FakeServerStatic;
+        fakeXhr: FakeXHR;
+    }
+}
+
+declare const Nise: Nise.API;
+
+export = Nise;
+export as namespace nise;
diff --git a/types/nise/nise-tests.ts b/types/nise/nise-tests.ts
new file mode 100644
index 0000000000..827275fc55
--- /dev/null
+++ b/types/nise/nise-tests.ts
@@ -0,0 +1,56 @@
+import { fakeXhr, fakeServer, FakeServer, FakeXMLHttpRequest } from 'nise';
+
+function testCreateFakeServer() {
+    fakeServer.create();
+    fakeServer.create({ autoRespond: true, autoRespondAfter: 3, fakeHTTPMethods: true, respondImmediately: false });
+    fakeServer.create({ autoRespond: true, autoRespondAfter: 3 });
+}
+
+function testFakeServer() {
+    const server: FakeServer = fakeServer.create();
+    const respondWith = ['GET', 'http://test.com', [200, {}, '']];
+
+    server.requests;
+    server.autoRespond = true;
+
+    server.respondWith((xhr: FakeXMLHttpRequest) => xhr.respond(200));
+    server.respondWith('body');
+    server.respondWith([]);
+
+    server.respondWith('http://test.com', 'body');
+    server.respondWith('http://test.com', []);
+    server.respondWith('http://test.com', (xhr: FakeXMLHttpRequest) => xhr.respond(200));
+
+    server.respondWith('GET', 'http://test.com', 'body');
+    server.respondWith('GET', 'http://test.com', []);
+    server.respondWith('GET', 'http://test.com', (xhr: FakeXMLHttpRequest) => xhr.respond(200));
+
+    server.respondWith(/url/, '');
+    server.respondWith(/url/, []);
+    server.respondWith(/url/, (xhr: FakeXMLHttpRequest) => xhr.respond(200));
+
+    server.respondWith('GET', /url/, '');
+    server.respondWith('GET', /url/, []);
+    server.respondWith('GET', /url/, (xhr: FakeXMLHttpRequest) => xhr.respond(200));
+    server.respondWith(...respondWith);
+    server.respond();
+    server.restore();
+}
+
+function testFakeXMLHttpRequest() {
+    const xhr = new fakeXhr.FakeXMLHttpRequest();
+    const headers = xhr.getAllResponseHeaders();
+    const header = xhr.getResponseHeader('test');
+
+    xhr.setResponseHeaders({ Accept: 'application/json' });
+    xhr.setResponseBody('body');
+    xhr.respond(200, { Accept: 'application/json' }, 'body');
+    xhr.error();
+}
+
+function testFakeXMLHttpRequestStatic() {
+    fakeXhr.FakeXMLHttpRequest.useFilters = true;
+    fakeXhr.FakeXMLHttpRequest.addFilter((method, url, async, user, pass) => true);
+    fakeXhr.FakeXMLHttpRequest.onCreate = (xhr: FakeXMLHttpRequest) => { };
+    fakeXhr.FakeXMLHttpRequest.restore();
+}
diff --git a/types/nise/tsconfig.json b/types/nise/tsconfig.json
new file mode 100644
index 0000000000..1e535819c3
--- /dev/null
+++ b/types/nise/tsconfig.json
@@ -0,0 +1,20 @@
+{
+    "compilerOptions": {
+        "forceConsistentCasingInFileNames": true,
+        "strictFunctionTypes": true,
+        "strictNullChecks": true,
+        "noImplicitThis": true,
+        "noImplicitAny": true,
+        "module": "commonjs",
+        "noEmit": true,
+        "types": [],
+        "lib": ["es6", "dom"],
+        "baseUrl": "../",
+        "typeRoots": ["../"]
+    },
+
+    "files": [
+        "nise-tests.ts",
+        "index.d.ts"
+    ]
+}
diff --git a/types/nise/tslint.json b/types/nise/tslint.json
new file mode 100644
index 0000000000..08b1465cd6
--- /dev/null
+++ b/types/nise/tslint.json
@@ -0,0 +1,6 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "unified-signatures": false
+    }
+}

From 1343e45412283277fc9b8d6effeee7a76eaee136 Mon Sep 17 00:00:00 2001
From: juwar <juwar@microsoft.com>
Date: Fri, 9 Nov 2018 07:30:07 -0800
Subject: [PATCH 034/836] Remove patch version

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

diff --git a/types/highcharts/index.d.ts b/types/highcharts/index.d.ts
index 644dc1a169..58154954a3 100644
--- a/types/highcharts/index.d.ts
+++ b/types/highcharts/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Highcharts 5.0.32
+// Type definitions for Highcharts 5.0
 // Project: http://www.highcharts.com/
 // Definitions by: Damiano Gambarotto <https://github.com/damianog>
 //                 Dan Lewi Harkestad <https://github.com/baltie>

From 8f2e78835f3e38c4a5b15a51dd2aa453a2031c47 Mon Sep 17 00:00:00 2001
From: Fellipe Chagas <chagas.0@gmail.com>
Date: Fri, 9 Nov 2018 15:19:11 -0200
Subject: [PATCH 035/836] Improves react-navigation typings

---
 types/react-navigation/index.d.ts | 121 +++++++++++++++++-------------
 1 file changed, 68 insertions(+), 53 deletions(-)

diff --git a/types/react-navigation/index.d.ts b/types/react-navigation/index.d.ts
index 846ea56a9e..512059e29c 100644
--- a/types/react-navigation/index.d.ts
+++ b/types/react-navigation/index.d.ts
@@ -27,6 +27,7 @@
 //                 Max Davidson <https://github.com/maxdavidson>
 //                 Lachlan Young <https://github.com/builtbyproxy>
 //                 Jason Killian <https://github.com/jkillian>
+//                 Fellipe Chagas <https://github.com/chagasaway>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 
@@ -94,6 +95,9 @@ export interface NavigationState {
    */
   index: number;
   routes: NavigationRoute[];
+  isTransitioning: boolean;
+  key: string;
+  params: NavigationParams;
 }
 
 export interface DrawerNavigationState extends NavigationState {
@@ -129,6 +133,8 @@ export interface NavigationLeafRoute<Params = NavigationParams> {
    * e.g. `{ car_id: 123 }` in a route that displays a car.
    */
   params?: Params;
+  routes: NavigationRoute[];
+  isTransitioning: boolean;
 }
 
 export type NavigationStateRoute<
@@ -280,28 +286,28 @@ export interface NavigationInitAction extends NavigationInitActionPayload {
 }
 
 export interface NavigationReplaceActionPayload {
-    key?: string;
-    newKey?: string;
-    routeName: string;
-    params?: NavigationParams;
-    action?: NavigationNavigateAction;
+  key?: string;
+  newKey?: string;
+  routeName: string;
+  params?: NavigationParams;
+  action?: NavigationNavigateAction;
 }
 
 export interface NavigationReplaceAction {
-    type: 'Navigation/REPLACE';
-    key: string;
-    routeName: string;
-    params?: NavigationParams;
-    action?: NavigationNavigateAction;
+  type: 'Navigation/REPLACE';
+  key: string;
+  routeName: string;
+  params?: NavigationParams;
+  action?: NavigationNavigateAction;
 }
 
 export interface NavigationCompleteTransitionActionPayload {
-    key?: string;
+  key?: string;
 }
 
 export interface NavigationCompleteTransitionAction {
-    type: 'Navigation/COMPLETE_TRANSITION';
-    key: string;
+  type: 'Navigation/COMPLETE_TRANSITION';
+  key: string;
 }
 
 export interface NavigationResetActionPayload {
@@ -343,33 +349,33 @@ export interface NavigationPopToTopAction
 }
 
 export interface NavigationPushActionPayload {
-    routeName: string;
-    params?: NavigationParams;
-    action?: NavigationNavigateAction;
-    key?: string;
+  routeName: string;
+  params?: NavigationParams;
+  action?: NavigationNavigateAction;
+  key?: string;
 }
 
 export interface NavigationPushAction {
-    type: 'Navigation/PUSH';
-    routeName: string;
-    params?: NavigationParams;
-    action?: NavigationNavigateAction;
-    key?: string;
+  type: 'Navigation/PUSH';
+  routeName: string;
+  params?: NavigationParams;
+  action?: NavigationNavigateAction;
+  key?: string;
 }
 
 export interface NavigationOpenDrawerAction {
-    key?: string;
-    type: 'Navigation/OPEN_DRAWER';
+  key?: string;
+  type: 'Navigation/OPEN_DRAWER';
 }
 
 export interface NavigationCloseDrawerAction {
-    key?: string;
-    type: 'Navigation/CLOSE_DRAWER';
+  key?: string;
+  type: 'Navigation/CLOSE_DRAWER';
 }
 
 export interface NavigationToggleDrawerAction {
-    key?: string;
-    type: 'Navigation/TOGGLE_DRAWER';
+  key?: string;
+  type: 'Navigation/TOGGLE_DRAWER';
 }
 
 export interface NavigationStackViewConfig {
@@ -655,9 +661,12 @@ export interface NavigationScreenProp<S, P = NavigationParams> {
   pop: (n?: number, params?: { immediate?: boolean }) => boolean;
   popToTop: (params?: { immediate?: boolean }) => boolean;
   isFocused: () => boolean;
+  router?: NavigationRouter;
+  dangerouslyGetParent: () => NavigationScreenProp<S> | undefined;
 }
 
 export interface NavigationNavigatorProps<O = {}, S = {}> {
+  detached?: boolean;
   navigation?: NavigationProp<S>;
   screenProps?: { [key: string]: any };
   navigationOptions?: O;
@@ -728,6 +737,9 @@ export interface NavigationTransitionSpec {
   easing?: (t: number) => number;
   // A timing function such as `Animated.timing`.
   timing?: (value: AnimatedValue, config: any) => any;
+  friction?: number;
+  tension?: number;
+  useNativeDriver?: boolean;
 }
 
 /**
@@ -1065,41 +1077,41 @@ export namespace NavigationActions {
  * DrawerActions
  */
 export namespace DrawerActions {
-    const OPEN_DRAWER: 'Navigation/OPEN_DRAWER';
-    const CLOSE_DRAWER: 'Navigation/CLOSE_DRAWER';
-    const TOGGLE_DRAWER: 'Navigation/TOGGLE_DRAWER';
+  const OPEN_DRAWER: 'Navigation/OPEN_DRAWER';
+  const CLOSE_DRAWER: 'Navigation/CLOSE_DRAWER';
+  const TOGGLE_DRAWER: 'Navigation/TOGGLE_DRAWER';
 
-    function openDrawer(): NavigationOpenDrawerAction;
-    function closeDrawer(): NavigationCloseDrawerAction;
-    function toggleDrawer(): NavigationToggleDrawerAction;
+  function openDrawer(): NavigationOpenDrawerAction;
+  function closeDrawer(): NavigationCloseDrawerAction;
+  function toggleDrawer(): NavigationToggleDrawerAction;
 }
 
 /**
  * StackActions
  */
 export namespace StackActions {
-    const POP: 'Navigation/POP';
-    const POP_TO_TOP: 'Navigation/POP_TO_TOP';
-    const PUSH: 'Navigation/PUSH';
-    const RESET: 'Navigation/RESET';
-    const REPLACE: 'Navigation/REPLACE';
-    const COMPLETE_TRANSITION: 'Navigation/COMPLETE_TRANSITION';
+  const POP: 'Navigation/POP';
+  const POP_TO_TOP: 'Navigation/POP_TO_TOP';
+  const PUSH: 'Navigation/PUSH';
+  const RESET: 'Navigation/RESET';
+  const REPLACE: 'Navigation/REPLACE';
+  const COMPLETE_TRANSITION: 'Navigation/COMPLETE_TRANSITION';
 
-    function pop(options: NavigationPopActionPayload): NavigationPopAction;
-    function popToTop(
-        options: NavigationPopToTopActionPayload
-    ): NavigationPopToTopAction;
+  function pop(options: NavigationPopActionPayload): NavigationPopAction;
+  function popToTop(
+    options: NavigationPopToTopActionPayload
+  ): NavigationPopToTopAction;
 
-    function push(options: NavigationPushActionPayload): NavigationPushAction;
-    function reset(options: NavigationResetActionPayload): NavigationResetAction;
+  function push(options: NavigationPushActionPayload): NavigationPushAction;
+  function reset(options: NavigationResetActionPayload): NavigationResetAction;
 
-    function replace(
-        options: NavigationReplaceActionPayload
-    ): NavigationReplaceAction;
+  function replace(
+    options: NavigationReplaceActionPayload
+  ): NavigationReplaceAction;
 
-    function completeTransition(
-        payload: NavigationCompleteTransitionActionPayload
-    ): NavigationCompleteTransitionAction;
+  function completeTransition(
+    payload: NavigationCompleteTransitionActionPayload
+  ): NavigationCompleteTransitionAction;
 }
 
 /**
@@ -1124,6 +1136,7 @@ export interface TransitionerProps {
     transitionProps: NavigationTransitionProps,
     prevTransitionProps?: NavigationTransitionProps
   ) => any;
+  descriptors: { [key: string]: NavigationDescriptor };
   style?: StyleProp<ViewStyle>;
 }
 
@@ -1169,11 +1182,13 @@ export interface NavigationDescriptor<Params = NavigationParams> {
   state: NavigationLeafRoute<Params> | NavigationStateRoute<Params>;
   navigation: NavigationScreenProp<any>;
   options: NavigationScreenOptions;
-  getComponent: () => React.ComponentType;
+  getComponent: <T = {}, N = any>() => React.ComponentType<T> & { navigationOptions: N };
 }
 
 export type NavigationView<O, S> = React.ComponentType<{
   descriptors: { [key: string]: NavigationDescriptor };
+  navigationConfig: O;
+  screenProps?: { [key: string]: any };
 } & NavigationInjectedProps>;
 
 export function createNavigator<S, Options>(

From eea8aaf433a16830c0bb9b99aa0a73b15afb9b79 Mon Sep 17 00:00:00 2001
From: Fellipe Chagas <chagas.0@gmail.com>
Date: Fri, 9 Nov 2018 15:58:46 -0200
Subject: [PATCH 036/836] Adjusts compilation errors

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

diff --git a/types/react-navigation/index.d.ts b/types/react-navigation/index.d.ts
index 512059e29c..e51629f3af 100644
--- a/types/react-navigation/index.d.ts
+++ b/types/react-navigation/index.d.ts
@@ -1136,7 +1136,7 @@ export interface TransitionerProps {
     transitionProps: NavigationTransitionProps,
     prevTransitionProps?: NavigationTransitionProps
   ) => any;
-  descriptors: { [key: string]: NavigationDescriptor };
+  descriptors?: { [key: string]: NavigationDescriptor };
   style?: StyleProp<ViewStyle>;
 }
 
@@ -1182,7 +1182,7 @@ export interface NavigationDescriptor<Params = NavigationParams> {
   state: NavigationLeafRoute<Params> | NavigationStateRoute<Params>;
   navigation: NavigationScreenProp<any>;
   options: NavigationScreenOptions;
-  getComponent: <T = {}, N = any>() => React.ComponentType<T> & { navigationOptions: N };
+  getComponent: () => React.ComponentType;
 }
 
 export type NavigationView<O, S> = React.ComponentType<{

From ac84fc6c7f22b49cfe4066d080109e02fdf76db9 Mon Sep 17 00:00:00 2001
From: Lucas <git@roang.info>
Date: Fri, 9 Nov 2018 22:02:35 +0100
Subject: [PATCH 037/836] Add initial definitions for kdbxweb

---
 types/kdbxweb/index.d.ts       | 461 +++++++++++++++++++++++++++++++++
 types/kdbxweb/kdbxweb-tests.ts |  18 ++
 types/kdbxweb/tsconfig.json    |  23 ++
 types/kdbxweb/tslint.json      |   1 +
 4 files changed, 503 insertions(+)
 create mode 100644 types/kdbxweb/index.d.ts
 create mode 100644 types/kdbxweb/kdbxweb-tests.ts
 create mode 100644 types/kdbxweb/tsconfig.json
 create mode 100644 types/kdbxweb/tslint.json

diff --git a/types/kdbxweb/index.d.ts b/types/kdbxweb/index.d.ts
new file mode 100644
index 0000000000..2787ba7a1f
--- /dev/null
+++ b/types/kdbxweb/index.d.ts
@@ -0,0 +1,461 @@
+// Type definitions for kdbxweb 1.2
+// Project: https://github.com/keeweb/kdbxweb#readme
+// Definitions by: Roang-zero1 <https://github.com/Roang-zero1>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+import Crypto from "crypto";
+
+/*~ If this module is a UMD module that exposes a global variable 'myLib' when
+ *~ loaded outside a module loader environment, declare that global here.
+ *~ Otherwise, delete this declaration.
+ */
+export as namespace kdbxweb;
+
+export interface Settings {
+    binaries: boolean;
+    customIcons: boolean;
+    historyRules: boolean;
+}
+
+export interface ObjectMap {
+    objects: object[];
+    remote: object[];
+    deleted: object[];
+}
+
+export interface editingState {
+    added: [Date];
+    deleted: [Date];
+}
+
+export interface editingStateDict {
+    meta: editingState;
+    [uuid: string]: editingState;
+}
+
+export class Credentials {
+    constructor(
+        password: ProtectedValue,
+        keyFile: string | ArrayBuffer | Uint8Array
+    );
+
+    getHash(): Promise<ArrayBuffer>;
+
+    setKeyFile(keyFile: ArrayBuffer | Uint8Array | null): Promise<void>;
+
+    setPassword(password: ProtectedValue | null): Promise<void>;
+
+    static createKeyFileWithHash(hash: string): Uint8Array;
+
+    static createRandomKeyFile(): Uint8Array;
+}
+
+export class Int64 {
+    constructor(lo: number, hi: number);
+
+    valueOf(): number;
+
+    static from(value: number): Int64;
+}
+
+export class Kdbx {
+    constructor();
+
+    addDeletedObject(uuid: KdbxUuid, dt: Date): void;
+
+    cleanup(settings: Settings): void;
+
+    createBinary(
+        value: ProtectedValue | ArrayBuffer
+    ): Promise<ProtectedValue | ArrayBuffer>;
+
+    createDefaultGroup(): void;
+
+    createEntry(group: Group): Entry;
+
+    createGroup(group: Group, name: string): Group;
+
+    createRecycleBin(): void;
+
+    getDefaultGroup(): Group;
+
+    getGroup(uuid: KdbxUuid | string, parentGroup: Group): Group | undefined;
+
+    getLocalEditState(): editingStateDict;
+
+    merge(remote: Kdbx): void;
+
+    move(object: Entry | Group, toGroup: Group, atIndex: number): void;
+
+    remove(object: Entry | Group): void;
+
+    removeLocalEditState(): void;
+
+    save(): Promise<ArrayBuffer>;
+
+    saveXml(): Promise<string>;
+
+    setLocalEditState(editingState: editingStateDict): void;
+
+    upgrade(): void;
+
+    static create(credentials: Credentials, name: string): Kdbx;
+
+    static load(data: ArrayBuffer, credentials: Credentials): Promise<Kdbx>;
+
+    static loadXml(data: string, credentials: Credentials): Promise<Kdbx>;
+}
+
+export class KdbxError {
+    constructor(code: number, message: string);
+
+    // Native method; no parameter or return type inference available
+    toString(): string;
+}
+
+export class KdbxUuid {
+    constructor(ab: string | ArrayBuffer);
+
+    equals(other: KdbxUuid): boolean;
+
+    toBytes(): Uint8Array | undefined;
+
+    toString(): string;
+
+    valueOf(): string | undefined;
+
+    static random(): KdbxUuid;
+}
+
+export class ProtectedValue {
+    constructor(value: ArrayBuffer, salt: ArrayBuffer);
+
+    clone(): ProtectedValue;
+
+    getBinary(): Uint8Array;
+
+    getHash(): Promise<ArrayBuffer>;
+
+    getText(): string;
+
+    includes(str: string): boolean;
+
+    setSalt(newSalt: ArrayBuffer): void;
+
+    toString(): string;
+
+    static fromBinary(binary: ArrayBuffer): ProtectedValue;
+
+    static fromString(str: string): ProtectedValue;
+}
+
+export class VarDictionary {
+    constructor();
+
+    get(key: string): any;
+
+    keys(): string[];
+
+    remove(key: string): void;
+
+    set(key: string, type: number, value: any): void;
+
+    write(stm: BinaryStream): void;
+
+    static ValueType: {
+        Bool: number;
+        Bytes: number;
+        Int32: number;
+        Int64: number;
+        String: number;
+        UInt32: number;
+        UInt64: number;
+    };
+
+    static read(stm: BinaryStream): VarDictionary;
+}
+
+export const Consts: {
+    AutoTypeObfuscationOptions: {
+        None: number;
+        UseClipboard: number;
+    };
+    CipherId: {
+        Aes: string;
+        ChaCha20: string;
+    };
+    CompressionAlgorithm: {
+        GZip: number;
+        None: number;
+    };
+    CrsAlgorithm: {
+        ArcFourVariant: number;
+        ChaCha20: number;
+        Null: number;
+        Salsa20: number;
+    };
+    Defaults: {
+        HistoryMaxItems: number;
+        HistoryMaxSize: number;
+        KeyEncryptionRounds: number;
+        MntncHistoryDays: number;
+        RecycleBinName: string;
+    };
+    ErrorCodes: {
+        BadSignature: string;
+        FileCorrupt: string;
+        InvalidArg: string;
+        InvalidKey: string;
+        InvalidVersion: string;
+        MergeError: string;
+        NotImplemented: string;
+        Unsupported: string;
+    };
+    Icons: {
+        Apple: number;
+        Archive: number;
+        BlackBerry: number;
+        Book: number;
+        CDRom: number;
+        Certificate: number;
+        Checked: number;
+        ClipboardReady: number;
+        Clock: number;
+        Configuration: number;
+        Console: number;
+        Digicam: number;
+        Disk: number;
+        Drive: number;
+        DriveWindows: number;
+        EMail: number;
+        EMailBox: number;
+        EMailSearch: number;
+        Energy: number;
+        EnergyCareful: number;
+        Expired: number;
+        Feather: number;
+        Folder: number;
+        FolderOpen: number;
+        FolderPackage: number;
+        Home: number;
+        Homebanking: number;
+        IRCommunication: number;
+        Identity: number;
+        Info: number;
+        Key: number;
+        List: number;
+        LockOpen: number;
+        MarkedDirectory: number;
+        Memory: number;
+        Money: number;
+        Monitor: number;
+        MultiKeys: number;
+        NetworkServer: number;
+        Note: number;
+        Notepad: number;
+        Package: number;
+        PaperFlag: number;
+        PaperLocked: number;
+        PaperNew: number;
+        PaperQ: number;
+        PaperReady: number;
+        Parts: number;
+        Pen: number;
+        Printer: number;
+        ProgramIcons: number;
+        Run: number;
+        Scanner: number;
+        Screen: number;
+        Settings: number;
+        Star: number;
+        TerminalEncrypted: number;
+        Thumbnail: number;
+        Tool: number;
+        TrashBin: number;
+        Tux: number;
+        UserCommunication: number;
+        UserKey: number;
+        Warning: number;
+        Wiki: number;
+        World: number;
+        WorldComputer: number;
+        WorldSocket: number;
+        WorldStar: number;
+    };
+    KdfId: {
+        Aes: string;
+        Argon2: string;
+    };
+    Signatures: {
+        FileMagic: number;
+        Sig2Kdb: number;
+        Sig2Kdbx: number;
+    };
+};
+
+export namespace ByteUtils {
+    function arrayBufferEquals(ab1: ArrayBuffer, ab2: ArrayBuffer): boolean;
+
+    function arrayToBuffer(arr: Uint8Array | ArrayBuffer): ArrayBuffer;
+
+    function base64ToBytes(str: string): Uint8Array;
+
+    function bytesToBase64(arr: Uint8Array | ArrayBuffer): string;
+
+    function bytesToHex(arr: Uint8Array | ArrayBuffer): string;
+
+    function bytesToString(arr: Uint8Array | ArrayBuffer): string;
+
+    function hexToBytes(hex: string): Uint8Array;
+
+    function stringToBytes(str: string): Uint8Array;
+
+    function zeroBuffer(buffer: Uint8Array | ArrayBuffer): void;
+}
+
+export namespace CryptoEngine {
+    const subtle: any;
+
+    const webCrypto: any;
+
+    function argon2(
+        password: ArrayBuffer,
+        salt: ArrayBuffer,
+        memory: number,
+        iterations: number,
+        length: number,
+        parallelism: number,
+        type: number,
+        version: number
+    ): Promise<ArrayBuffer>;
+
+    function chacha20(
+        data: ArrayBuffer,
+        key: ArrayBuffer,
+        iv: ArrayBuffer
+    ): Promise<ArrayBuffer>;
+
+    function configure(
+        newSubtle: SubtleCrypto | null,
+        newWebCrypto: Crypto | null,
+        newNodeCrypto: Crypto | null
+    ): void;
+
+    function createAesCbc(): any;
+
+    function hmacSha256(
+        key: ArrayBuffer,
+        data: ArrayBuffer
+    ): Promise<ArrayBuffer>;
+
+    function random(len: number): Uint8Array;
+
+    function sha256(data: ArrayBuffer): Promise<ArrayBuffer>;
+
+    function sha512(data: ArrayBuffer): Promise<ArrayBuffer>;
+}
+
+export namespace Random {
+    function getBytes(len: number): Uint8Array;
+}
+
+export class BinaryStream {
+    constructor(arrayBuffer: ArrayBuffer);
+
+    getByteLength(): number;
+
+    getFloat32(littleEdian?: boolean): number;
+
+    getFloat64(littleEdian?: boolean): number;
+
+    getInt16(littleEdian?: boolean): number;
+
+    getInt32(littleEdian?: boolean): number;
+
+    getInt8(littleEdian?: boolean): number;
+
+    getPos(): number;
+
+    getUint16(littleEdian?: boolean): number;
+
+    getUint32(littleEdian?: boolean): number;
+
+    getUint64(littleEdian?: boolean): number;
+
+    getUint8(littleEdian?: boolean): number;
+
+    getWrittenBytes(): ArrayBuffer;
+
+    readBytes(size: number): ArrayBuffer;
+
+    readBytesNoAdvance(startPos: number, endPos: number): ArrayBuffer;
+
+    readBytesToEnd(): ArrayBuffer;
+
+    setFloat32(value: number, littleEdian?: boolean): void;
+
+    setFloat64(value: number, littleEdian?: boolean): void;
+
+    setInt16(value: number, littleEdian?: boolean): void;
+
+    setInt32(value: number, littleEdian?: boolean): void;
+
+    setInt8(value: number, littleEdian?: boolean): void;
+
+    setUint16(value: number, littleEdian?: boolean): void;
+
+    setUint32(value: number, littleEdian?: boolean): void;
+
+    setUint64(value: number, littleEdian?: boolean): void;
+
+    setUint8(value: number, littleEdian?: boolean): void;
+
+    writeBytes(bytes: ArrayBuffer | Uint8Array): void;
+}
+
+export class Context {
+    constructor(opts: Kdbx);
+
+    setXmlDate(node: Node, dt: Date): void;
+}
+
+export class Group {
+    constructor();
+
+    static create(name: string, parentGroup: Group): Group;
+    static read(xmlNode: Node, ctx: Context, parentGroup: Group): Group;
+
+    write(parentNode: Node, ctx: Context): void;
+    forEach(
+        callback: (
+            thisArg: (value: any) => void,
+            entry: Entry | undefined
+        ) => void,
+        thisArg: (value: any) => void
+    ): void;
+    merge(objectMap: ObjectMap): void;
+    copyFrom(group: Group): void;
+}
+
+export class Entry {
+    constructor();
+
+    static create(meta: Meta, parentGroup: Group): Entry;
+    static read(xmlNode: Node, ctx: Context, parentGroup: Group): Entry;
+
+    write(parentNode: Node, ctx: Context): void;
+    pushHistory(): void;
+    removeHistory(index: number, count: number): void;
+    copyFrom(entry: Entry): void;
+    merge(objectMap: ObjectMap): void;
+}
+
+export class Meta {
+    constructor();
+
+    static create(): Meta;
+    static read(xmlNode: Node, ctx: Context): Meta;
+
+    write(parentNode: Node, ctx: Context): void;
+    merge(remote: Meta, objectMap: ObjectMap): void;
+}
diff --git a/types/kdbxweb/kdbxweb-tests.ts b/types/kdbxweb/kdbxweb-tests.ts
new file mode 100644
index 0000000000..d667117b6b
--- /dev/null
+++ b/types/kdbxweb/kdbxweb-tests.ts
@@ -0,0 +1,18 @@
+import * as kdbxweb from "kdbxweb";
+
+const dataarr = new ArrayBuffer(0);
+
+const credentials = new kdbxweb.Credentials(
+    kdbxweb.ProtectedValue.fromString("demo"),
+    "nFWx&e5SzT"
+);
+
+kdbxweb.Kdbx.load(dataarr, credentials).then(db => db);
+kdbxweb.Kdbx.loadXml("data", credentials).then(db =>  db);
+
+const newDb = kdbxweb.Kdbx.create(credentials, 'My new db');
+const group = newDb.createGroup(newDb.getDefaultGroup(), 'subgroup');
+const entry = newDb.createEntry(group);
+
+newDb.save().then(dataAsArrayBuffer => dataAsArrayBuffer);
+newDb.saveXml().then(xmlAsString => xmlAsString);
diff --git a/types/kdbxweb/tsconfig.json b/types/kdbxweb/tsconfig.json
new file mode 100644
index 0000000000..6c6083b077
--- /dev/null
+++ b/types/kdbxweb/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "kdbxweb-tests.ts"
+    ]
+}
diff --git a/types/kdbxweb/tslint.json b/types/kdbxweb/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/kdbxweb/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 2009fc1c826aae33afd1ac1c571707fa57bc328f Mon Sep 17 00:00:00 2001
From: Lucas <git@roang.info>
Date: Sat, 10 Nov 2018 19:34:31 +0100
Subject: [PATCH 038/836] Add library for dom elements

---
 types/kdbxweb/tsconfig.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/types/kdbxweb/tsconfig.json b/types/kdbxweb/tsconfig.json
index 6c6083b077..77578b1129 100644
--- a/types/kdbxweb/tsconfig.json
+++ b/types/kdbxweb/tsconfig.json
@@ -2,7 +2,8 @@
     "compilerOptions": {
         "module": "commonjs",
         "lib": [
-            "es6"
+            "es6",
+            "dom"
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,

From e9b486b9065591cb640120fbd92e1d1ad9c39159 Mon Sep 17 00:00:00 2001
From: Lucas <git@roang.info>
Date: Sat, 10 Nov 2018 20:22:08 +0100
Subject: [PATCH 039/836] Remove unnecessary import

---
 types/kdbxweb/index.d.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/types/kdbxweb/index.d.ts b/types/kdbxweb/index.d.ts
index 2787ba7a1f..376e0bafde 100644
--- a/types/kdbxweb/index.d.ts
+++ b/types/kdbxweb/index.d.ts
@@ -3,8 +3,6 @@
 // Definitions by: Roang-zero1 <https://github.com/Roang-zero1>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-import Crypto from "crypto";
-
 /*~ If this module is a UMD module that exposes a global variable 'myLib' when
  *~ loaded outside a module loader environment, declare that global here.
  *~ Otherwise, delete this declaration.

From 702978e8c6188eaaa4baf7f2d5e93a4afb94ee4d Mon Sep 17 00:00:00 2001
From: Lucas <git@roang.info>
Date: Sat, 10 Nov 2018 20:24:01 +0100
Subject: [PATCH 040/836] Add KdbxObject type

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

diff --git a/types/kdbxweb/index.d.ts b/types/kdbxweb/index.d.ts
index 376e0bafde..c781470283 100644
--- a/types/kdbxweb/index.d.ts
+++ b/types/kdbxweb/index.d.ts
@@ -9,6 +9,8 @@
  */
 export as namespace kdbxweb;
 
+export type KdbxObject = Entry | Group;
+
 export interface Settings {
     binaries: boolean;
     customIcons: boolean;
@@ -16,9 +18,9 @@ export interface Settings {
 }
 
 export interface ObjectMap {
-    objects: object[];
-    remote: object[];
-    deleted: object[];
+    objects: KdbxObject[];
+    remote: KdbxObject[];
+    deleted: KdbxObject[];
 }
 
 export interface editingState {
@@ -59,6 +61,8 @@ export class Int64 {
 export class Kdbx {
     constructor();
 
+    deletedObjects: KdbxObject[];
+
     addDeletedObject(uuid: KdbxUuid, dt: Date): void;
 
     cleanup(settings: Settings): void;
@@ -83,9 +87,9 @@ export class Kdbx {
 
     merge(remote: Kdbx): void;
 
-    move(object: Entry | Group, toGroup: Group, atIndex: number): void;
+    move(object: KdbxObject, toGroup: Group, atIndex?: number): void;
 
-    remove(object: Entry | Group): void;
+    remove(object: KdbxObject): void;
 
     removeLocalEditState(): void;
 

From bfbd5e652499e05b03bb2d657b9f462bbe0905c1 Mon Sep 17 00:00:00 2001
From: Lucas <git@roang.info>
Date: Sat, 10 Nov 2018 20:24:38 +0100
Subject: [PATCH 041/836] Update settings interface

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

diff --git a/types/kdbxweb/index.d.ts b/types/kdbxweb/index.d.ts
index c781470283..9530ad3fa8 100644
--- a/types/kdbxweb/index.d.ts
+++ b/types/kdbxweb/index.d.ts
@@ -12,9 +12,9 @@ export as namespace kdbxweb;
 export type KdbxObject = Entry | Group;
 
 export interface Settings {
-    binaries: boolean;
-    customIcons: boolean;
-    historyRules: boolean;
+    binaries?: boolean;
+    customIcons?: boolean;
+    historyRules?: boolean;
 }
 
 export interface ObjectMap {

From 4e753b47a47b0417dc9a510f357004290f323d13 Mon Sep 17 00:00:00 2001
From: Lucas <git@roang.info>
Date: Sat, 10 Nov 2018 20:25:10 +0100
Subject: [PATCH 042/836] Add binaries class

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

diff --git a/types/kdbxweb/index.d.ts b/types/kdbxweb/index.d.ts
index 9530ad3fa8..3f04965a59 100644
--- a/types/kdbxweb/index.d.ts
+++ b/types/kdbxweb/index.d.ts
@@ -23,6 +23,11 @@ export interface ObjectMap {
     deleted: KdbxObject[];
 }
 
+export interface BinaryInforamtion {
+    ref: string;
+    value: ProtectedValue | ArrayBuffer;
+}
+
 export interface editingState {
     added: [Date];
     deleted: [Date];
@@ -61,6 +66,7 @@ export class Int64 {
 export class Kdbx {
     constructor();
 
+    binaries: Binaries;
     deletedObjects: KdbxObject[];
 
     addDeletedObject(uuid: KdbxUuid, dt: Date): void;
@@ -415,6 +421,17 @@ export class BinaryStream {
     writeBytes(bytes: ArrayBuffer | Uint8Array): void;
 }
 
+export class Binaries {
+    constructor();
+
+    hash(): Promise<any[]>;
+    getBinaryHash(
+        binary: ProtectedValue | ArrayBuffer | Uint8Array
+    ): Promise<string>;
+    assignIds(): void;
+    add(value: ProtectedValue | ArrayBuffer): Promise<BinaryInforamtion>;
+}
+
 export class Context {
     constructor(opts: Kdbx);
 

From 2224bdf11a6e5420ab6777b22570044af354bd83 Mon Sep 17 00:00:00 2001
From: Lucas <git@roang.info>
Date: Sat, 10 Nov 2018 20:27:47 +0100
Subject: [PATCH 043/836] Add class properties

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

diff --git a/types/kdbxweb/index.d.ts b/types/kdbxweb/index.d.ts
index 3f04965a59..0e52af89c0 100644
--- a/types/kdbxweb/index.d.ts
+++ b/types/kdbxweb/index.d.ts
@@ -58,6 +58,9 @@ export class Credentials {
 export class Int64 {
     constructor(lo: number, hi: number);
 
+    lo: number;
+    hi: number;
+
     valueOf(): number;
 
     static from(value: number): Int64;
@@ -66,7 +69,12 @@ export class Int64 {
 export class Kdbx {
     constructor();
 
+    header: Header;
+    credentials: Credentials;
+    meta: Meta;
+    xml: Document;
     binaries: Binaries;
+    groups: Group[];
     deletedObjects: KdbxObject[];
 
     addDeletedObject(uuid: KdbxUuid, dt: Date): void;
@@ -117,6 +125,10 @@ export class Kdbx {
 export class KdbxError {
     constructor(code: number, message: string);
 
+    name: "KdbxError";
+    code: number;
+    message: string;
+
     // Native method; no parameter or return type inference available
     toString(): string;
 }
@@ -124,6 +136,9 @@ export class KdbxError {
 export class KdbxUuid {
     constructor(ab: string | ArrayBuffer);
 
+    id: string | undefined;
+    empty: boolean;
+
     equals(other: KdbxUuid): boolean;
 
     toBytes(): Uint8Array | undefined;
@@ -441,6 +456,22 @@ export class Context {
 export class Group {
     constructor();
 
+    uuid: string;
+    name: string;
+    notes: string;
+    icon: number;
+    customIcon: KdbxUuid;
+    times: Times;
+    expanded: boolean;
+    defaultAutoTypeSeq: string;
+    enableAutoType: boolean;
+    enableSearching: boolean;
+    lastTopVisibleEntry: KdbxUuid;
+    groups: Group[];
+    entries: Entry[];
+    parentGroup: Group;
+    customData: any;
+
     static create(name: string, parentGroup: Group): Group;
     static read(xmlNode: Node, ctx: Context, parentGroup: Group): Group;
 
@@ -459,6 +490,21 @@ export class Group {
 export class Entry {
     constructor();
 
+    uuid: string;
+    icon: any;
+    customIcon: any;
+    fgColor: any;
+    bgColor: any;
+    overrideUrl: any;
+    tags: any[];
+    times: Times;
+    fields: { [name: string]: any };
+    binaries: {};
+    autoType: any;
+    history: any[];
+    parentGroup: Group;
+    customData: any;
+
     static create(meta: Meta, parentGroup: Group): Entry;
     static read(xmlNode: Node, ctx: Context, parentGroup: Group): Entry;
 
@@ -478,3 +524,50 @@ export class Meta {
     write(parentNode: Node, ctx: Context): void;
     merge(remote: Meta, objectMap: ObjectMap): void;
 }
+
+export class Header {
+    constructor();
+
+    compression: number;
+    crsAlgorithm: number;
+    dataCipherUuid: KdbxUuid;
+    encryptionIV: any;
+    endPos: number;
+    kdfParameters: VarDictionary;
+    keyEncryptionRounds: number;
+    masterSeed: Uint8Array;
+    protectedStreamKey: any;
+    publicCustomData: any;
+    streamStartBytes: any;
+    transformSeed: any;
+    versionMajor: number;
+    versionMinor: number;
+
+    static read(stm: BinaryStream, ctx: Context): Header;
+    static create(): Header;
+
+    generateSalts(): void;
+    readInnerHeader(stm: BinaryStream, ctx: Context): void;
+    upgrade(): void;
+    write(stm: BinaryStream): void;
+    writeInnerHeader(stm: BinaryStream, ctx: Context): void;
+}
+
+export class Times {
+    constructor();
+
+    creationTime: Date;
+    lastModTime: Date;
+    lastAccessTime: Date;
+    expiryTime: Date;
+    expires: boolean;
+    usageCount: number;
+    locationChanged: Date;
+
+    static create(): Times;
+    static read(xmlNode: Node): Times;
+
+    clone(): Times;
+    update(): void;
+    write(parentNode: Node, ctx: Context): void;
+}

From 4ea7a5f73578f7230fc6f54e5c3d025a2e74fe7a Mon Sep 17 00:00:00 2001
From: Lucas <git@roang.info>
Date: Sat, 10 Nov 2018 20:28:07 +0100
Subject: [PATCH 044/836] Update CryptoEngine namespace

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

diff --git a/types/kdbxweb/index.d.ts b/types/kdbxweb/index.d.ts
index 0e52af89c0..f846123cbb 100644
--- a/types/kdbxweb/index.d.ts
+++ b/types/kdbxweb/index.d.ts
@@ -337,9 +337,9 @@ export namespace ByteUtils {
 }
 
 export namespace CryptoEngine {
-    const subtle: any;
-
-    const webCrypto: any;
+    const subtle: SubtleCrypto | null;
+    const webCrypto: Crypto | null;
+    const NodeCrypto: Crypto | null;
 
     function argon2(
         password: ArrayBuffer,

From 3902c860b7edf771017802786a9cbcb0168f68c2 Mon Sep 17 00:00:00 2001
From: Lucas <git@roang.info>
Date: Sat, 10 Nov 2018 20:28:23 +0100
Subject: [PATCH 045/836] Fix getGroup delcaration

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

diff --git a/types/kdbxweb/index.d.ts b/types/kdbxweb/index.d.ts
index f846123cbb..2b5952fa0e 100644
--- a/types/kdbxweb/index.d.ts
+++ b/types/kdbxweb/index.d.ts
@@ -95,7 +95,7 @@ export class Kdbx {
 
     getDefaultGroup(): Group;
 
-    getGroup(uuid: KdbxUuid | string, parentGroup: Group): Group | undefined;
+    getGroup(uuid: KdbxUuid | string, parentGroup?: Group): Group | undefined;
 
     getLocalEditState(): editingStateDict;
 

From 8cb32a28e6b6e0e131325e0ebfcd7f60476bda8d Mon Sep 17 00:00:00 2001
From: Lucas <git@roang.info>
Date: Sat, 10 Nov 2018 20:36:42 +0100
Subject: [PATCH 046/836] Update Entry properties

---
 types/kdbxweb/index.d.ts | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/types/kdbxweb/index.d.ts b/types/kdbxweb/index.d.ts
index 2b5952fa0e..e7860b1e92 100644
--- a/types/kdbxweb/index.d.ts
+++ b/types/kdbxweb/index.d.ts
@@ -490,18 +490,26 @@ export class Group {
 export class Entry {
     constructor();
 
-    uuid: string;
-    icon: any;
-    customIcon: any;
-    fgColor: any;
-    bgColor: any;
-    overrideUrl: any;
-    tags: any[];
+    uuid: KdbxUuid;
+    icon: number;
+    customIcon: KdbxUuid;
+    fgColor: string;
+    bgColor: string;
+    overrideUrl: string;
+    tags: string[];
     times: Times;
-    fields: { [name: string]: any };
+    fields: { [key: string]: any };
     binaries: {};
-    autoType: any;
-    history: any[];
+    autoType: {
+        enabled: boolean;
+        obfuscation: number;
+        defaultSequence: string;
+        items: {
+            windows: string;
+            keystrokeSequence: string;
+        };
+    };
+    history: Entry[];
     parentGroup: Group;
     customData: any;
 

From 13502ed0fd81121e1206821b520f29a1587bfc83 Mon Sep 17 00:00:00 2001
From: Lucas <git@roang.info>
Date: Sat, 10 Nov 2018 20:49:16 +0100
Subject: [PATCH 047/836] Update header

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

diff --git a/types/kdbxweb/index.d.ts b/types/kdbxweb/index.d.ts
index e7860b1e92..76f7ad1e88 100644
--- a/types/kdbxweb/index.d.ts
+++ b/types/kdbxweb/index.d.ts
@@ -2,11 +2,8 @@
 // Project: https://github.com/keeweb/kdbxweb#readme
 // Definitions by: Roang-zero1 <https://github.com/Roang-zero1>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2' just under the header
 
-/*~ If this module is a UMD module that exposes a global variable 'myLib' when
- *~ loaded outside a module loader environment, declare that global here.
- *~ Otherwise, delete this declaration.
- */
 export as namespace kdbxweb;
 
 export type KdbxObject = Entry | Group;

From f96d6bb925853867ba0df91c29f489fa8037e71d Mon Sep 17 00:00:00 2001
From: Lucas <git@roang.info>
Date: Sat, 10 Nov 2018 20:50:02 +0100
Subject: [PATCH 048/836] Add types

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

diff --git a/types/kdbxweb/index.d.ts b/types/kdbxweb/index.d.ts
index 76f7ad1e88..90aa997fb7 100644
--- a/types/kdbxweb/index.d.ts
+++ b/types/kdbxweb/index.d.ts
@@ -172,13 +172,13 @@ export class ProtectedValue {
 export class VarDictionary {
     constructor();
 
-    get(key: string): any;
+    get(key: string): object;
 
     keys(): string[];
 
     remove(key: string): void;
 
-    set(key: string, type: number, value: any): void;
+    set(key: string, type: number, value: object): void;
 
     write(stm: BinaryStream): void;
 
@@ -467,7 +467,7 @@ export class Group {
     groups: Group[];
     entries: Entry[];
     parentGroup: Group;
-    customData: any;
+    customData: {};
 
     static create(name: string, parentGroup: Group): Group;
     static read(xmlNode: Node, ctx: Context, parentGroup: Group): Group;
@@ -495,7 +495,7 @@ export class Entry {
     overrideUrl: string;
     tags: string[];
     times: Times;
-    fields: { [key: string]: any };
+    fields: { [key: string]: ProtectedValue | string };
     binaries: {};
     autoType: {
         enabled: boolean;
@@ -508,7 +508,7 @@ export class Entry {
     };
     history: Entry[];
     parentGroup: Group;
-    customData: any;
+    customData: {};
 
     static create(meta: Meta, parentGroup: Group): Entry;
     static read(xmlNode: Node, ctx: Context, parentGroup: Group): Entry;

From 7b887b047d662793ec6bdaaaa799c60cc38b07b3 Mon Sep 17 00:00:00 2001
From: Lucas <git@roang.info>
Date: Sat, 10 Nov 2018 20:57:43 +0100
Subject: [PATCH 049/836] Update tests

---
 types/kdbxweb/kdbxweb-tests.ts | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/types/kdbxweb/kdbxweb-tests.ts b/types/kdbxweb/kdbxweb-tests.ts
index d667117b6b..dfc8167b4b 100644
--- a/types/kdbxweb/kdbxweb-tests.ts
+++ b/types/kdbxweb/kdbxweb-tests.ts
@@ -8,11 +8,27 @@ const credentials = new kdbxweb.Credentials(
 );
 
 kdbxweb.Kdbx.load(dataarr, credentials).then(db => db);
-kdbxweb.Kdbx.loadXml("data", credentials).then(db =>  db);
+kdbxweb.Kdbx.loadXml("data", credentials).then(db => db);
 
-const newDb = kdbxweb.Kdbx.create(credentials, 'My new db');
-const group = newDb.createGroup(newDb.getDefaultGroup(), 'subgroup');
+const newDb = kdbxweb.Kdbx.create(credentials, "My new db");
+const defaultGroup = newDb.getDefaultGroup();
+const group = newDb.createGroup(defaultGroup, "subgroup");
+const anotherGroup = newDb.createGroup(group, "subgroup-2");
+const yetAnotherGroup = newDb.createGroup(group, "subgroup-3");
+const deepGroup = defaultGroup.groups[0].groups[0];
+
+if (newDb.getGroup(yetAnotherGroup.uuid)){
+    newDb.remove(yetAnotherGroup);
+}
 const entry = newDb.createEntry(group);
+newDb.move(entry, anotherGroup);
+newDb.remove(entry);
 
 newDb.save().then(dataAsArrayBuffer => dataAsArrayBuffer);
 newDb.saveXml().then(xmlAsString => xmlAsString);
+
+newDb.cleanup({
+    customIcons: true
+});
+
+newDb.upgrade();

From 2fda9144831406ccc783172a7ff14fa049b91287 Mon Sep 17 00:00:00 2001
From: Lucas <git@roang.info>
Date: Sat, 10 Nov 2018 20:58:38 +0100
Subject: [PATCH 050/836] Fix linting issues

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

diff --git a/types/kdbxweb/index.d.ts b/types/kdbxweb/index.d.ts
index 90aa997fb7..67dbac91f4 100644
--- a/types/kdbxweb/index.d.ts
+++ b/types/kdbxweb/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/keeweb/kdbxweb#readme
 // Definitions by: Roang-zero1 <https://github.com/Roang-zero1>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2' just under the header
+// TypeScript Version: 2.2
 
 export as namespace kdbxweb;
 
diff --git a/types/kdbxweb/kdbxweb-tests.ts b/types/kdbxweb/kdbxweb-tests.ts
index dfc8167b4b..86a312adb7 100644
--- a/types/kdbxweb/kdbxweb-tests.ts
+++ b/types/kdbxweb/kdbxweb-tests.ts
@@ -17,7 +17,7 @@ const anotherGroup = newDb.createGroup(group, "subgroup-2");
 const yetAnotherGroup = newDb.createGroup(group, "subgroup-3");
 const deepGroup = defaultGroup.groups[0].groups[0];
 
-if (newDb.getGroup(yetAnotherGroup.uuid)){
+if (newDb.getGroup(yetAnotherGroup.uuid)) {
     newDb.remove(yetAnotherGroup);
 }
 const entry = newDb.createEntry(group);

From 2a58861813cc188a501116d5220119c558946918 Mon Sep 17 00:00:00 2001
From: Lucas <git@roang.info>
Date: Sat, 10 Nov 2018 21:36:22 +0100
Subject: [PATCH 051/836] Fix uuid types

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

diff --git a/types/kdbxweb/index.d.ts b/types/kdbxweb/index.d.ts
index 67dbac91f4..0d9e7201fe 100644
--- a/types/kdbxweb/index.d.ts
+++ b/types/kdbxweb/index.d.ts
@@ -32,7 +32,7 @@ export interface editingState {
 
 export interface editingStateDict {
     meta: editingState;
-    [uuid: string]: editingState;
+    [uuid: KdbxUuid]: editingState;
 }
 
 export class Credentials {
@@ -453,7 +453,7 @@ export class Context {
 export class Group {
     constructor();
 
-    uuid: string;
+    uuid: KdbxUuid;
     name: string;
     notes: string;
     icon: number;

From bc1b05a692c420e5b0987fbdca6662c0d85fbf83 Mon Sep 17 00:00:00 2001
From: Lucas <git@roang.info>
Date: Sat, 10 Nov 2018 22:02:51 +0100
Subject: [PATCH 052/836] Update property types

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

diff --git a/types/kdbxweb/index.d.ts b/types/kdbxweb/index.d.ts
index 0d9e7201fe..ce4892e4f2 100644
--- a/types/kdbxweb/index.d.ts
+++ b/types/kdbxweb/index.d.ts
@@ -7,6 +7,7 @@
 export as namespace kdbxweb;
 
 export type KdbxObject = Entry | Group;
+export type StringProtected = ProtectedValue | string;
 
 export interface Settings {
     binaries?: boolean;
@@ -86,7 +87,7 @@ export class Kdbx {
 
     createEntry(group: Group): Entry;
 
-    createGroup(group: Group, name: string): Group;
+    createGroup(group: Group, name: StringProtected): Group;
 
     createRecycleBin(): void;
 
@@ -454,13 +455,13 @@ export class Group {
     constructor();
 
     uuid: KdbxUuid;
-    name: string;
-    notes: string;
+    name: StringProtected;
+    notes: StringProtected;
     icon: number;
     customIcon: KdbxUuid;
     times: Times;
     expanded: boolean;
-    defaultAutoTypeSeq: string;
+    defaultAutoTypeSeq: StringProtected;
     enableAutoType: boolean;
     enableSearching: boolean;
     lastTopVisibleEntry: KdbxUuid;
@@ -469,7 +470,7 @@ export class Group {
     parentGroup: Group;
     customData: {};
 
-    static create(name: string, parentGroup: Group): Group;
+    static create(name: StringProtected, parentGroup: Group): Group;
     static read(xmlNode: Node, ctx: Context, parentGroup: Group): Group;
 
     write(parentNode: Node, ctx: Context): void;
@@ -490,12 +491,12 @@ export class Entry {
     uuid: KdbxUuid;
     icon: number;
     customIcon: KdbxUuid;
-    fgColor: string;
-    bgColor: string;
-    overrideUrl: string;
+    fgColor: StringProtected;
+    bgColor: StringProtected;
+    overrideUrl: StringProtected;
     tags: string[];
     times: Times;
-    fields: { [key: string]: ProtectedValue | string };
+    fields: { [key: string]: StringProtected };
     binaries: {};
     autoType: {
         enabled: boolean;

From f0e3d17c298fed30e78e03a35e66d7bbcf4645f1 Mon Sep 17 00:00:00 2001
From: Lucas <git@roang.info>
Date: Sat, 10 Nov 2018 22:14:53 +0100
Subject: [PATCH 053/836] Fix index signature parameter

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

diff --git a/types/kdbxweb/index.d.ts b/types/kdbxweb/index.d.ts
index ce4892e4f2..805a45a2b0 100644
--- a/types/kdbxweb/index.d.ts
+++ b/types/kdbxweb/index.d.ts
@@ -33,7 +33,7 @@ export interface editingState {
 
 export interface editingStateDict {
     meta: editingState;
-    [uuid: KdbxUuid]: editingState;
+    [uuid: string]: editingState;
 }
 
 export class Credentials {

From 8b93c6cd5b697a264d1609f86051bb2392c698b8 Mon Sep 17 00:00:00 2001
From: Matt McCutchen <matt@mattmccutchen.net>
Date: Sat, 10 Nov 2018 19:27:38 -0500
Subject: [PATCH 054/836] react-navigation: Make declarations work with
 strictFunctionTypes.

Believed to fix https://stackoverflow.com/q/53154003.

This reverts 4464cbbfe725bfc191006e41cbe634dc87b8baaa.  I was unable to
reproduce the issue that that commit was originally trying to fix.
Without reverting it, the BackButtonWithNavigationWithExplicitProps test
fails on typescript@next.
---
 types/react-navigation/index.d.ts             | 26 +++++++++----------
 .../react-navigation-tests.tsx                |  4 +--
 types/react-navigation/tsconfig.json          |  2 +-
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/types/react-navigation/index.d.ts b/types/react-navigation/index.d.ts
index 846ea56a9e..15e72b6b61 100644
--- a/types/react-navigation/index.d.ts
+++ b/types/react-navigation/index.d.ts
@@ -1248,17 +1248,17 @@ export interface NavigationInjectedProps<P = NavigationParams> {
 }
 
 // If the wrapped component is a class, we can get a ref to it
-export function withNavigation<T extends React.ComponentClass<NavigationInjectedProps>>(
-  Component: T,
-): React.ComponentType<Omit<InferProps<T>, keyof NavigationInjectedProps> & { onRef?: React.Ref<InstanceType<T>> }>;
+export function withNavigation<P extends NavigationInjectedProps, T extends React.ComponentClass<P>>(
+  Component: T & React.ComponentClass<P>,
+): React.ComponentType<Omit<P, keyof NavigationInjectedProps> & { onRef?: React.Ref<InstanceType<T>> }>;
 
-export function withNavigation<T extends React.ComponentType<NavigationInjectedProps>>(
-  Component: T,
-): React.ComponentType<Omit<InferProps<T>, keyof NavigationInjectedProps>>;
+export function withNavigation<P extends NavigationInjectedProps>(
+  Component: React.ComponentType<P>,
+): React.ComponentType<Omit<P, keyof NavigationInjectedProps>>;
 
 // For backwards compatibility
 export function withNavigation<T = {}, P = NavigationParams>(
-  Component: React.ComponentType<T | (T & NavigationInjectedProps<P>)>,
+  Component: React.ComponentType<T & NavigationInjectedProps<P>>,
 ): React.ComponentType<T & { onRef?: React.Ref<React.Component<T & NavigationInjectedProps<P>>> }>;
 
 export interface NavigationFocusInjectedProps<P = NavigationParams> extends NavigationInjectedProps<P> {
@@ -1266,13 +1266,13 @@ export interface NavigationFocusInjectedProps<P = NavigationParams> extends Navi
 }
 
 // If the wrapped component is a class, we can get a ref to it
-export function withNavigationFocus<T extends React.ComponentClass<NavigationFocusInjectedProps>>(
-  Component: T,
-): React.ComponentType<Omit<InferProps<T>, keyof NavigationFocusInjectedProps> & { onRef?: React.Ref<InstanceType<T>> }>;
+export function withNavigationFocus<P extends NavigationFocusInjectedProps, T extends React.ComponentClass<P>>(
+  Component: T & React.ComponentClass<P>,
+): React.ComponentType<Omit<P, keyof NavigationFocusInjectedProps> & { onRef?: React.Ref<InstanceType<T>> }>;
 
-export function withNavigationFocus<T extends React.ComponentType<NavigationFocusInjectedProps>>(
-  Component: T,
-): React.ComponentType<Omit<InferProps<T>, keyof NavigationFocusInjectedProps>>;
+export function withNavigationFocus<P extends NavigationFocusInjectedProps>(
+  Component: React.ComponentType<P>,
+): React.ComponentType<Omit<P, keyof NavigationFocusInjectedProps>>;
 
 // For backwards compatibility
 export function withNavigationFocus<T = {}, P = NavigationParams>(
diff --git a/types/react-navigation/react-navigation-tests.tsx b/types/react-navigation/react-navigation-tests.tsx
index e568fbed27..ba77442a40 100644
--- a/types/react-navigation/react-navigation-tests.tsx
+++ b/types/react-navigation/react-navigation-tests.tsx
@@ -383,14 +383,14 @@ class CustomTransitioner extends React.Component<CustomTransitionerProps, null>
             />
         );
     }
-    _render = (props: NavigationTransitionProps, prevProps: NavigationTransitionProps): React.ReactElement<any> => {
+    _render = (props: NavigationTransitionProps, prevProps?: NavigationTransitionProps): React.ReactElement<any> => {
         return (
             <View />
         );
     }
     _configureTransition = (
         _transitionProps: NavigationTransitionProps,
-        _prevTransitionProps: NavigationTransitionProps
+        _prevTransitionProps?: NavigationTransitionProps
     ) => {
         return {};
     }
diff --git a/types/react-navigation/tsconfig.json b/types/react-navigation/tsconfig.json
index b0cf7029db..bc49bee237 100644
--- a/types/react-navigation/tsconfig.json
+++ b/types/react-navigation/tsconfig.json
@@ -7,7 +7,7 @@
         "noImplicitAny": true,
         "noImplicitThis": true,
         "strictNullChecks": true,
-        "strictFunctionTypes": false,
+        "strictFunctionTypes": true,
         "baseUrl": "../",
         "jsx": "react",
         "typeRoots": [

From e0c287512b36786de0e7390d2bd78d1fa400ca5c Mon Sep 17 00:00:00 2001
From: Simon Schick <demwizzy@gmail.com>
Date: Sun, 11 Nov 2018 01:46:35 +0100
Subject: [PATCH 055/836] fix(yar): fix cache options

---
 types/catbox/index.d.ts |  8 +++++---
 types/hapi/index.d.ts   |  3 +++
 types/yar/index.d.ts    | 18 ++++++++++++------
 types/yar/yar-tests.ts  |  4 ++++
 4 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/types/catbox/index.d.ts b/types/catbox/index.d.ts
index 2a17490dd4..62b99ac5b3 100644
--- a/types/catbox/index.d.ts
+++ b/types/catbox/index.d.ts
@@ -118,6 +118,8 @@ export interface ClientOptions {
 
 export type PolicyOptionVariants<T> = PolicyOptions<T> | DecoratedPolicyOptions<T>;
 
+export type Id = string | { id: string };
+
 /**
  * The Policy object provides a convenient cache interface by setting a
  * global policy which is automatically applied to every storage action.
@@ -138,7 +140,7 @@ export class Policy<T, O extends PolicyOptionVariants<T>> {
      * @param id the unique item identifier (within the policy segment).
      * Can be a string or an object with the required 'id' key.
      */
-    get(id: string | { id: string }): Promise<O extends DecoratedPolicyOptions<T> ? DecoratedResult<T> : T | null>;
+    get(id: Id): Promise<O extends DecoratedPolicyOptions<T> ? DecoratedResult<T> : T | null>;
 
     /**
      * store an item in the cache where:
@@ -148,12 +150,12 @@ export class Policy<T, O extends PolicyOptionVariants<T>> {
      * removed from the cache (or is marked invalid).
      *    This should be set to 0 in order to use the caching rules configured when creating the Policy object.
      */
-    set(id: string | { id: string }, value: T, ttl?: number): Promise<void>;
+    set(id: Id, value: T, ttl?: number): Promise<void>;
     /**
      * remove the item from cache where:
      * @param id the unique item identifier (within the policy segment).
      */
-    drop(id: string | { id: string }): Promise<void>;
+    drop(id: Id): Promise<void>;
     /**
      * given a created timestamp in milliseconds, returns the time-to-live left
      * based on the configured rules.
diff --git a/types/hapi/index.d.ts b/types/hapi/index.d.ts
index 9bd9a14f41..644c48c5d1 100644
--- a/types/hapi/index.d.ts
+++ b/types/hapi/index.d.ts
@@ -2104,6 +2104,9 @@ export interface ServerAuth {
 }
 
 export type CachePolicyOptions<T> = PolicyOptionVariants<T> & {
+    /**
+     * @default '_default'
+     */
     cache?: string;
     segment?: string;
 };
diff --git a/types/yar/index.d.ts b/types/yar/index.d.ts
index e40503c58e..b6c199416d 100644
--- a/types/yar/index.d.ts
+++ b/types/yar/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for yar 9.0
+// Type definitions for yar 9.1
 // Project: https://github.com/hapijs/yar#readme
 // Definitions by: Simon Schick <https://github.com/SimonSchick>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -10,7 +10,9 @@ import {
     ServerOptionsCache,
     Request,
     Plugin,
+    CachePolicyOptions,
 } from 'hapi';
+import { PolicyOptions, Id } from 'catbox';
 declare namespace yar {
     interface YarOptions {
         /**
@@ -41,12 +43,8 @@ declare namespace yar {
         /**
          * hapi cache options which includes (among other options):
          */
-        cache?: ServerOptionsCache;
+        cache?: CachePolicyOptions<any>;
 
-        /**
-         * server-side storage expiration (defaults to 1 day).
-         */
-        expiresIn?: number;
         /**
          * the configuration for cookie-specific features:
          */
@@ -161,6 +159,10 @@ declare namespace yar {
          */
         lazy(enabled: boolean): void;
     }
+
+    interface ServerYar {
+        revoke(id: Id): Promise<void>;
+    }
 }
 declare const yar: Plugin<yar.YarOptions>;
 export = yar;
@@ -169,4 +171,8 @@ declare module 'hapi' {
     interface Request {
         yar: yar.Yar;
     }
+
+    interface Server {
+        yar: yar.ServerYar;
+    }
 }
diff --git a/types/yar/yar-tests.ts b/types/yar/yar-tests.ts
index c7e75e0a4b..e7ad2c1c24 100644
--- a/types/yar/yar-tests.ts
+++ b/types/yar/yar-tests.ts
@@ -10,6 +10,10 @@ async function boot() {
                 password: 'test',
                 isSecure: true,
             },
+            cache: {
+                cache: 'test',
+                expiresIn: 123141243,
+            }
         },
     });
 

From 7d0a6c9d6797412a73dcd97f21ce29f56002cdd4 Mon Sep 17 00:00:00 2001
From: Shuhei Tsukaomoto <seljydef@gmail.com>
Date: Sun, 11 Nov 2018 19:29:21 +0900
Subject: [PATCH 056/836] [react-map-gl]: update to 4.0

---
 types/react-map-gl/index.d.ts | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/types/react-map-gl/index.d.ts b/types/react-map-gl/index.d.ts
index 136f9352bb..6a215225d7 100644
--- a/types/react-map-gl/index.d.ts
+++ b/types/react-map-gl/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for react-map-gl 3.3
+// Type definitions for react-map-gl 4.0
 // Project: https://github.com/uber/react-map-gl#readme
 // Definitions by: Robert Imig <https://github.com/rimig>
 //                 Fabio Berta <https://github.com/fnberta>
@@ -18,7 +18,11 @@ export interface Viewport {
 }
 
 export interface MapError {
+  error?: {
     message: string;
+    status: number;
+  };
+  status: number;
 }
 
 export interface MapRequest {
@@ -145,6 +149,17 @@ export interface InteractiveMapProps extends StaticMapProps {
 
     onHover?: (event: MapEvent) => void;
     onClick?: (event: MapEvent) => void;
+    onDblClick?: (event: MapEvent) => void;
+    onMouseDown?: (event: MapEvent) => void;
+    onMouseMove?: (event: MapEvent) => void;
+    onMouseUp?: (event: MapEvent) => void;
+    onTouchStart?: (event: MapEvent) => void;
+    onTouchMove?: (event: MapEvent) => void;
+    onTouchEnd?: (event: MapEvent) => void;
+    onMouseEnter?: (event: MapEvent) => void;
+    onMouseLeave?: (event: MapEvent) => void;
+    onWheel?: (event: MapEvent) => void;
+    onMouseOut?: (event: MapEvent) => void;
 
     onContextMenu?: (event: MapEvent) => void;
 
@@ -186,6 +201,9 @@ export interface MarkerProps extends BaseControlProps {
     latitude: number;
     offsetLeft?: number;
     offsetTop?: number;
+    onDrag: (event: any) => void;
+    onDragStart: (event: any) => void;
+    onDragEnd: (event: any) => void;
 }
 
 export class Marker extends BaseControl<MarkerProps> {}
@@ -201,6 +219,7 @@ export interface PopupProps extends BaseControlProps {
     closeOnClick?: boolean;
     anchor?: 'top' | 'top-left' | 'top-right' | 'bottom' | 'bottom-left' | 'bottom-right' | 'left' | 'right';
     dynamicPosition?: boolean;
+    sortByDepth?: boolean;
     onClose?: () => void;
 }
 
@@ -251,8 +270,6 @@ export class SVGOverlay extends BaseControl<SVGOverlayProps> {}
 
 export namespace experimental {
     interface Options {
-        // TODO(deprecate): remove this when `onChangeViewport` gets deprecated
-        onChangeViewport?: (viewport: Viewport) => void;
         // TODO(deprecate): remove this when `touchZoomRotate` gets deprecated
         touchZoomRotate?: boolean;
 

From e714e43f06cd24acf7066b41ed0941b2b2a20960 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Santiago=20Aguilar=20Hern=C3=A1ndez?=
 <santiago777@outlook.com>
Date: Mon, 12 Nov 2018 03:36:03 -0500
Subject: [PATCH 057/836] * Renamed property according with docs * Moved types
 to other file

---
 types/better-sqlite3/better-sqlite3-tests.ts |  2 +
 types/better-sqlite3/index.d.ts              | 84 +-------------------
 types/better-sqlite3/tsconfig.json           |  1 +
 types/better-sqlite3/types.d.ts              | 80 +++++++++++++++++++
 4 files changed, 86 insertions(+), 81 deletions(-)
 create mode 100644 types/better-sqlite3/types.d.ts

diff --git a/types/better-sqlite3/better-sqlite3-tests.ts b/types/better-sqlite3/better-sqlite3-tests.ts
index 34ee6808c3..5d8b95ecf7 100644
--- a/types/better-sqlite3/better-sqlite3-tests.ts
+++ b/types/better-sqlite3/better-sqlite3-tests.ts
@@ -1,7 +1,9 @@
 import Database = require('better-sqlite3');
+import { RunResult } from 'better-sqlite3/types';
 
 const integer = Database.Integer(1);
 const err = new Database.SqliteError('ok', 'ok');
+const result: RunResult = { changes: 1, lastInsertRowid: 1 };
 
 let db = Database('.');
 db = new Database('.', {memory: true});
diff --git a/types/better-sqlite3/index.d.ts b/types/better-sqlite3/index.d.ts
index 899a85a2e2..d120209765 100644
--- a/types/better-sqlite3/index.d.ts
+++ b/types/better-sqlite3/index.d.ts
@@ -1,89 +1,11 @@
-// Type definitions for better-sqlite3 3.1
+// Type definitions for better-sqlite3 5.0
 // Project: http://github.com/JoshuaWise/better-sqlite3
 // Definitions by: Ben Davies <https://github.com/Morfent>
 //                 Mathew Rumsey <https://github.com/matrumz>
+//                 Santiago Aguilar <https://github.com/sant123>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-import Integer = require('integer');
-
-interface RunResult {
-	changes: number;
-	lastInsertROWID: Integer.IntLike;
-}
-
-declare class Statement {
-	database: Database;
-	source: string;
-	returnsData: boolean;
-	constructor(db: Database, sources: string[]);
-
-	run(...params: any[]): RunResult;
-	get(...params: any[]): any;
-	all(...params: any[]): any[];
-	each(params: any, cb: (row: any) => void): void;
-	each(cb: (row: any) => void): void;
-	each(...params: any[]): void;
-	pluck(toggleState?: boolean): this;
-	bind(...params: any[]): this;
-	safeIntegers(toggleState?: boolean): this;
-}
-
-declare class Transaction {
-	database: Database;
-	source: string;
-	constructor(db: Database, sources: string[]);
-
-	run(...params: any[]): RunResult;
-	bind(...params: any[]): this;
-	safeIntegers(toggleState?: boolean): this;
-}
-
-interface DatabaseOptions {
-	memory?: boolean;
-	readonly?: boolean;
-	fileMustExist?: boolean;
-}
-
-interface RegistrationOptions {
-	name?: string;
-	varargs?: boolean;
-	deterministic?: boolean;
-	safeIntegers?: boolean;
-}
-
-interface Database {
-	memory: boolean;
-	readonly: boolean;
-	name: string;
-	open: boolean;
-	inTransaction: boolean;
-
-	prepare(source: string): Statement;
-	transaction(sources: string[]): Transaction;
-	exec(source: string): this;
-	pragma(source: string, simplify?: boolean): any;
-	checkpoint(databaseName?: string): this;
-	register(cb: (...params: any[]) => any): this;
-	register(options: RegistrationOptions, cb: (...params: any[]) => any): this;
-	close(): this;
-	defaultSafeIntegers(toggleState?: boolean): this;
-}
-
-declare class SqliteError implements Error {
-	name: string;
-	message: string;
-	code: string;
-	constructor(message: string, code: string);
-}
-
-interface DatabaseConstructor {
-	new(filename: string, options?: DatabaseOptions): Database;
-	(filename: string, options?: DatabaseOptions): Database;
-	prototype: Database;
-
-	Integer: typeof Integer;
-	SqliteError: typeof SqliteError;
-}
+import { DatabaseConstructor } from "./types";
 
 declare const Database: DatabaseConstructor;
 export = Database;
diff --git a/types/better-sqlite3/tsconfig.json b/types/better-sqlite3/tsconfig.json
index 30a480355b..891afa0aad 100644
--- a/types/better-sqlite3/tsconfig.json
+++ b/types/better-sqlite3/tsconfig.json
@@ -18,6 +18,7 @@
     },
     "files": [
         "index.d.ts",
+        "types.d.ts",
         "better-sqlite3-tests.ts"
     ]
 }
\ No newline at end of file
diff --git a/types/better-sqlite3/types.d.ts b/types/better-sqlite3/types.d.ts
new file mode 100644
index 0000000000..61f376b0bf
--- /dev/null
+++ b/types/better-sqlite3/types.d.ts
@@ -0,0 +1,80 @@
+import Integer = require("integer");
+
+export interface RunResult {
+    changes: number;
+    lastInsertRowid: Integer.IntLike;
+}
+
+export class Statement {
+    database: Database;
+    source: string;
+    returnsData: boolean;
+    constructor(db: Database, sources: string[]);
+
+    run(...params: any[]): RunResult;
+    get(...params: any[]): any;
+    all(...params: any[]): any[];
+    each(params: any, cb: (row: any) => void): void;
+    each(cb: (row: any) => void): void;
+    each(...params: any[]): void;
+    pluck(toggleState?: boolean): this;
+    bind(...params: any[]): this;
+    safeIntegers(toggleState?: boolean): this;
+}
+
+export class Transaction {
+    database: Database;
+    source: string;
+    constructor(db: Database, sources: string[]);
+
+    run(...params: any[]): RunResult;
+    bind(...params: any[]): this;
+    safeIntegers(toggleState?: boolean): this;
+}
+
+export interface DatabaseOptions {
+    memory?: boolean;
+    readonly?: boolean;
+    fileMustExist?: boolean;
+}
+
+export interface RegistrationOptions {
+    name?: string;
+    varargs?: boolean;
+    deterministic?: boolean;
+    safeIntegers?: boolean;
+}
+
+export interface Database {
+    memory: boolean;
+    readonly: boolean;
+    name: string;
+    open: boolean;
+    inTransaction: boolean;
+
+    prepare(source: string): Statement;
+    transaction(sources: string[]): Transaction;
+    exec(source: string): this;
+    pragma(source: string, simplify?: boolean): any;
+    checkpoint(databaseName?: string): this;
+    register(cb: (...params: any[]) => any): this;
+    register(options: RegistrationOptions, cb: (...params: any[]) => any): this;
+    close(): this;
+    defaultSafeIntegers(toggleState?: boolean): this;
+}
+
+export class SqliteError implements Error {
+    name: string;
+    message: string;
+    code: string;
+    constructor(message: string, code: string);
+}
+
+export interface DatabaseConstructor {
+    new (filename: string, options?: DatabaseOptions): Database;
+    (filename: string, options?: DatabaseOptions): Database;
+    prototype: Database;
+
+    Integer: typeof Integer;
+    SqliteError: typeof SqliteError;
+}

From 980b86eed1eea61b54c716c67dde90fce38ab7e8 Mon Sep 17 00:00:00 2001
From: Alex Lipatov <alexey.lipatov@ge.com>
Date: Mon, 12 Nov 2018 06:16:42 -0500
Subject: [PATCH 058/836] Update middleware callbaback signature to take 4
 arguments instead of 2

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

diff --git a/types/swagger-express-middleware/index.d.ts b/types/swagger-express-middleware/index.d.ts
index acc36d3356..11c4e31c21 100644
--- a/types/swagger-express-middleware/index.d.ts
+++ b/types/swagger-express-middleware/index.d.ts
@@ -1,6 +1,7 @@
 // Type definitions for swagger-express-middleware 1.x
 // Project: https://github.com/BigstickCarpet/swagger-express-middleware
 // Definitions by: Alexandre Roba <https://github.com/alexandreroba>
+// Updated by: Tromgy <https://github.com/tromgy>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -39,8 +40,9 @@ declare module "swagger-express-middleware" {
             (apiDefinitionPathOrObject: string | SwaggerObject, appOrRouter: Application | Router, cb: SwaggerMiddlewareConstructorCallback): SwaggerMiddleware;
         }
         interface SwaggerMiddlewareConstructorCallback {
-            (err: any, middleware: SwaggerMiddleware): void;
+            (err: any, middleware: SwaggerMiddleware, api: any, parser: any): void;
         }
+
         export interface SwaggerMiddleware {
             /**
             * Annotates the HTTP request (the `req` object) with Swagger metadata.

From 11f845bdfc61f1bcee44e37f432f155b881ef408 Mon Sep 17 00:00:00 2001
From: Alex Lipatov <alexey.lipatov@ge.com>
Date: Mon, 12 Nov 2018 07:26:41 -0500
Subject: [PATCH 059/836] Update test to use new callback argument.

---
 .../swagger-express-middleware/PetStore.yaml  | 45 +++++++++++++++++++
 types/swagger-express-middleware/index.d.ts   |  2 +-
 .../swagger-express-middleware-tests.ts       | 17 ++++++-
 3 files changed, 61 insertions(+), 3 deletions(-)
 create mode 100644 types/swagger-express-middleware/PetStore.yaml

diff --git a/types/swagger-express-middleware/PetStore.yaml b/types/swagger-express-middleware/PetStore.yaml
new file mode 100644
index 0000000000..ae4f16b3b1
--- /dev/null
+++ b/types/swagger-express-middleware/PetStore.yaml
@@ -0,0 +1,45 @@
+swagger: '2.0'
+info:
+  version: 1.0.0
+  title: Swagger Petstore
+  description: A sample API that uses a petstore as an example to demonstrate features in the swagger-2.0 specification
+  termsOfService: 'http://swagger.io/terms/'
+  contact:
+    name: Swagger API Team
+  license:
+    name: MIT
+host: petstore.swagger.io
+basePath: /api
+schemes:
+  - http
+consumes:
+  - application/json
+produces:
+  - application/json
+paths:
+  /pets:
+    get:
+      description: Returns all pets from the system that the user has access to
+      produces:
+        - application/json
+      responses:
+        '200':
+          description: A list of pets.
+          schema:
+            type: array
+            items:
+              $ref: '#/definitions/Pet'
+definitions:
+  Pet:
+    type: object
+    required:
+      - id
+      - name
+    properties:
+      id:
+        type: integer
+        format: int64
+      name:
+        type: string
+      tag:
+        type: string
diff --git a/types/swagger-express-middleware/index.d.ts b/types/swagger-express-middleware/index.d.ts
index 11c4e31c21..80d56ae812 100644
--- a/types/swagger-express-middleware/index.d.ts
+++ b/types/swagger-express-middleware/index.d.ts
@@ -1,7 +1,7 @@
 // Type definitions for swagger-express-middleware 1.x
 // Project: https://github.com/BigstickCarpet/swagger-express-middleware
 // Definitions by: Alexandre Roba <https://github.com/alexandreroba>
-// Updated by: Tromgy <https://github.com/tromgy>
+//                 Tromgy <https://github.com/tromgy>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
diff --git a/types/swagger-express-middleware/swagger-express-middleware-tests.ts b/types/swagger-express-middleware/swagger-express-middleware-tests.ts
index 1a01d8475d..8717755725 100644
--- a/types/swagger-express-middleware/swagger-express-middleware-tests.ts
+++ b/types/swagger-express-middleware/swagger-express-middleware-tests.ts
@@ -4,7 +4,7 @@ import SwaggerExpressMiddleware = require("swagger-express-middleware");
 let app = express();
 let router = express.Router();
 
-SwaggerExpressMiddleware("PetStore.yaml", app, (err: any, middleware: SwaggerExpressMiddleware.SwaggerMiddleware) => {
+SwaggerExpressMiddleware("PetStore.yaml", app, (err: any, middleware: SwaggerExpressMiddleware.SwaggerMiddleware, api) => {
     let filesOptions: SwaggerExpressMiddleware.FilesOptions = {
         useBasePath: false,
         apiPath: "/api-docs/",
@@ -30,6 +30,20 @@ SwaggerExpressMiddleware("PetStore.yaml", app, (err: any, middleware: SwaggerExp
 
     }
 
+    // Demonstrates use of the swagger basePath, it is available from the third argument of the callback
+    // Complile and run this sample, then do a GET from http://localhost:8000/api/pets
+    // If for instance you create version 2 of your API, but in this new version "GET pets" implementation
+    // does not change, you only need to change the basePath to "/api/v2" in the
+    // swagger YAML file, and this method will still be called.
+    app.get(`${api.basePath}/pets`, (req, res, next) => {
+      res.json(
+        [
+          { id: 'pet_1', name: 'Itchy' },
+          { id: 'pet_2', name: 'Scratchy' }
+        ]
+      );
+    });
+
     app.use(
         middleware.metadata(router),
         middleware.CORS(),
@@ -991,4 +1005,3 @@ let uberApiDefinition: SwaggerExpressMiddleware.SwaggerObject =
       }
     }
   }
-

From 1319b54f692bf90f1958f7ab6ca1633b721b295c Mon Sep 17 00:00:00 2001
From: walterh <walter.holohan@sportsbet.com.au>
Date: Tue, 13 Nov 2018 10:56:32 +1100
Subject: [PATCH 060/836] react-navigation: add experimental prop
 transparentCard

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

diff --git a/types/react-navigation/index.d.ts b/types/react-navigation/index.d.ts
index 846ea56a9e..868039a0a4 100644
--- a/types/react-navigation/index.d.ts
+++ b/types/react-navigation/index.d.ts
@@ -379,6 +379,7 @@ export interface NavigationStackViewConfig {
   headerTransitionPreset?: 'fade-in-place' | 'uikit';
   headerLayoutPreset?: 'left' | 'center';
   cardStyle?: StyleProp<ViewStyle>;
+  transparentCard?: boolean;
   transitionConfig?: (
     transitionProps: NavigationTransitionProps,
     prevTransitionProps: NavigationTransitionProps,

From 79605fcbf13c7785f3f9409cf29d741721c62bf4 Mon Sep 17 00:00:00 2001
From: Stefano Bourscheid <stefano.bourscheid@gmail.com>
Date: Tue, 13 Nov 2018 14:26:48 +0100
Subject: [PATCH 061/836] Add subs types declaration

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

diff --git a/types/react-native-video/index.d.ts b/types/react-native-video/index.d.ts
index 190d731394..698d919d1c 100644
--- a/types/react-native-video/index.d.ts
+++ b/types/react-native-video/index.d.ts
@@ -32,6 +32,12 @@ export interface LoadError {
   };
 }
 
+declare const TextTrackType: {
+  SRT: "application/x-subrip",
+  TTML: "application/ttml+xml",
+  VTT: "text/vtt"
+}
+
 export interface VideoProperties extends ViewProps {
     /* Native only */
     src?: any;

From bb14e16ea403e8e56e38b8b2219f84d091b481e9 Mon Sep 17 00:00:00 2001
From: Stefano Bourscheid <stefano.bourscheid@gmail.com>
Date: Tue, 13 Nov 2018 16:30:56 +0100
Subject: [PATCH 062/836] Add support for 3.1 subs props

---
 types/react-native-video/index.d.ts | 157 +++++++++++++++-------------
 1 file changed, 84 insertions(+), 73 deletions(-)

diff --git a/types/react-native-video/index.d.ts b/types/react-native-video/index.d.ts
index 698d919d1c..f20cd68664 100644
--- a/types/react-native-video/index.d.ts
+++ b/types/react-native-video/index.d.ts
@@ -1,13 +1,11 @@
-// Type definitions for react-native-video 2.0
+// Type definitions for react-native-video 2.0 and 3.1
 // Project: https://github.com/react-native-community/react-native-video
 // Definitions by: HuHuanming <https://github.com/huhuanming>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 
 import * as React from 'react';
-import {
-    ViewProps
-} from 'react-native';
+import { ViewProps } from 'react-native';
 
 export interface OnLoadData {
   canPlayFastForward: boolean;
@@ -33,80 +31,93 @@ export interface LoadError {
 }
 
 declare const TextTrackType: {
-  SRT: "application/x-subrip",
-  TTML: "application/ttml+xml",
-  VTT: "text/vtt"
-}
+  SRT: 'application/x-subrip';
+  TTML: 'application/ttml+xml';
+  VTT: 'text/vtt';
+};
 
 export interface VideoProperties extends ViewProps {
-    /* Native only */
-    src?: any;
-    seek?: number;
-    fullscreen?: boolean;
-    onVideoLoadStart?(): void;
-    onVideoLoad?(): void;
-    onVideoBuffer?(): void;
-    onVideoError?(): void;
-    onVideoProgress?(): void;
-    onVideoSeek?(): void;
-    onVideoEnd?(): void;
-    onTimedMetadata?(): void;
-    onVideoFullscreenPlayerWillPresent?(): void;
-    onVideoFullscreenPlayerDidPresent?(): void;
-    onVideoFullscreenPlayerWillDismiss?(): void;
-    onVideoFullscreenPlayerDidDismiss?(): void;
+  /* Native only */
+  src?: any;
+  seek?: number;
+  fullscreen?: boolean;
+  onVideoLoadStart?(): void;
+  onVideoLoad?(): void;
+  onVideoBuffer?(): void;
+  onVideoError?(): void;
+  onVideoProgress?(): void;
+  onVideoSeek?(): void;
+  onVideoEnd?(): void;
+  onTimedMetadata?(): void;
+  onVideoFullscreenPlayerWillPresent?(): void;
+  onVideoFullscreenPlayerDidPresent?(): void;
+  onVideoFullscreenPlayerWillDismiss?(): void;
+  onVideoFullscreenPlayerDidDismiss?(): void;
 
-    /* Wrapper component */
-    // Opaque type returned by require('./video.mp4')
-    source: { uri?: string } | number;
-    resizeMode?: string;
-    poster?: string;
-    repeat?: boolean;
-    paused?: boolean;
-    muted?: boolean;
-    volume?: number;
-    rate?: number;
-    playInBackground?: boolean;
-    playWhenInactive?: boolean;
-    ignoreSilentSwitch?: 'ignore' | 'obey';
-    disableFocus?: boolean;
-    controls?: boolean;
-    currentTime?: number;
-    progressUpdateInterval?: number;
-    useTextureView?: boolean;
-    allowsExternalPlayback?: boolean;
-    onLoadStart?(): void;
-    onLoad?(data: OnLoadData): void;
-    onBuffer?(): void;
-    onError?(error: LoadError): void;
-    onProgress?(data: {
-        currentTime: number;
-        playableDuration: number;
-        seekableDuration: number;
-    }): void;
-    onSeek?(): void;
-    onEnd?(): void;
-    onFullscreenPlayerWillPresent?(): void;
-    onFullscreenPlayerDidPresent?(): void;
-    onFullscreenPlayerWillDismiss?(): void;
-    onFullscreenPlayerDidDismiss?(): void;
-    onReadyForDisplay?(): void;
-    onPlaybackStalled?(): void;
-    onPlaybackResume?(): void;
-    onPlaybackRateChange?(): void;
-    onAudioFocusChanged?(): void;
-    onAudioBecomingNoisy?(): void;
+  /* Wrapper component */
+  // Opaque type returned by require('./video.mp4')
+  source: { uri?: string } | number;
+  resizeMode?: string;
+  poster?: string;
+  repeat?: boolean;
+  paused?: boolean;
+  muted?: boolean;
+  volume?: number;
+  rate?: number;
+  playInBackground?: boolean;
+  playWhenInactive?: boolean;
+  ignoreSilentSwitch?: 'ignore' | 'obey';
+  disableFocus?: boolean;
+  controls?: boolean;
+  currentTime?: number;
+  progressUpdateInterval?: number;
+  useTextureView?: boolean;
+  allowsExternalPlayback?: boolean;
 
-    /* Required by react-native */
-    scaleX?: number;
-    scaleY?: number;
-    translateX?: number;
-    translateY?: number;
-    rotation?: number;
+  onLoadStart?(): void;
+  onLoad?(data: OnLoadData): void;
+  onBuffer?(): void;
+  onError?(error: LoadError): void;
+  onProgress?(data: {
+    currentTime: number;
+    playableDuration: number;
+    seekableDuration: number;
+  }): void;
+  onSeek?(): void;
+  onEnd?(): void;
+  onFullscreenPlayerWillPresent?(): void;
+  onFullscreenPlayerDidPresent?(): void;
+  onFullscreenPlayerWillDismiss?(): void;
+  onFullscreenPlayerDidDismiss?(): void;
+  onReadyForDisplay?(): void;
+  onPlaybackStalled?(): void;
+  onPlaybackResume?(): void;
+  onPlaybackRateChange?(): void;
+  onAudioFocusChanged?(): void;
+  onAudioBecomingNoisy?(): void;
+
+  /* 3.0 onwards */
+  selectedTextTrack?: {
+    type: 'system' | 'disabled' | 'title' | 'language' | 'index';
+    value?: string | number;
+  };
+  textTracks?: {
+    title?: string;
+    language?: string;
+    type: 'application/x-subrip' | 'application/ttml+xml' | 'text/vtt';
+    uri: string;
+  }[];
+
+  /* Required by react-native */
+  scaleX?: number;
+  scaleY?: number;
+  translateX?: number;
+  translateY?: number;
+  rotation?: number;
 }
 
 export default class Video extends React.Component<VideoProperties> {
-    seek(time: number, tolerance?: number): void;
-    presentFullscreenPlayer(): void;
-    dismissFullscreenPlayer(): void;
+  seek(time: number, tolerance?: number): void;
+  presentFullscreenPlayer(): void;
+  dismissFullscreenPlayer(): void;
 }

From 136608196335a0b2dfdffbcdb6a818eda82d863f Mon Sep 17 00:00:00 2001
From: Stefano Bourscheid <stefano.bourscheid@gmail.com>
Date: Tue, 13 Nov 2018 16:36:13 +0100
Subject: [PATCH 063/836] Fix CI errors

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

diff --git a/types/react-native-video/index.d.ts b/types/react-native-video/index.d.ts
index f20cd68664..726169caca 100644
--- a/types/react-native-video/index.d.ts
+++ b/types/react-native-video/index.d.ts
@@ -30,7 +30,7 @@ export interface LoadError {
   };
 }
 
-declare const TextTrackType: {
+export const TextTrackType: {
   SRT: 'application/x-subrip';
   TTML: 'application/ttml+xml';
   VTT: 'text/vtt';
@@ -101,12 +101,12 @@ export interface VideoProperties extends ViewProps {
     type: 'system' | 'disabled' | 'title' | 'language' | 'index';
     value?: string | number;
   };
-  textTracks?: {
+  textTracks?: Array<{
     title?: string;
     language?: string;
     type: 'application/x-subrip' | 'application/ttml+xml' | 'text/vtt';
     uri: string;
-  }[];
+  }>;
 
   /* Required by react-native */
   scaleX?: number;

From 9acef5b9dcbda4b7d8c078f8f3384ace6c58c545 Mon Sep 17 00:00:00 2001
From: Mauri Edo <medo@atlassian.com>
Date: Wed, 14 Nov 2018 10:04:41 +1100
Subject: [PATCH 064/836] fixing wrong type for exclusiveMinimum and
 exclusiveMaximum in BaseSchema

---
 types/swagger-schema-official/index.d.ts                    | 4 ++--
 .../swagger-schema-official-tests.ts                        | 6 +++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/types/swagger-schema-official/index.d.ts b/types/swagger-schema-official/index.d.ts
index f914e3e394..09d31cc8e7 100644
--- a/types/swagger-schema-official/index.d.ts
+++ b/types/swagger-schema-official/index.d.ts
@@ -127,9 +127,9 @@ export interface BaseSchema {
   default?: string|boolean|number|{};
   multipleOf?: number;
   maximum?: number;
-  exclusiveMaximum?: number;
+  exclusiveMaximum?: boolean;
   minimum?: number;
-  exclusiveMinimum?: number;
+  exclusiveMinimum?: boolean;
   maxLength?: number;
   minLength?: number;
   pattern?: string;
diff --git a/types/swagger-schema-official/swagger-schema-official-tests.ts b/types/swagger-schema-official/swagger-schema-official-tests.ts
index d574d055cf..4fb3e55f07 100644
--- a/types/swagger-schema-official/swagger-schema-official-tests.ts
+++ b/types/swagger-schema-official/swagger-schema-official-tests.ts
@@ -1243,7 +1243,11 @@ const uber: swagger.Spec = {
         },
         "surge_multiplier": {
           "type": "number",
-          "description": "Expected surge multiplier. Surge is active if surge_multiplier is greater than 1. Price estimate already factors in the surge multiplier."
+          "description": "Expected surge multiplier. Surge is active if surge_multiplier is greater than 1. Price estimate already factors in the surge multiplier.",
+          "minimum": 0,
+          "exclusiveMinimum": true,
+          "maximum": 10,
+          "exclusiveMaximum": true
         }
       }
     },

From f125ffc14e21869c7d8a71a2c5a620b24a978b4c Mon Sep 17 00:00:00 2001
From: Alex Lipatov <alexey.lipatov@ge.com>
Date: Tue, 13 Nov 2018 19:10:43 -0500
Subject: [PATCH 065/836] Make more specific type definitions.

---
 types/swagger-express-middleware/index.d.ts                | 7 ++++++-
 .../swagger-express-middleware-tests.ts                    | 4 +++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/types/swagger-express-middleware/index.d.ts b/types/swagger-express-middleware/index.d.ts
index 80d56ae812..4d83cebfb0 100644
--- a/types/swagger-express-middleware/index.d.ts
+++ b/types/swagger-express-middleware/index.d.ts
@@ -40,7 +40,7 @@ declare module "swagger-express-middleware" {
             (apiDefinitionPathOrObject: string | SwaggerObject, appOrRouter: Application | Router, cb: SwaggerMiddlewareConstructorCallback): SwaggerMiddleware;
         }
         interface SwaggerMiddlewareConstructorCallback {
-            (err: any, middleware: SwaggerMiddleware, api: any, parser: any): void;
+            (err: any, middleware: SwaggerMiddleware, api: SwaggerObject, parser: SwaggerParser): void;
         }
 
         export interface SwaggerMiddleware {
@@ -363,6 +363,11 @@ declare module "swagger-express-middleware" {
             externalDocs?: ExternalDocumentationObject
         }
 
+        export interface SwaggerParser {
+            $refs: any
+            schema: SwaggerObject
+        }
+
         type MimeTypes = string[]
 
         export interface InfoObject {
diff --git a/types/swagger-express-middleware/swagger-express-middleware-tests.ts b/types/swagger-express-middleware/swagger-express-middleware-tests.ts
index 8717755725..37bbf66ec7 100644
--- a/types/swagger-express-middleware/swagger-express-middleware-tests.ts
+++ b/types/swagger-express-middleware/swagger-express-middleware-tests.ts
@@ -4,7 +4,9 @@ import SwaggerExpressMiddleware = require("swagger-express-middleware");
 let app = express();
 let router = express.Router();
 
-SwaggerExpressMiddleware("PetStore.yaml", app, (err: any, middleware: SwaggerExpressMiddleware.SwaggerMiddleware, api) => {
+SwaggerExpressMiddleware("PetStore.yaml", app, (err: any, 
+                                                middleware: SwaggerExpressMiddleware.SwaggerMiddleware,
+                                                api: SwaggerExpressMiddleware.SwaggerObject) => {
     let filesOptions: SwaggerExpressMiddleware.FilesOptions = {
         useBasePath: false,
         apiPath: "/api-docs/",

From 0218259e41efedfd2253da837ea5cc49988c9ac8 Mon Sep 17 00:00:00 2001
From: Alex Lipatov <alexey.lipatov@ge.com>
Date: Tue, 13 Nov 2018 19:28:03 -0500
Subject: [PATCH 066/836] Remove sample swagger file (used in the test) -
 apparently Travis doesn't know it is actually used.

---
 .../swagger-express-middleware/PetStore.yaml  | 45 -------------------
 1 file changed, 45 deletions(-)
 delete mode 100644 types/swagger-express-middleware/PetStore.yaml

diff --git a/types/swagger-express-middleware/PetStore.yaml b/types/swagger-express-middleware/PetStore.yaml
deleted file mode 100644
index ae4f16b3b1..0000000000
--- a/types/swagger-express-middleware/PetStore.yaml
+++ /dev/null
@@ -1,45 +0,0 @@
-swagger: '2.0'
-info:
-  version: 1.0.0
-  title: Swagger Petstore
-  description: A sample API that uses a petstore as an example to demonstrate features in the swagger-2.0 specification
-  termsOfService: 'http://swagger.io/terms/'
-  contact:
-    name: Swagger API Team
-  license:
-    name: MIT
-host: petstore.swagger.io
-basePath: /api
-schemes:
-  - http
-consumes:
-  - application/json
-produces:
-  - application/json
-paths:
-  /pets:
-    get:
-      description: Returns all pets from the system that the user has access to
-      produces:
-        - application/json
-      responses:
-        '200':
-          description: A list of pets.
-          schema:
-            type: array
-            items:
-              $ref: '#/definitions/Pet'
-definitions:
-  Pet:
-    type: object
-    required:
-      - id
-      - name
-    properties:
-      id:
-        type: integer
-        format: int64
-      name:
-        type: string
-      tag:
-        type: string

From 59ab5b3aef80fa55010f7d8385f785514d2e0b1a Mon Sep 17 00:00:00 2001
From: Jessica <jessicamfranco3@gmail.com>
Date: Wed, 14 Nov 2018 13:14:32 +0900
Subject: [PATCH 067/836] Add more complete support for object styles, tests

---
 types/styled-components/index.d.ts     | 163 ++++++++---------
 types/styled-components/test/index.tsx | 237 +++++++++++++++++--------
 2 files changed, 249 insertions(+), 151 deletions(-)

diff --git a/types/styled-components/index.d.ts b/types/styled-components/index.d.ts
index 25d006f6f1..6398ee36d5 100644
--- a/types/styled-components/index.d.ts
+++ b/types/styled-components/index.d.ts
@@ -9,10 +9,21 @@
 
 /// <reference types="node" />
 
-import * as React from 'react';
-import * as CSS from 'csstype';
+import * as React from "react";
+import * as CSS from "csstype";
 
-export type CSSObject = CSS.Properties<string | number>;
+export type CSSObject = CSS.Properties<string | number> &
+    // Index type to allow selector nesting
+    // This is "[key in string]" and not "[key: string]" to allow CSSObject to be self-referential
+    {
+        // we need the CSS.Properties in here too to ensure the index signature doesn't create impossible values
+        [key in string]:
+            | CSS.Properties<string | number>[keyof CSS.Properties<
+                  string | number
+              >]
+            | CSSObject
+    };
+export type CSSKeyframes = object & { [key: string]: CSSObject };
 
 export interface ThemeProps<T> {
     theme: T;
@@ -45,27 +56,25 @@ type StyledComponentPropsWithAs<
 
 export type FalseyValue = undefined | null | false;
 export type Interpolation<P> =
-    | FlattenInterpolation<P>
-    | ReadonlyArray<
-          FlattenInterpolation<P> | ReadonlyArray<FlattenInterpolation<P>>
-      >;
-export type FlattenInterpolation<P> =
     | InterpolationValue
-    | InterpolationFunction<P>;
+    | InterpolationFunction<P>
+    | FlattenInterpolation<P>;
+// must be an interface to be self-referential
+export interface FlattenInterpolation<P>
+    extends ReadonlyArray<Interpolation<P>> {}
 export type InterpolationValue =
     | string
     | number
-    | Styles
     | FalseyValue
     | Keyframes
     | StyledComponentInterpolation
     | CSSObject;
 export type SimpleInterpolation =
     | InterpolationValue
-    | ReadonlyArray<InterpolationValue | ReadonlyArray<InterpolationValue>>;
-export interface Styles {
-    [ruleOrSelector: string]: string | number | Styles;
-}
+    | FlattenSimpleInterpolation;
+// must be an interface to be self-referential
+interface FlattenSimpleInterpolation
+    extends ReadonlyArray<SimpleInterpolation> {}
 
 export type InterpolationFunction<P> = (props: P) => Interpolation<P>;
 
@@ -76,9 +85,8 @@ type DeprecatedAttrs<P, A extends Partial<P>, T> = {
     [K in keyof A]: ((props: ThemedStyledProps<P, T>) => A[K]) | A[K]
 };
 
-export type ThemedGlobalStyledClassProps<P, T> = P & {
-    suppressMultiMountWarning?: boolean
-    theme?: T
+export type ThemedGlobalStyledClassProps<P, T> = WithOptionalTheme<P, T> & {
+    suppressMultiMountWarning?: boolean;
 };
 
 export interface GlobalStyleComponent<P, T>
@@ -86,8 +94,8 @@ export interface GlobalStyleComponent<P, T>
 
 // remove the call signature from StyledComponent so Interpolation can still infer InterpolationFunction
 type StyledComponentInterpolation = Pick<
-    StyledComponent<any, any>,
-    keyof StyledComponent<any, any>
+    AnyStyledComponent,
+    keyof StyledComponentBase<any, any>
 >;
 
 // abuse Pick to strip the call signature from ForwardRefExoticComponent
@@ -101,7 +109,16 @@ export type AnyStyledComponent =
     | StyledComponent<any, any, any, any>
     | StyledComponent<any, any, any>;
 
-export interface StyledComponent<
+export type StyledComponent<
+    C extends keyof JSX.IntrinsicElements | React.ComponentType<any>,
+    T extends object,
+    O extends object = {},
+    A extends keyof any = never
+> = // the "string" allows this to be used as an object key
+    // I really want to avoid this if possible but it's the only way to use nesting with object styles...
+    string & StyledComponentBase<C, T, O, A>;
+
+export interface StyledComponentBase<
     C extends keyof JSX.IntrinsicElements | React.ComponentType<any>,
     T extends object,
     O extends object = {},
@@ -127,7 +144,7 @@ export interface StyledComponent<
              *
              * String types need to be cast to themselves to become literal types (as={'a' as 'a'}).
              */
-            as?: keyof JSX.IntrinsicElements | React.ComponentType<any>
+            as?: keyof JSX.IntrinsicElements | React.ComponentType<any>;
         }
     ): React.ReactElement<StyledComponentProps<C, T, O, A>>;
     withComponent<WithC extends AnyStyledComponent>(
@@ -145,34 +162,38 @@ export interface StyledComponent<
     ): StyledComponent<WithC, T, O, A>;
 }
 
+export type ThemedStyledFunctionBase<
+    C extends keyof JSX.IntrinsicElements | React.ComponentType<any>,
+    T extends object,
+    O extends object = {},
+    A extends keyof any = never
+> =
+    // at least the first argument is required, whatever it is
+    <U extends object>(
+        first: NonNullable<
+            Interpolation<
+                ThemedStyledProps<StyledComponentPropsWithRef<C> & O & U, T>
+            >
+        >,
+        ...rest: Array<
+            Interpolation<
+                ThemedStyledProps<StyledComponentPropsWithRef<C> & O & U, T>
+            >
+        >
+    ) => StyledComponent<C, T, O & U, A>;
+
 export interface ThemedStyledFunction<
     C extends keyof JSX.IntrinsicElements | React.ComponentType<any>,
     T extends object,
     O extends object = {},
     A extends keyof any = never
-> {
-    (
-        strings: TemplateStringsArray,
-        ...interpolations: Array<
-            Interpolation<
-                ThemedStyledProps<StyledComponentPropsWithRef<C> & O, T>
-            >
-        >
-    ): StyledComponent<C, T, O, A>;
-    <U extends object>(
-        strings: TemplateStringsArray,
-        ...interpolations: Array<
-            Interpolation<
-                ThemedStyledProps<StyledComponentPropsWithRef<C> & O & U, T>
-            >
-        >
-    ): StyledComponent<C, T, O & U, A>;
+> extends ThemedStyledFunctionBase<C, T, O, A> {
     // Fun thing: 'attrs' can also provide a polymorphic 'as' prop
     // My head already hurts enough so maybe later...
     attrs<
         U,
         A extends Partial<StyledComponentPropsWithRef<C> & U> & {
-            [others: string]: any
+            [others: string]: any;
         } = {}
     >(
         attrs: Attrs<StyledComponentPropsWithRef<C> & U, A, T>
@@ -183,7 +204,7 @@ export interface ThemedStyledFunction<
     attrs<
         U,
         A extends Partial<StyledComponentPropsWithRef<C> & U> & {
-            [others: string]: any
+            [others: string]: any;
         } = {}
     >(
         attrs: DeprecatedAttrs<StyledComponentPropsWithRef<C> & U, A, T>
@@ -244,20 +265,11 @@ export type ThemedStyledInterface<T extends object> = ThemedBaseStyledInterface<
 >;
 export type StyledInterface = ThemedStyledInterface<DefaultTheme>;
 
-export interface BaseThemedCssFunction<T extends object> {
-    (cssObject: CSSObject): InterpolationValue[];
-    (
-        strings: TemplateStringsArray,
-        ...interpolations: SimpleInterpolation[]
-    ): InterpolationValue[];
-    <P>(
-        strings: TemplateStringsArray,
-        ...interpolations: Array<Interpolation<ThemedStyledProps<P, T>>>
-    ): Array<FlattenInterpolation<ThemedStyledProps<P, T>>>;
-    <P>(func: InterpolationFunction<ThemedStyledProps<P, T>>): Array<
-        FlattenInterpolation<ThemedStyledProps<P, T>>
-    >;
-}
+export type BaseThemedCssFunction<T extends object> = <P>(
+    first: NonNullable<Interpolation<ThemedStyledProps<P, T>>>,
+    ...interpolations: Array<Interpolation<ThemedStyledProps<P, T>>>
+) => Array<FlattenInterpolation<ThemedStyledProps<P, T>>>;
+
 export type ThemedCssFunction<T extends object> = BaseThemedCssFunction<
     Extract<keyof T, string> extends never ? any : T
 >;
@@ -266,8 +278,8 @@ export type ThemedCssFunction<T extends object> = BaseThemedCssFunction<
 type Omit<T, K extends keyof T> = Pick<T, Exclude<keyof T, K>>;
 type DiffBetween<T, U> = Pick<T, Exclude<keyof T, keyof U>> &
     Pick<U, Exclude<keyof U, keyof T>>;
-type WithOptionalTheme<P extends { theme?: T }, T> = Omit<P, 'theme'> & {
-    theme?: T
+type WithOptionalTheme<P extends { theme?: T }, T> = Omit<P, "theme"> & {
+    theme?: T;
 };
 
 export interface ThemedStyledComponentsModule<T extends object> {
@@ -275,20 +287,16 @@ export interface ThemedStyledComponentsModule<T extends object> {
 
     css: ThemedCssFunction<T>;
 
-    keyframes(cssObject: CSSObject): Keyframes;
+    // unfortunately keyframes can't interpolate props from the theme
     keyframes(
-        strings: TemplateStringsArray,
+        strings: TemplateStringsArray | CSSKeyframes,
         ...interpolations: SimpleInterpolation[]
     ): Keyframes;
 
-    createGlobalStyle(cssObject: CSSObject): GlobalStyleComponent<{}, T>;
-    createGlobalStyle<P = {}>(
-        strings: TemplateStringsArray,
+    createGlobalStyle<P extends object = {}>(
+        first: NonNullable<Interpolation<ThemedStyledProps<P, T>>>,
         ...interpolations: Array<Interpolation<ThemedStyledProps<P, T>>>
     ): GlobalStyleComponent<P, T>;
-    createGlobalStyle<P = {}>(
-        func: InterpolationFunction<ThemedStyledProps<P, T>>
-    ): GlobalStyleComponent<P, T>;
 
     withTheme: WithThemeFnInterface<T>;
     ThemeProvider: ThemeProviderComponent<T>;
@@ -326,33 +334,28 @@ export type BaseThemeProviderComponent<T extends object> = React.ComponentClass<
 >;
 export type ThemeProviderComponent<
     T extends object
-> = BaseThemeProviderComponent<Extract<keyof T, string> extends never ? any : T>;
+> = BaseThemeProviderComponent<
+    Extract<keyof T, string> extends never ? any : T
+>;
 export const ThemeProvider: ThemeProviderComponent<DefaultTheme>;
 // NOTE: this technically starts as undefined
 // Also, this cannot be DefaultTheme as it breaks TypedComponents' assignability
 export const ThemeContext: React.Context<any>;
-export const ThemeConsumer: typeof ThemeContext['Consumer'];
+export const ThemeConsumer: typeof ThemeContext["Consumer"];
 
 export interface Keyframes {
     getName(): string;
 }
 
-export function keyframes(cssObject: CSSObject): Keyframes;
 export function keyframes(
-    strings: TemplateStringsArray,
+    strings: TemplateStringsArray | CSSKeyframes,
     ...interpolations: SimpleInterpolation[]
 ): Keyframes;
 
-export function createGlobalStyle(
-    cssObject: CSSObject
-): GlobalStyleComponent<{}, DefaultTheme>;
-export function createGlobalStyle<P = {}>(
-    strings: TemplateStringsArray,
+export function createGlobalStyle<P extends object = {}>(
+    first: NonNullable<Interpolation<ThemedStyledProps<P, DefaultTheme>>>,
     ...interpolations: Array<Interpolation<ThemedStyledProps<P, DefaultTheme>>>
 ): GlobalStyleComponent<P, DefaultTheme>;
-export function createGlobalStyle<P = {}>(
-    func: InterpolationFunction<ThemedStyledProps<P, DefaultTheme>>
-): GlobalStyleComponent<P, DefaultTheme>;
 
 export function isStyledComponent(
     target: any
@@ -373,12 +376,12 @@ export class ServerStyleSheet {
 
 type StyleSheetManagerProps =
     | {
-          sheet: ServerStyleSheet
-          target?: never
+          sheet: ServerStyleSheet;
+          target?: never;
       }
     | {
-          sheet?: never
-          target: HTMLElement
+          sheet?: never;
+          target: HTMLElement;
       };
 
 export class StyleSheetManager extends React.Component<
diff --git a/types/styled-components/test/index.tsx b/types/styled-components/test/index.tsx
index 64e0f447ba..7ce9e59fa2 100644
--- a/types/styled-components/test/index.tsx
+++ b/types/styled-components/test/index.tsx
@@ -1,6 +1,6 @@
-import * as React from 'react';
-import * as ReactDOM from 'react-dom';
-import * as ReactDOMServer from 'react-dom/server';
+import * as React from "react";
+import * as ReactDOM from "react-dom";
+import * as ReactDOMServer from "react-dom/server";
 
 import styled, {
     css,
@@ -14,7 +14,8 @@ import styled, {
     withTheme,
     ThemeConsumer,
     StyledComponent,
-} from 'styled-components';
+    ThemedStyledComponentsModule
+} from "styled-components";
 
 /**
  * general usage
@@ -72,8 +73,8 @@ const TomatoButton = styled(MyButton)`
 
 const CustomizableButton = styled(MyButton)`
     /* Adapt the colors based on primary prop */
-    background: ${props => (props.primary ? 'palevioletred' : 'white')};
-    color: ${props => (props.primary ? 'white' : 'palevioletred')};
+    background: ${props => (props.primary ? "palevioletred" : "white")};
+    color: ${props => (props.primary ? "white" : "palevioletred")};
 
     font-size: 1em;
     margin: 1em;
@@ -86,7 +87,7 @@ const example = css`
     font-size: 1.5em;
     text-align: center;
     color: ${props => props.theme.primary};
-    border-color: ${'red'};
+    border-color: ${"red"};
 `;
 
 const fadeIn = keyframes`
@@ -99,15 +100,15 @@ const fadeIn = keyframes`
 `;
 
 const animationRule = css`
-  ${fadeIn} 1s infinite alternate;
+    ${fadeIn} 1s infinite alternate;
 `;
 
 const ComponentWithKeyframe = styled.div`
-  animation: ${animationRule};
+    animation: ${animationRule};
 `;
 
 const theme = {
-    main: 'mediumseagreen',
+    main: "mediumseagreen"
 };
 
 const ExampleGlobalStyle = createGlobalStyle`
@@ -130,7 +131,7 @@ class Example extends React.Component {
                     <Wrapper>
                         <Title>
                             Hello World, this is my first styled component!
-                    </Title>
+                        </Title>
 
                         <Input placeholder="@mxstbr" type="text" />
                         <TomatoButton name="demo" />
@@ -143,13 +144,13 @@ class Example extends React.Component {
 
 // css which only uses simple interpolations without functions
 const cssWithValues1 = css`
-    font-size: ${14} ${'pt'};
+    font-size: ${14} ${"pt"};
 `;
 // css which uses other simple interpolations without functions
 const cssWithValues2 = css`
   ${cssWithValues1}
   ${[cssWithValues1, cssWithValues1]}
-  font-weight: ${'bold'};
+  font-weight: ${"bold"};
 `;
 
 // css which uses function interpolations with common props
@@ -168,7 +169,7 @@ const styledButton = styled.button`
   ${() => [cssWithFunc1, cssWithFunc2]}
 `;
 
-const name = 'hey';
+const name = "hey";
 
 const ThemedMyButton = withTheme(MyButton);
 
@@ -216,7 +217,7 @@ const ComposedLink = () => (
 
 // Create a <LinkFromString> react component that renders an <a> which is
 // centered, palevioletred and sized at 1.5em
-const LinkFromString = styled('a')`
+const LinkFromString = styled("a")`
     font-size: 1.5em;
     text-align: center;
     color: palevioletred;
@@ -235,10 +236,10 @@ interface LinkProps {
     canClick: boolean;
 }
 
-const LinkFromStringWithProps = styled('a')`
+const LinkFromStringWithProps = styled("a")`
     font-size: 1.5em;
     text-align: center;
-    color: ${(a: LinkProps) => (a.canClick ? 'palevioletred' : 'gray')};
+    color: ${(a: LinkProps) => (a.canClick ? "palevioletred" : "gray")};
 `;
 
 // A LinkFromStringWithProps instance should be backed by an HTMLAnchorElement
@@ -251,10 +252,10 @@ const MyOtherComponentWithProps = () => (
 
 // Create a <LinkFromStringWithPropsAndGenerics> react component that renders an <a>
 // which takes extra props passed as a generic type argument
-const LinkFromStringWithPropsAndGenerics = styled('a')<LinkProps>`
+const LinkFromStringWithPropsAndGenerics = styled("a")<LinkProps>`
     font-size: 1.5em;
     text-align: center;
-    color: ${a => (a.canClick ? 'palevioletred' : 'gray')};
+    color: ${a => (a.canClick ? "palevioletred" : "gray")};
 `;
 
 // A LinkFromStringWithPropsAndGenerics instance should be backed by an HTMLAnchorElement
@@ -274,19 +275,19 @@ interface ObjectStyleProps {
 }
 
 const functionReturningStyleObject = (props: ObjectStyleProps) => ({
-    padding: props.size === 'big' ? '10px' : 2,
+    padding: props.size === "big" ? "10px" : 2
 });
 
 const ObjectStylesBox = styled.div`
     ${functionReturningStyleObject} ${{
-        backgroundColor: 'red',
+        backgroundColor: "red",
 
         // Supports nested objects (pseudo selectors, media queries, etc)
-        '@media screen and (min-width: 800px)': {
-            backgroundColor: 'blue',
+        "@media screen and (min-width: 800px)": {
+            backgroundColor: "blue"
         },
 
-        fontSize: 2,
+        fontSize: 2
     }};
 `;
 
@@ -298,11 +299,11 @@ const ObjectStylesBox = styled.div`
 
 const AttrsInput = styled.input.attrs({
     // we can define static props
-    type: 'password',
+    type: "password",
 
     // or we can define dynamic ones
-    margin: (props: any) => (props.size as string) || '1em',
-    padding: (props: any) => (props.size as string) || '1em',
+    margin: (props: any) => (props.size as string) || "1em",
+    padding: (props: any) => (props.size as string) || "1em"
 })`
     color: palevioletred;
     font-size: 1em;
@@ -315,9 +316,9 @@ const AttrsInput = styled.input.attrs({
 `;
 
 // https://github.com/DefinitelyTyped/DefinitelyTyped/issues/30042
-const AttrsWithOnlyNewProps = styled.h2.attrs({ as: 'h1' })`
-    color: ${props => props.as === 'h1' ? 'red' : 'blue'};
-    font-size: ${props => props.as === 'h1' ? 2 : 1};
+const AttrsWithOnlyNewProps = styled.h2.attrs({ as: "h1" })`
+    color: ${props => (props.as === "h1" ? "red" : "blue")};
+    font-size: ${props => (props.as === "h1" ? 2 : 1)};
 `;
 
 /**
@@ -356,14 +357,14 @@ const ThemedButton = styled.button`
 
 // Define our `fg` and `bg` on the theme
 const theme2 = {
-    fg: 'palevioletred',
-    bg: 'white',
+    fg: "palevioletred",
+    bg: "white"
 };
 
 // This theme swaps `fg` and `bg`
 const invertTheme = ({ fg, bg }: { fg: string; bg: string }) => ({
     fg: bg,
-    bg: fg,
+    bg: fg
 });
 
 const MyApp = (
@@ -386,7 +387,7 @@ class MyComponent extends React.Component<ThemeProps<{}>> {
     render() {
         const { theme } = this.props;
 
-        console.log('Current theme: ', theme);
+        console.log("Current theme: ", theme);
 
         return <h1>Hello</h1>;
     }
@@ -400,7 +401,7 @@ const ThemedMyComponent = withTheme(MyComponent);
 //     ref;
 // }}/>;
 const themedRef = React.createRef<MyComponent>();
-<ThemedMyComponent ref={themedRef}/>;
+<ThemedMyComponent ref={themedRef} />;
 
 interface WithThemeProps {
     theme: {
@@ -415,12 +416,10 @@ const Component = (props: WithThemeProps) => (
 
 const ComponentWithTheme = withTheme(Component);
 
-<ComponentWithTheme text={'hi'} />; // ok
-<ComponentWithTheme text={'hi'} theme={{ color: 'red' }} />; // ok
+<ComponentWithTheme text={"hi"} />; // ok
+<ComponentWithTheme text={"hi"} theme={{ color: "red" }} />; // ok
 
-<ThemeConsumer>
-    {(theme) => <Component text="hi" theme={theme} />}
-</ThemeConsumer>;
+<ThemeConsumer>{theme => <Component text="hi" theme={theme} />}</ThemeConsumer>;
 
 /**
  * isStyledComponent utility
@@ -439,7 +438,7 @@ class ClassComponent extends React.Component {
 isStyledComponent(StyledComponent);
 isStyledComponent(StatelessComponent);
 isStyledComponent(ClassComponent);
-isStyledComponent('div');
+isStyledComponent("div");
 
 /**
  * server side rendering
@@ -470,7 +469,7 @@ const css2 = sheet2.getStyleElement();
 const sheet3 = new ServerStyleSheet();
 const appStream = ReactDOMServer.renderToNodeStream(<Title>Hello world</Title>);
 const wrappedCssStream: NodeJS.ReadableStream = sheet3.interleaveWithNodeStream(
-    appStream,
+    appStream
 );
 
 /**
@@ -511,10 +510,10 @@ class Random extends React.Component<any, any> {
     }
 }
 
-const WithComponentH2 = WithComponentH1.withComponent('h2');
-const WithComponentAbbr = WithComponentH1.withComponent('abbr');
+const WithComponentH2 = WithComponentH1.withComponent("h2");
+const WithComponentAbbr = WithComponentH1.withComponent("abbr");
 
-const WithComponentAnchor = WithComponentH1.withComponent('a');
+const WithComponentAnchor = WithComponentH1.withComponent("a");
 const AnchorContainer = () => (
     <WithComponentAnchor href="https://example.com">
         withComponent Anchor
@@ -524,37 +523,41 @@ const AnchorContainer = () => (
 const WithComponentRandomHeading = WithComponentH1.withComponent(Random);
 
 const WithComponentCompA: React.SFC<{ a: number; className?: string }> = ({
-    className,
+    className
 }) => <div className={className} />;
 const WithComponentCompB: React.SFC<{ b: number; className?: string }> = ({
-    className,
+    className
 }) => <div className={className} />;
 const WithComponentStyledA = styled(WithComponentCompA)`
     color: ${(props: { color: string }) => props.color};
 `;
 
 const WithComponentFirstStyledA = styled(WithComponentStyledA).attrs({
-    a: 1,
+    a: 1
 })``;
 
 const WithComponentFirstStyledB = WithComponentFirstStyledA.withComponent(
-    WithComponentCompB,
+    WithComponentCompB
 );
 
-const WithComponentFirstStyledANew = styled(WithComponentStyledA).attrs(props => ({ a: 1 }))``;
+const WithComponentFirstStyledANew = styled(WithComponentStyledA).attrs(
+    props => ({ a: 1 })
+)``;
 
 const test = () => [
-    <WithComponentFirstStyledA color={'black'} />,
-    <WithComponentFirstStyledB b={2} color={'black'} />,
-    <WithComponentFirstStyledANew color={'black'} />,
+    <WithComponentFirstStyledA color={"black"} />,
+    <WithComponentFirstStyledB b={2} color={"black"} />,
+    <WithComponentFirstStyledANew color={"black"} />
 ];
 
-const WithComponentRequired = styled((props: { to: string }) => <a href={props.to}/>)``;
+const WithComponentRequired = styled((props: { to: string }) => (
+    <a href={props.to} />
+))``;
 // These tests pass in tsservice, but they fail in dtslint. I do not know why.
 // <WithComponentRequired href=''/>; // $ExpectError
 // <WithComponentRequired to=''/>;
 
-const WithComponentRequired2 = WithComponentRequired.withComponent('a');
+const WithComponentRequired2 = WithComponentRequired.withComponent("a");
 // These tests pass in tsservice, but they fail in dtslint. I do not know why.
 // <WithComponentRequired2 href=''/>;
 // <WithComponentRequired2 to=''/>; // $ExpectError
@@ -569,7 +572,7 @@ const asTest = (
 );
 
 interface TestContainerProps {
-    size: 'big' | 'small';
+    size: "big" | "small";
     test?: boolean;
 }
 const TestContainer = ({ size, test }: TestContainerProps) => {
@@ -581,7 +584,7 @@ const StyledTestContainer = styled(TestContainer)`
 `;
 
 interface Test2ContainerProps {
-    type: 'foo' | 'bar';
+    type: "foo" | "bar";
 }
 class Test2Container extends React.Component<Test2ContainerProps> {
     render() {
@@ -592,28 +595,120 @@ class Test2Container extends React.Component<Test2ContainerProps> {
 const containerTest = (
     // TODO (TypeScript 3.2): once the polymorphic overload is un-commented-out this should be the correct test
     // <StyledTestContainer as={Test2Container} type='foo' />
-    <StyledTestContainer as={Test2Container} size='small' />
+    <StyledTestContainer as={Test2Container} size="small" />
 );
 
 // 4.0 refs
 
-const divFnRef = (ref: HTMLDivElement|null) => { /* empty */ };
+const divFnRef = (ref: HTMLDivElement | null) => {
+    /* empty */
+};
 const divRef = React.createRef<HTMLDivElement>();
 
 const StyledDiv = styled.div``;
 
-<StyledDiv ref={divRef}/>;
-<StyledDiv ref={divFnRef}/>;
-<StyledDiv ref='string'/>; // $ExpectError
+<StyledDiv ref={divRef} />;
+<StyledDiv ref={divFnRef} />;
+<StyledDiv ref="string" />; // $ExpectError
 
 const StyledStyledDiv = styled(StyledDiv)``;
-<StyledStyledDiv ref={divRef}/>;
-<StyledStyledDiv ref={divFnRef}/>;
-<StyledStyledDiv ref='string'/>; // $ExpectError
+<StyledStyledDiv ref={divRef} />;
+<StyledStyledDiv ref={divFnRef} />;
+<StyledStyledDiv ref="string" />; // $ExpectError
 
-const StyledA = StyledDiv.withComponent('a');
-<StyledA ref={divRef}/>; // $ExpectError
-<StyledA ref={ref => {
-    // $ExpectType HTMLAnchorElement | null
-    ref;
-}}/>;
+const StyledA = StyledDiv.withComponent("a");
+<StyledA ref={divRef} />; // $ExpectError
+<StyledA
+    ref={ref => {
+        // $ExpectType HTMLAnchorElement | null
+        ref;
+    }}
+/>;
+
+async function typedThemes() {
+    const theme = {
+        color: "green"
+    };
+
+    // abuse "await import(...)" to be able to reference the styled-components namespace
+    // without actually doing a top level namespace import
+    const {
+        default: styled,
+        css,
+        createGlobalStyle,
+        ThemeProvider,
+        ThemeConsumer
+    } = (await import("styled-components")) as ThemedStyledComponentsModule<
+        typeof theme
+    >;
+
+    const ThemedDiv = styled.div`
+        background: ${props => {
+            // $ExpectType string
+            props.theme.color;
+            // $ExpectType number | undefined
+            props.tabIndex;
+            return props.theme.color;
+        }};
+    `;
+    const ThemedDiv2 = styled.div(props => {
+        // $ExpectType string
+        props.theme.color;
+        // $ExpectType number | undefined
+        props.tabIndex;
+
+        return {
+            background: props.theme.color
+        };
+    });
+    const ThemedDiv3 = styled.div(props => {
+        // $ExpectType string
+        props.theme.color;
+        // $ExpectType number | undefined
+        props.tabIndex;
+
+        return css`
+            background: ${props.theme.color};
+        `;
+    });
+    const themedCss = css`
+        background: ${props => {
+            // $ExpectType string
+            props.theme.color;
+            // $ExpectType "theme"
+            type Keys = keyof typeof props;
+            return props.theme.color;
+        }};
+    `;
+    const ThemedDiv4 = styled.div(themedCss);
+
+    const themedCssWithNesting = css(props => ({
+        color: props.theme.color,
+        [ThemedDiv3]: {
+            color: "green"
+        }
+    }));
+
+    const Global = createGlobalStyle`
+        ${themedCssWithNesting}
+    `;
+
+    return (
+        <ThemeProvider theme={theme}>
+            <>
+                <Global />
+                <ThemedDiv />
+                <ThemedDiv2 />
+                <ThemedDiv3 />
+                <ThemedDiv4 />
+                <ThemeConsumer>
+                    {theme => {
+                        // $ExpectType string
+                        theme.color;
+                        return theme.color;
+                    }}
+                </ThemeConsumer>
+            </>
+        </ThemeProvider>
+    );
+}

From 160c4de7df14c392722aed3fcdd931f53dbc4dd7 Mon Sep 17 00:00:00 2001
From: Jessica <jessicamfranco3@gmail.com>
Date: Wed, 14 Nov 2018 17:25:01 +0900
Subject: [PATCH 068/836] Use a helper for the Extract<keyof T> stuff, support
 DefaultTheme in ThemeConsumer

---
 types/styled-components/index.d.ts | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/types/styled-components/index.d.ts b/types/styled-components/index.d.ts
index 6398ee36d5..c04de160b0 100644
--- a/types/styled-components/index.d.ts
+++ b/types/styled-components/index.d.ts
@@ -261,7 +261,7 @@ export interface ThemedBaseStyledInterface<T extends object>
 }
 
 export type ThemedStyledInterface<T extends object> = ThemedBaseStyledInterface<
-    Extract<keyof T, string> extends never ? any : T
+    AnyIfEmpty<T>
 >;
 export type StyledInterface = ThemedStyledInterface<DefaultTheme>;
 
@@ -271,16 +271,15 @@ export type BaseThemedCssFunction<T extends object> = <P>(
 ) => Array<FlattenInterpolation<ThemedStyledProps<P, T>>>;
 
 export type ThemedCssFunction<T extends object> = BaseThemedCssFunction<
-    Extract<keyof T, string> extends never ? any : T
+    AnyIfEmpty<T>
 >;
 
 // Helper type operators
 type Omit<T, K extends keyof T> = Pick<T, Exclude<keyof T, K>>;
-type DiffBetween<T, U> = Pick<T, Exclude<keyof T, keyof U>> &
-    Pick<U, Exclude<keyof U, keyof T>>;
 type WithOptionalTheme<P extends { theme?: T }, T> = Omit<P, "theme"> & {
     theme?: T;
 };
+type AnyIfEmpty<T extends object> = keyof T extends never ? any : T;
 
 export interface ThemedStyledComponentsModule<T extends object> {
     default: ThemedStyledInterface<T>;
@@ -318,7 +317,7 @@ export type BaseWithThemeFnInterface<T extends object> = <
     WithOptionalTheme<React.ComponentPropsWithRef<C>, T>
 >;
 export type WithThemeFnInterface<T extends object> = BaseWithThemeFnInterface<
-    Extract<keyof T, string> extends never ? any : T
+    AnyIfEmpty<T>
 >;
 export const withTheme: WithThemeFnInterface<DefaultTheme>;
 
@@ -334,13 +333,10 @@ export type BaseThemeProviderComponent<T extends object> = React.ComponentClass<
 >;
 export type ThemeProviderComponent<
     T extends object
-> = BaseThemeProviderComponent<
-    Extract<keyof T, string> extends never ? any : T
->;
-export const ThemeProvider: ThemeProviderComponent<DefaultTheme>;
-// NOTE: this technically starts as undefined
-// Also, this cannot be DefaultTheme as it breaks TypedComponents' assignability
-export const ThemeContext: React.Context<any>;
+> = BaseThemeProviderComponent<AnyIfEmpty<T>>;
+export const ThemeProvider: ThemeProviderComponent<AnyIfEmpty<DefaultTheme>>;
+// NOTE: this technically starts as undefined, but allowing undefined is unhelpful when used correctly
+export const ThemeContext: React.Context<AnyIfEmpty<DefaultTheme>>;
 export const ThemeConsumer: typeof ThemeContext["Consumer"];
 
 export interface Keyframes {

From 9a4b5d4d34c079b80117f4c3758afce64a506e49 Mon Sep 17 00:00:00 2001
From: Jessica <jessicamfranco3@gmail.com>
Date: Wed, 14 Nov 2018 17:37:42 +0900
Subject: [PATCH 069/836] Document DefaultTheme, test
 ThemedStyledComponentsModule shape

---
 types/styled-components/index.d.ts     | 12 ++++++++++++
 types/styled-components/test/index.tsx | 14 ++++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/types/styled-components/index.d.ts b/types/styled-components/index.d.ts
index c04de160b0..2ad44e7e57 100644
--- a/types/styled-components/index.d.ts
+++ b/types/styled-components/index.d.ts
@@ -301,6 +301,12 @@ export interface ThemedStyledComponentsModule<T extends object> {
     ThemeProvider: ThemeProviderComponent<T>;
     ThemeConsumer: React.Consumer<T>;
     ThemeContext: React.Context<T>;
+
+    // This could be made to assert `target is StyledComponent<any, T>` instead, but that feels not type safe
+    isStyledComponent: typeof isStyledComponent;
+
+    ServerStyleSheet: typeof ServerStyleSheet;
+    StyleSheetManager: typeof StyleSheetManager;
 }
 
 declare const styled: StyledInterface;
@@ -321,6 +327,12 @@ export type WithThemeFnInterface<T extends object> = BaseWithThemeFnInterface<
 >;
 export const withTheme: WithThemeFnInterface<DefaultTheme>;
 
+/**
+ * This interface can be augmented by users to add types to `styled-components`' default theme
+ * without needing to reexport `ThemedStyledComponentsModule`.
+ */
+// Unfortunately, there is no way to write tests for this
+// as any augmentation will break the tests for the default case (not augmented).
 // tslint:disable-next-line:no-empty-interface
 export interface DefaultTheme {}
 
diff --git a/types/styled-components/test/index.tsx b/types/styled-components/test/index.tsx
index 7ce9e59fa2..628a294a48 100644
--- a/types/styled-components/test/index.tsx
+++ b/types/styled-components/test/index.tsx
@@ -712,3 +712,17 @@ async function typedThemes() {
         </ThemeProvider>
     );
 }
+
+async function reexportCompatibility() {
+    const sc = await import("styled-components");
+    const themed = sc as ThemedStyledComponentsModule<any>;
+
+    let { ...scExports } = sc;
+    let { ...themedExports } = themed;
+    // both branches must be assignable to each other
+    if (Math.random()) {
+        scExports = themedExports;
+    } else {
+        themedExports = scExports;
+    }
+}

From 9e6ea6abc62b5e8e0fe73c3b60e57460f153975c Mon Sep 17 00:00:00 2001
From: Jessica <jessicamfranco3@gmail.com>
Date: Wed, 14 Nov 2018 18:53:20 +0900
Subject: [PATCH 070/836] Add a way to declare a ThemeProvider is augmenting
 another ThemeProvider

---
 types/styled-components/index.d.ts     | 23 +++++++++------
 types/styled-components/test/index.tsx | 41 ++++++++++++++++++++++++++
 2 files changed, 55 insertions(+), 9 deletions(-)

diff --git a/types/styled-components/index.d.ts b/types/styled-components/index.d.ts
index 2ad44e7e57..b915040c7e 100644
--- a/types/styled-components/index.d.ts
+++ b/types/styled-components/index.d.ts
@@ -281,7 +281,10 @@ type WithOptionalTheme<P extends { theme?: T }, T> = Omit<P, "theme"> & {
 };
 type AnyIfEmpty<T extends object> = keyof T extends never ? any : T;
 
-export interface ThemedStyledComponentsModule<T extends object> {
+export interface ThemedStyledComponentsModule<
+    T extends object,
+    U extends object = T
+> {
     default: ThemedStyledInterface<T>;
 
     css: ThemedCssFunction<T>;
@@ -298,7 +301,7 @@ export interface ThemedStyledComponentsModule<T extends object> {
     ): GlobalStyleComponent<P, T>;
 
     withTheme: WithThemeFnInterface<T>;
-    ThemeProvider: ThemeProviderComponent<T>;
+    ThemeProvider: ThemeProviderComponent<T, U>;
     ThemeConsumer: React.Consumer<T>;
     ThemeContext: React.Context<T>;
 
@@ -336,16 +339,18 @@ export const withTheme: WithThemeFnInterface<DefaultTheme>;
 // tslint:disable-next-line:no-empty-interface
 export interface DefaultTheme {}
 
-export interface ThemeProviderProps<T extends object> {
+export interface ThemeProviderProps<T extends object, U extends object = T> {
     children?: React.ReactChild; // only one child is allowed, goes through React.Children.only
-    theme: T | ((theme: T) => T);
+    theme: T | ((theme: U) => T);
 }
-export type BaseThemeProviderComponent<T extends object> = React.ComponentClass<
-    ThemeProviderProps<T>
->;
+export type BaseThemeProviderComponent<
+    T extends object,
+    U extends object = T
+> = React.ComponentClass<ThemeProviderProps<T, U>>;
 export type ThemeProviderComponent<
-    T extends object
-> = BaseThemeProviderComponent<AnyIfEmpty<T>>;
+    T extends object,
+    U extends object = T
+> = BaseThemeProviderComponent<AnyIfEmpty<T>, AnyIfEmpty<U>>;
 export const ThemeProvider: ThemeProviderComponent<AnyIfEmpty<DefaultTheme>>;
 // NOTE: this technically starts as undefined, but allowing undefined is unhelpful when used correctly
 export const ThemeContext: React.Context<AnyIfEmpty<DefaultTheme>>;
diff --git a/types/styled-components/test/index.tsx b/types/styled-components/test/index.tsx
index 628a294a48..0e9fec66a1 100644
--- a/types/styled-components/test/index.tsx
+++ b/types/styled-components/test/index.tsx
@@ -726,3 +726,44 @@ async function reexportCompatibility() {
         themedExports = scExports;
     }
 }
+
+async function themeAugmentation() {
+    interface BaseTheme {
+        background: string;
+    }
+    interface ExtraTheme extends BaseTheme {
+        accent: string;
+    }
+
+    const base = (await import("styled-components")) as ThemedStyledComponentsModule<
+        BaseTheme
+    >;
+    const extra = (await import("styled-components")) as ThemedStyledComponentsModule<
+        ExtraTheme,
+        BaseTheme
+    >;
+
+    return (
+        <base.ThemeProvider
+            theme={{
+                background: "black"
+            }}
+        >
+            <>
+                <extra.ThemeProvider
+                    theme={base => base} // $ExpectError
+                >
+                    <extra.ThemeConsumer>{() => null}</extra.ThemeConsumer>
+                </extra.ThemeProvider>
+                <extra.ThemeProvider
+                    theme={base => ({
+                        ...base,
+                        accent: "blue"
+                    })}
+                >
+                    <extra.ThemeConsumer>{() => null}</extra.ThemeConsumer>
+                </extra.ThemeProvider>
+            </>
+        </base.ThemeProvider>
+    );
+}

From a0df8f39a019eeded79d2a5c6abf1a90fd5b0f7a Mon Sep 17 00:00:00 2001
From: Mihai Dinculescu <faithraven@gmail.com>
Date: Thu, 15 Nov 2018 12:07:20 +0000
Subject: [PATCH 071/836] redux-immutable-state-invariant: redux 4 support.

---
 types/redux-immutable-state-invariant/index.d.ts   | 4 ++--
 types/redux-immutable-state-invariant/package.json | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/types/redux-immutable-state-invariant/index.d.ts b/types/redux-immutable-state-invariant/index.d.ts
index 6ad2a0e588..64c3fa6851 100644
--- a/types/redux-immutable-state-invariant/index.d.ts
+++ b/types/redux-immutable-state-invariant/index.d.ts
@@ -1,6 +1,6 @@
-// Type definitions for redux-immutable-state-invariant v2.0.0
+// Type definitions for redux-immutable-state-invariant v2.1.0
 // Project: https://github.com/leoasis/redux-immutable-state-invariant
-// Definitions by: Remo H. Jansen <https://github.com/remojansen>, Ben Rogers <https://github.com/highflying>
+// Definitions by: Remo H. Jansen <https://github.com/remojansen>, Ben Rogers <https://github.com/highflying>, Mihai Dinculescu <https://github.com/mihai-dinculescu>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 import * as Redux from "redux";
diff --git a/types/redux-immutable-state-invariant/package.json b/types/redux-immutable-state-invariant/package.json
index 6d68bf2f9b..998f8e9b38 100644
--- a/types/redux-immutable-state-invariant/package.json
+++ b/types/redux-immutable-state-invariant/package.json
@@ -1,6 +1,6 @@
 {
     "private": true,
     "dependencies": {
-        "redux": "^3.6.0"
+        "redux": "^3.6.0 || ^4.0.0"
     }
 }

From 1d5101593cc01612f67c9bbd07f814f01c94a67b Mon Sep 17 00:00:00 2001
From: Mihai Dinculescu <faithraven@gmail.com>
Date: Thu, 15 Nov 2018 12:20:14 +0000
Subject: [PATCH 072/836] Add TypeScript version.

---
 types/redux-immutable-state-invariant/index.d.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/types/redux-immutable-state-invariant/index.d.ts b/types/redux-immutable-state-invariant/index.d.ts
index 64c3fa6851..502f7e65bf 100644
--- a/types/redux-immutable-state-invariant/index.d.ts
+++ b/types/redux-immutable-state-invariant/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/leoasis/redux-immutable-state-invariant
 // Definitions by: Remo H. Jansen <https://github.com/remojansen>, Ben Rogers <https://github.com/highflying>, Mihai Dinculescu <https://github.com/mihai-dinculescu>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 import * as Redux from "redux";
 

From c700743bc387d8df7a99711e448d1b6f7388f103 Mon Sep 17 00:00:00 2001
From: Brian Caruso <brian@invioinc.com>
Date: Thu, 15 Nov 2018 15:37:48 -0800
Subject: [PATCH 073/836] Update detect-browser to v3.0

---
 types/detect-browser/detect-browser-tests.ts | 63 +++++++++++++++++++-
 types/detect-browser/index.d.ts              | 28 ++++++---
 2 files changed, 80 insertions(+), 11 deletions(-)

diff --git a/types/detect-browser/detect-browser-tests.ts b/types/detect-browser/detect-browser-tests.ts
index 48abb964f8..7453ed044a 100644
--- a/types/detect-browser/detect-browser-tests.ts
+++ b/types/detect-browser/detect-browser-tests.ts
@@ -1,7 +1,64 @@
-import { detect } from 'detect-browser';
+import { BrowserName, BrowserInfo, detect } from 'detect-browser';
 const browser = detect();
 
 if (browser) {
-    const name: string = browser.name;
-    const version: string = browser.version;
+    const name: string | undefined = browser.name;
+    const version: string | undefined = browser.version;
+    const os: string | undefined | null = browser.os;
+    const bot: true | undefined = browser.bot;
 }
+
+const browserInfos: BrowserInfo[] = [];
+
+// Those that can happen when 'detect' hits on a browser
+
+browserInfos.push(
+  {
+    name: "chrome",
+    version: "1.2.3",
+    os: null
+  }
+);
+
+browserInfos.push(
+  {
+    name: "edge",
+    version: "24.5.3",
+    os: "Sun OS"
+  }
+);
+
+browserInfos.push(
+  {
+    name: "edge",
+    version: "13.0",
+    os: "Windows 10",
+    bot: true
+  }
+);
+
+// Those that could be returned when it's a bot
+
+browserInfos.push(
+    {
+        name: "facebook",
+        version: "1.0.2",
+        os: "Linux",
+        bot: true
+    }
+);
+
+browserInfos.push(
+    {
+        name: "crios",
+        version: "2.9.4",
+        os: undefined,
+        bot: true
+    }
+);
+
+browserInfos.push(
+    {
+        bot: true
+    }
+);
diff --git a/types/detect-browser/index.d.ts b/types/detect-browser/index.d.ts
index 22d6bf9c17..943484b013 100644
--- a/types/detect-browser/index.d.ts
+++ b/types/detect-browser/index.d.ts
@@ -1,30 +1,42 @@
-// Type definitions for detect-browser 2.0
+// Type definitions for detect-browser 3.0
 // Project: https://github.com/DamonOehlman/detect-browser
 // Definitions by: Rogier Schouten <https://github.com/rogierschouten>
-// Definitions: https://github.com/borisyankov/DefinitelyTyped
+//                 Brian Caruso <https://github.com/carusology>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export {};
 
 export type BrowserName =
+    "aol" |
     "android" |
     "bb10" |
     "chrome" |
     "crios" |
     "edge" |
+    "facebook" |
     "firefox" |
     "fxios" |
     "ie" |
+    "instagram" |
     "ios" |
+    "ios-webview" |
     "kakaotalk" |
+    "node" |
     "opera" |
     "phantomjs" |
     "safari" |
+    "samsung" |
     "vivaldi" |
-    "yandexbrowser" |
-    "node";
+    "yandexbrowser";
 
 export interface BrowserInfo {
-    name: BrowserName;
-    version: string;
-    os: string;
+    name?: string;
+    version?: string;
+    os?: string | null;
+    bot?: true;
 }
 
-export function detect(): null | BrowserInfo;
+export function detect(): null | false | BrowserInfo;
+export function detectOS(userAgentString: string): null | string;
+export function parseUserAgent(userAgentString: string): null | BrowserInfo;
+export function getNodeVersion(): false | BrowserInfo;

From e4b6fecfdc601e8a9b85bb567171c0806d82c344 Mon Sep 17 00:00:00 2001
From: Hiroshi Ioka <hirochachacha@gmail.com>
Date: Fri, 16 Nov 2018 08:35:26 +0900
Subject: [PATCH 074/836] @types/koa-bodyparser: use any for Request.body

Also, fix Request.rawBody and library version.
---
 types/koa-bodyparser/index.d.ts              | 10 ++++++----
 types/koa-bodyparser/koa-bodyparser-tests.ts |  1 +
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/types/koa-bodyparser/index.d.ts b/types/koa-bodyparser/index.d.ts
index deb1eb04e9..9687f15ff9 100644
--- a/types/koa-bodyparser/index.d.ts
+++ b/types/koa-bodyparser/index.d.ts
@@ -1,6 +1,8 @@
-// Type definitions for koa-bodyparser 5.0
+// Type definitions for koa-bodyparser 4.2
 // Project: https://github.com/koajs/bodyparser
-// Definitions by: Jerry Chin <https://github.com/hellopao>, Anup Kishore <https://github.com/anup-2s>
+// Definitions by: Jerry Chin <https://github.com/hellopao>
+//                 Anup Kishore <https://github.com/anup-2s>
+//                 Hiroshi Ioka <https://github.com/hirochachacha>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -18,8 +20,8 @@ import * as Koa from "koa";
 
 declare module "koa" {
     interface Request {
-        body: {} | null | undefined;
-        rawBody: {} | null | undefined;
+        body: any;
+        rawBody: string;
     }
 }
 
diff --git a/types/koa-bodyparser/koa-bodyparser-tests.ts b/types/koa-bodyparser/koa-bodyparser-tests.ts
index e38eb112dd..6b14693914 100644
--- a/types/koa-bodyparser/koa-bodyparser-tests.ts
+++ b/types/koa-bodyparser/koa-bodyparser-tests.ts
@@ -7,6 +7,7 @@ app.use(bodyParser({ strict: false }));
 
 app.use((ctx) => {
     console.log(ctx.request.body);
+    console.log(ctx.request.body.ok);
     console.log(ctx.request.rawBody);
 });
 

From 2ee57c7d32b0ef6af3d7d5197a924fc8763c7365 Mon Sep 17 00:00:00 2001
From: Jessica <jessicamfranco3@gmail.com>
Date: Fri, 16 Nov 2018 10:54:52 +0900
Subject: [PATCH 075/836] Fix return type of css``, tweak overloads

---
 types/styled-components/index.d.ts | 89 +++++++++++++++++++++---------
 1 file changed, 62 insertions(+), 27 deletions(-)

diff --git a/types/styled-components/index.d.ts b/types/styled-components/index.d.ts
index b915040c7e..4a86aa245f 100644
--- a/types/styled-components/index.d.ts
+++ b/types/styled-components/index.d.ts
@@ -9,8 +9,8 @@
 
 /// <reference types="node" />
 
-import * as React from "react";
 import * as CSS from "csstype";
+import * as React from "react";
 
 export type CSSObject = CSS.Properties<string | number> &
     // Index type to allow selector nesting
@@ -30,7 +30,7 @@ export interface ThemeProps<T> {
 }
 
 export type ThemedStyledProps<P, T> = P & ThemeProps<T>;
-export type StyledProps<P> = ThemedStyledProps<P, any>;
+export type StyledProps<P> = ThemedStyledProps<P, AnyIfEmpty<DefaultTheme>>;
 
 export type StyledComponentProps<
     // The Component from whose props are derived
@@ -57,8 +57,8 @@ type StyledComponentPropsWithAs<
 export type FalseyValue = undefined | null | false;
 export type Interpolation<P> =
     | InterpolationValue
-    | InterpolationFunction<P>
-    | FlattenInterpolation<P>;
+    | FlattenInterpolation<P>
+    | InterpolationFunction<P>;
 // must be an interface to be self-referential
 export interface FlattenInterpolation<P>
     extends ReadonlyArray<Interpolation<P>> {}
@@ -93,10 +93,15 @@ export interface GlobalStyleComponent<P, T>
     extends React.ComponentClass<ThemedGlobalStyledClassProps<P, T>> {}
 
 // remove the call signature from StyledComponent so Interpolation can still infer InterpolationFunction
-type StyledComponentInterpolation = Pick<
-    AnyStyledComponent,
-    keyof StyledComponentBase<any, any>
->;
+type StyledComponentInterpolation =
+    | Pick<
+          StyledComponentBase<any, any, any, any>,
+          keyof StyledComponentBase<any, any>
+      >
+    | Pick<
+          StyledComponentBase<any, any, any>,
+          keyof StyledComponentBase<any, any>
+      >;
 
 // abuse Pick to strip the call signature from ForwardRefExoticComponent
 type ForwardRefExoticBase<P> = Pick<
@@ -162,25 +167,45 @@ export interface StyledComponentBase<
     ): StyledComponent<WithC, T, O, A>;
 }
 
-export type ThemedStyledFunctionBase<
+export interface ThemedStyledFunctionBase<
     C extends keyof JSX.IntrinsicElements | React.ComponentType<any>,
     T extends object,
     O extends object = {},
     A extends keyof any = never
-> =
+> {
+    (
+        first:
+            | TemplateStringsArray
+            | NonNullable<
+                  Interpolation<
+                      ThemedStyledProps<StyledComponentPropsWithRef<C> & O, T>
+                  >
+              >,
+        ...rest: Array<
+            Interpolation<
+                ThemedStyledProps<StyledComponentPropsWithRef<C> & O, T>
+            >
+        >
+    ): StyledComponent<C, T, O, A>;
     // at least the first argument is required, whatever it is
     <U extends object>(
-        first: NonNullable<
-            Interpolation<
-                ThemedStyledProps<StyledComponentPropsWithRef<C> & O & U, T>
-            >
-        >,
+        first:
+            | TemplateStringsArray
+            | NonNullable<
+                  Interpolation<
+                      ThemedStyledProps<
+                          StyledComponentPropsWithRef<C> & O & U,
+                          T
+                      >
+                  >
+              >,
         ...rest: Array<
             Interpolation<
                 ThemedStyledProps<StyledComponentPropsWithRef<C> & O & U, T>
             >
         >
-    ) => StyledComponent<C, T, O & U, A>;
+    ): StyledComponent<C, T, O & U, A>;
+}
 
 export interface ThemedStyledFunction<
     C extends keyof JSX.IntrinsicElements | React.ComponentType<any>,
@@ -243,17 +268,13 @@ type StyledComponentInnerAttrs<
 
 export interface ThemedBaseStyledInterface<T extends object>
     extends ThemedStyledComponentFactories<T> {
-    <TTag extends keyof JSX.IntrinsicElements>(tag: TTag): ThemedStyledFunction<
-        TTag,
-        T
-    >;
     <C extends AnyStyledComponent>(component: C): ThemedStyledFunction<
         StyledComponentInnerComponent<C>,
         T,
         StyledComponentInnerOtherProps<C>,
         StyledComponentInnerAttrs<C>
     >;
-    <C extends React.ComponentType<any>>(
+    <C extends keyof JSX.IntrinsicElements | React.ComponentType<any>>(
         // unfortunately using a conditional type to validate that it can receive a `theme?: Theme`
         // causes tests to fail in TS 3.1
         component: C
@@ -265,10 +286,20 @@ export type ThemedStyledInterface<T extends object> = ThemedBaseStyledInterface<
 >;
 export type StyledInterface = ThemedStyledInterface<DefaultTheme>;
 
-export type BaseThemedCssFunction<T extends object> = <P>(
-    first: NonNullable<Interpolation<ThemedStyledProps<P, T>>>,
-    ...interpolations: Array<Interpolation<ThemedStyledProps<P, T>>>
-) => Array<FlattenInterpolation<ThemedStyledProps<P, T>>>;
+export interface BaseThemedCssFunction<T extends object> {
+    (
+        first:
+            | TemplateStringsArray
+            | NonNullable<Interpolation<ThemedStyledProps<{}, T>>>,
+        ...interpolations: Array<Interpolation<ThemedStyledProps<{}, T>>>
+    ): FlattenInterpolation<ThemedStyledProps<{}, T>>;
+    <P extends object>(
+        first:
+            | TemplateStringsArray
+            | NonNullable<Interpolation<ThemedStyledProps<P, T>>>,
+        ...interpolations: Array<Interpolation<ThemedStyledProps<P, T>>>
+    ): FlattenInterpolation<ThemedStyledProps<P, T>>;
+}
 
 export type ThemedCssFunction<T extends object> = BaseThemedCssFunction<
     AnyIfEmpty<T>
@@ -296,7 +327,9 @@ export interface ThemedStyledComponentsModule<
     ): Keyframes;
 
     createGlobalStyle<P extends object = {}>(
-        first: NonNullable<Interpolation<ThemedStyledProps<P, T>>>,
+        first:
+            | TemplateStringsArray
+            | NonNullable<Interpolation<ThemedStyledProps<P, T>>>,
         ...interpolations: Array<Interpolation<ThemedStyledProps<P, T>>>
     ): GlobalStyleComponent<P, T>;
 
@@ -366,7 +399,9 @@ export function keyframes(
 ): Keyframes;
 
 export function createGlobalStyle<P extends object = {}>(
-    first: NonNullable<Interpolation<ThemedStyledProps<P, DefaultTheme>>>,
+    first:
+        | TemplateStringsArray
+        | NonNullable<Interpolation<ThemedStyledProps<P, DefaultTheme>>>,
     ...interpolations: Array<Interpolation<ThemedStyledProps<P, DefaultTheme>>>
 ): GlobalStyleComponent<P, DefaultTheme>;
 

From 7c2cd7f5d26dcbfffaf80d43f85da7258d056dd4 Mon Sep 17 00:00:00 2001
From: Pine Mizune <pinemz@gmail.com>
Date: Fri, 16 Nov 2018 12:36:38 +0900
Subject: [PATCH 076/836] Fix the contributor name and url

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

diff --git a/types/js-url/index.d.ts b/types/js-url/index.d.ts
index d5bf93257d..69583e1553 100644
--- a/types/js-url/index.d.ts
+++ b/types/js-url/index.d.ts
@@ -1,6 +1,6 @@
 // Type definitions for url v1.8.6
 // Project: https://github.com/websanova/js-url
-// Definitions by: MIZUNE Pine <https://github.com/pine613>
+// Definitions by: Pine Mizune <https://github.com/pine>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 interface UrlStatic {

From 9fd098392c06110c6235db8687be9267c3604bfb Mon Sep 17 00:00:00 2001
From: Sutrisno Suryajaya <sutris.sdp@gmail.com>
Date: Fri, 16 Nov 2018 11:49:09 +0800
Subject: [PATCH 077/836] Proper type definition for Relay connection args

In the graphql-relay implementation
(https://github.com/graphql/graphql-relay-js/blob/da2801ab9e64006b1e41bcdb28c889799ee5c170/src/connection/connection.js#L30-L59)
`forwardConnectionArgs`, `backwardConnectionArgs` and `connectionArgs`
refer to the argument's GraphQL schema definition instead of the
argument structured when used in a GraphQL query.
---
 types/graphql-relay/graphql-relay-tests.ts | 18 ++++++++++--------
 types/graphql-relay/index.d.ts             | 19 ++++++-------------
 2 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/types/graphql-relay/graphql-relay-tests.ts b/types/graphql-relay/graphql-relay-tests.ts
index cebc90e2ca..e490329b65 100644
--- a/types/graphql-relay/graphql-relay-tests.ts
+++ b/types/graphql-relay/graphql-relay-tests.ts
@@ -11,6 +11,7 @@ import {
     GraphQLInputFieldConfigMap,
     GraphQLNonNull,
     GraphQLID,
+    GraphQLInt
 } from "graphql";
 import {
     // Connections
@@ -30,18 +31,19 @@ import {
     // Mutations
     mutationWithClientMutationId,
 } from "graphql-relay";
+
 // Connections
 // connectionArgs returns the arguments that fields should provide when they return a connection type that supports bidirectional pagination.
-connectionArgs.first = 10;
-connectionArgs.after = "a";
-connectionArgs.before = "b";
-connectionArgs.last = 10;
+connectionArgs.first = { type: GraphQLInt };
+connectionArgs.after = { type: GraphQLString };
+connectionArgs.before = { type: GraphQLString };
+connectionArgs.last = { type: GraphQLInt };
 // forwardConnectionArgs returns the arguments that fields should provide when they return a connection type that only supports forward pagination.
-forwardConnectionArgs.after = "a";
-forwardConnectionArgs.first = 10;
+forwardConnectionArgs.after = { type: GraphQLString };
+forwardConnectionArgs.first = { type: GraphQLInt };
 // backwardConnectionArgs returns the arguments that fields should provide when they return a connection type that only supports backward pagination.
-backwardConnectionArgs.before = "b";
-backwardConnectionArgs.last = 10;
+backwardConnectionArgs.before = { type: GraphQLString };
+backwardConnectionArgs.last = { type: GraphQLInt };
 // connectionDefinitions returns a connectionType and its associated edgeType, given a node type.
 const resolve: GraphQLFieldResolver<any, any> = (source, args, context, info) => {
     context.flag = "f";
diff --git a/types/graphql-relay/index.d.ts b/types/graphql-relay/index.d.ts
index d4bba06948..67edfa3df0 100644
--- a/types/graphql-relay/index.d.ts
+++ b/types/graphql-relay/index.d.ts
@@ -34,27 +34,20 @@ import {
  * whose return type is a connection type with forward pagination.
  */
 export interface ForwardConnectionArgs {
-    after?: ConnectionCursor | null;
-    first?: number | null;
+    after: { type: GraphQLScalarType };
+    first: { type: GraphQLScalarType };
 }
-export const forwardConnectionArgs: GraphQLFieldConfigArgumentMap & {
-    after?: ConnectionCursor | null;
-    first?: number | null;
-};
+export const forwardConnectionArgs: GraphQLFieldConfigArgumentMap & ForwardConnectionArgs;
 
 /**
  * Returns a GraphQLFieldConfigArgumentMap appropriate to include on a field
  * whose return type is a connection type with backward pagination.
  */
 export interface BackwardConnectionArgs {
-    before?: ConnectionCursor | null;
-    last?: number | null;
+    before: { type: GraphQLScalarType };
+    last: { type: GraphQLScalarType };
 }
-export const backwardConnectionArgs: GraphQLFieldConfigArgumentMap & {
-    before?: ConnectionCursor | null;
-    last?: number | null;
-};
-
+export const backwardConnectionArgs: GraphQLFieldConfigArgumentMap & BackwardConnectionArgs;
 /**
  * Returns a GraphQLFieldConfigArgumentMap appropriate to include on a field
  * whose return type is a connection type with bidirectional pagination.

From a0a99124e9c77cac8e3985001a3865f47d6bf6fa Mon Sep 17 00:00:00 2001
From: Jessica <jessicamfranco3@gmail.com>
Date: Fri, 16 Nov 2018 16:54:58 +0900
Subject: [PATCH 078/836] Preserve optionality of parent StyledComponent .attrs

---
 types/styled-components/index.d.ts     | 12 ++++++------
 types/styled-components/test/index.tsx |  4 ++++
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/types/styled-components/index.d.ts b/types/styled-components/index.d.ts
index 4a86aa245f..a842c94c63 100644
--- a/types/styled-components/index.d.ts
+++ b/types/styled-components/index.d.ts
@@ -217,23 +217,23 @@ export interface ThemedStyledFunction<
     // My head already hurts enough so maybe later...
     attrs<
         U,
-        A extends Partial<StyledComponentPropsWithRef<C> & U> & {
+        NewA extends Partial<StyledComponentPropsWithRef<C> & U> & {
             [others: string]: any;
         } = {}
     >(
-        attrs: Attrs<StyledComponentPropsWithRef<C> & U, A, T>
-    ): ThemedStyledFunction<C, T, O & A, keyof A>;
+        attrs: Attrs<StyledComponentPropsWithRef<C> & U, NewA, T>
+    ): ThemedStyledFunction<C, T, O & NewA, A | keyof NewA>;
     // Only this overload is deprecated
     // tslint:disable:unified-signatures
     /** @deprecated Prefer using the new single function style, to be removed in v5 */
     attrs<
         U,
-        A extends Partial<StyledComponentPropsWithRef<C> & U> & {
+        NewA extends Partial<StyledComponentPropsWithRef<C> & U> & {
             [others: string]: any;
         } = {}
     >(
-        attrs: DeprecatedAttrs<StyledComponentPropsWithRef<C> & U, A, T>
-    ): ThemedStyledFunction<C, T, O & A, keyof A>;
+        attrs: DeprecatedAttrs<StyledComponentPropsWithRef<C> & U, NewA, T>
+    ): ThemedStyledFunction<C, T, O & NewA, A | keyof NewA>;
     // tslint:enable:unified-signatures
 }
 
diff --git a/types/styled-components/test/index.tsx b/types/styled-components/test/index.tsx
index 0e9fec66a1..e435d90011 100644
--- a/types/styled-components/test/index.tsx
+++ b/types/styled-components/test/index.tsx
@@ -321,6 +321,10 @@ const AttrsWithOnlyNewProps = styled.h2.attrs({ as: "h1" })`
     font-size: ${props => (props.as === "h1" ? 2 : 1)};
 `;
 
+const AttrsInputExtra = styled(AttrsInput).attrs({ autoComplete: "off" })``;
+
+<AttrsInputExtra />;
+
 /**
  * component type
  */

From ea77585d48502609a9f71c1d832247ab05485c7b Mon Sep 17 00:00:00 2001
From: carl-coolblue <carl.reid@coolblue.nl>
Date: Fri, 16 Nov 2018 09:24:23 +0100
Subject: [PATCH 079/836] Add missing `data` prop type to `Option`

---
 types/react-select/lib/components/Option.d.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/types/react-select/lib/components/Option.d.ts b/types/react-select/lib/components/Option.d.ts
index defe37711a..c6113aa934 100644
--- a/types/react-select/lib/components/Option.d.ts
+++ b/types/react-select/lib/components/Option.d.ts
@@ -32,6 +32,8 @@ export type OptionProps<OptionType> = PropsWithStyles &
     /* Type is used by the menu to determine whether this is an option or a group.
     In the case of option this is always `option`. */
     type: 'option',
+    /* The data of the selected option. */
+    data: any,
   };
 
 export function optionCSS(state: State): React.CSSProperties;

From 8320760d0170eefbd1029391263ebcc06a3c46ac Mon Sep 17 00:00:00 2001
From: Mihail Novikov <thepocp@gmail.com>
Date: Fri, 16 Nov 2018 12:11:29 +0300
Subject: [PATCH 080/836] [react-table] Add overridden components

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

diff --git a/types/react-table/index.d.ts b/types/react-table/index.d.ts
index 2e9c14980c..fd7681d3b3 100644
--- a/types/react-table/index.d.ts
+++ b/types/react-table/index.d.ts
@@ -342,6 +342,10 @@ export interface ComponentProps {
     TdComponent: React.ReactType;
     TfootComponent: React.ReactType;
     ExpanderComponent: React.ReactType;
+    AggregatedComponent: React.ReactType,
+    PivotValueComponent: React.ReactType,
+    PivotComponent: React.ReactType,
+    FilterComponent: React.ReactType,
     PaginationComponent: React.ReactType;
     PreviousComponent: React.ReactType;
     NextComponent: React.ReactType;

From 3634a3943538a5270c1b2722b4592dd077645842 Mon Sep 17 00:00:00 2001
From: Mihail Novikov <thepocp@gmail.com>
Date: Fri, 16 Nov 2018 12:18:31 +0300
Subject: [PATCH 081/836] [react-table] Add overridden components (fix errors)

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

diff --git a/types/react-table/index.d.ts b/types/react-table/index.d.ts
index fd7681d3b3..d6b1679edd 100644
--- a/types/react-table/index.d.ts
+++ b/types/react-table/index.d.ts
@@ -342,10 +342,10 @@ export interface ComponentProps {
     TdComponent: React.ReactType;
     TfootComponent: React.ReactType;
     ExpanderComponent: React.ReactType;
-    AggregatedComponent: React.ReactType,
-    PivotValueComponent: React.ReactType,
-    PivotComponent: React.ReactType,
-    FilterComponent: React.ReactType,
+    AggregatedComponent: React.ReactType;
+    PivotValueComponent: React.ReactType;
+    PivotComponent: React.ReactType;
+    FilterComponent: React.ReactType;
     PaginationComponent: React.ReactType;
     PreviousComponent: React.ReactType;
     NextComponent: React.ReactType;

From b5e51f206129d6ee3780ba22fe85e1ddd6687cf0 Mon Sep 17 00:00:00 2001
From: Mihail Novikov <thepocp@gmail.com>
Date: Fri, 16 Nov 2018 13:43:49 +0300
Subject: [PATCH 082/836] [react-table] Fix tests

---
 types/react-table/test/select-table-tests.tsx | 2 --
 types/react-table/test/tree-table-tests.tsx   | 2 --
 2 files changed, 4 deletions(-)

diff --git a/types/react-table/test/select-table-tests.tsx b/types/react-table/test/select-table-tests.tsx
index 1a29ed07c1..1a1b231292 100644
--- a/types/react-table/test/select-table-tests.tsx
+++ b/types/react-table/test/select-table-tests.tsx
@@ -6,8 +6,6 @@ import selectTableHOC, {
     SelectTableAdditionalProps
 } from 'react-table/lib/hoc/selectTable';
 
-import 'react-table/react-table.css';
-
 const SelectTable = selectTableHOC(ReactTable);
 
 const selectTableAdditionalProps: SelectTableAdditionalProps = {
diff --git a/types/react-table/test/tree-table-tests.tsx b/types/react-table/test/tree-table-tests.tsx
index 14ad8265de..a099124c61 100644
--- a/types/react-table/test/tree-table-tests.tsx
+++ b/types/react-table/test/tree-table-tests.tsx
@@ -4,8 +4,6 @@ import * as ReactDOM from 'react-dom';
 import ReactTable, { Column } from 'react-table';
 import treeTableHOC from 'react-table/lib/hoc/treeTable';
 
-import 'react-table/react-table.css';
-
 const SelectTable = treeTableHOC(ReactTable);
 
 const data = [{ id: 1, name: 'Foo' }, { id: 2, name: 'Bar' }];

From fa930bcc17a0461d1d0c42233321f3d8beb84b6d Mon Sep 17 00:00:00 2001
From: Mihail Novikov <thepocp@gmail.com>
Date: Fri, 16 Nov 2018 13:52:27 +0300
Subject: [PATCH 083/836] [react-table] Fix test

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

diff --git a/types/react-table/react-table-tests.tsx b/types/react-table/react-table-tests.tsx
index fdc3870733..de7eea0bc7 100644
--- a/types/react-table/react-table-tests.tsx
+++ b/types/react-table/react-table-tests.tsx
@@ -3,7 +3,6 @@ import * as ReactDOM from 'react-dom';
 
 // Import React Table
 import ReactTable, { Column, FinalState, Instance } from "react-table";
-import "react-table/react-table.css";
 
 interface Data {
   firstName: string;

From f18851bea8e67645232633c8c88321add78a1822 Mon Sep 17 00:00:00 2001
From: Bryan Smith <bryan.smith@logos.com>
Date: Fri, 16 Nov 2018 10:35:29 -0800
Subject: [PATCH 084/836] Add onBeforeInput form events.

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

diff --git a/types/react/index.d.ts b/types/react/index.d.ts
index 332d3ac640..2a1c7baf7b 100644
--- a/types/react/index.d.ts
+++ b/types/react/index.d.ts
@@ -808,6 +808,8 @@ declare namespace React {
         // Form Events
         onChange?: FormEventHandler<T>;
         onChangeCapture?: FormEventHandler<T>;
+        onBeforeInput?: FormEventHandler<T>;
+        onBeforeInputCapture?: FormEventHandler<T>;
         onInput?: FormEventHandler<T>;
         onInputCapture?: FormEventHandler<T>;
         onReset?: FormEventHandler<T>;

From 7364d8937f28c0460ff0eefd3ee1a3e7bd6393e3 Mon Sep 17 00:00:00 2001
From: HokieGeek <andres.f.perez@gmail.com>
Date: Fri, 16 Nov 2018 15:30:20 -0500
Subject: [PATCH 085/836] @types/lunr: Updated Builder functions to add new
 optional arguments

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

diff --git a/types/lunr/index.d.ts b/types/lunr/index.d.ts
index da87ae95d8..415c7c1d8f 100644
--- a/types/lunr/index.d.ts
+++ b/types/lunr/index.d.ts
@@ -1,6 +1,6 @@
-// Type definitions for lunr.js 2.1
+// Type definitions for lunr.js 2.3
 // Project: https://github.com/olivernn/lunr.js
-// Definitions by: Sean Tan <https://github.com/seantanly>
+// Definitions by: Sean Tan <https://github.com/seantanly>, Andrés Pérez <https://github.com/hokiegeek>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -127,9 +127,14 @@ declare namespace lunr {
          * All fields should be added before adding documents to the index. Adding fields after
          * a document has been indexed will have no effect on already indexed documents.
          *
+         * Fields can be boosted at build time. This allows terms within that field to have more
+         * importance when ranking search results. Use a field boost to specify that matches
+         * within one field are more important than other fields.
+         *
          * @param field - The name of a field to index in all documents.
+         * @param attributes - Optional attributes associated with this field.
          */
-        field(field: string): void;
+        field(field: string, attributes?: object): void;
 
         /**
          * A parameter to tune the amount of field length normalisation that is applied when
@@ -160,9 +165,13 @@ declare namespace lunr {
          * it should have all fields defined for indexing, though null or undefined values will not
          * cause errors.
          *
+         * Entire documents can be boosted at build time. Applying a boost to a document indicates that
+         * this document should rank higher in search results than other documents.
+         *
          * @param doc - The document to add to the index.
+         * @param attributes - Optional attributes associated with this document.
          */
-        add(doc: object): void;
+        add(doc: object, attributes?: object): void;
 
         /**
          * Builds the index, creating an instance of lunr.Index.
diff --git a/types/lunr/lunr-tests.ts b/types/lunr/lunr-tests.ts
index ade45cae64..a14fd1947f 100644
--- a/types/lunr/lunr-tests.ts
+++ b/types/lunr/lunr-tests.ts
@@ -4,11 +4,18 @@ function basic_test() {
     const index = lunr(function() {
         this.field("title");
         this.field("body");
+        this.field("content", {
+            boost: 2,
+            extractor: (doc: object) => "oof"
+        });
         this.ref("id");
         this.add({
             id: 1,
             title: "Foo",
             body: "Foo foo foo!"
+        },
+        {
+            boost: 2
         });
         this.add({
             id: 2,

From 1e5d13c5544fc148545dba075306ecc49aee0c1f Mon Sep 17 00:00:00 2001
From: Christophe Hurpeau <christophe.hurpeau+github@gmail.com>
Date: Fri, 16 Nov 2018 21:43:44 +0100
Subject: [PATCH 086/836] webpack: NormalModuleReplacementPlugin doesnt seems
 deprecated

doc here: https://webpack.js.org/plugins/normal-module-replacement-plugin/
---
 types/webpack/index.d.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/types/webpack/index.d.ts b/types/webpack/index.d.ts
index 357c63e330..f5beb1dc63 100644
--- a/types/webpack/index.d.ts
+++ b/types/webpack/index.d.ts
@@ -1394,7 +1394,6 @@ declare namespace webpack {
         constructor();
     }
 
-    /** @deprecated use webpack.NoEmitOnErrorsPlugin */
     class NormalModuleReplacementPlugin extends Plugin {
         constructor(resourceRegExp: any, newResource: any);
     }

From 95b71e55e54883aaf6bffa5bdc2dd1a24ec0bb8e Mon Sep 17 00:00:00 2001
From: Jeroen Vervaeke <jeroen@vervaeke.pro>
Date: Sat, 17 Nov 2018 00:22:54 +0100
Subject: [PATCH 087/836] Improved DrawerItems

---
 types/react-navigation/index.d.ts             | 36 +++++++++++++++++--
 .../react-navigation-tests.tsx                | 13 +++++++
 2 files changed, 47 insertions(+), 2 deletions(-)

diff --git a/types/react-navigation/index.d.ts b/types/react-navigation/index.d.ts
index 4e81a26c88..92f3daa0e6 100644
--- a/types/react-navigation/index.d.ts
+++ b/types/react-navigation/index.d.ts
@@ -27,6 +27,7 @@
 //                 Max Davidson <https://github.com/maxdavidson>
 //                 Lachlan Young <https://github.com/builtbyproxy>
 //                 Jason Killian <https://github.com/jkillian>
+//                 Jeroen Vervaeke <https://github.com/jeroenvervaeke>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 
@@ -876,7 +877,38 @@ export function createSwitchNavigator(
 ): NavigationContainer;
 
 // DrawerItems
-export const DrawerItems: React.ReactType;
+export const DrawerItems: React.ComponentType<DrawerItemsProps>;
+
+export interface DrawerItemsProps {
+  navigation: NavigationScreenProp<NavigationState>,
+  items: Array<NavigationRoute>,
+  activeItemKey?: string,
+  activeTintColor?: string,
+  activeBackgroundColor?: string,
+  inactiveTintColor?: string,
+  inactiveBackgroundColor?: string,
+  getLabel: (scene: DrawerScene) => React.ReactNode | string,
+  renderIcon: (scene: DrawerScene) => React.ReactNode,
+  onItemPress: (info: DrawerItem) => void,
+  itemsContainerForceInset?: Object,
+  itemsContainerStyle?: StyleProp<ViewStyle>,
+  itemStyle?: StyleProp<ViewStyle>,
+  labelStyle?: StyleProp<TextStyle>,
+  activeLabelStyle?: StyleProp<TextStyle>,
+  inactiveLabelStyle?: StyleProp<TextStyle>,
+  iconContainerStyle?: StyleProp<ViewStyle>,
+  drawerPosition: 'left' | 'right',
+}
+declare type DrawerScene = {
+  route: NavigationRoute,
+  focused: boolean,
+  index: number,
+  tintColor?: string,
+};
+declare type DrawerItem = {
+  route: NavigationRoute,
+  focused: boolean,
+};
 
 /**
  * Drawer Navigator
@@ -885,7 +917,7 @@ export interface DrawerViewConfig {
   drawerBackgroundColor?: string;
   drawerWidth?: number;
   drawerPosition?: 'left' | 'right';
-  contentComponent?: React.ReactType;
+  contentComponent?: React.ComponentType<DrawerItemsProps>;
   contentOptions?: any;
   style?: StyleProp<ViewStyle>;
 }
diff --git a/types/react-navigation/react-navigation-tests.tsx b/types/react-navigation/react-navigation-tests.tsx
index 66bcf13c3c..43cadcde76 100644
--- a/types/react-navigation/react-navigation-tests.tsx
+++ b/types/react-navigation/react-navigation-tests.tsx
@@ -8,6 +8,8 @@ import {
 import {
     createDrawerNavigator,
     createBottomTabNavigator,
+    DrawerItems,
+    DrawerItemsProps,
     DrawerNavigatorConfig,
     NavigationAction,
     NavigationActions,
@@ -331,6 +333,17 @@ const BasicDrawerNavigator = createDrawerNavigator(
     stackNavigatorConfig,
 );
 
+const Drawer = (props: DrawerItemsProps) => (
+    <DrawerItems {...props} />
+);
+  
+const DrawerNavigatorWithCustomDrawer = createDrawerNavigator(
+    routeConfigMap,
+    {   
+        contentComponent: Drawer,
+    }
+);
+
 function renderBasicDrawerNavigator(): JSX.Element {
     return (
         <BasicDrawerNavigator

From aee31fb6add5fbf2f221dee71bb37d01776f53b3 Mon Sep 17 00:00:00 2001
From: Jeroen Vervaeke <jeroen@vervaeke.pro>
Date: Sat, 17 Nov 2018 00:45:18 +0100
Subject: [PATCH 088/836] Ran 'npm run lint package-name'

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

diff --git a/types/react-navigation/index.d.ts b/types/react-navigation/index.d.ts
index 92f3daa0e6..593500e585 100644
--- a/types/react-navigation/index.d.ts
+++ b/types/react-navigation/index.d.ts
@@ -880,35 +880,34 @@ export function createSwitchNavigator(
 export const DrawerItems: React.ComponentType<DrawerItemsProps>;
 
 export interface DrawerItemsProps {
-  navigation: NavigationScreenProp<NavigationState>,
-  items: Array<NavigationRoute>,
-  activeItemKey?: string,
-  activeTintColor?: string,
-  activeBackgroundColor?: string,
-  inactiveTintColor?: string,
-  inactiveBackgroundColor?: string,
-  getLabel: (scene: DrawerScene) => React.ReactNode | string,
-  renderIcon: (scene: DrawerScene) => React.ReactNode,
-  onItemPress: (info: DrawerItem) => void,
-  itemsContainerForceInset?: Object,
-  itemsContainerStyle?: StyleProp<ViewStyle>,
-  itemStyle?: StyleProp<ViewStyle>,
-  labelStyle?: StyleProp<TextStyle>,
-  activeLabelStyle?: StyleProp<TextStyle>,
-  inactiveLabelStyle?: StyleProp<TextStyle>,
-  iconContainerStyle?: StyleProp<ViewStyle>,
-  drawerPosition: 'left' | 'right',
+  navigation: NavigationScreenProp<NavigationState>;
+  items: NavigationRoute[];
+  activeItemKey?: string;
+  activeTintColor?: string;
+  activeBackgroundColor?: string;
+  inactiveTintColor?: string;
+  inactiveBackgroundColor?: string;
+  getLabel: (scene: DrawerScene) => React.ReactNode | string;
+  renderIcon: (scene: DrawerScene) => React.ReactNode;
+  onItemPress: (info: DrawerItem) => void;
+  itemsContainerStyle?: StyleProp<ViewStyle>;
+  itemStyle?: StyleProp<ViewStyle>;
+  labelStyle?: StyleProp<TextStyle>;
+  activeLabelStyle?: StyleProp<TextStyle>;
+  inactiveLabelStyle?: StyleProp<TextStyle>;
+  iconContainerStyle?: StyleProp<ViewStyle>;
+  drawerPosition: 'left' | 'right';
+}
+export interface DrawerScene {
+  route: NavigationRoute;
+  focused: boolean;
+  index: number;
+  tintColor?: string;
+}
+export interface DrawerItem {
+  route: NavigationRoute;
+  focused: boolean;
 }
-declare type DrawerScene = {
-  route: NavigationRoute,
-  focused: boolean,
-  index: number,
-  tintColor?: string,
-};
-declare type DrawerItem = {
-  route: NavigationRoute,
-  focused: boolean,
-};
 
 /**
  * Drawer Navigator

From a7e72529b207c1529dd2ad7707f154ac0e359b86 Mon Sep 17 00:00:00 2001
From: robbywashere <robertapolana@gmail.com>
Date: Fri, 16 Nov 2018 22:16:01 -0500
Subject: [PATCH 089/836] Update to types/recompose package withStateHandler to
 give stateUpdaters typed arguments rather than

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

diff --git a/types/recompose/index.d.ts b/types/recompose/index.d.ts
index 6f61888954..edb8ef9415 100644
--- a/types/recompose/index.d.ts
+++ b/types/recompose/index.d.ts
@@ -151,7 +151,7 @@ declare module 'recompose' {
       [updaterName: string]: StateHandler<TState>;
     };
     type StateUpdaters<TOutter, TState, TUpdaters> = {
-      [updaterName in keyof TUpdaters]: (state: TState, props: TOutter) => StateHandler<TState>;
+      [updaterName in keyof TUpdaters]: (state: TState, props: TOutter) => TUpdaters[updaterName];
     };
     export function withStateHandlers<TState, TUpdaters extends StateHandlerMap<TState>, TOutter = {}>(
       createProps: TState | mapper<TOutter, TState>,

From cd38ae33dea2dd375ae01a31399d85eeb1f219a6 Mon Sep 17 00:00:00 2001
From: islishude <lishude@aliyun.com>
Date: Sat, 17 Nov 2018 12:41:11 +0800
Subject: [PATCH 090/836] [node]: add props to repl.Context

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

diff --git a/types/node/index.d.ts b/types/node/index.d.ts
index fdda9e948a..221dd5baad 100644
--- a/types/node/index.d.ts
+++ b/types/node/index.d.ts
@@ -2501,7 +2501,9 @@ declare module "readline" {
 }
 
 declare module "vm" {
-    interface Context { }
+    interface Context { 
+        [key: string]: any;
+    }
     interface BaseOptions {
         /**
          * Specifies the filename used in stack traces produced by this script.
diff --git a/types/node/node-tests.ts b/types/node/node-tests.ts
index 20159c70d9..0ae3866a8a 100644
--- a/types/node/node-tests.ts
+++ b/types/node/node-tests.ts
@@ -3675,6 +3675,12 @@ import * as p from "process";
         function test() {
             throw new repl.Recoverable(new Error("test"));
         }
+
+        _server.context.key0 = 1;
+        _server.context.key1 = "string";
+        _server.context.key2 = true;
+        _server.context.key3 = [];
+        _server.context.key4 = {};
     }
 }
 
diff --git a/types/node/v9/index.d.ts b/types/node/v9/index.d.ts
index 4678c59c74..b620ac9ce1 100644
--- a/types/node/v9/index.d.ts
+++ b/types/node/v9/index.d.ts
@@ -2390,7 +2390,9 @@ declare module "readline" {
 }
 
 declare module "vm" {
-    export interface Context { }
+    export interface Context { 
+        [key: string]: any;
+    }
     export interface ScriptOptions {
         filename?: string;
         lineOffset?: number;

From 8e0be6712ba2c19b495ffc32b8ffb37ff8eb21f6 Mon Sep 17 00:00:00 2001
From: denis <denisname@users.noreply.github.com>
Date: Sat, 17 Nov 2018 11:05:38 +0100
Subject: [PATCH 091/836] Fix no-angle-bracket-type-assertion

---
 types/d3-brush/d3-brush-tests.ts         | 2 +-
 types/d3-drag/d3-drag-tests.ts           | 6 +++---
 types/d3-selection/d3-selection-tests.ts | 2 +-
 types/d3-selection/tslint.json           | 1 -
 types/d3-zoom/d3-zoom-tests.ts           | 8 ++++----
 types/d3-zoom/tslint.json                | 1 -
 types/d3kit/d3kit-tests.ts               | 4 ++--
 7 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/types/d3-brush/d3-brush-tests.ts b/types/d3-brush/d3-brush-tests.ts
index dc2c9a0dc8..c5a287b562 100644
--- a/types/d3-brush/d3-brush-tests.ts
+++ b/types/d3-brush/d3-brush-tests.ts
@@ -48,7 +48,7 @@ brush = brush.extent(function(d, i, group) {
 // chainable
 brush = brush.filter(function(d, i, group) {
     // Cast d3 event to D3ZoomEvent to be used in filter logic
-    const e = <d3Brush.D3BrushEvent<BrushDatum>> event;
+    const e = event as d3Brush.D3BrushEvent<BrushDatum>;
 
     console.log('Owner SVG Element of svg group: ', this.ownerSVGElement); // this is of type SVGGElement
     return e.sourceEvent.type !== 'zoom' || !d.filterZoomEvent; // datum type is BrushDatum (as propagated to SVGGElement with brush event attached)
diff --git a/types/d3-drag/d3-drag-tests.ts b/types/d3-drag/d3-drag-tests.ts
index cf5428e7e2..5e376c003b 100644
--- a/types/d3-drag/d3-drag-tests.ts
+++ b/types/d3-drag/d3-drag-tests.ts
@@ -134,7 +134,7 @@ touchableFn = circleDrag.touchable();
 
 circleCustomDrag.subject(function(d, i, g) {
     // Cast event type for completeness, otherwise event is of type any.
-    const e = <d3Drag.D3DragEvent<SVGCircleElement, CircleDatum, CustomSubject | d3Drag.SubjectPosition>> event;
+    const e = event as d3Drag.D3DragEvent<SVGCircleElement, CircleDatum, CustomSubject | d3Drag.SubjectPosition>;
     const that: SVGCircleElement = this;
     const datum: CircleDatum = d;
     const index: number = i;
@@ -163,14 +163,14 @@ subjectAccessor = circleCustomDrag.subject();
 
 function dragstarted(this: SVGCircleElement, d: CircleDatum) {
     // cast d3 event to drag event. Otherwise, d3 event is currently defined as type 'any'
-    const e = <d3Drag.D3DragEvent<SVGCircleElement, CircleDatum, CircleDatum | d3Drag.SubjectPosition>> event;
+    const e = event as d3Drag.D3DragEvent<SVGCircleElement, CircleDatum, CircleDatum | d3Drag.SubjectPosition>;
     e.sourceEvent.stopPropagation();
     select(this).classed('dragging', true);
 }
 
 function dragged(this: SVGCircleElement, d: CircleDatum) {
     // cast d3 event to drag event. Otherwise, d3 event is currently defined as type 'any'
-    const e = <d3Drag.D3DragEvent<SVGCircleElement, CircleDatum, CircleDatum | d3Drag.SubjectPosition>> event;
+    const e = event as d3Drag.D3DragEvent<SVGCircleElement, CircleDatum, CircleDatum | d3Drag.SubjectPosition>;
     select(this).attr('cx', d.x = e.x).attr('cy', d.y = e.y);
 }
 
diff --git a/types/d3-selection/d3-selection-tests.ts b/types/d3-selection/d3-selection-tests.ts
index bafc1aeb11..092e8bfa5a 100644
--- a/types/d3-selection/d3-selection-tests.ts
+++ b/types/d3-selection/d3-selection-tests.ts
@@ -1060,7 +1060,7 @@ interface SuccessEvent {
 const successEvent = { type: 'wonEuro2016', team: 'Island' };
 
 function customListener(this: HTMLBodyElement | null, finalOpponent: string): string {
-    const e = <SuccessEvent> d3Selection.event;
+    const e = d3Selection.event as SuccessEvent;
 
     return `${e.team} defeated ${finalOpponent} in the EURO 2016 Cup. Who would have thought!!!`;
 }
diff --git a/types/d3-selection/tslint.json b/types/d3-selection/tslint.json
index c89636b4b7..26ee29cf50 100644
--- a/types/d3-selection/tslint.json
+++ b/types/d3-selection/tslint.json
@@ -2,7 +2,6 @@
     "extends": "dtslint/dt.json",
     "rules": {
         // TODO
-        "no-angle-bracket-type-assertion": false,
         "no-this-assignment": false,
         "unified-signatures": false,
         "no-unnecessary-generics": false
diff --git a/types/d3-zoom/d3-zoom-tests.ts b/types/d3-zoom/d3-zoom-tests.ts
index 19a16930d6..c758e83448 100644
--- a/types/d3-zoom/d3-zoom-tests.ts
+++ b/types/d3-zoom/d3-zoom-tests.ts
@@ -91,7 +91,7 @@ interface GroupDatum {
 
 function zoomedCanvas(this: HTMLCanvasElement, d: CanvasDatum) {
     // Cast d3 event to D3ZoomEvent to be used in zoom event handler
-    const e = <d3Zoom.D3ZoomEvent<HTMLCanvasElement, any>> event;
+    const e = event as d3Zoom.D3ZoomEvent<HTMLCanvasElement, any>;
     if (context) {
         context.save();
         context.clearRect(0, 0, this.width, this.height); // this element
@@ -112,7 +112,7 @@ canvasZoom = d3Zoom.zoom<HTMLCanvasElement, CanvasDatum>()
 
 function zoomedSVGOverlay(this: SVGRectElement) {
     // Cast d3 event to D3ZoomEvent to be used in zoom event handler
-    const e = <d3Zoom.D3ZoomEvent<HTMLCanvasElement, any>> event;
+    const e = event as d3Zoom.D3ZoomEvent<HTMLCanvasElement, any>;
 
     g.attr('transform', e.transform.toString());
 }
@@ -146,7 +146,7 @@ constraintFn = svgZoom.constrain();
 // chainable
 svgZoom = svgZoom.filter(function(d, i, group) {
     // Cast d3 event to D3ZoomEvent to be used in filter logic
-    const e = <d3Zoom.D3ZoomEvent<SVGRectElement, SVGDatum>> event;
+    const e = event as d3Zoom.D3ZoomEvent<SVGRectElement, SVGDatum>;
 
     console.log('Overlay Rectangle width: ', this.width.baseVal.value); // this typing is SVGRectElement
     return e.sourceEvent.type !== 'brush' || !d.filterBrushEvent; // datum type is SVGDatum (as propagated to SVGRectElement with zoom event attached)
@@ -178,7 +178,7 @@ touchableFn = svgZoom.touchable();
 // chainable
 svgZoom = svgZoom.wheelDelta(function(d, i, group) {
     // Cast d3 event to D3ZoomEvent to be used in filter logic
-    const e = <WheelEvent> event;
+    const e = event as WheelEvent;
     const that: SVGRectElement = this;
     const datum: SVGDatum = d;
     const index: number = i;
diff --git a/types/d3-zoom/tslint.json b/types/d3-zoom/tslint.json
index c89636b4b7..26ee29cf50 100644
--- a/types/d3-zoom/tslint.json
+++ b/types/d3-zoom/tslint.json
@@ -2,7 +2,6 @@
     "extends": "dtslint/dt.json",
     "rules": {
         // TODO
-        "no-angle-bracket-type-assertion": false,
         "no-this-assignment": false,
         "unified-signatures": false,
         "no-unnecessary-generics": false
diff --git a/types/d3kit/d3kit-tests.ts b/types/d3kit/d3kit-tests.ts
index ec3b2de1ce..705b9fcc59 100644
--- a/types/d3kit/d3kit-tests.ts
+++ b/types/d3kit/d3kit-tests.ts
@@ -304,7 +304,7 @@ function test_svg_chart() {
      * Test plate functions
      */
     plate = new d3kit.SvgPlate();
-    plate = <d3kit.SvgPlate> chart.addPlate('a-plate', plate, true); // with doNotAppend
+    plate = chart.addPlate('a-plate', plate, true) as d3kit.SvgPlate; // with doNotAppend
     chart = chart.addPlate('a-plate', plate);       // without doNotAppend
     chart = chart.removePlate('a-plate');
 
@@ -381,7 +381,7 @@ function test_hybrid_chart() {
      * Test plate functions
      */
     plate = new d3kit.SvgPlate();
-    plate = <d3kit.SvgPlate> chart.addPlate('a-plate', plate, true); // with doNotAppend
+    plate = chart.addPlate('a-plate', plate, true) as d3kit.SvgPlate; // with doNotAppend
     chart = chart.addPlate('a-plate', plate);       // without doNotAppend
     chart = chart.removePlate('a-plate');
 

From 25c1531d1cf4b4e6ebc0d708b65529b7be89d0a9 Mon Sep 17 00:00:00 2001
From: loveky <ylzcylx@gmail.com>
Date: Sat, 17 Nov 2018 23:08:51 +0800
Subject: [PATCH 092/836] Update definition for webpack-chain to match version
 5.0

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

diff --git a/types/webpack-chain/index.d.ts b/types/webpack-chain/index.d.ts
index 033ef9951f..d821d13417 100644
--- a/types/webpack-chain/index.d.ts
+++ b/types/webpack-chain/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for webpack-chain 4.8
+// Type definitions for webpack-chain 5.0
 // Project: https://github.com/mozilla-neutrino/webpack-chain
 // Definitions by: Eirikur Nilsson <https://github.com/eirikurn>, Paul Sachs <https://github.com/psachs21>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -209,7 +209,7 @@ declare namespace Config {
 		flagIncludedChunks(value: boolean): this;
 		mergeDuplicateChunks(value: boolean): this;
 		minimize(value: boolean): this;
-		minimizer(value: webpack.Plugin[]): this;
+		minimizer(name: string): Plugin<this>;
 		namedChunks(value: boolean): this;
 		namedModules(value: boolean): this;
 		nodeEnv(value: boolean | string): this;
diff --git a/types/webpack-chain/webpack-chain-tests.ts b/types/webpack-chain/webpack-chain-tests.ts
index f1d0daa5e2..b655df07ea 100644
--- a/types/webpack-chain/webpack-chain-tests.ts
+++ b/types/webpack-chain/webpack-chain-tests.ts
@@ -173,7 +173,9 @@ config
 		.flagIncludedChunks(true)
 		.mergeDuplicateChunks(true)
 		.minimize(true)
-		.minimizer([])
+		.minimizer('foo')
+			.use(webpack.DefinePlugin)
+			.end()
 		.namedChunks(true)
 		.namedModules(true)
 		.nodeEnv(true)

From 1acadfde0d9c5f18226c73c45b4c80a1a39c501a Mon Sep 17 00:00:00 2001
From: Jeroen Vervaeke <jeroen@vervaeke.pro>
Date: Sat, 17 Nov 2018 16:43:21 +0100
Subject: [PATCH 093/836] Removed trailing whitespace

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

diff --git a/types/react-navigation/react-navigation-tests.tsx b/types/react-navigation/react-navigation-tests.tsx
index 43cadcde76..fe6a939a61 100644
--- a/types/react-navigation/react-navigation-tests.tsx
+++ b/types/react-navigation/react-navigation-tests.tsx
@@ -336,10 +336,10 @@ const BasicDrawerNavigator = createDrawerNavigator(
 const Drawer = (props: DrawerItemsProps) => (
     <DrawerItems {...props} />
 );
-  
+
 const DrawerNavigatorWithCustomDrawer = createDrawerNavigator(
     routeConfigMap,
-    {   
+    {
         contentComponent: Drawer,
     }
 );

From c6b16d03af70d28b26eccdf2a452984f14d10b5f Mon Sep 17 00:00:00 2001
From: Shuhei Tsukaomoto <seljydef@gmail.com>
Date: Sun, 18 Nov 2018 16:24:48 +0900
Subject: [PATCH 094/836] update: add MjolnirEvent.

---
 types/react-map-gl/index.d.ts | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/types/react-map-gl/index.d.ts b/types/react-map-gl/index.d.ts
index 6a215225d7..7f59244154 100644
--- a/types/react-map-gl/index.d.ts
+++ b/types/react-map-gl/index.d.ts
@@ -78,6 +78,22 @@ export interface MapEvent {
     features: Array<{}>;
 }
 
+export interface MjolnirEvent {
+    type: string;
+    offsetCenter: {x: number, y: number};
+    deltaX: number;
+    deltaY: number;
+    delta: number;
+    scale: number;
+    rotation: number;
+    pointerType: string;
+    metaKey: boolean;
+    rightButton: boolean;
+    stopPropagation: () => void;
+    preventDefault: () => void;
+    srcEvent: any;
+}
+
 export interface Center {
     x: number;
     y: number;
@@ -201,9 +217,9 @@ export interface MarkerProps extends BaseControlProps {
     latitude: number;
     offsetLeft?: number;
     offsetTop?: number;
-    onDrag: (event: any) => void;
-    onDragStart: (event: any) => void;
-    onDragEnd: (event: any) => void;
+    onDrag: (event: MjolnirEvent) => void;
+    onDragStart: (event: MjolnirEvent) => void;
+    onDragEnd: (event: MjolnirEvent) => void;
 }
 
 export class Marker extends BaseControl<MarkerProps> {}

From 43ced3fe679143e0e60eb966d1d03db48991925a Mon Sep 17 00:00:00 2001
From: Fabio Berta <fnberta@gmail.com>
Date: Sun, 18 Nov 2018 12:58:37 +0100
Subject: [PATCH 095/836] update for 4.0

---
 types/react-map-gl/index.d.ts             | 269 ++++++++++++----------
 types/react-map-gl/react-map-gl-tests.tsx |  18 +-
 2 files changed, 150 insertions(+), 137 deletions(-)

diff --git a/types/react-map-gl/index.d.ts b/types/react-map-gl/index.d.ts
index 7f59244154..4522ddf729 100644
--- a/types/react-map-gl/index.d.ts
+++ b/types/react-map-gl/index.d.ts
@@ -9,12 +9,13 @@ import * as React from 'react';
 import * as MapboxGL from 'mapbox-gl';
 import * as GeoJSON from 'geojson';
 
-export interface Viewport {
+export interface ViewState {
     latitude: number;
     longitude: number;
     zoom: number;
     bearing?: number;
     pitch?: number;
+    altitude?: number;
 }
 
 export interface MapError {
@@ -31,31 +32,37 @@ export interface MapRequest {
     credentials?: string;
 }
 
-export interface MapboxProps extends Partial<Viewport> {
-    container?: {};
+export interface MapboxProps extends Partial<ViewState> {
+    container?: object;
+    gl?: object;
     mapboxApiAccessToken?: string;
     attributionControl?: boolean;
     preserveDrawingBuffer?: boolean;
+    reuseMaps?: boolean;
+    transformRequest?: (url?: string, resourceType?: string) => MapRequest;
+    mapOptions?: object;
+    mapStyle?: string | object;
+    visible?: boolean;
     onLoad?: () => void;
     onError?: (e: MapError) => void;
-    reuseMaps?: boolean;
     reuseMap?: boolean;
-    transformRequest?: (url?: string, resourceType?: string) => MapRequest;
-
-    mapStyle?: string | {};
-
-    width: number;
-    height: number;
-
-    viewState?: Viewport;
-
-    altitude?: number; // Note: Non-public API, see https://github.com/mapbox/mapbox-gl-js/issues/1137
+    width: number | string;
+    height: number | string;
+    viewState?: ViewState;
 }
 
 export interface StaticMapProps extends MapboxProps {
+    onResize?: (dimensions: { width: number; height: number }) => void;
     preventStyleDiffing?: boolean;
-    visible?: boolean;
+    disableTokenWarning?: boolean;
     className?: string;
+    style?: object;
+    visibilityConstraints?: {
+        minZoom?: number;
+        maxZoom?: number;
+        minPitch?: number;
+        maxPitch?: number;
+    };
 }
 
 export interface QueryRenderedFeaturesParams {
@@ -68,30 +75,71 @@ export class StaticMap extends React.Component<StaticMapProps> {
     queryRenderedFeatures(geometry?: MapboxGL.PointLike | MapboxGL.PointLike[], parameters?: QueryRenderedFeaturesParams): Array<GeoJSON.Feature<GeoJSON.GeometryObject>>;
 }
 
-export interface InteractiveMapState {
+export interface ExtraState {
     isDragging: boolean;
     isHovering: boolean;
 }
 
-export interface MapEvent {
-    lngLat: [number, number];
-    features: Array<{}>;
+export interface PositionInput {
+  pos: [number, number];
 }
 
-export interface MjolnirEvent {
-    type: string;
-    offsetCenter: {x: number, y: number};
-    deltaX: number;
-    deltaY: number;
-    delta: number;
-    scale: number;
-    rotation: number;
-    pointerType: string;
-    metaKey: boolean;
-    rightButton: boolean;
-    stopPropagation: () => void;
-    preventDefault: () => void;
-    srcEvent: any;
+export interface MapControllerOptions {
+    onViewportChange?: (viewState: ViewState) => void;
+    onStateChange?: (state: MapState) => void;
+    eventManager?: any;
+    isInteractive: boolean;
+    scrollZoom?: boolean;
+    dragPan?: boolean;
+    dragRotate?: boolean;
+    doubleClickZoom?: boolean;
+    touchZoom?: boolean;
+    touchRotate?: boolean;
+    keyboard?: boolean;
+}
+
+export interface ViewportProps {
+  width: number;
+  height: number;
+  latitude: number;
+  longitude: number;
+  zoom: number;
+  bearing: number;
+  pitch: number;
+  altitude: number;
+  maxZoom: number;
+  minZoom: number;
+  maxPitch: number;
+  minPitch: number;
+  transitionDuration?: number;
+  transitionInterpolator?: TransitionInterpolator;
+  transitionInterruption?: TRANSITION_EVENTS;
+  transitionEasing?: EasingFunction;
+}
+
+export interface InteractiveState {
+  startPanLngLat?: [number, number];
+  startZoomLngLat?: [number, number];
+  startBearing?: number;
+  startPitch?: number;
+  startZoom?: number;
+}
+
+export type MapStateProps = Partial<ViewportProps & InteractiveState>;
+
+export class MapState {
+  constructor(props: MapStateProps);
+  getViewportProps(): ViewportProps;
+  getInteractiveState(): InteractiveState;
+  panStart(input: PositionInput): MapState;
+  pan(input: PositionInput & { startPos?: [number, number] }): MapState;
+  panEnd(): MapState;
+  rotateStart(input: PositionInput): MapState;
+  rotate(input: { deltaScaleX?: number; deltaScaleY?: number }): MapState;
+  rotateEnd(): MapState;
+  zoomStart(input: PositionInput): MapState;
+  zoom(input: PositionInput & { scale: number; startPos?: [number, number] }): MapState;
+  zoomEnd(): MapState;
 }
 
 export interface Center {
@@ -113,11 +161,30 @@ export interface MapControlEvent {
     delta?: number;
 }
 
-export interface BaseMapControls {
+export interface BaseMapController {
     events: string[];
     handleEvent(event: MapControlEvent): void;
 }
 
+export class MapController implements BaseMapController {
+    events: string[];
+    handleEvent(event: MapControlEvent): void;
+    getMapState(overrides: Partial<MapState>): MapState;
+    setOptions(options: MapControllerOptions): void;
+    setState(newState: MapState): void;
+    updateViewport(newMapState: MapState, extraProps: any, extraState: ExtraState): void;
+}
+
+export interface PointerEvent {
+    type: string;
+    point: [number, number];
+    lngLat: [number, number];
+    target: any;
+    srcEvent: any;
+    // backward compatibility: v3 interface
+    features: any[];
+}
+
 export type EasingFunction = (t: number) => number;
 
 export enum TRANSITION_EVENTS {
@@ -135,7 +202,7 @@ export class LinearInterpolator extends TransitionInterpolator {
 export class FlyToInterpolator extends TransitionInterpolator {}
 
 export interface ViewStateChangeInfo {
-  viewState: Viewport;
+  viewState: ViewState;
 }
 
 export interface InteractiveMapProps extends StaticMapProps {
@@ -143,10 +210,9 @@ export interface InteractiveMapProps extends StaticMapProps {
     minZoom?: number;
     maxPitch?: number;
     minPitch?: number;
-
-    onViewportChange?: (viewport: Viewport) => void;
     onViewStateChange?: (info: ViewStateChangeInfo) => void;
-
+    onViewportChange?: (viewState: ViewState) => void;
+    onInteractionStateChange?: (state: ExtraState) => void;
     transitionDuration?: number;
     transitionInterpolator?: TransitionInterpolator;
     transitionInterruption?: TRANSITION_EVENTS;
@@ -154,7 +220,6 @@ export interface InteractiveMapProps extends StaticMapProps {
     onTransitionStart?: () => void;
     onTransitionInterrupt?: () => void;
     onTransitionEnd?: () => void;
-
     scrollZoom?: boolean;
     dragPan?: boolean;
     dragRotate?: boolean;
@@ -162,37 +227,25 @@ export interface InteractiveMapProps extends StaticMapProps {
     touchZoom?: boolean;
     touchRotate?: boolean;
     keyboard?: boolean;
-
-    onHover?: (event: MapEvent) => void;
-    onClick?: (event: MapEvent) => void;
-    onDblClick?: (event: MapEvent) => void;
-    onMouseDown?: (event: MapEvent) => void;
-    onMouseMove?: (event: MapEvent) => void;
-    onMouseUp?: (event: MapEvent) => void;
-    onTouchStart?: (event: MapEvent) => void;
-    onTouchMove?: (event: MapEvent) => void;
-    onTouchEnd?: (event: MapEvent) => void;
-    onMouseEnter?: (event: MapEvent) => void;
-    onMouseLeave?: (event: MapEvent) => void;
-    onWheel?: (event: MapEvent) => void;
-    onMouseOut?: (event: MapEvent) => void;
-
-    onContextMenu?: (event: MapEvent) => void;
-
+    onHover?: (event: PointerEvent) => void;
+    onClick?: (event: PointerEvent) => void;
+    onDblClick?: (event: PointerEvent) => void;
+    onContextMenu?: (event: PointerEvent) => void;
+    onMouseDown?: (event: PointerEvent) => void;
+    onMouseMove?: (event: PointerEvent) => void;
+    onMouseUp?: (event: PointerEvent) => void;
+    onTouchStart?: (event: PointerEvent) => void;
+    onTouchMove?: (event: PointerEvent) => void;
+    onTouchEnd?: (event: PointerEvent) => void;
+    onMouseEnter?: (event: PointerEvent) => void;
+    onMouseLeave?: (event: PointerEvent) => void;
+    onMouseOut?: (event: PointerEvent) => void;
+    onWheel?: (event: PointerEvent) => void;
     touchAction?: string;
-
     clickRadius?: number;
-
-    getCursor?: (state: InteractiveMapState) => void;
-
-    visibilityConstraints?: {
-        minZoom?: number;
-        maxZoom?: number;
-        minPitch?: number;
-        maxPitch?: number;
-    };
-
-    mapControls?: BaseMapControls;
+    interactiveLayerIds?: string[];
+    getCursor?: (state: ExtraState) => void;
+    controller?: MapController;
 }
 
 export class InteractiveMap extends React.Component<InteractiveMapProps> {
@@ -211,15 +264,21 @@ export interface BaseControlProps {
 
 export class BaseControl<T extends BaseControlProps> extends React.Component<T> {}
 
+export interface DragEvent {
+    lngLat: [number, number];
+    [key: string]: any;
+}
+
 export interface MarkerProps extends BaseControlProps {
     className?: string;
     longitude: number;
     latitude: number;
     offsetLeft?: number;
     offsetTop?: number;
-    onDrag: (event: MjolnirEvent) => void;
-    onDragStart: (event: MjolnirEvent) => void;
-    onDragEnd: (event: MjolnirEvent) => void;
+    draggable?: boolean;
+    onDrag?: (event: DragEvent) => void;
+    onDragEnd?: (event: DragEvent) => void;
+    onDragStart?: (event: DragEvent) => void;
 }
 
 export class Marker extends BaseControl<MarkerProps> {}
@@ -228,6 +287,7 @@ export interface PopupProps extends BaseControlProps {
     className?: string;
     longitude: number;
     latitude: number;
+    altitude?: number;
     offsetLeft?: number;
     offsetTop?: number;
     tipSize?: number;
@@ -244,13 +304,22 @@ export class Popup extends BaseControl<PopupProps> {}
 export interface NavigationControlProps extends BaseControlProps {
     className?: string;
     onViewStateChange: (info: ViewStateChangeInfo) => void;
-    onViewportChange: (viewport: Viewport) => void;
+    onViewportChange: (viewport: ViewState) => void;
     showCompass?: boolean;
     showZoom?: boolean;
 }
 
 export class NavigationControl extends BaseControl<NavigationControlProps> {}
 
+export interface DraggableControlProps extends BaseControlProps {
+    draggable?: boolean;
+    onDrag?: (event: DragEvent) => void;
+    onDragEnd?: (event: DragEvent) => void;
+    onDragStart?: (event: DragEvent) => void;
+}
+
+export class DraggableControl extends BaseControl<DraggableControlProps> {}
+
 export interface HTMLRedrawOptions {
     width: number;
     height: number;
@@ -283,59 +352,3 @@ export interface SVGOverlayProps extends BaseControlProps {
 }
 
 export class SVGOverlay extends BaseControl<SVGOverlayProps> {}
-
-export namespace experimental {
-    interface Options {
-        // TODO(deprecate): remove this when `touchZoomRotate` gets deprecated
-        touchZoomRotate?: boolean;
-
-        onViewStateChange?: (info: ViewStateChangeInfo) => void;
-        onViewportChange?: (viewport: Viewport) => void;
-        onStateChange?: (state: MapState) => void;
-        eventManager?: any;
-        scrollZoom?: boolean;
-        dragPan?: boolean;
-        dragRotate?: boolean;
-        doubleClickZoom?: boolean;
-        touchZoom?: boolean;
-        touchRotate?: boolean;
-        keyboard?: boolean;
-    }
-
-    class MapState implements Viewport {
-        width: number;
-        height: number;
-        latitude: number;
-        longitude: number;
-        zoom: number;
-        bearing?: number;
-        pitch?: number;
-        altitude?: number;
-
-        maxZoom?: number;
-        minZoom?: number;
-        maxPitch?: number;
-        minPitch?: number;
-
-        transitionDuration?: number;
-        transitionInterpolator?: TransitionInterpolator;
-        transitionInterruption?: TRANSITION_EVENTS;
-        transitionEasing?: EasingFunction;
-
-        startPanLngLat?: [number, number];
-        startZoomLngLat?: [number, number];
-        startBearing?: number;
-        startPitch?: number;
-        startZoom?: number;
-    }
-
-    class MapControls implements BaseMapControls {
-        events: string[];
-
-        handleEvent(event: MapControlEvent): void;
-        getMapState(overrides: Partial<MapState>): MapState;
-        setOptions(options: Options): void;
-        setState(newState: MapState): void;
-        updateViewport(newMapState: MapState, extraProps: any, extraState: InteractiveMapState): void;
-    }
-}
diff --git a/types/react-map-gl/react-map-gl-tests.tsx b/types/react-map-gl/react-map-gl-tests.tsx
index 7eb5bfd590..c9024287c9 100644
--- a/types/react-map-gl/react-map-gl-tests.tsx
+++ b/types/react-map-gl/react-map-gl-tests.tsx
@@ -1,6 +1,6 @@
 import * as React from "react";
 import {
-    Viewport,
+    ViewState,
     InteractiveMap,
     CanvasOverlay,
     SVGOverlay,
@@ -13,12 +13,12 @@ import {
 import * as MapboxGL from "mapbox-gl";
 
 interface State {
-    viewport: Viewport;
+    viewState: ViewState;
 }
 
 class MyMap extends React.Component<{}, State> {
     readonly state: State = {
-        viewport: {
+        viewState: {
             bearing: 0,
             latitude: 0,
             longitude: 0,
@@ -31,14 +31,14 @@ class MyMap extends React.Component<{}, State> {
         return (
             <div>
                 <InteractiveMap
-                    {...this.state.viewport}
+                    {...this.state.viewState}
                     mapboxApiAccessToken="pk.test"
                     height={400}
                     width={400}
                     ref={this.setRefInteractive}
                 >
                     <CanvasOverlay
-                        redraw={(opts: CanvasRedrawOptions) => {
+                        redraw={opts => {
                             const {
                                 ctx,
                                 height,
@@ -51,7 +51,7 @@ class MyMap extends React.Component<{}, State> {
                         }}
                     />
                     <CanvasOverlay
-                        redraw={(opts: CanvasRedrawOptions) => {}}
+                        redraw={opts => {}}
                         captureScroll={true}
                         captureDrag={true}
                         captureClick={true}
@@ -61,7 +61,7 @@ class MyMap extends React.Component<{}, State> {
                         redraw={() => {}}
                     />
                     <SVGOverlay
-                        redraw={(opts: SVGRedrawOptions) => {
+                        redraw={opts => {
                             const {
                                 height,
                                 project,
@@ -79,7 +79,7 @@ class MyMap extends React.Component<{}, State> {
                         redraw={() => {}}
                     />
                     <HTMLOverlay
-                        redraw={(opts: HTMLRedrawOptions) => {
+                        redraw={opts => {
                             const {
                                 height,
                                 project,
@@ -98,7 +98,7 @@ class MyMap extends React.Component<{}, State> {
                     />
                 </InteractiveMap>
                 <StaticMap
-                    {...this.state.viewport}
+                    {...this.state.viewState}
                     mapboxApiAccessToken="pk.test"
                     height={400}
                     width={400}

From cd96d508963ea2dc3d7300f7f97bf8ce8b8e7400 Mon Sep 17 00:00:00 2001
From: Dimitri Benin <dimitri.benin@gmail.com>
Date: Sun, 18 Nov 2018 21:55:59 +0100
Subject: [PATCH 096/836] types for dinero.js

---
 types/dinero.js/dinero.js-tests.ts | 71 +++++++++++++++++++++++++++
 types/dinero.js/index.d.ts         | 78 ++++++++++++++++++++++++++++++
 types/dinero.js/tsconfig.json      | 23 +++++++++
 types/dinero.js/tslint.json        |  1 +
 4 files changed, 173 insertions(+)
 create mode 100644 types/dinero.js/dinero.js-tests.ts
 create mode 100644 types/dinero.js/index.d.ts
 create mode 100644 types/dinero.js/tsconfig.json
 create mode 100644 types/dinero.js/tslint.json

diff --git a/types/dinero.js/dinero.js-tests.ts b/types/dinero.js/dinero.js-tests.ts
new file mode 100644
index 0000000000..803184c3db
--- /dev/null
+++ b/types/dinero.js/dinero.js-tests.ts
@@ -0,0 +1,71 @@
+import Dinero = require("dinero.js");
+
+Dinero.globalExchangeRatesApi = {
+    endpoint: "https://yourexchangerates.api/latest?base={{from}}",
+    propertyPath: "data.rates.{{to}}",
+    headers: {
+        "user-key": "xxxxxxxxx",
+    },
+};
+Dinero.globalExchangeRatesApi = {
+    endpoint: "https://yourexchangerates.api/latest?base={{from}}",
+    propertyPath: "data.rates.{{to}}",
+    roundingMode: "HALF_UP",
+};
+
+Dinero();
+Dinero({ amount: 1 });
+Dinero({ currency: "USD" });
+Dinero({ precision: 2 });
+
+let number: number;
+let string: string;
+let boolean: boolean;
+
+let dinero: Dinero.Dinero = Dinero();
+let dineroArr: Dinero.Dinero[];
+let dineroObject: Dinero.DineroObject;
+
+number = dinero.getAmount();
+string = dinero.getCurrency();
+string = dinero.setLocale("fr-FR").getLocale();
+number = dinero.convertPrecision(4).getPrecision();
+dinero = dinero.add(Dinero({ amount: 104545, precision: 4 }));
+dinero = dinero.subtract(Dinero({ amount: 104545, precision: 4 }));
+dinero = dinero.multiply(2.00125);
+dinero = dinero.multiply(2.00125, "HALF_UP");
+dinero = dinero.divide(2);
+dinero = dinero.divide(2, "HALF_UP");
+dinero = dinero.percentage(50);
+dineroArr = dinero.allocate([50, 50]);
+dinero.convert("EUR").then(d => (dinero = d));
+dinero.convert("XBT", {
+    endpoint: "https://yourexchangerates.api/latest?base={{from}}",
+    propertyPath: "data.rates.{{to}}",
+    headers: {
+        "user-key": "xxxxxxxxx",
+    },
+    roundingMode: "HALF_UP",
+});
+boolean = dinero.equalsTo(Dinero({ amount: 500, currency: "EUR" }));
+boolean = dinero.lessThan(Dinero({ amount: 800 }));
+boolean = dinero.lessThanOrEqual(Dinero({ amount: 800 }));
+boolean = dinero.greaterThan(Dinero({ amount: 800 }));
+boolean = dinero.greaterThanOrEqual(Dinero({ amount: 800 }));
+boolean = dinero.isZero();
+boolean = dinero.isPositive();
+boolean = dinero.isNegative();
+boolean = dinero.hasSubUnits();
+boolean = dinero.hasCents();
+boolean = dinero.hasSameCurrency(Dinero({ amount: 1000, currency: "EUR" }));
+boolean = dinero.hasSameAmount(Dinero({ amount: 1000, currency: "EUR" }));
+string = dinero.toFormat("0,0 dollar");
+string = dinero.toFormat("0,0 dollar", "HALF_EVEN");
+number = dinero.toUnit();
+number = dinero.toRoundedUnit(1);
+number = dinero.toRoundedUnit(1, "HALF_EVEN");
+dineroObject = dinero.toObject();
+dineroArr = Dinero.normalizePrecision([
+    Dinero({ amount: 100, precision: 2 }),
+    Dinero({ amount: 1000, precision: 3 }),
+]);
diff --git a/types/dinero.js/index.d.ts b/types/dinero.js/index.d.ts
new file mode 100644
index 0000000000..82a5026380
--- /dev/null
+++ b/types/dinero.js/index.d.ts
@@ -0,0 +1,78 @@
+// Type definitions for dinero.js 1.4
+// Project: https://sarahdayan.github.io/dinero.js
+// Definitions by: BendingBender <https://github.com/BendingBender>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.1
+
+export as namespace Dinero;
+
+export = DineroFactory;
+
+declare function DineroFactory(options?: Dinero.Options): DineroFactory.Dinero;
+
+declare namespace DineroFactory {
+    let globalExchangeRatesApi: ExchangeRatesApiOptions;
+    function normalizePrecision(objects: Dinero[]): Dinero[];
+
+    interface Options {
+        amount?: number;
+        currency?: string;
+        precision?: number;
+    }
+
+    interface Dinero {
+        getAmount(): number;
+        getCurrency(): string;
+        getLocale(): string;
+        setLocale(newLocale: string): Dinero;
+        getPrecision(): number;
+        convertPrecision(newPrecision: number): Dinero;
+        add(addend: Dinero): Dinero;
+        subtract(subtrahend: Dinero): Dinero;
+        multiply(multiplier: number, roundingMode?: RoundingMode): Dinero;
+        divide(divisor: number, roundingMode?: RoundingMode): Dinero;
+        percentage(percentage: number): Dinero;
+        allocate(ratios: number[]): Dinero[];
+        convert(currency: string, options?: ExchangeRatesApiOptions): Promise<Dinero>;
+        equalsTo(comparator: Dinero): boolean;
+        lessThan(comparator: Dinero): boolean;
+        lessThanOrEqual(comparator: Dinero): boolean;
+        greaterThan(comparator: Dinero): boolean;
+        greaterThanOrEqual(comparator: Dinero): boolean;
+        isZero(): boolean;
+        isPositive(): boolean;
+        isNegative(): boolean;
+        hasSubUnits(): boolean;
+        /**
+         * @deprecated since version 2.0
+         */
+        hasCents(): boolean;
+        hasSameCurrency(comparator: Dinero): boolean;
+        hasSameAmount(comparator: Dinero): boolean;
+        toFormat(format?: string, roundingMode?: RoundingMode): string;
+        toUnit(): number;
+        toRoundedUnit(digits: number, roundingMode?: RoundingMode): number;
+        toObject(): DineroObject;
+    }
+
+    type RoundingMode =
+        | "HALF_ODD"
+        | "HALF_EVEN"
+        | "HALF_UP"
+        | "HALF_DOWN"
+        | "HALF_TOWARDS_ZERO"
+        | "HALF_AWAY_FROM_ZERO";
+
+    interface ExchangeRatesApiOptions {
+        endpoint: string;
+        propertyPath: string;
+        headers?: { [header: string]: string };
+        roundingMode?: RoundingMode;
+    }
+
+    interface DineroObject {
+        amount: number;
+        currency: string;
+        precision: number;
+    }
+}
diff --git a/types/dinero.js/tsconfig.json b/types/dinero.js/tsconfig.json
new file mode 100644
index 0000000000..2b306e0676
--- /dev/null
+++ b/types/dinero.js/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "dinero.js-tests.ts"
+    ]
+}
diff --git a/types/dinero.js/tslint.json b/types/dinero.js/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/dinero.js/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 67b864b0bd89d3ffd1b89d75ccdc5c0f8b05149f Mon Sep 17 00:00:00 2001
From: islishude <lishude@aliyun.com>
Date: Mon, 19 Nov 2018 11:09:15 +0800
Subject: [PATCH 097/836] chore: styling code

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

diff --git a/types/node/index.d.ts b/types/node/index.d.ts
index 221dd5baad..66c319c895 100644
--- a/types/node/index.d.ts
+++ b/types/node/index.d.ts
@@ -2501,7 +2501,7 @@ declare module "readline" {
 }
 
 declare module "vm" {
-    interface Context { 
+    interface Context {
         [key: string]: any;
     }
     interface BaseOptions {
diff --git a/types/node/node-tests.ts b/types/node/node-tests.ts
index 0ae3866a8a..7e3c491802 100644
--- a/types/node/node-tests.ts
+++ b/types/node/node-tests.ts
@@ -3676,11 +3676,11 @@ import * as p from "process";
             throw new repl.Recoverable(new Error("test"));
         }
 
-        _server.context.key0 = 1;
-        _server.context.key1 = "string";
-        _server.context.key2 = true;
-        _server.context.key3 = [];
-        _server.context.key4 = {};
+        _server.context['key0'] = 1;
+        _server.context['key1'] = "";
+        _server.context['key2'] = true;
+        _server.context['key3'] = [];
+        _server.context['key4'] = {};
     }
 }
 
diff --git a/types/node/v9/index.d.ts b/types/node/v9/index.d.ts
index b620ac9ce1..3660d87725 100644
--- a/types/node/v9/index.d.ts
+++ b/types/node/v9/index.d.ts
@@ -2390,7 +2390,7 @@ declare module "readline" {
 }
 
 declare module "vm" {
-    export interface Context { 
+    export interface Context {
         [key: string]: any;
     }
     export interface ScriptOptions {

From a0b3d80a77fe1ad8f136388e17d117d70081911f Mon Sep 17 00:00:00 2001
From: Jan Bevers <jan.bevers@kunstmaan.be>
Date: Mon, 19 Nov 2018 08:54:51 +0100
Subject: [PATCH 098/836] [react-big-calendar] Added props declartion for
 Toolbar and Eventwrapper components

---
 types/react-big-calendar/index.d.ts           | 62 +++++++++++++++----
 .../react-big-calendar-tests.tsx              | 28 ++++++++-
 2 files changed, 77 insertions(+), 13 deletions(-)

diff --git a/types/react-big-calendar/index.d.ts b/types/react-big-calendar/index.d.ts
index bbfd7047ec..9d9b62881c 100644
--- a/types/react-big-calendar/index.d.ts
+++ b/types/react-big-calendar/index.d.ts
@@ -5,14 +5,23 @@
 //                 Krzysztof Bezrąk <https://github.com/pikpok>
 //                 Sebastian Silbermann <https://github.com/eps1lon>
 //                 Paul Potsides <https://github.com/strongpauly>
+//                 janb87 <https://github.com/janb87>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 import { Validator } from 'prop-types';
 import * as React from 'react';
 
+export type DayPropGetter = (date: Date) => { className?: string, style?: object };
+export type EventPropGetter<T> = (event: T, start: stringOrDate, end: stringOrDate, isSelected: boolean) => { className?: string, style?: React.CSSProperties };
+export type SlotPropGetter = (date: Date) => { className?: string, style?: object };
 export type stringOrDate = string | Date;
 export type ViewKey = 'MONTH' | 'WEEK' | 'WORK_WEEK' | 'DAY' | 'AGENDA';
 export type View = 'month' | 'week' | 'work_week' | 'day' | 'agenda';
+export type Views = View[] | {
+    month: boolean | React.SFC | React.Component,
+    week: boolean | React.SFC | React.Component,
+    myweek: boolean | React.SFC | React.Component,
+};
 export type Navigate = 'PREV' | 'NEXT' | 'TODAY' | 'DATE';
 
 export type Event = object;
@@ -70,7 +79,7 @@ export interface Formats {
     /**
      * Toolbar header format for the Agenda view, e.g. "4/1/2015 — 5/1/2015"
      */
-    agendaHeaderFormat?: DateFormat;
+    agendaHeaderFormat?: DateRangeFormatFunction;
 
     /**
      * A time range format for selecting time slots, e.g "8:00am — 2:00pm"
@@ -105,14 +114,14 @@ export interface HeaderProps {
 
 export interface Components {
     event?: React.SFC | React.Component | React.ComponentClass | JSX.Element;
-    eventWrapper?: React.SFC | React.Component | React.ComponentClass | JSX.Element;
+    eventWrapper?: React.SFC<EventWrapperProps> | React.Component<EventWrapperProps> | React.ComponentClass<EventWrapperProps> | JSX.Element;
     dayWrapper?: React.SFC | React.Component | React.ComponentClass | JSX.Element;
     dateCellWrapper?: React.SFC | React.Component | React.ComponentClass | JSX.Element;
     /**
      * component used as a header for each column in the TimeGridHeader
      */
     header?: React.ComponentType<HeaderProps>;
-    toolbar?: React.SFC | React.Component | React.ComponentClass | JSX.Element;
+    toolbar?: React.SFC<ToolbarProps> | React.Component<ToolbarProps> | React.ComponentClass<ToolbarProps> | JSX.Element;
     agenda?: {
         date?: React.SFC | React.Component | React.ComponentClass | JSX.Element;
         time?: React.SFC | React.Component | React.ComponentClass | JSX.Element;
@@ -133,6 +142,41 @@ export interface Components {
     };
 }
 
+export interface ToolbarProps {
+    date: Date;
+    view: View;
+    views: Views;
+    label: string;
+    localizer: { messages: Messages };
+    onNavigate: (navigate: Navigate, date?: Date) => void;
+    onView: (view: View) => void;
+    children?: React.ReactNode;
+}
+
+export interface EventWrapperProps<T extends Event = Event> {
+    style?: React.CSSProperties & { xOffset: number };
+    className: string;
+    event: T;
+    isRtl: boolean;
+    getters: {
+        eventProp?: EventPropGetter<T>;
+        slotProp?: SlotPropGetter;
+        dayProp?: DayPropGetter;
+    };
+    onClick: (e: React.MouseEvent<HTMLElement>) => void;
+    onDoubleClick: (e: React.MouseEvent<HTMLElement>) => void;
+    accessors: {
+        title?: (event: T) => string;
+        tooltip?: (event: T) => string;
+        end?: (event: T) => Date;
+        start?: (event: T) => Date;
+    };
+    selected: boolean;
+    label: string;
+    continuesEarlier: boolean;
+    continuesLater: boolean;
+}
+
 export interface Messages {
     date?: string;
     time?: string;
@@ -186,11 +230,7 @@ export interface BigCalendarProps<T extends Event = Event> extends React.Props<B
     onSelectEvent?: (event: T, e: React.SyntheticEvent<HTMLElement>) => void;
     onSelecting?: (range: { start: stringOrDate, end: stringOrDate }) => boolean | undefined | null;
     selected?: any;
-    views?: View[] | {
-        month: boolean | React.SFC | React.Component,
-        week: boolean | React.SFC | React.Component,
-        myweek: boolean | React.SFC | React.Component,
-    };
+    views?: Views;
     drilldownView?: View | null;
     getDrilldownView?: ((targetDate: Date, currentViewName: View, configuredViewNames: View[]) => void) | null;
     length?: number;
@@ -202,9 +242,9 @@ export interface BigCalendarProps<T extends Event = Event> extends React.Props<B
     step?: number;
     timeslots?: number;
     rtl?: boolean;
-    eventPropGetter?: (event: T, start: stringOrDate, end: stringOrDate, isSelected: boolean) => { className?: string, style?: React.CSSProperties };
-    slotPropGetter?: (date: Date) => { className?: string, style?: object };
-    dayPropGetter?: (date: Date) => { className?: string, style?: object };
+    eventPropGetter?: EventPropGetter<T>;
+    slotPropGetter?: SlotPropGetter;
+    dayPropGetter?: DayPropGetter;
     showMultiDayTimes?: boolean;
     min?: stringOrDate;
     max?: stringOrDate;
diff --git a/types/react-big-calendar/react-big-calendar-tests.tsx b/types/react-big-calendar/react-big-calendar-tests.tsx
index e1b561901e..321327e8e7 100644
--- a/types/react-big-calendar/react-big-calendar-tests.tsx
+++ b/types/react-big-calendar/react-big-calendar-tests.tsx
@@ -1,6 +1,6 @@
 import * as React from "react";
 import * as ReactDOM from "react-dom";
-import BigCalendar, { BigCalendarProps, Navigate, View, DateRange, DateLocalizer } from "react-big-calendar";
+import BigCalendar, { BigCalendarProps, Navigate, View, DateRange, DateLocalizer, ToolbarProps, EventWrapperProps } from "react-big-calendar";
 
 // Don't want to add this as a dependency, because it is only used for tests.
 declare const globalize: any;
@@ -101,7 +101,9 @@ class CalendarEvent {
                         event: Event,
                         agenda: {
                             event: EventAgenda
-                        }
+                        },
+                        toolbar: Toolbar,
+                        eventWrapper: EventWrapper,
                     }}
                     dayPropGetter={customDayPropGetter}
                     slotPropGetter={customSlotPropGetter}
@@ -172,3 +174,25 @@ function Event(event: any) {
         </span>
     );
 }
+
+class EventWrapper extends React.Component<EventWrapperProps> {
+    render() {
+        const { continuesEarlier, label, accessors = {}, style } = this.props;
+        return (
+            <div style={style}>
+                <div>{continuesEarlier}-{label}-{accessors.title && event && accessors.title(event)}}</div>
+            </div>
+        );
+    }
+}
+
+class Toolbar extends React.Component<ToolbarProps> {
+    render() {
+        const { date, label, view } = this.props;
+        return (
+            <div>
+                <div>{date.toJSON()}-{label}-{view}}</div>
+            </div>
+        );
+    }
+}

From ead05a22eb89d1a00082c4eb62e8f6393c58399c Mon Sep 17 00:00:00 2001
From: Esteban Ibarra <eibarra1992@hotmail.com>
Date: Mon, 19 Nov 2018 08:19:12 -0500
Subject: [PATCH 099/836] Fix children type for react-native-dialog (#1)

* Fix children type for react-native-dialog
---
 types/react-native-dialog/index.d.ts          |  4 +++-
 .../react-native-dialog-tests.tsx             | 20 +++++++++++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/types/react-native-dialog/index.d.ts b/types/react-native-dialog/index.d.ts
index 10e977f420..14d7458140 100644
--- a/types/react-native-dialog/index.d.ts
+++ b/types/react-native-dialog/index.d.ts
@@ -1,6 +1,8 @@
 // Type definitions for react-native-dialog 4.0
 // Project: https://github.com/mmazzarolo/react-native-dialog
 // Definitions by: MrLuje <https://github.com/MrLuje>
+//                 Stack Builders <https://github.com/stackbuilders>
+//                 Esteban Ibarra <https://github.com/ibarrae>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 
@@ -32,7 +34,7 @@ interface ButtonProps {
 
 interface ContainerProps {
     blurComponentIOS?: ReactNode;
-    children: JSX.Element[];
+    children: React.ReactNode[];
     /**
      * default: false
      */
diff --git a/types/react-native-dialog/react-native-dialog-tests.tsx b/types/react-native-dialog/react-native-dialog-tests.tsx
index 151ee14af5..544025051c 100644
--- a/types/react-native-dialog/react-native-dialog-tests.tsx
+++ b/types/react-native-dialog/react-native-dialog-tests.tsx
@@ -2,6 +2,24 @@ import Dialog from "react-native-dialog";
 import { createRef, Component } from "react";
 
 class Example extends Component {
+    dynamicButtons() {
+        const buttonFunc = () => console.log('click');
+        const buttons = [
+            { label: 'Button 1', action: buttonFunc },
+            { label: 'Button 2', action: buttonFunc },
+        ];
+        return buttons.map(({ label , action }) =>
+            <Dialog.Button
+                label={label}
+                onPress={action}
+            />
+        );
+    }
+
+    singleButton() {
+        return (<Dialog.Button label="Click" onPress={() => null} />);
+    }
+
     render() {
         const ref = createRef();
 
@@ -23,6 +41,8 @@ class Example extends Component {
                     label="Validate"
                     onPress={() => console.log("test")}
                 />
+                {this.dynamicButtons()}
+                {this.singleButton()}
             </Dialog.Container>
         );
     }

From 1bc50af06d237a0e9dad12339213bf6290383cae Mon Sep 17 00:00:00 2001
From: Adam Binford <adam.binford@radiantsolutions.com>
Date: Mon, 19 Nov 2018 12:01:59 -0500
Subject: [PATCH 100/836] Added types for react-leaflet-markercluster

---
 types/react-leaflet-markercluster/index.d.ts  | 13 ++++++++
 .../react-leaflet-markercluster-tests.tsx     | 30 +++++++++++++++++++
 .../react-leaflet-markercluster/tsconfig.json | 24 +++++++++++++++
 types/react-leaflet-markercluster/tslint.json |  1 +
 4 files changed, 68 insertions(+)
 create mode 100644 types/react-leaflet-markercluster/index.d.ts
 create mode 100644 types/react-leaflet-markercluster/react-leaflet-markercluster-tests.tsx
 create mode 100644 types/react-leaflet-markercluster/tsconfig.json
 create mode 100644 types/react-leaflet-markercluster/tslint.json

diff --git a/types/react-leaflet-markercluster/index.d.ts b/types/react-leaflet-markercluster/index.d.ts
new file mode 100644
index 0000000000..989605f27c
--- /dev/null
+++ b/types/react-leaflet-markercluster/index.d.ts
@@ -0,0 +1,13 @@
+// Type definitions for react-leaflet-markercluster 2.0
+// Project: https://github.com/YUzhva/react-leaflet-markercluster
+// Definitions by: Adam Binford <https://github.com/Kimahriman>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
+
+import 'leaflet.markercluster';
+import * as Leaflet from 'leaflet';
+import * as ReactLeaflet from 'react-leaflet';
+
+export type MarkerClusterGroupProps = ReactLeaflet.MapLayerProps & Leaflet.MarkerClusterGroupOptions;
+
+export default class MarkerClusterGroup<P extends MarkerClusterGroupProps = MarkerClusterGroupProps> extends ReactLeaflet.MapLayer<P> { }
diff --git a/types/react-leaflet-markercluster/react-leaflet-markercluster-tests.tsx b/types/react-leaflet-markercluster/react-leaflet-markercluster-tests.tsx
new file mode 100644
index 0000000000..9fc901c527
--- /dev/null
+++ b/types/react-leaflet-markercluster/react-leaflet-markercluster-tests.tsx
@@ -0,0 +1,30 @@
+import * as React from 'react';
+import * as Leaflet from 'leaflet';
+import MarkerClusterGroup from 'react-leaflet-markercluster';
+
+const MarkerCluster = (
+    <MarkerClusterGroup
+        showCoverageOnHover
+        zoomToBoundsOnClick
+        spiderfyOnMaxZoom
+        removeOutsideVisibleBounds
+        animate
+        animateAddingMarkers
+        singleMarkerMode
+        chunkedLoading
+        chunkDelay={ 500 }
+        disableClusteringAtZoom={ 4 }
+        maxClusterRadius={ 0 }
+        spiderfyDistanceMultiplier={ 2 }
+        polygonOptions={ {
+            stroke: true,
+            color: 'blue',
+            opacity: 0.5
+        } }
+        spiderLegPolylineOptions={ {
+            stroke: true,
+            color: 'blue',
+            opacity: 0.5
+        } }
+        iconCreateFunction={ cluster => Leaflet.divIcon({ html: `<b>${cluster.getChildCount()}</b>` }) }/>
+);
diff --git a/types/react-leaflet-markercluster/tsconfig.json b/types/react-leaflet-markercluster/tsconfig.json
new file mode 100644
index 0000000000..071c9c734d
--- /dev/null
+++ b/types/react-leaflet-markercluster/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "jsx": "react",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "react-leaflet-markercluster-tests.tsx"
+    ]
+}
diff --git a/types/react-leaflet-markercluster/tslint.json b/types/react-leaflet-markercluster/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-leaflet-markercluster/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 2437acbc1cad793b1596fc0e3e5ed5318b0a8da9 Mon Sep 17 00:00:00 2001
From: IanStorm <IanStorm28@outlook.com>
Date: Mon, 19 Nov 2018 19:33:40 +0100
Subject: [PATCH 101/836] Generated required package structure by running
 `dts-gen --dt`

---
 types/list-stream/index.d.ts           | 39 ++++++++++++++++++++++++++
 types/list-stream/list-stream-tests.ts |  0
 types/list-stream/tsconfig.json        | 22 +++++++++++++++
 types/list-stream/tslint.json          |  1 +
 4 files changed, 62 insertions(+)
 create mode 100644 types/list-stream/index.d.ts
 create mode 100644 types/list-stream/list-stream-tests.ts
 create mode 100644 types/list-stream/tsconfig.json
 create mode 100644 types/list-stream/tslint.json

diff --git a/types/list-stream/index.d.ts b/types/list-stream/index.d.ts
new file mode 100644
index 0000000000..f331fcf838
--- /dev/null
+++ b/types/list-stream/index.d.ts
@@ -0,0 +1,39 @@
+// Type definitions for list-stream 1.0
+// Project: https://github.com/rvagg/list-stream
+// Definitions by: My Self <https://github.com/me>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/*~ If this module is a UMD module that exposes a global variable 'myLib' when
+ *~ loaded outside a module loader environment, declare that global here.
+ *~ Otherwise, delete this declaration.
+ */
+export as namespace myLib;
+
+/*~ If this module has methods, declare them as functions like so.
+ */
+export function myMethod(a: string): string;
+export function myOtherMethod(a: number): number;
+
+/*~ You can declare types that are available via importing the module */
+export interface someType {
+    name: string;
+    length: number;
+    extras?: string[];
+}
+
+/*~ You can declare properties of the module using const, let, or var */
+export const myField: number;
+
+/*~ If there are types, properties, or methods inside dotted names
+ *~ of the module, declare them inside a 'namespace'.
+ */
+export namespace subProp {
+    /*~ For example, given this definition, someone could write:
+     *~   import { subProp } from 'yourModule';
+     *~   subProp.foo();
+     *~ or
+     *~   import * as yourMod from 'yourModule';
+     *~   yourMod.subProp.foo();
+     */
+    export function foo(): void;
+}
\ No newline at end of file
diff --git a/types/list-stream/list-stream-tests.ts b/types/list-stream/list-stream-tests.ts
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/types/list-stream/tsconfig.json b/types/list-stream/tsconfig.json
new file mode 100644
index 0000000000..ce92e0529c
--- /dev/null
+++ b/types/list-stream/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",
+        "list-stream-tests.ts"
+    ]
+}
diff --git a/types/list-stream/tslint.json b/types/list-stream/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/list-stream/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 4b09a1e10024bbf4852f6b210066dae080fc39f8 Mon Sep 17 00:00:00 2001
From: IanStorm <IanStorm28@outlook.com>
Date: Mon, 19 Nov 2018 19:35:07 +0100
Subject: [PATCH 102/836] Editing author information

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

diff --git a/types/list-stream/index.d.ts b/types/list-stream/index.d.ts
index f331fcf838..4024bd51ee 100644
--- a/types/list-stream/index.d.ts
+++ b/types/list-stream/index.d.ts
@@ -1,6 +1,6 @@
 // Type definitions for list-stream 1.0
 // Project: https://github.com/rvagg/list-stream
-// Definitions by: My Self <https://github.com/me>
+// Definitions by: IanStorm <https://github.com/IanStorm>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /*~ If this module is a UMD module that exposes a global variable 'myLib' when

From 1074143fd85b1e4e1cc17b8ace89cf2c9c8a5b07 Mon Sep 17 00:00:00 2001
From: IanStorm <IanStorm28@outlook.com>
Date: Mon, 19 Nov 2018 20:34:19 +0100
Subject: [PATCH 103/836] Added actual type definition and tests

---
 types/list-stream/index.d.ts           | 47 ++++++++++----------------
 types/list-stream/list-stream-tests.ts | 37 ++++++++++++++++++++
 2 files changed, 55 insertions(+), 29 deletions(-)

diff --git a/types/list-stream/index.d.ts b/types/list-stream/index.d.ts
index 4024bd51ee..8b97483cdb 100644
--- a/types/list-stream/index.d.ts
+++ b/types/list-stream/index.d.ts
@@ -3,37 +3,26 @@
 // Definitions by: IanStorm <https://github.com/IanStorm>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/*~ If this module is a UMD module that exposes a global variable 'myLib' when
- *~ loaded outside a module loader environment, declare that global here.
- *~ Otherwise, delete this declaration.
- */
-export as namespace myLib;
+/// <reference types="node" />
 
-/*~ If this module has methods, declare them as functions like so.
- */
-export function myMethod(a: string): string;
-export function myOtherMethod(a: number): number;
 
-/*~ You can declare types that are available via importing the module */
-export interface someType {
-    name: string;
-    length: number;
-    extras?: string[];
+import { Duplex, DuplexOptions } from "stream";
+
+declare namespace ListStream {
 }
 
-/*~ You can declare properties of the module using const, let, or var */
-export const myField: number;
+declare class ListStream extends Duplex {
+    constructor(callback?: (err: Error, data: any[]) => void);
+    constructor(options?: DuplexOptions, callback?: (err: Error, data: any[]) => void);
 
-/*~ If there are types, properties, or methods inside dotted names
- *~ of the module, declare them inside a 'namespace'.
- */
-export namespace subProp {
-    /*~ For example, given this definition, someone could write:
-     *~   import { subProp } from 'yourModule';
-     *~   subProp.foo();
-     *~ or
-     *~   import * as yourMod from 'yourModule';
-     *~   yourMod.subProp.foo();
-     */
-    export function foo(): void;
-}
\ No newline at end of file
+    static obj(callback?: (err: Error, data: any[]) => void): ListStream;
+    static obj(options?: DuplexOptions, callback?: (err: Error, data: any[]) => void): ListStream;
+
+    append(chunk: any): void;
+    duplicate(): ListStream;
+    end(): void;
+    get(index: number): any;
+    length: number;
+}
+
+export = ListStream;
diff --git a/types/list-stream/list-stream-tests.ts b/types/list-stream/list-stream-tests.ts
index e69de29bb2..aefb41bf0c 100644
--- a/types/list-stream/list-stream-tests.ts
+++ b/types/list-stream/list-stream-tests.ts
@@ -0,0 +1,37 @@
+import * as ListStream from "list-stream";
+
+let chunk: any = "chunk";
+let listStream: ListStream;
+let num: number = 1;
+
+listStream = new ListStream((err: Error, data: any[]) => {
+    if (err) { throw err; }
+    console.log(data.length);
+    for (const date of data) {
+        console.log(date);
+    }
+});
+listStream = new ListStream({ objectMode: true }, (err: Error, data: any[]) => {
+    if (err) { throw err; }
+    console.log(data.length);
+    for (const date of data) {
+        console.log(date);
+    }
+});
+listStream = ListStream.obj((err: Error, data: any[]) => {
+    if (err) { throw err; }
+    console.log(data.length);
+    for (const date of data) {
+        console.log(date);
+    }
+});
+
+listStream.append(chunk);
+
+listStream = listStream.duplicate();
+
+listStream.end();
+
+chunk = listStream.get(num);
+
+num = listStream.length;

From 8bd0adc2267e15543719193222ccf5d202234646 Mon Sep 17 00:00:00 2001
From: IanStorm <IanStorm28@outlook.com>
Date: Mon, 19 Nov 2018 20:46:35 +0100
Subject: [PATCH 104/836] Added `strictFunctionTypes` inside `tsconfig.json` as
 required for Merge Request

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

diff --git a/types/list-stream/tsconfig.json b/types/list-stream/tsconfig.json
index ce92e0529c..52ec1c73e1 100644
--- a/types/list-stream/tsconfig.json
+++ b/types/list-stream/tsconfig.json
@@ -7,6 +7,7 @@
         "noImplicitAny": true,
         "noImplicitThis": true,
         "strictNullChecks": true,
+        "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [
             "../"

From 0ee6ec5d83ce1b1be83a95f67674afc39998d871 Mon Sep 17 00:00:00 2001
From: IanStorm <IanStorm28@outlook.com>
Date: Mon, 19 Nov 2018 21:04:02 +0100
Subject: [PATCH 105/836] Fixed issues raised by `npm test`: *
 `no-consecutive-blank-lines` * `no-inferrable-types`

---
 types/list-stream/index.d.ts           | 1 -
 types/list-stream/list-stream-tests.ts | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/types/list-stream/index.d.ts b/types/list-stream/index.d.ts
index 8b97483cdb..226d4c09ab 100644
--- a/types/list-stream/index.d.ts
+++ b/types/list-stream/index.d.ts
@@ -5,7 +5,6 @@
 
 /// <reference types="node" />
 
-
 import { Duplex, DuplexOptions } from "stream";
 
 declare namespace ListStream {
diff --git a/types/list-stream/list-stream-tests.ts b/types/list-stream/list-stream-tests.ts
index aefb41bf0c..4b7fc2a6ab 100644
--- a/types/list-stream/list-stream-tests.ts
+++ b/types/list-stream/list-stream-tests.ts
@@ -2,7 +2,7 @@ import * as ListStream from "list-stream";
 
 let chunk: any = "chunk";
 let listStream: ListStream;
-let num: number = 1;
+let num = 1;
 
 listStream = new ListStream((err: Error, data: any[]) => {
     if (err) { throw err; }

From e32a1cd583291d44c2faf36a296007d65db79636 Mon Sep 17 00:00:00 2001
From: Dimitri Benin <dimitri.benin@gmail.com>
Date: Mon, 19 Nov 2018 22:16:27 +0100
Subject: [PATCH 106/836] Add types for dicer

---
 types/dicer/dicer-tests.ts |  81 ++++++++++++++++++
 types/dicer/index.d.ts     | 167 +++++++++++++++++++++++++++++++++++++
 types/dicer/tsconfig.json  |  23 +++++
 types/dicer/tslint.json    |   1 +
 4 files changed, 272 insertions(+)
 create mode 100644 types/dicer/dicer-tests.ts
 create mode 100644 types/dicer/index.d.ts
 create mode 100644 types/dicer/tsconfig.json
 create mode 100644 types/dicer/tslint.json

diff --git a/types/dicer/dicer-tests.ts b/types/dicer/dicer-tests.ts
new file mode 100644
index 0000000000..cd7f7a4251
--- /dev/null
+++ b/types/dicer/dicer-tests.ts
@@ -0,0 +1,81 @@
+import Dicer = require("dicer");
+import * as fs from "fs";
+import * as stream from "stream";
+
+function testDicerSyntax() {
+    const opts: Dicer.Config = {
+        boundary: "testing",
+    };
+    const dicer = new Dicer(opts);
+    const opts2: Dicer.Config = {
+        headerFirst: true,
+        maxHeaderPairs: 1,
+    };
+    const opts3: Dicer.Config = {
+        boundary: "more-testing",
+        headerFirst: false,
+        maxHeaderPairs: 8,
+    };
+    dicer.setBoundary("new-testing-boundary");
+    dicer.on("part", handleDicerPartStream);
+    dicer.on("finish", () => {
+        console.log("dicer parsing finished");
+    });
+    dicer.on("preamble", part => {
+        console.log("dicer preamble to new part");
+    });
+    dicer.on("trailer", data => {
+        console.log(`dicer trailing data found: ${data.length} bytes`);
+    });
+    dicer.on("close", () => {
+        console.log("dicer close");
+    });
+    dicer.on("drain", () => {
+        console.log("dicer drain");
+    });
+    dicer.on("error", err => {
+        console.error(`dicer error: ${err.message || JSON.stringify(err)}`);
+    });
+    dicer.on("finish", () => {
+        console.log("dicer finish");
+    });
+    dicer.on("pipe", (src: stream.Readable) => {
+        console.log("dicer pipe");
+    });
+    dicer.on("unpipe", (src: stream.Readable) => {
+        console.log("dicer unpipe");
+    });
+    const inputFileStream = fs.createReadStream("in-test-file.txt");
+    inputFileStream.pipe(dicer);
+}
+/**
+ * Handle a part found by a Dicer parser
+ *
+ * @param part Part found
+ */
+function handleDicerPartStream(part: Dicer.PartStream) {
+    console.log("dicer part found");
+    const outputFileStream = fs.createWriteStream("out-test-file.txt");
+    part.on("readable", () => {
+        console.log("part readable");
+    });
+    part.on("header", header => {
+        console.log(`part header found:\n${JSON.stringify(header)}`);
+    });
+    part.on("data", () => {
+        console.log("part data");
+    });
+    part.on("finish", () => {
+        console.log("part finished");
+    });
+    part.on("error", err => {
+        console.error(`part error: ${err.message || JSON.stringify(err)}`);
+    });
+    part.on("end", () => {
+        console.log("part ended");
+    });
+    part.on("close", () => {
+        console.log("part closed");
+    });
+    part.pipe(outputFileStream);
+}
diff --git a/types/dicer/index.d.ts b/types/dicer/index.d.ts
new file mode 100644
index 0000000000..319768a2cd
--- /dev/null
+++ b/types/dicer/index.d.ts
@@ -0,0 +1,167 @@
+// Type definitions for dicer 0.2
+// Project: https://github.com/mscdex/dicer
+// Definitions by: Robin Goupil <https://github.com/GoupilRobin>
+//                 BendingBender <https://github.com/BendingBender>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+/// <reference types="node" />
+
+export = Dicer;
+
+import stream = require("stream");
+
+// tslint:disable:unified-signatures
+
+/**
+ * A very fast streaming multipart parser for node.js.
+ * Dicer is a WritableStream
+ *
+ * Dicer (special) events:
+ * - on('finish', ()) - Emitted when all parts have been parsed and the Dicer instance has been ended.
+ * - on('part', (stream: PartStream)) - Emitted when a new part has been found.
+ * - on('preamble', (stream: PartStream)) - Emitted for preamble if you should happen to need it (can usually be ignored).
+ * - on('trailer', (data: Buffer)) - Emitted when trailing data was found after the terminating boundary (as with the preamble, this can usually be ignored too).
+ */
+declare class Dicer extends stream.Writable {
+    /**
+     * Creates and returns a new Dicer instance with the following valid config settings:
+     *
+     * @param config The configuration to use
+     */
+    constructor(config: Dicer.Config);
+    /**
+     * Sets the boundary to use for parsing and performs some initialization needed for parsing.
+     * You should only need to use this if you set headerFirst to true in the constructor and are parsing the boundary from the preamble header.
+     *
+     * @param boundary The boundary to use
+     */
+    setBoundary(boundary: string): void;
+    addListener(event: string, listener: (...args: any[]) => void): this;
+    addListener(event: "finish", listener: () => void): this;
+    addListener(event: "part", listener: (stream: Dicer.PartStream) => void): this;
+    addListener(event: "preamble", listener: (stream: Dicer.PartStream) => void): this;
+    addListener(event: "trailer", listener: (data: Buffer) => void): this;
+    addListener(event: "close", listener: () => void): this;
+    addListener(event: "drain", listener: () => void): this;
+    addListener(event: "error", listener: (err: Error) => void): this;
+    addListener(event: "pipe", listener: (src: stream.Readable) => void): this;
+    addListener(event: "unpipe", listener: (src: stream.Readable) => void): this;
+    on(event: string, listener: (...args: any[]) => void): this;
+    on(event: "finish", listener: () => void): this;
+    on(event: "part", listener: (stream: Dicer.PartStream) => void): this;
+    on(event: "preamble", listener: (stream: Dicer.PartStream) => void): this;
+    on(event: "trailer", listener: (data: Buffer) => void): this;
+    on(event: "close", listener: () => void): this;
+    on(event: "drain", listener: () => void): this;
+    on(event: "error", listener: (err: Error) => void): this;
+    on(event: "pipe", listener: (src: stream.Readable) => void): this;
+    on(event: "unpipe", listener: (src: stream.Readable) => void): this;
+    once(event: string, listener: (...args: any[]) => void): this;
+    once(event: "finish", listener: () => void): this;
+    once(event: "part", listener: (stream: Dicer.PartStream) => void): this;
+    once(event: "preamble", listener: (stream: Dicer.PartStream) => void): this;
+    once(event: "trailer", listener: (data: Buffer) => void): this;
+    once(event: "close", listener: () => void): this;
+    once(event: "drain", listener: () => void): this;
+    once(event: "error", listener: (err: Error) => void): this;
+    once(event: "pipe", listener: (src: stream.Readable) => void): this;
+    once(event: "unpipe", listener: (src: stream.Readable) => void): this;
+    prependListener(event: string, listener: (...args: any[]) => void): this;
+    prependListener(event: "finish", listener: () => void): this;
+    prependListener(event: "part", listener: (stream: Dicer.PartStream) => void): this;
+    prependListener(event: "preamble", listener: (stream: Dicer.PartStream) => void): this;
+    prependListener(event: "trailer", listener: (data: Buffer) => void): this;
+    prependListener(event: "close", listener: () => void): this;
+    prependListener(event: "drain", listener: () => void): this;
+    prependListener(event: "error", listener: (err: Error) => void): this;
+    prependListener(event: "pipe", listener: (src: stream.Readable) => void): this;
+    prependListener(event: "unpipe", listener: (src: stream.Readable) => void): this;
+    prependOnceListener(event: string, listener: (...args: any[]) => void): this;
+    prependOnceListener(event: "finish", listener: () => void): this;
+    prependOnceListener(event: "part", listener: (stream: Dicer.PartStream) => void): this;
+    prependOnceListener(event: "preamble", listener: (stream: Dicer.PartStream) => void): this;
+    prependOnceListener(event: "trailer", listener: (data: Buffer) => void): this;
+    prependOnceListener(event: "close", listener: () => void): this;
+    prependOnceListener(event: "drain", listener: () => void): this;
+    prependOnceListener(event: "error", listener: (err: Error) => void): this;
+    prependOnceListener(event: "pipe", listener: (src: stream.Readable) => void): this;
+    prependOnceListener(event: "unpipe", listener: (src: stream.Readable) => void): this;
+    removeListener(event: string, listener: (...args: any[]) => void): this;
+    removeListener(event: "finish", listener: () => void): this;
+    removeListener(event: "part", listener: (stream: Dicer.PartStream) => void): this;
+    removeListener(event: "preamble", listener: (stream: Dicer.PartStream) => void): this;
+    removeListener(event: "trailer", listener: (data: Buffer) => void): this;
+    removeListener(event: "close", listener: () => void): this;
+    removeListener(event: "drain", listener: () => void): this;
+    removeListener(event: "error", listener: (err: Error) => void): this;
+    removeListener(event: "pipe", listener: (src: stream.Readable) => void): this;
+    removeListener(event: "unpipe", listener: (src: stream.Readable) => void): this;
+}
+
+declare namespace Dicer {
+    interface Config {
+        /**
+         * This is the boundary used to detect the beginning of a new part.
+         */
+        boundary?: string;
+        /**
+         * If true, preamble header parsing will be performed first.
+         */
+        headerFirst?: boolean;
+        /**
+         * The maximum number of header key=>value pairs to parse Default: 2000 (same as node's http).
+         */
+        maxHeaderPairs?: number;
+    }
+
+    /**
+     * PartStream is a _ReadableStream_
+     *
+     * PartStream (special) events:
+     * - on('header', (header: object)) - An object containing the header for this particular part. Each property value is an array of one or more string values.
+     */
+    interface PartStream extends stream.Readable {
+        addListener(event: string, listener: (...args: any[]) => void): this;
+        addListener(event: "header", listener: (header: object) => void): this;
+        addListener(event: "close", listener: () => void): this;
+        addListener(event: "data", listener: (chunk: Buffer | string) => void): this;
+        addListener(event: "end", listener: () => void): this;
+        addListener(event: "readable", listener: () => void): this;
+        addListener(event: "error", listener: (err: Error) => void): this;
+        on(event: string, listener: (...args: any[]) => void): this;
+        on(event: "header", listener: (header: object) => void): this;
+        on(event: "close", listener: () => void): this;
+        on(event: "data", listener: (chunk: Buffer | string) => void): this;
+        on(event: "end", listener: () => void): this;
+        on(event: "readable", listener: () => void): this;
+        on(event: "error", listener: (err: Error) => void): this;
+        once(event: string, listener: (...args: any[]) => void): this;
+        once(event: "header", listener: (header: object) => void): this;
+        once(event: "close", listener: () => void): this;
+        once(event: "data", listener: (chunk: Buffer | string) => void): this;
+        once(event: "end", listener: () => void): this;
+        once(event: "readable", listener: () => void): this;
+        once(event: "error", listener: (err: Error) => void): this;
+        prependListener(event: string, listener: (...args: any[]) => void): this;
+        prependListener(event: "header", listener: (header: object) => void): this;
+        prependListener(event: "close", listener: () => void): this;
+        prependListener(event: "data", listener: (chunk: Buffer | string) => void): this;
+        prependListener(event: "end", listener: () => void): this;
+        prependListener(event: "readable", listener: () => void): this;
+        prependListener(event: "error", listener: (err: Error) => void): this;
+        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
+        prependOnceListener(event: "header", listener: (header: object) => void): this;
+        prependOnceListener(event: "close", listener: () => void): this;
+        prependOnceListener(event: "data", listener: (chunk: Buffer | string) => void): this;
+        prependOnceListener(event: "end", listener: () => void): this;
+        prependOnceListener(event: "readable", listener: () => void): this;
+        prependOnceListener(event: "error", listener: (err: Error) => void): this;
+        removeListener(event: string, listener: (...args: any[]) => void): this;
+        removeListener(event: "header", listener: (header: object) => void): this;
+        removeListener(event: "close", listener: () => void): this;
+        removeListener(event: "data", listener: (chunk: Buffer | string) => void): this;
+        removeListener(event: "end", listener: () => void): this;
+        removeListener(event: "readable", listener: () => void): this;
+        removeListener(event: "error", listener: (err: Error) => void): this;
+    }
+}
diff --git a/types/dicer/tsconfig.json b/types/dicer/tsconfig.json
new file mode 100644
index 0000000000..09c2832cb1
--- /dev/null
+++ b/types/dicer/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "dicer-tests.ts"
+    ]
+}
diff --git a/types/dicer/tslint.json b/types/dicer/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/dicer/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 75eafa5a64bc327ae8715ac973824d600e563ccd Mon Sep 17 00:00:00 2001
From: Dimitri Benin <dimitri.benin@gmail.com>
Date: Mon, 19 Nov 2018 22:36:14 +0100
Subject: [PATCH 107/836] Add types for detect-character-encoding

---
 .../detect-character-encoding-tests.ts        | 10 ++++++++
 types/detect-character-encoding/index.d.ts    | 17 ++++++++++++++
 types/detect-character-encoding/tsconfig.json | 23 +++++++++++++++++++
 types/detect-character-encoding/tslint.json   |  1 +
 4 files changed, 51 insertions(+)
 create mode 100644 types/detect-character-encoding/detect-character-encoding-tests.ts
 create mode 100644 types/detect-character-encoding/index.d.ts
 create mode 100644 types/detect-character-encoding/tsconfig.json
 create mode 100644 types/detect-character-encoding/tslint.json

diff --git a/types/detect-character-encoding/detect-character-encoding-tests.ts b/types/detect-character-encoding/detect-character-encoding-tests.ts
new file mode 100644
index 0000000000..42f21a688e
--- /dev/null
+++ b/types/detect-character-encoding/detect-character-encoding-tests.ts
@@ -0,0 +1,10 @@
+import detectCharacterEncoding = require("detect-character-encoding");
+
+const buf: Buffer = null as any;
+
+const result: detectCharacterEncoding.Result | null = detectCharacterEncoding(buf);
+
+if (result) {
+    const str: string = result.encoding;
+    const num: number = result.confidence;
+}
diff --git a/types/detect-character-encoding/index.d.ts b/types/detect-character-encoding/index.d.ts
new file mode 100644
index 0000000000..123a7659eb
--- /dev/null
+++ b/types/detect-character-encoding/index.d.ts
@@ -0,0 +1,17 @@
+// Type definitions for detect-character-encoding 0.7
+// Project: https://github.com/sonicdoe/detect-character-encoding#readme
+// Definitions by: BendingBender <https://github.com/BendingBender>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node"/>
+
+export = detectCharacterEncoding;
+
+declare function detectCharacterEncoding(buf: Buffer): detectCharacterEncoding.Result | null;
+
+declare namespace detectCharacterEncoding {
+    interface Result {
+        encoding: string;
+        confidence: number;
+    }
+}
diff --git a/types/detect-character-encoding/tsconfig.json b/types/detect-character-encoding/tsconfig.json
new file mode 100644
index 0000000000..e2adad72dd
--- /dev/null
+++ b/types/detect-character-encoding/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "detect-character-encoding-tests.ts"
+    ]
+}
diff --git a/types/detect-character-encoding/tslint.json b/types/detect-character-encoding/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/detect-character-encoding/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 3ee44a1fedd5bd80235385f24d1149f29425f203 Mon Sep 17 00:00:00 2001
From: Dimitri Benin <dimitri.benin@gmail.com>
Date: Mon, 19 Nov 2018 20:44:56 +0100
Subject: [PATCH 108/836] Add types for stream-to-string

---
 types/stream-to-string/index.d.ts             | 20 ++++++++++++++++
 .../stream-to-string-tests.ts                 | 15 ++++++++++++
 types/stream-to-string/tsconfig.json          | 23 +++++++++++++++++++
 types/stream-to-string/tslint.json            |  1 +
 4 files changed, 59 insertions(+)
 create mode 100644 types/stream-to-string/index.d.ts
 create mode 100644 types/stream-to-string/stream-to-string-tests.ts
 create mode 100644 types/stream-to-string/tsconfig.json
 create mode 100644 types/stream-to-string/tslint.json

diff --git a/types/stream-to-string/index.d.ts b/types/stream-to-string/index.d.ts
new file mode 100644
index 0000000000..89df48b3ff
--- /dev/null
+++ b/types/stream-to-string/index.d.ts
@@ -0,0 +1,20 @@
+// Type definitions for stream-to-string 1.1
+// Project: https://github.com/jasonpincin/stream-to-string
+// Definitions by: BendingBender <https://github.com/BendingBender>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+export = streamToString;
+
+// tslint:disable:unified-signatures
+
+declare function streamToString(stream: NodeJS.ReadableStream): Promise<string>;
+declare function streamToString(stream: NodeJS.ReadableStream, cb: Callback): Promise<string>;
+declare function streamToString(
+    stream: NodeJS.ReadableStream,
+    enc: string,
+    cb?: Callback
+): Promise<string>;
+
+type Callback = (error: Error | undefined, str: string) => void;
diff --git a/types/stream-to-string/stream-to-string-tests.ts b/types/stream-to-string/stream-to-string-tests.ts
new file mode 100644
index 0000000000..3d601a53db
--- /dev/null
+++ b/types/stream-to-string/stream-to-string-tests.ts
@@ -0,0 +1,15 @@
+import streamToString = require("stream-to-string");
+
+const stream = (null as any) as NodeJS.ReadableStream;
+let convertedString: Promise<string>;
+
+convertedString = streamToString(stream);
+convertedString = streamToString(stream, "hex");
+streamToString(stream, (err, msg) => {
+    const e: Error | undefined = err;
+    const str: string = msg;
+});
+streamToString(stream, "hex", (err, msg) => {
+    const e: Error | undefined = err;
+    const str: string = msg;
+});
diff --git a/types/stream-to-string/tsconfig.json b/types/stream-to-string/tsconfig.json
new file mode 100644
index 0000000000..81628c9480
--- /dev/null
+++ b/types/stream-to-string/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "stream-to-string-tests.ts"
+    ]
+}
diff --git a/types/stream-to-string/tslint.json b/types/stream-to-string/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/stream-to-string/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 95930ad595d00dd54f4a63628c929181b55cc177 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andi=20P=C3=A4tzold?= <andi.paetzold@gmail.com>
Date: Mon, 19 Nov 2018 22:55:47 +0100
Subject: [PATCH 109/836] feat(mailgun-js) add types for email validation

---
 types/mailgun-js/index.d.ts          | 28 ++++++++++++++++++++++++++++
 types/mailgun-js/mailgun-js-tests.ts | 25 +++++++++++++++++++++++++
 2 files changed, 53 insertions(+)

diff --git a/types/mailgun-js/index.d.ts b/types/mailgun-js/index.d.ts
index 3244639aed..82a75913cf 100644
--- a/types/mailgun-js/index.d.ts
+++ b/types/mailgun-js/index.d.ts
@@ -1,6 +1,7 @@
 // Type definitions for mailgun-js 0.16
 // Project: https://github.com/bojand/mailgun-js
 // Definitions by: Sampson Oliver <https://github.com/sampsonjoliver>
+//                 Andi Pätzold <https://github.com/andipaetzold>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
 
@@ -126,7 +127,17 @@ declare namespace Mailgun {
         }
 
         interface ValidateResponse {
+            address: string;
+            did_you_mean: string | null;
+            is_disposable_address: boolean;
+            is_role_address: boolean;
             is_valid: boolean;
+            mailbox_verification: "true" | "false" | "unknown" | null;
+            parts: {
+                display_name: string | null;
+                domain: string;
+                local_part: string;
+            };
         }
     }
 
@@ -149,6 +160,23 @@ declare namespace Mailgun {
             address: string,
             callback?: (error: Error, body: validation.ValidateResponse) => void
         ): Promise<validation.ValidateResponse>;
+        validate(
+            address: string,
+            isPrivate: boolean,
+            callback?: (error: Error, body: validation.ValidateResponse) => void
+        ): Promise<validation.ValidateResponse>;
+        validate(
+            address: string,
+            // tslint:disable-next-line unified-signatures
+            opts: { [key: string]: any },
+            callback?: (error: Error, body: validation.ValidateResponse) => void
+        ): Promise<validation.ValidateResponse>;
+        validate(
+            address: string,
+            isPrivate: boolean,
+            opts: { [key: string]: any },
+            callback?: (error: Error, body: validation.ValidateResponse) => void
+        ): Promise<validation.ValidateResponse>;
     }
 
     interface Lists {
diff --git a/types/mailgun-js/mailgun-js-tests.ts b/types/mailgun-js/mailgun-js-tests.ts
index 8a625bc8ef..e2bef4cab3 100644
--- a/types/mailgun-js/mailgun-js-tests.ts
+++ b/types/mailgun-js/mailgun-js-tests.ts
@@ -29,3 +29,28 @@ const exampleSendData: mailgunFactory.messages.SendData = {
   };
 
 mailgun.messages().send(exampleSendData, (err, body) => {});
+
+const validationResult1: Promise<mailgunFactory.validation.ValidateResponse> =
+    mailgun.validate("foo@mailgun.net");
+const validationResult2: Promise<mailgunFactory.validation.ValidateResponse> =
+    mailgun.validate("foo@mailgun.net", (error, body) => {});
+const validationResult3: Promise<mailgunFactory.validation.ValidateResponse> =
+    mailgun.validate("foo@mailgun.net", true);
+const validationResult4: Promise<mailgunFactory.validation.ValidateResponse> =
+    mailgun.validate("foo@mailgun.net", true, (error, body) => {});
+const validationResult5: Promise<mailgunFactory.validation.ValidateResponse> =
+    mailgun.validate("foo@mailgun.net", true, { option: "option" }, (error, body) => {});
+
+const validationResult6: mailgunFactory.validation.ValidateResponse = {
+    address: "foo@mailgun.net",
+    did_you_mean: "bar@mailgun.net",
+    is_disposable_address: false,
+    is_role_address: true,
+    is_valid: true,
+    mailbox_verification: "true",
+    parts: {
+        display_name: "foo",
+        domain: "mailgun.net",
+        local_part: "foo"
+    }
+};

From 8e69c7755ddd2a33058b50779d0f2a8d0e4e2b51 Mon Sep 17 00:00:00 2001
From: bangbang93 <bangbang93@163.com>
Date: Tue, 20 Nov 2018 10:38:33 +0800
Subject: [PATCH 110/836] fix typo for "Mock.county"

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

diff --git a/types/mockjs/index.d.ts b/types/mockjs/index.d.ts
index 9be645b791..25d6cac833 100644
--- a/types/mockjs/index.d.ts
+++ b/types/mockjs/index.d.ts
@@ -198,7 +198,7 @@ declare namespace mockjs {
     city(prefix?: B): S;
 
     // Random.county
-    country(prefix?: B): S;
+    county(prefix?: B): S;
 
     // Random.zip
     zip(prefix?: B): S;

From 8ab49bf4cac1baa67375fac46e74d1e20f6a4d88 Mon Sep 17 00:00:00 2001
From: Shingo Sato <shinsugar@gmail.com>
Date: Tue, 20 Nov 2018 14:17:40 +0900
Subject: [PATCH 111/836] Update react-paginate

---
 types/react-paginate/index.d.ts               |  16 ++-
 types/react-paginate/react-paginate-tests.tsx |   1 +
 types/react-paginate/v5/index.d.ts            | 126 ++++++++++++++++++
 .../v5/react-paginate-tests.tsx               |  33 +++++
 types/react-paginate/v5/tsconfig.json         |  25 ++++
 types/react-paginate/v5/tslint.json           |   1 +
 6 files changed, 197 insertions(+), 5 deletions(-)
 create mode 100644 types/react-paginate/v5/index.d.ts
 create mode 100644 types/react-paginate/v5/react-paginate-tests.tsx
 create mode 100644 types/react-paginate/v5/tsconfig.json
 create mode 100644 types/react-paginate/v5/tslint.json

diff --git a/types/react-paginate/index.d.ts b/types/react-paginate/index.d.ts
index 83a03ac838..4b73f0cf14 100644
--- a/types/react-paginate/index.d.ts
+++ b/types/react-paginate/index.d.ts
@@ -1,10 +1,11 @@
-// Type definitions for react-paginate 5.2
+// Type definitions for react-paginate 6.0
 // Project: https://github.com/AdeleD/react-paginate
 // Definitions by: Simon Hartcher <https://github.com/deevus>
 //                 Wouter Hardeman <https://github.com/wouterhardeman>
 //                 pegel03 <https://github.com/pegel03>
 //                 Simon Archer <https://github.com/archy-bold>
 //                 Yasunori Ohoka <https://github.com/yasupeke>
+//                 Shingo Sato <https://github.com/sugarshin>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 
@@ -29,22 +30,22 @@ interface ReactPaginateProps {
     /**
      * Label for the `previous` button.
      */
-    previousLabel?: string | JSX.Element;
+    previousLabel?: React.ReactNode;
 
     /**
      * Label for the `next` button.
      */
-    nextLabel?: string | JSX.Element;
+    nextLabel?: React.ReactNode;
 
     /**
      * Label for ellipsis.
      */
-    breakLabel?: string | JSX.Element;
+    breakLabel?: string | React.ReactNode;
 
     /**
      * The classname on tag `li` of the ellipsis element.
      */
-    breakClassName?: string | JSX.Element;
+    breakClassName?: string;
 
     /**
      * The method to call when a page is clicked. Exposes the current page object as an argument.
@@ -86,6 +87,11 @@ interface ReactPaginateProps {
      */
     activeClassName?: string;
 
+    /**
+     * The classname for the active link.
+     */
+    activeLinkClassName?: string;
+
     /**
      * The classname on tag `li` of the `previous` button.
      */
diff --git a/types/react-paginate/react-paginate-tests.tsx b/types/react-paginate/react-paginate-tests.tsx
index a98e8702a4..90a8718c52 100644
--- a/types/react-paginate/react-paginate-tests.tsx
+++ b/types/react-paginate/react-paginate-tests.tsx
@@ -20,6 +20,7 @@ class Test extends React.Component {
                 pageClassName={'page-li'}
                 pageLinkClassName={'page-a'}
                 activeClassName={'active'}
+                activeLinkClassName={'active'}
                 previousClassName={'previous-li'}
                 nextClassName={'next-li'}
                 previousLinkClassName={'previous-a'}
diff --git a/types/react-paginate/v5/index.d.ts b/types/react-paginate/v5/index.d.ts
new file mode 100644
index 0000000000..83a03ac838
--- /dev/null
+++ b/types/react-paginate/v5/index.d.ts
@@ -0,0 +1,126 @@
+// Type definitions for react-paginate 5.2
+// Project: https://github.com/AdeleD/react-paginate
+// Definitions by: Simon Hartcher <https://github.com/deevus>
+//                 Wouter Hardeman <https://github.com/wouterhardeman>
+//                 pegel03 <https://github.com/pegel03>
+//                 Simon Archer <https://github.com/archy-bold>
+//                 Yasunori Ohoka <https://github.com/yasupeke>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
+
+import * as React from 'react';
+
+interface ReactPaginateProps {
+    /**
+     * The total number of pages.
+     */
+    pageCount: number;
+
+    /**
+     * The range of pages displayed.
+     */
+    pageRangeDisplayed: number;
+
+    /**
+     * The number of pages to display for margins.
+     */
+    marginPagesDisplayed: number;
+
+    /**
+     * Label for the `previous` button.
+     */
+    previousLabel?: string | JSX.Element;
+
+    /**
+     * Label for the `next` button.
+     */
+    nextLabel?: string | JSX.Element;
+
+    /**
+     * Label for ellipsis.
+     */
+    breakLabel?: string | JSX.Element;
+
+    /**
+     * The classname on tag `li` of the ellipsis element.
+     */
+    breakClassName?: string | JSX.Element;
+
+    /**
+     * The method to call when a page is clicked. Exposes the current page object as an argument.
+     */
+    onPageChange?(selectedItem: { selected: number }): void;
+
+    /**
+     * The initial page selected.
+     */
+    initialPage?: number;
+
+    /**
+     * To override selected page with parent prop.
+     */
+    forcePage?: number;
+
+    /**
+     * Disable onPageChange callback with initial page. Default: false
+     */
+    disableInitialCallback?: boolean;
+
+    /**
+     * The classname of the pagination container.
+     */
+    containerClassName?: string;
+
+    /**
+     * The classname on tag `li` of each page element.
+     */
+    pageClassName?: string;
+
+    /**
+     * The classname on tag `a` of each page element.
+     */
+    pageLinkClassName?: string;
+
+    /**
+     * The classname for the active page.
+     */
+    activeClassName?: string;
+
+    /**
+     * The classname on tag `li` of the `previous` button.
+     */
+    previousClassName?: string;
+
+    /**
+     * The classname on tag `li` of the `next` button.
+     */
+    nextClassName?: string;
+
+    /**
+     * The classname on tag `a` of the `previous` button.
+     */
+    previousLinkClassName?: string;
+
+    /**
+     * The classname on tag `a` of the `next` button.
+     */
+    nextLinkClassName?: string;
+
+    /**
+     * The classname for disabled `previous` and `next` buttons.
+     */
+    disabledClassName?: string;
+
+    /**
+     * The method is called to generate the href attribute value on tag a of each page element.
+     */
+    hrefBuilder?(pageIndex: number): void;
+
+    /**
+     * Extra context to add to the aria-label HTML attribute.
+     */
+    extraAriaContext?: string;
+}
+
+declare const ReactPaginate: React.ComponentClass<ReactPaginateProps>;
+export default ReactPaginate;
diff --git a/types/react-paginate/v5/react-paginate-tests.tsx b/types/react-paginate/v5/react-paginate-tests.tsx
new file mode 100644
index 0000000000..a98e8702a4
--- /dev/null
+++ b/types/react-paginate/v5/react-paginate-tests.tsx
@@ -0,0 +1,33 @@
+import * as React from 'react';
+import ReactPaginate from 'react-paginate';
+
+class Test extends React.Component {
+    render() {
+        return (
+            <ReactPaginate
+                pageCount={1}
+                pageRangeDisplayed={10}
+                marginPagesDisplayed={2}
+                previousLabel={'previous'}
+                nextLabel={'next'}
+                breakLabel={'break-me'}
+                breakClassName={'break-class'}
+                onPageChange={(selectedItem: {selected: number}) => null}
+                initialPage={2}
+                forcePage={3}
+                disableInitialCallback={false}
+                containerClassName={'container'}
+                pageClassName={'page-li'}
+                pageLinkClassName={'page-a'}
+                activeClassName={'active'}
+                previousClassName={'previous-li'}
+                nextClassName={'next-li'}
+                previousLinkClassName={'previous-a'}
+                nextLinkClassName={'next-a'}
+                disabledClassName={'disabled'}
+                hrefBuilder={(pageIndex: number) => null}
+                extraAriaContext={'aria'}
+            />
+        );
+    }
+}
diff --git a/types/react-paginate/v5/tsconfig.json b/types/react-paginate/v5/tsconfig.json
new file mode 100644
index 0000000000..5c49c56d9e
--- /dev/null
+++ b/types/react-paginate/v5/tsconfig.json
@@ -0,0 +1,25 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "jsx": "react"
+    },
+    "files": [
+        "index.d.ts",
+        "react-paginate-tests.tsx"
+    ]
+ }
diff --git a/types/react-paginate/v5/tslint.json b/types/react-paginate/v5/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-paginate/v5/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From ca65601d0fd234d3d8aed8763de0e471404ccb99 Mon Sep 17 00:00:00 2001
From: Shingo Sato <shinsugar@gmail.com>
Date: Tue, 20 Nov 2018 15:07:31 +0900
Subject: [PATCH 112/836] Fix tsconfig

---
 types/react-paginate/v5/tsconfig.json | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/types/react-paginate/v5/tsconfig.json b/types/react-paginate/v5/tsconfig.json
index 5c49c56d9e..9ff370a729 100644
--- a/types/react-paginate/v5/tsconfig.json
+++ b/types/react-paginate/v5/tsconfig.json
@@ -9,10 +9,15 @@
         "noImplicitThis": true,
         "strictNullChecks": true,
         "strictFunctionTypes": true,
-        "baseUrl": "../",
+        "baseUrl": "../../",
         "typeRoots": [
-            "../"
+            "../../"
         ],
+        "paths": {
+            "react-paginate": [
+                "react-paginate/v5"
+            ]
+        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true,

From a735e1c1df6d7b694a85dad74e95eba7d2b8af7c Mon Sep 17 00:00:00 2001
From: Konch Roman <300konya@gmail.com>
Date: Tue, 20 Nov 2018 12:26:28 +0300
Subject: [PATCH 113/836] Fix echarts options definition in npm package

Details:
npm package has no its own tsconfig so
we should reference to options manually
---
 types/echarts/index.d.ts         |  1 +
 types/echarts/options/index.d.ts | 28 ++++++++++++++++++++++++++++
 2 files changed, 29 insertions(+)
 create mode 100644 types/echarts/options/index.d.ts

diff --git a/types/echarts/index.d.ts b/types/echarts/index.d.ts
index 207b8366ef..adc4a2a24e 100644
--- a/types/echarts/index.d.ts
+++ b/types/echarts/index.d.ts
@@ -9,6 +9,7 @@
 // TypeScript Version: 2.3
 
 /// <reference types="zrender" />
+/// <reference path="./options/index.d.ts" />
 
 declare namespace echarts {
     /**
diff --git a/types/echarts/options/index.d.ts b/types/echarts/options/index.d.ts
new file mode 100644
index 0000000000..fded0ed4c7
--- /dev/null
+++ b/types/echarts/options/index.d.ts
@@ -0,0 +1,28 @@
+/// <reference path="./series/bar.d.ts" />
+/// <reference path="./series/boxplot.d.ts" />
+/// <reference path="./series/candlestick.d.ts" />
+/// <reference path="./series/custom.d.ts" />
+/// <reference path="./series/effect-scatter.d.ts" />
+/// <reference path="./series/funnel.d.ts" />
+/// <reference path="./series/gauge.d.ts" />
+/// <reference path="./series/graph.d.ts" />
+/// <reference path="./series/heatmap.d.ts" />
+/// <reference path="./series/line.d.ts" />
+/// <reference path="./series/lines.d.ts" />
+/// <reference path="./series/map.d.ts" />
+/// <reference path="./series/parallel.d.ts" />
+/// <reference path="./series/pictorial-bar.d.ts" />
+/// <reference path="./series/pie.d.ts" />
+/// <reference path="./series/radar.d.ts" />
+/// <reference path="./series/sankey.d.ts" />
+/// <reference path="./series/scatter.d.ts" />
+/// <reference path="./series/sunburst.d.ts" />
+/// <reference path="./series/theme-river.d.ts" />
+/// <reference path="./series/tree.d.ts" />
+/// <reference path="./series/treemap.d.ts" />
+/// <reference path="./axis-pointer.d.ts" />
+/// <reference path="./data-zoom.d.ts" />
+/// <reference path="./text-style.d.ts" />
+/// <reference path="./tooltip.d.ts" />
+/// <reference path="./x-axis.d.ts" />
+/// <reference path="./y-axis.d.ts" />

From ea2fd32b95c0fe3e3dcd2e174ab95b2141a88c7f Mon Sep 17 00:00:00 2001
From: Shervin Sarain <shervin.sarain@labri.fr>
Date: Wed, 7 Nov 2018 16:11:49 +0100
Subject: [PATCH 114/836] Added type definitions for kerberos npm package

---
 types/kerberos/index.d.ts        | 190 +++++++++++++++++++++++++++++++
 types/kerberos/kerberos-tests.ts |  94 +++++++++++++++
 types/kerberos/tsconfig.json     |  23 ++++
 types/kerberos/tslint.json       |   1 +
 4 files changed, 308 insertions(+)
 create mode 100644 types/kerberos/index.d.ts
 create mode 100644 types/kerberos/kerberos-tests.ts
 create mode 100644 types/kerberos/tsconfig.json
 create mode 100644 types/kerberos/tslint.json

diff --git a/types/kerberos/index.d.ts b/types/kerberos/index.d.ts
new file mode 100644
index 0000000000..eaebdb5a84
--- /dev/null
+++ b/types/kerberos/index.d.ts
@@ -0,0 +1,190 @@
+// Type definitions for kerberos 1.1
+// Project: https://github.com/mongodb-js/kerberos#readme
+// Definitions by: Shervin Sarain <https://github.com/velezsarain>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export const GSS_C_DELEG_FLAG: number;
+export const GSS_C_MUTUAL_FLAG: number;
+export const GSS_C_REPLAY_FLAG: number;
+export const GSS_C_SEQUENCE_FLAG: number;
+export const GSS_C_CONF_FLAG: number;
+export const GSS_C_INTEG_FLAG: number;
+export const GSS_C_ANON_FLAG: number;
+export const GSS_C_PROT_READY_FLAG: number;
+export const GSS_C_TRANS_FLAG: number;
+
+export const GSS_C_NO_OID: number;
+export const GSS_MECH_OID_KRB5: number;
+export const GSS_MECH_OID_SPNEGO: number;
+
+// Interfaces for configuration objects
+/**
+ * @description Optional settings for *KerberosClient.wrap* method
+ */
+export interface WrapOptions {
+    /**
+     * @description The user to authorize
+     */
+    user?: string;
+}
+
+/**
+ * @description Optional settings for *KerberosClient.wrap* method
+ */
+export interface InitializeClientOptions {
+    /**
+     * @description Optional string containing the client principal in the form '`user@realm`'
+     */
+    principal?: string;
+    /**
+     * @description Optional integer used to set GSS flags. (e.g. GSS_C_DELEG_FLAG|GSS_C_MUTUAL_FLAG|GSS_C_SEQUENCE_FLAG will allow for forwarding credentials to the remote host)
+     */
+    gssFlag?: number;
+    /**
+     * @description Optional GSS mech OID. Defaults to None (GSS_C_NO_OID). Other possible values are `GSS_MECH_OID_KRB5`, `GSS_MECH_OID_SPNEGO`
+     */
+    mechOID?: number;
+}
+
+export class KerberosClient {
+    /**
+     * @description The username used for authentication
+     */
+    username: string;
+    /**
+     * @description The last response received during authentication steps
+     */
+    response: string;
+    /**
+     * @description Indicates whether confidentiality was applied or not (GSSAPI only)
+     */
+    responseConf: string;
+    /**
+     * @description Indicates that authentication has successfully completed or not
+     */
+    contextComplete: boolean;
+
+    /**
+     * Processes a single kerberos client-side step using the supplied server challenge.
+     *
+     * @param challenge A string containing the base64-encoded server data (which may be empty for the first step)
+     * @param callback
+     * @return returns Promise if no callback passed
+     */
+    step(challenge: string): Promise<string>;
+    step(challenge: string, callback: (err: string, clientResponse: string) => any): void;
+
+    /**
+     * Perform the client side kerberos wrap step.
+     *
+     * @param challenge The response returned after calling `unwrap`
+     * @param options Optional settings
+     * @param [callback]
+     * @return returns Promise if no callback passed
+     */
+    wrap(challenge: string, options?: WrapOptions): Promise<string>;
+    wrap(challenge: string, callback: (err: string, challengeResponse: string) => any): void;
+    wrap(challenge: string, options: WrapOptions, callback: (err: string, challengeResponse: string) => any): void;
+
+    /**
+     * Perform the client side kerberos unwrap step
+     *
+     * @param challenge A string containing the base64-encoded server data
+     * @param callback
+     * @return returns Promise if no callback passed
+     */
+    unwrap(challenge: string): Promise<string>;
+    unwrap(challenge: string, callback: (err: string, challengeResponse: string) => any): void;
+}
+
+export class KerberosServer {
+    /**
+     * @description  The username used for authentication
+     */
+    username: string;
+    /**
+     * @description The last response received during authentication steps
+     */
+    response: string;
+    /**
+     * @description The target used for authentication
+     */
+    targetName: string;
+    /**
+     * @description Indicates that authentication has successfully completed or not
+     */
+    contextComplete: boolean;
+
+    /**
+     * Processes a single kerberos server-side step using the supplied client data.
+     *
+     * @param challenge A string containing the base64-encoded client data
+     * @param callback
+     * @return returns Promise if no callback passed
+     */
+    step(challenge: string): Promise<string>;
+    step(challenge: string, callback: (err: string, serverResponse: string) => any): void;
+}
+
+/**
+ * This function provides a simple way to verify that a user name and password
+ * match those normally used for Kerberos authentication.
+ * It does this by checking that the supplied user name and password can be
+ * used to get a ticket for the supplied service.
+ * If the user name does not contain a realm, then the default realm supplied
+ * is used.
+ *
+ * For this to work properly the Kerberos must be configured properly on this
+ * machine.
+ * That will likely mean ensuring that the edu.mit.Kerberos preference file
+ * has the correct realms and KDCs listed.
+ *
+ * IMPORTANT: This method is vulnerable to KDC spoofing attacks and it should
+ * only be used for testing. Do not use this in any production system - your
+ * security could be compromised if you do.
+ *
+ * @param username The Kerberos user name. If no realm is supplied, then the `defaultRealm` will be used.
+ * @param password The password for the user.
+ * @param service The Kerberos service to check access for.
+ * @param defaultRealm The default realm to use if one is not supplied in the user argument.
+ * @param callback
+ * @return returns Promise if no callback passed
+ */
+export function checkPassword(name: string, password: string, service: string, defaultRealm?: string): Promise<void>;
+export function checkPassword(name: string, password: string, service: string, callback: (err: string) => any): void;
+export function checkPassword(name: string, password: string, service: string, defaultRealm: string, callback: (err: string) => any): void;
+
+/**
+ * This function returns the service principal for the server given a service type and hostname.
+ *
+ * Details are looked up via the `/etc/keytab` file.
+ *
+ * @param service The Kerberos service type for the server.
+ * @param hostname The hostname of the server.
+ * @param callback
+ * @return returns Promise if no callback passed
+ */
+export function principalDetails(service: string, hostname: string): Promise<string>;
+export function principalDetails(service: string, hostname: string, callback: (err: string, details: string) => any): void;
+
+/**
+ * Initializes a context for client-side authentication with the given service principal.
+ *
+ * @param service A string containing the service principal in the form '`type@fqdn`'.
+ * @param [options] Optional settings
+ * @param callback
+ * @return returns Promise if no callback passed
+ */
+export function initializeClient(service: string, options?: InitializeClientOptions): Promise<KerberosClient>;
+export function initializeClient(service: string, callback: (err: string, client: KerberosClient) => any): void;
+export function initializeClient(service: string, options: InitializeClientOptions, callback: (err: string, client: KerberosClient) => any): void;
+
+/**
+ * Initializes a context for server-side authentication with the given service principal.
+ *
+ * @param service A string containing the service principal in the form 'type@fqdn' (e.g. 'imap@mail.apple.com').
+ * @param callback
+ * @return returns Promise if no callback passed
+ */
+export function initializeServer(service: string): Promise<KerberosServer>;
+export function initializeServer(service: string, callback: (err: string, server: KerberosServer) => any): void;
diff --git a/types/kerberos/kerberos-tests.ts b/types/kerberos/kerberos-tests.ts
new file mode 100644
index 0000000000..8d016515c0
--- /dev/null
+++ b/types/kerberos/kerberos-tests.ts
@@ -0,0 +1,94 @@
+import * as kerberos from 'kerberos';
+
+// environment variables
+const username = 'administrator';
+const password = 'Password01';
+const realm = 'example.com';
+const hostname = 'hostname.example.com';
+const port = '80';
+let service: string;
+
+kerberos.principalDetails('HTTP', hostname, (err, details) => {
+    if (!err) {
+        return err;
+    }
+    return details;
+});
+
+kerberos.principalDetails('HTTP', hostname).then(details => {
+    return details;
+}).catch(err => {
+    return err;
+});
+
+service = `HTTP/${hostname}`;
+kerberos.checkPassword(username, password, service, realm.toUpperCase(), err => {
+    if (!err) {
+        return true;
+    }
+    return err;
+});
+
+kerberos.checkPassword(username, password, service, realm.toUpperCase()).then(() => {
+    return true;
+}).catch(err => {
+    return err;
+});
+
+service = `HTTP@${hostname}`;
+kerberos.initializeClient(service, {}, (err, client) => {
+    kerberos.initializeServer(service, (err, server) => {
+        client.step('', (err, clientResponse) => {
+            server.step(clientResponse, (err, serverResponse) => {
+                client.unwrap(clientResponse, (err, challengeResponse) => {
+                    client.wrap(challengeResponse, { user : "user" }, (err, challengeResponse2) => {
+                        return challengeResponse2;
+                    });
+                });
+            });
+        });
+    });
+});
+
+service = `HTTP@${hostname}`;
+kerberos.initializeClient(service, {}).then(client => {
+    kerberos.initializeServer(service).then(server => {
+        client.step('').then(clientResponse => {
+            server.step(clientResponse).then(serverResponse => {
+                client.unwrap(clientResponse).then(challengeResponse => {
+                    client.wrap(challengeResponse, { user : "user" }).then(challengeResponse2 => {
+                        return challengeResponse2;
+                    });
+                });
+            });
+        });
+    });
+});
+
+service = `HTTP@${hostname}`;
+const url = `http://${hostname}:${port}/`;
+
+const mechOID = kerberos.GSS_MECH_OID_KRB5;
+kerberos.initializeClient(service, { mechOID }, (err, client) => {
+    client.step('', (err, kerberosToken) => {
+        return kerberosToken;
+    });
+});
+
+kerberos.initializeClient(service, { mechOID }).then(client => {
+    client.step('', (err, kerberosToken) => {
+        return kerberosToken;
+    });
+});
+
+kerberos.initializeClient(service, (err, client) => {
+    client.step('', (err, kerberosToken) => {
+        return kerberosToken;
+    });
+});
+
+kerberos.initializeClient(service).then(client => {
+    client.step('', (err, kerberosToken) => {
+        return kerberosToken;
+    });
+});
diff --git a/types/kerberos/tsconfig.json b/types/kerberos/tsconfig.json
new file mode 100644
index 0000000000..c0e3913b2b
--- /dev/null
+++ b/types/kerberos/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "strictFunctionTypes": true,
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "kerberos-tests.ts"
+    ]
+}
diff --git a/types/kerberos/tslint.json b/types/kerberos/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/kerberos/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 58ab88a2b4b47553bb8ed3fc372a03630003f0c2 Mon Sep 17 00:00:00 2001
From: Flo Luccioni <luccioni.f@gmail.com>
Date: Tue, 20 Nov 2018 12:06:47 +0100
Subject: [PATCH 115/836] feat(mapbox): add missing styleLayer definition

---
 types/mapbox/index.d.ts      | 15 +++++++++++++++
 types/mapbox/mapbox-tests.ts |  2 ++
 2 files changed, 17 insertions(+)

diff --git a/types/mapbox/index.d.ts b/types/mapbox/index.d.ts
index 334d644e21..97da469e4a 100644
--- a/types/mapbox/index.d.ts
+++ b/types/mapbox/index.d.ts
@@ -1,6 +1,7 @@
 // Type definitions for Mapbox 1.6
 // Project: https://www.mapbox.com/mapbox.js/
 // Definitions by: Maxime Fabre <https://github.com/anahkiasen>
+//                 Florian Luccioni <https://github.com/Fluccioni>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -153,6 +154,20 @@ declare global {
 			getGeoJSON(): any;
 		}
 
+        // StyleLayer
+        //////////////////////////////////////////////////////////////////////
+
+        /**
+         * L.mapbox.styleLayer provides a way to integrate styles created with Mapbox Studio into your map.
+         */
+        function styleLayer(url: string, options?: StyleLayerOptions): StyleLayer;
+
+        interface StyleLayerOptions extends Leaflet.TileLayerOptions {
+            sanitizer?(template: string): string;
+        }
+
+        type StyleLayer = Leaflet.TileLayer;
+
 		//////////////////////////////////////////////////////////////////////
 		////////////////////////////// GEOCODING /////////////////////////////
 		//////////////////////////////////////////////////////////////////////
diff --git a/types/mapbox/mapbox-tests.ts b/types/mapbox/mapbox-tests.ts
index ab9ad6c5de..a9610ba5c4 100644
--- a/types/mapbox/mapbox-tests.ts
+++ b/types/mapbox/mapbox-tests.ts
@@ -4,6 +4,8 @@ const mapboxTiles = L.tileLayer('https://{s}.tiles.mapbox.com/v3/examples.map-i8
 
 const map = L.map('map').addLayer(mapboxTiles).setView(new L.LatLng([42.3610, -71.0587]), 15);
 
+const lightTiles = L.mapbox.styleLayer('mapbox://styles/mapbox/light-v9').addTo(map);
+
 const coordinates = document.getElementById('coordinates');
 
 const marker = L.marker(new L.LatLng([0, 0]), {

From 52185a5dc8897b7c716020b7c39679e617edb712 Mon Sep 17 00:00:00 2001
From: Jan Bevers <jan.bevers@kunstmaan.be>
Date: Tue, 20 Nov 2018 15:10:31 +0100
Subject: [PATCH 116/836] [react-big-calendar] Improvements to toolbar and
 eventwrapper props

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

diff --git a/types/react-big-calendar/index.d.ts b/types/react-big-calendar/index.d.ts
index 9d9b62881c..790a5887cb 100644
--- a/types/react-big-calendar/index.d.ts
+++ b/types/react-big-calendar/index.d.ts
@@ -11,9 +11,9 @@
 import { Validator } from 'prop-types';
 import * as React from 'react';
 
-export type DayPropGetter = (date: Date) => { className?: string, style?: object };
+export type DayPropGetter = (date: Date) => { className?: string, style?: React.CSSProperties };
 export type EventPropGetter<T> = (event: T, start: stringOrDate, end: stringOrDate, isSelected: boolean) => { className?: string, style?: React.CSSProperties };
-export type SlotPropGetter = (date: Date) => { className?: string, style?: object };
+export type SlotPropGetter = (date: Date) => { className?: string, style?: React.CSSProperties };
 export type stringOrDate = string | Date;
 export type ViewKey = 'MONTH' | 'WEEK' | 'WORK_WEEK' | 'DAY' | 'AGENDA';
 export type View = 'month' | 'week' | 'work_week' | 'day' | 'agenda';
@@ -114,14 +114,14 @@ export interface HeaderProps {
 
 export interface Components {
     event?: React.SFC | React.Component | React.ComponentClass | JSX.Element;
-    eventWrapper?: React.SFC<EventWrapperProps> | React.Component<EventWrapperProps> | React.ComponentClass<EventWrapperProps> | JSX.Element;
+    eventWrapper?: React.ComponentType<EventWrapperProps>;
     dayWrapper?: React.SFC | React.Component | React.ComponentClass | JSX.Element;
     dateCellWrapper?: React.SFC | React.Component | React.ComponentClass | JSX.Element;
     /**
      * component used as a header for each column in the TimeGridHeader
      */
     header?: React.ComponentType<HeaderProps>;
-    toolbar?: React.SFC<ToolbarProps> | React.Component<ToolbarProps> | React.ComponentClass<ToolbarProps> | JSX.Element;
+    toolbar?: React.ComponentType<ToolbarProps>;
     agenda?: {
         date?: React.SFC | React.Component | React.ComponentClass | JSX.Element;
         time?: React.SFC | React.Component | React.ComponentClass | JSX.Element;
@@ -154,6 +154,7 @@ export interface ToolbarProps {
 }
 
 export interface EventWrapperProps<T extends Event = Event> {
+    // https://github.com/intljusticemission/react-big-calendar/blob/27a2656b40ac8729634d24376dff8ea781a66d50/src/TimeGridEvent.js#L28
     style?: React.CSSProperties & { xOffset: number };
     className: string;
     event: T;

From 6556eb615fad17f3c819bd8ea25e1f441dd2ae88 Mon Sep 17 00:00:00 2001
From: Shrujal Shah <shrujalshah@hotmail.com>
Date: Tue, 20 Nov 2018 22:15:19 +0530
Subject: [PATCH 117/836] Add missing explorer option in column chart

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

diff --git a/types/google.visualization/index.d.ts b/types/google.visualization/index.d.ts
index e5e400bc44..878e17a011 100644
--- a/types/google.visualization/index.d.ts
+++ b/types/google.visualization/index.d.ts
@@ -597,6 +597,7 @@ declare namespace google {
             chartArea?: ChartArea;
             colors?: string[];
             enableInteractivity?: boolean;
+            explorer?: ChartExplorer;
             focusTarget?: string;
             fontSize?: number;
             fontName?: string;

From 845918b6a86a6190c23da22b4d8def7ac9adeffb Mon Sep 17 00:00:00 2001
From: Esteban Ibarra <eibarra1992@hotmail.com>
Date: Tue, 20 Nov 2018 12:15:15 -0500
Subject: [PATCH 118/836] Add types for react-native-draggable-flatlist

---
 .../index.d.ts                                | 59 +++++++++++++++++++
 .../react-native-draggable-flatlist-tests.tsx | 44 ++++++++++++++
 .../tsconfig.json                             | 24 ++++++++
 .../tslint.json                               |  1 +
 4 files changed, 128 insertions(+)
 create mode 100644 types/react-native-draggable-flatlist/index.d.ts
 create mode 100644 types/react-native-draggable-flatlist/react-native-draggable-flatlist-tests.tsx
 create mode 100644 types/react-native-draggable-flatlist/tsconfig.json
 create mode 100644 types/react-native-draggable-flatlist/tslint.json

diff --git a/types/react-native-draggable-flatlist/index.d.ts b/types/react-native-draggable-flatlist/index.d.ts
new file mode 100644
index 0000000000..0b96f0b3cd
--- /dev/null
+++ b/types/react-native-draggable-flatlist/index.d.ts
@@ -0,0 +1,59 @@
+// Type definitions for react-native-draggable-flatlist 1.1
+// Project: https://github.com/computerjazz/react-native-draggable-flatlist#readme
+// Definitions by: Stack Builders <https://github.com/stackbuilders>
+//                 Esteban Ibarra <https://github.com/ibarrae>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
+
+import { VirtualizedListWithoutRenderItemProps } from "react-native";
+import { Component } from "react";
+
+export interface RenderItemInfo<ItemR> {
+  item: ItemR;
+  index: number;
+  move: () => void;
+  moveEnd: () => void;
+  isActive: boolean;
+}
+
+export interface OnMoveEndInfo<ItemM> {
+  data: ReadonlyArray<ItemM> | null;
+  to: number;
+  from: number;
+  row: ItemM;
+}
+
+interface DraggableFlatListProps<Item> extends VirtualizedListWithoutRenderItemProps<Item> {
+  /**
+   * Items to be rendered.
+   */
+  data: ReadonlyArray<Item> | null;
+
+  /**
+   *  Function that returns updated ordering of data
+   */
+  onMoveEnd?: (info: OnMoveEndInfo<Item>) => void;
+
+  /**
+   * Function that is called when row becomes active.
+   */
+  onMoveBegin?: (index: number) => void;
+
+  /**
+   * Sets where scrolling begins.
+   *
+   * Default is 5
+   */
+  scrollPercent?: number;
+
+  /**
+   * Function that calls move when the row should become active (in an onPress, onLongPress, etc). Calls moveEnd when the gesture is complete (in onPressOut).
+   */
+  renderItem: (info: RenderItemInfo<Item>) => React.ReactElement<any> | null;
+}
+
+declare class DraggableFlatList<Item> extends Component<DraggableFlatListProps<Item>> {
+  constructor(props: DraggableFlatListProps<Item>);
+}
+
+export default DraggableFlatList;
diff --git a/types/react-native-draggable-flatlist/react-native-draggable-flatlist-tests.tsx b/types/react-native-draggable-flatlist/react-native-draggable-flatlist-tests.tsx
new file mode 100644
index 0000000000..40d613e4ea
--- /dev/null
+++ b/types/react-native-draggable-flatlist/react-native-draggable-flatlist-tests.tsx
@@ -0,0 +1,44 @@
+import * as React from 'react';
+import { TouchableOpacity, Text } from 'react-native';
+import DraggableFlatList, { RenderItemInfo } from 'react-native-draggable-flatlist';
+
+interface Item {
+  name: string;
+  mail: string;
+}
+
+class Example extends React.Component {
+  state = {
+    data: [
+      { name: 'Esteban', mail: 'foo@foo.com' },
+      { name: 'Xavier', mail: 'foo2@foo.com' },
+    ]
+  };
+
+  renderItem({ item, index, move, moveEnd, isActive }: RenderItemInfo<Item>) {
+    return (
+      <TouchableOpacity
+        onLongPress={move}
+        onPressOut={moveEnd}
+      >
+        <Text>{index}</Text>
+        <Text>{item.name}</Text>
+        <Text>{item.mail}</Text>
+      </TouchableOpacity>
+    );
+  }
+
+  render() {
+    const { data } = this.state;
+    return (
+      <DraggableFlatList
+        data={data}
+        renderItem={this.renderItem}
+        keyExtractor={(_item, index) => `draggable-item-${index}`}
+        scrollPercent={10}
+        onMoveEnd={({ data }) => this.setState({ data })}
+        ListFooterComponent={<Text>{'Hello'}</Text>}
+      />
+    );
+  }
+}
diff --git a/types/react-native-draggable-flatlist/tsconfig.json b/types/react-native-draggable-flatlist/tsconfig.json
new file mode 100644
index 0000000000..b3c009feac
--- /dev/null
+++ b/types/react-native-draggable-flatlist/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "jsx": "react-native"
+    },
+    "files": [
+        "index.d.ts",
+        "react-native-draggable-flatlist-tests.tsx"
+    ]
+}
diff --git a/types/react-native-draggable-flatlist/tslint.json b/types/react-native-draggable-flatlist/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-native-draggable-flatlist/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From ba61ea8fd2dfbfa313d3786480ced0992dcea729 Mon Sep 17 00:00:00 2001
From: Alexander <alexander.tarasyuk@outlook.com>
Date: Tue, 20 Nov 2018 21:22:05 +0200
Subject: [PATCH 119/836] add changes based on pr feedback

---
 types/nise/index.d.ts | 553 +++++++++++++++++++++---------------------
 1 file changed, 272 insertions(+), 281 deletions(-)

diff --git a/types/nise/index.d.ts b/types/nise/index.d.ts
index d01ad3303d..f054bad373 100644
--- a/types/nise/index.d.ts
+++ b/types/nise/index.d.ts
@@ -4,288 +4,279 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 
-declare namespace Nise {
-    interface FakeUploadProgress {
-        eventListeners: {
-            progress: any[];
-            load: any[];
-            abort: any[];
-            error: any[];
-        };
+export interface FakeUploadProgress {
+    eventListeners: {
+        progress: any[];
+        load: any[];
+        abort: any[];
+        error: any[];
+    };
 
-        addEventListener(event: string, listener: (e: Event) => any): void;
-        removeEventListener(event: string, listener: (e: Event) => any): void;
-        dispatchEvent(event: Event): void;
-    }
-
-    interface FakeXMLHttpRequest {
-        /**
-         * The URL set on the request object.
-         */
-        url: string;
-        /**
-         * The request method as a string.
-         */
-        method: string;
-        /**
-         * An object of all request headers, i.e.:
-         */
-        requestHeaders: any;
-        /**
-         * The request body
-         */
-        requestBody: string;
-        /**
-         * The request’s status code.
-         * undefined if the request has not been handled (see respond below)
-         */
-        status: number;
-        /**
-         * Only populated if the respond method is called (see below).
-         */
-        statusText: string;
-        /**
-         * Whether or not the request is asynchronous.
-         */
-        async: boolean;
-        /**
-         * Username, if any.
-         */
-        username: string;
-        /**
-         * Password, if any.
-         */
-        password: string;
-        withCredentials: boolean;
-        upload: FakeUploadProgress;
-        /**
-         * When using respond, this property is populated with a parsed document if response headers indicate as much (see the spec)
-         */
-        responseXML: Document;
-        /**
-         * The value of the given response header, if the request has been responded to (see respond).
-         * @param header
-         */
-        getResponseHeader(header: string): string;
-        /**
-         * All response headers as an object.
-         */
-        getAllResponseHeaders(): any;
-
-        /**
-         * Sets response headers (e.g. { "Content-Type": "text/html", ... }, updates the readyState property and fires onreadystatechange.
-         * @param headers
-         */
-        setResponseHeaders(headers: any): void;
-        /**
-         * Sets the respond body, updates the readyState property and fires onreadystatechange.
-         * Additionally, populates responseXML with a parsed document if response headers indicate as much.
-         */
-        setResponseBody(body: string): void;
-        /**
-         * Calls the above three methods.
-         */
-        respond(status: number, headers?: any, body?: string): void;
-        autoRespond(ms: number): void;
-        /**
-         * Simulates a network error on the request. The onerror handler will be called and the status will be 0.
-         */
-        error(): void;
-
-        onloadstart(e: Event): void;
-        onprogress(e: Event): void;
-        ontimeout(e: Event): void;
-        onloadend(e: Event): void;
-        onerror(e: Event): void;
-        onabort(e: Event): void;
-        onload(e: Event): void;
-    }
-
-    interface FakeServerOptions {
-        /**
-         * When set to true, causes the server to automatically respond to incoming requests after a timeout.
-         * The default timeout is 10ms but you can control it through the autoRespondAfter property.
-         * Note that this feature is intended to help during mockup development, and is not suitable for use in tests.
-         */
-        autoRespond: boolean;
-        /**
-         * When autoRespond is true, respond to requests after this number of milliseconds. Default is 10.
-         */
-        autoRespondAfter: number;
-        /**
-         * If set to true, server will find _method parameter in POST body and recognize that as the actual method.
-         * Supports a pattern common to Ruby on Rails applications. For custom HTTP method faking, override server.getHTTPMethod(request).
-         */
-        fakeHTTPMethods: boolean;
-        /**
-         * If set, the server will respond to every request immediately and synchronously.
-         * This is ideal for faking the server from within a test without having to call server.respond() after each request made in that test.
-         * As this is synchronous and immediate, this is not suitable for simulating actual network latency in tests or mockups.
-         * To simulate network latency with automatic responses, see server.autoRespond and server.autoRespondAfter.
-         */
-        respondImmediately: boolean;
-    }
-
-    interface FakeServer extends FakeServerOptions {
-        lastRequest: FakeXMLHttpRequest | undefined;
-        firstRequest: FakeXMLHttpRequest | undefined;
-        secondRequest: FakeXMLHttpRequest | undefined;
-        thirdRequest: FakeXMLHttpRequest | undefined;
-
-        /**
-         * Used internally to determine the HTTP method used with the provided request.
-         * By default this method simply returns request.method.
-         * When server.fakeHTTPMethods is true, the method will return the value of the _method parameter if the method is “POST”.
-         * This method can be overridden to provide custom behavior.
-         * @param request
-         */
-        getHTTPMethod(request: FakeXMLHttpRequest): string;
-
-        /**
-         * You can inspect the server.requests to verify request ordering, find unmatched requests or check that no requests has been done.
-         * server.requests is an array of all the FakeXMLHttpRequest objects that have been created.
-         */
-        requests: FakeXMLHttpRequest[];
-
-        /**
-         * Causes the server to respond to any request not matched by another response with the provided data. The default catch-all response is [404, {}, ""].
-         * A String representing the response body
-         * An Array with status, headers and response body, e.g. [200, { "Content-Type": "text/html", "Content-Length": 2 }, "OK"]
-         * A Function.
-         * Default status is 200 and default headers are none.
-         * When the response is a Function, it will be passed the request object. You must manually call respond on it to complete the request.
-         * @param body A String representing the response body
-         */
-        respondWith(body: string): void;
-        /**
-         * Causes the server to respond to any request not matched by another response with the provided data. The default catch-all response is [404, {}, ""].
-         * Default status is 200 and default headers are none.
-         * When the response is a Function, it will be passed the request object. You must manually call respond on it to complete the request.
-         * @param response An Array with status, headers and response body, e.g. [200, { "Content-Type": "text/html", "Content-Length": 2 }, "OK"]
-         */
-        respondWith(response: any[]): void;
-        /**
-         * Causes the server to respond to any request not matched by another response with the provided data. The default catch-all response is [404, {}, ""].
-         * Default status is 200 and default headers are none.
-         * When the response is a Function, it will be passed the request object. You must manually call respond on it to complete the request.
-         * @param fn A Function.
-         */
-        respondWith(fn: (xhr: FakeXMLHttpRequest) => void): void;
-        /**
-         * Responds to all requests to given URL, e.g. /posts/1.
-         */
-        respondWith(url: string, body: string): void;
-        /**
-         * Responds to all requests to given URL, e.g. /posts/1.
-         */
-        respondWith(url: string, response: any[]): void;
-        /**
-         * Responds to all requests to given URL, e.g. /posts/1.
-         */
-        respondWith(url: string, fn: (xhr: FakeXMLHttpRequest) => void): void;
-        /**
-         * Responds to all method requests to the given URL with the given response.
-         * method is an HTTP verb.
-         */
-        respondWith(method: string, url: string, body: string): void;
-        /**
-         * Responds to all method requests to the given URL with the given response.
-         * method is an HTTP verb.
-         */
-        respondWith(method: string, url: string, response: any[]): void;
-        /**
-         * Responds to all method requests to the given URL with the given response.
-         * method is an HTTP verb.
-         */
-        respondWith(method: string, url: string, fn: (xhr: FakeXMLHttpRequest) => void): void;
-        /**
-         * URL may be a regular expression, e.g. /\\/post\\//\\d+
-         * If the response is a Function, it will be passed any capture groups from the regular expression along with the XMLHttpRequest object:
-         */
-        respondWith(url: RegExp, body: string): void;
-        /**
-         * URL may be a regular expression, e.g. /\\/post\\//\\d+
-         * If the response is a Function, it will be passed any capture groups from the regular expression along with the XMLHttpRequest object:
-         */
-        respondWith(url: RegExp, response: any[]): void;
-        /**
-         * URL may be a regular expression, e.g. /\\/post\\//\\d+
-         * If the response is a Function, it will be passed any capture groups from the regular expression along with the XMLHttpRequest object:
-         */
-        respondWith(url: RegExp, fn: (xhr: FakeXMLHttpRequest) => void): void;
-        /**
-         * Responds to all method requests to URLs matching the regular expression.
-         */
-        respondWith(method: string, url: RegExp, body: string): void;
-        /**
-         * Responds to all method requests to URLs matching the regular expression.
-         */
-        respondWith(method: string, url: RegExp, response: any[]): void;
-        /**
-         * Responds to all method requests to URLs matching the regular expression.
-         */
-        respondWith(method: string, url: RegExp, fn: (xhr: FakeXMLHttpRequest) => void): void;
-        respondWith(...args: any[]): void;
-
-        /**
-         * Causes all queued asynchronous requests to receive a response.
-         * If none of the responses added through respondWith match, the default response is [404, {}, ""].
-         * Synchronous requests are responded to immediately, so make sure to call respondWith upfront.
-         * If called with arguments, respondWith will be called with those arguments before responding to requests.
-         */
-        respond(): void;
-        restore(): void;
-
-        getRequest(): FakeXMLHttpRequest | undefined;
-        reset(): void;
-        resetBehavior(): void;
-        resetHistory(): void;
-    }
-
-    interface FakeXMLHttpRequestStatic {
-        new(): FakeXMLHttpRequest;
-        /**
-         * Default false.
-         * When set to true, Sinon will check added filters if certain requests should be “unfaked”
-         */
-        useFilters: boolean;
-        /**
-         * Add a filter that will decide whether or not to fake a request.
-         * The filter will be called when xhr.open is called, with the exact same arguments (method, url, async, username, password).
-         * If the filter returns true, the request will not be faked.
-         * @param filter
-         */
-        addFilter(filter: (method: string, url: string, async: boolean, username: string, password: string) => boolean): void;
-        /**
-         * By assigning a function to the onCreate property of the returned object from useFakeXMLHttpRequest()
-         * you can subscribe to newly created FakeXMLHttpRequest objects. See below for the fake xhr object API.
-         * Using this observer means you can still reach objects created by e.g. jQuery.ajax (or other abstractions/frameworks).
-         * @param xhr
-         */
-        onCreate(xhr: FakeXMLHttpRequest): void;
-        /**
-         * Restore original function(s).
-         */
-        restore(): void;
-    }
-
-    interface FakeServerStatic {
-        create(options?: Partial<FakeServerOptions>): FakeServer;
-    }
-
-    interface FakeXHR {
-        useFakeXMLHttpRequest(): FakeXMLHttpRequestStatic;
-        FakeXMLHttpRequest: FakeXMLHttpRequestStatic;
-    }
-
-    interface API {
-        fakeServerWithClock: FakeServerStatic;
-        fakeServer: FakeServerStatic;
-        fakeXhr: FakeXHR;
-    }
+    addEventListener(event: string, listener: (e: Event) => any): void;
+    removeEventListener(event: string, listener: (e: Event) => any): void;
+    dispatchEvent(event: Event): void;
 }
 
-declare const Nise: Nise.API;
+export interface FakeXMLHttpRequest {
+    /**
+     * The URL set on the request object.
+     */
+    url: string;
+    /**
+     * The request method as a string.
+     */
+    method: string;
+    /**
+     * An object of all request headers, i.e.:
+     */
+    requestHeaders: any;
+    /**
+     * The request body
+     */
+    requestBody: string;
+    /**
+     * The request’s status code.
+     * undefined if the request has not been handled (see respond below)
+     */
+    status: number;
+    /**
+     * Only populated if the respond method is called (see below).
+     */
+    statusText: string;
+    /**
+     * Whether or not the request is asynchronous.
+     */
+    async: boolean;
+    /**
+     * Username, if any.
+     */
+    username: string;
+    /**
+     * Password, if any.
+     */
+    password: string;
+    withCredentials: boolean;
+    upload: FakeUploadProgress;
+    /**
+     * When using respond, this property is populated with a parsed document if response headers indicate as much (see the spec)
+     */
+    responseXML: Document;
+    /**
+     * The value of the given response header, if the request has been responded to (see respond).
+     * @param header
+     */
+    getResponseHeader(header: string): string;
+    /**
+     * All response headers as an object.
+     */
+    getAllResponseHeaders(): any;
 
-export = Nise;
-export as namespace nise;
+    /**
+     * Sets response headers (e.g. { "Content-Type": "text/html", ... }, updates the readyState property and fires onreadystatechange.
+     * @param headers
+     */
+    setResponseHeaders(headers: any): void;
+    /**
+     * Sets the respond body, updates the readyState property and fires onreadystatechange.
+     * Additionally, populates responseXML with a parsed document if response headers indicate as much.
+     */
+    setResponseBody(body: string): void;
+    /**
+     * Calls the above three methods.
+     */
+    respond(status: number, headers?: any, body?: string): void;
+    autoRespond(ms: number): void;
+    /**
+     * Simulates a network error on the request. The onerror handler will be called and the status will be 0.
+     */
+    error(): void;
+
+    onloadstart(e: Event): void;
+    onprogress(e: Event): void;
+    ontimeout(e: Event): void;
+    onloadend(e: Event): void;
+    onerror(e: Event): void;
+    onabort(e: Event): void;
+    onload(e: Event): void;
+}
+
+export interface FakeServerOptions {
+    /**
+     * When set to true, causes the server to automatically respond to incoming requests after a timeout.
+     * The default timeout is 10ms but you can control it through the autoRespondAfter property.
+     * Note that this feature is intended to help during mockup development, and is not suitable for use in tests.
+     */
+    autoRespond: boolean;
+    /**
+     * When autoRespond is true, respond to requests after this number of milliseconds. Default is 10.
+     */
+    autoRespondAfter: number;
+    /**
+     * If set to true, server will find _method parameter in POST body and recognize that as the actual method.
+     * Supports a pattern common to Ruby on Rails applications. For custom HTTP method faking, override server.getHTTPMethod(request).
+     */
+    fakeHTTPMethods: boolean;
+    /**
+     * If set, the server will respond to every request immediately and synchronously.
+     * This is ideal for faking the server from within a test without having to call server.respond() after each request made in that test.
+     * As this is synchronous and immediate, this is not suitable for simulating actual network latency in tests or mockups.
+     * To simulate network latency with automatic responses, see server.autoRespond and server.autoRespondAfter.
+     */
+    respondImmediately: boolean;
+}
+
+export interface FakeServer extends FakeServerOptions {
+    lastRequest: FakeXMLHttpRequest | undefined;
+    firstRequest: FakeXMLHttpRequest | undefined;
+    secondRequest: FakeXMLHttpRequest | undefined;
+    thirdRequest: FakeXMLHttpRequest | undefined;
+
+    /**
+     * Used internally to determine the HTTP method used with the provided request.
+     * By default this method simply returns request.method.
+     * When server.fakeHTTPMethods is true, the method will return the value of the _method parameter if the method is “POST”.
+     * This method can be overridden to provide custom behavior.
+     * @param request
+     */
+    getHTTPMethod(request: FakeXMLHttpRequest): string;
+
+    /**
+     * You can inspect the server.requests to verify request ordering, find unmatched requests or check that no requests has been done.
+     * server.requests is an array of all the FakeXMLHttpRequest objects that have been created.
+     */
+    requests: FakeXMLHttpRequest[];
+
+    /**
+     * Causes the server to respond to any request not matched by another response with the provided data. The default catch-all response is [404, {}, ""].
+     * A String representing the response body
+     * An Array with status, headers and response body, e.g. [200, { "Content-Type": "text/html", "Content-Length": 2 }, "OK"]
+     * A Function.
+     * Default status is 200 and default headers are none.
+     * When the response is a Function, it will be passed the request object. You must manually call respond on it to complete the request.
+     * @param body A String representing the response body
+     */
+    respondWith(body: string): void;
+    /**
+     * Causes the server to respond to any request not matched by another response with the provided data. The default catch-all response is [404, {}, ""].
+     * Default status is 200 and default headers are none.
+     * When the response is a Function, it will be passed the request object. You must manually call respond on it to complete the request.
+     * @param response An Array with status, headers and response body, e.g. [200, { "Content-Type": "text/html", "Content-Length": 2 }, "OK"]
+     */
+    respondWith(response: any[]): void;
+    /**
+     * Causes the server to respond to any request not matched by another response with the provided data. The default catch-all response is [404, {}, ""].
+     * Default status is 200 and default headers are none.
+     * When the response is a Function, it will be passed the request object. You must manually call respond on it to complete the request.
+     * @param fn A Function.
+     */
+    respondWith(fn: (xhr: FakeXMLHttpRequest) => void): void;
+    /**
+     * Responds to all requests to given URL, e.g. /posts/1.
+     */
+    respondWith(url: string, body: string): void;
+    /**
+     * Responds to all requests to given URL, e.g. /posts/1.
+     */
+    respondWith(url: string, response: any[]): void;
+    /**
+     * Responds to all requests to given URL, e.g. /posts/1.
+     */
+    respondWith(url: string, fn: (xhr: FakeXMLHttpRequest) => void): void;
+    /**
+     * Responds to all method requests to the given URL with the given response.
+     * method is an HTTP verb.
+     */
+    respondWith(method: string, url: string, body: string): void;
+    /**
+     * Responds to all method requests to the given URL with the given response.
+     * method is an HTTP verb.
+     */
+    respondWith(method: string, url: string, response: any[]): void;
+    /**
+     * Responds to all method requests to the given URL with the given response.
+     * method is an HTTP verb.
+     */
+    respondWith(method: string, url: string, fn: (xhr: FakeXMLHttpRequest) => void): void;
+    /**
+     * URL may be a regular expression, e.g. /\\/post\\//\\d+
+     * If the response is a Function, it will be passed any capture groups from the regular expression along with the XMLHttpRequest object:
+     */
+    respondWith(url: RegExp, body: string): void;
+    /**
+     * URL may be a regular expression, e.g. /\\/post\\//\\d+
+     * If the response is a Function, it will be passed any capture groups from the regular expression along with the XMLHttpRequest object:
+     */
+    respondWith(url: RegExp, response: any[]): void;
+    /**
+     * URL may be a regular expression, e.g. /\\/post\\//\\d+
+     * If the response is a Function, it will be passed any capture groups from the regular expression along with the XMLHttpRequest object:
+     */
+    respondWith(url: RegExp, fn: (xhr: FakeXMLHttpRequest) => void): void;
+    /**
+     * Responds to all method requests to URLs matching the regular expression.
+     */
+    respondWith(method: string, url: RegExp, body: string): void;
+    /**
+     * Responds to all method requests to URLs matching the regular expression.
+     */
+    respondWith(method: string, url: RegExp, response: any[]): void;
+    /**
+     * Responds to all method requests to URLs matching the regular expression.
+     */
+    respondWith(method: string, url: RegExp, fn: (xhr: FakeXMLHttpRequest) => void): void;
+    respondWith(...args: any[]): void;
+
+    /**
+     * Causes all queued asynchronous requests to receive a response.
+     * If none of the responses added through respondWith match, the default response is [404, {}, ""].
+     * Synchronous requests are responded to immediately, so make sure to call respondWith upfront.
+     * If called with arguments, respondWith will be called with those arguments before responding to requests.
+     */
+    respond(): void;
+    restore(): void;
+
+    getRequest(): FakeXMLHttpRequest | undefined;
+    reset(): void;
+    resetBehavior(): void;
+    resetHistory(): void;
+}
+
+export interface FakeXMLHttpRequestStatic {
+    new(): FakeXMLHttpRequest;
+    /**
+     * Default false.
+     * When set to true, Sinon will check added filters if certain requests should be “unfaked”
+     */
+    useFilters: boolean;
+    /**
+     * Add a filter that will decide whether or not to fake a request.
+     * The filter will be called when xhr.open is called, with the exact same arguments (method, url, async, username, password).
+     * If the filter returns true, the request will not be faked.
+     * @param filter
+     */
+    addFilter(filter: (method: string, url: string, async: boolean, username: string, password: string) => boolean): void;
+    /**
+     * By assigning a function to the onCreate property of the returned object from useFakeXMLHttpRequest()
+     * you can subscribe to newly created FakeXMLHttpRequest objects. See below for the fake xhr object API.
+     * Using this observer means you can still reach objects created by e.g. jQuery.ajax (or other abstractions/frameworks).
+     * @param xhr
+     */
+    onCreate(xhr: FakeXMLHttpRequest): void;
+    /**
+     * Restore original function(s).
+     */
+    restore(): void;
+}
+
+export interface FakeServerStatic {
+    create(options?: Partial<FakeServerOptions>): FakeServer;
+}
+
+export interface FakeXHR {
+    useFakeXMLHttpRequest(): FakeXMLHttpRequestStatic;
+    FakeXMLHttpRequest: FakeXMLHttpRequestStatic;
+}
+
+export const fakeServerWithClock: FakeServerStatic;
+export const fakeServer: FakeServerStatic;
+export const fakeXhr: FakeXHR;

From 97c198362b7ab34c42f49ef95200826162a23524 Mon Sep 17 00:00:00 2001
From: Fabio Berta <fnberta@gmail.com>
Date: Tue, 20 Nov 2018 21:01:56 +0100
Subject: [PATCH 120/836] fix indention

---
 types/react-map-gl/index.d.ts | 75 +++++++++++++++++------------------
 1 file changed, 36 insertions(+), 39 deletions(-)

diff --git a/types/react-map-gl/index.d.ts b/types/react-map-gl/index.d.ts
index 4522ddf729..3fea6a3ea9 100644
--- a/types/react-map-gl/index.d.ts
+++ b/types/react-map-gl/index.d.ts
@@ -19,11 +19,8 @@ export interface ViewState {
 }
 
 export interface MapError {
-  error?: {
-    message: string;
+    error?: { message: string; status: number };
     status: number;
-  };
-  status: number;
 }
 
 export interface MapRequest {
@@ -81,7 +78,7 @@ export interface ExtraState {
 }
 
 export interface PositionInput {
-  pos: [number, number];
+    pos: [number, number];
 }
 
 export interface MapControllerOptions {
@@ -99,47 +96,47 @@ export interface MapControllerOptions {
 }
 
 export interface ViewportProps {
-  width: number;
-  height: number;
-  latitude: number;
-  longitude: number;
-  zoom: number;
-  bearing: number;
-  pitch: number;
-  altitude: number;
-  maxZoom: number;
-  minZoom: number;
-  maxPitch: number;
-  minPitch: number;
-  transitionDuration?: number;
-  transitionInterpolator?: TransitionInterpolator;
-  transitionInterruption?: TRANSITION_EVENTS;
-  transitionEasing?: EasingFunction;
+    width: number;
+    height: number;
+    latitude: number;
+    longitude: number;
+    zoom: number;
+    bearing: number;
+    pitch: number;
+    altitude: number;
+    maxZoom: number;
+    minZoom: number;
+    maxPitch: number;
+    minPitch: number;
+    transitionDuration?: number;
+    transitionInterpolator?: TransitionInterpolator;
+    transitionInterruption?: TRANSITION_EVENTS;
+    transitionEasing?: EasingFunction;
 }
 
 export interface InteractiveState {
-  startPanLngLat?: [number, number];
-  startZoomLngLat?: [number, number];
-  startBearing?: number;
-  startPitch?: number;
-  startZoom?: number;
+    startPanLngLat?: [number, number];
+    startZoomLngLat?: [number, number];
+    startBearing?: number;
+    startPitch?: number;
+    startZoom?: number;
 }
 
 export type MapStateProps = Partial<ViewportProps & InteractiveState>;
 
 export class MapState {
-  constructor(props: MapStateProps);
-  getViewportProps(): ViewportProps;
-  getInteractiveState(): InteractiveState;
-  panStart(input: PositionInput): MapState;
-  pan(input: PositionInput & { startPos?: [number, number] }): MapState;
-  panEnd(): MapState;
-  rotateStart(input: PositionInput): MapState;
-  rotate(input: { deltaScaleX?: number; deltaScaleY?: number }): MapState;
-  rotateEnd(): MapState;
-  zoomStart(input: PositionInput): MapState;
-  zoom(input: PositionInput & { scale: number; startPos?: [number, number] }): MapState;
-  zoomEnd(): MapState;
+    constructor(props: MapStateProps);
+    getViewportProps(): ViewportProps;
+    getInteractiveState(): InteractiveState;
+    panStart(input: PositionInput): MapState;
+    pan(input: PositionInput & { startPos?: [number, number] }): MapState;
+    panEnd(): MapState;
+    rotateStart(input: PositionInput): MapState;
+    rotate(input: { deltaScaleX?: number; deltaScaleY?: number }): MapState;
+    rotateEnd(): MapState;
+    zoomStart(input: PositionInput): MapState;
+    zoom(input: PositionInput & { scale: number; startPos?: [number, number] }): MapState;
+    zoomEnd(): MapState;
 }
 
 export interface Center {
@@ -202,7 +199,7 @@ export class LinearInterpolator extends TransitionInterpolator {
 export class FlyToInterpolator extends TransitionInterpolator {}
 
 export interface ViewStateChangeInfo {
-  viewState: ViewState;
+    viewState: ViewState;
 }
 
 export interface InteractiveMapProps extends StaticMapProps {

From ca53c065a52c288b7d8d3fb3bde5709c6d496f7c Mon Sep 17 00:00:00 2001
From: Esteban Ibarra <eibarra1992@hotmail.com>
Date: Tue, 20 Nov 2018 15:18:30 -0500
Subject: [PATCH 121/836] Revert changes of react-native-draggable-flatlist

---
 .../index.d.ts                                | 59 -------------------
 .../react-native-draggable-flatlist-tests.tsx | 44 --------------
 .../tsconfig.json                             | 24 --------
 .../tslint.json                               |  1 -
 4 files changed, 128 deletions(-)
 delete mode 100644 types/react-native-draggable-flatlist/index.d.ts
 delete mode 100644 types/react-native-draggable-flatlist/react-native-draggable-flatlist-tests.tsx
 delete mode 100644 types/react-native-draggable-flatlist/tsconfig.json
 delete mode 100644 types/react-native-draggable-flatlist/tslint.json

diff --git a/types/react-native-draggable-flatlist/index.d.ts b/types/react-native-draggable-flatlist/index.d.ts
deleted file mode 100644
index 0b96f0b3cd..0000000000
--- a/types/react-native-draggable-flatlist/index.d.ts
+++ /dev/null
@@ -1,59 +0,0 @@
-// Type definitions for react-native-draggable-flatlist 1.1
-// Project: https://github.com/computerjazz/react-native-draggable-flatlist#readme
-// Definitions by: Stack Builders <https://github.com/stackbuilders>
-//                 Esteban Ibarra <https://github.com/ibarrae>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.8
-
-import { VirtualizedListWithoutRenderItemProps } from "react-native";
-import { Component } from "react";
-
-export interface RenderItemInfo<ItemR> {
-  item: ItemR;
-  index: number;
-  move: () => void;
-  moveEnd: () => void;
-  isActive: boolean;
-}
-
-export interface OnMoveEndInfo<ItemM> {
-  data: ReadonlyArray<ItemM> | null;
-  to: number;
-  from: number;
-  row: ItemM;
-}
-
-interface DraggableFlatListProps<Item> extends VirtualizedListWithoutRenderItemProps<Item> {
-  /**
-   * Items to be rendered.
-   */
-  data: ReadonlyArray<Item> | null;
-
-  /**
-   *  Function that returns updated ordering of data
-   */
-  onMoveEnd?: (info: OnMoveEndInfo<Item>) => void;
-
-  /**
-   * Function that is called when row becomes active.
-   */
-  onMoveBegin?: (index: number) => void;
-
-  /**
-   * Sets where scrolling begins.
-   *
-   * Default is 5
-   */
-  scrollPercent?: number;
-
-  /**
-   * Function that calls move when the row should become active (in an onPress, onLongPress, etc). Calls moveEnd when the gesture is complete (in onPressOut).
-   */
-  renderItem: (info: RenderItemInfo<Item>) => React.ReactElement<any> | null;
-}
-
-declare class DraggableFlatList<Item> extends Component<DraggableFlatListProps<Item>> {
-  constructor(props: DraggableFlatListProps<Item>);
-}
-
-export default DraggableFlatList;
diff --git a/types/react-native-draggable-flatlist/react-native-draggable-flatlist-tests.tsx b/types/react-native-draggable-flatlist/react-native-draggable-flatlist-tests.tsx
deleted file mode 100644
index 40d613e4ea..0000000000
--- a/types/react-native-draggable-flatlist/react-native-draggable-flatlist-tests.tsx
+++ /dev/null
@@ -1,44 +0,0 @@
-import * as React from 'react';
-import { TouchableOpacity, Text } from 'react-native';
-import DraggableFlatList, { RenderItemInfo } from 'react-native-draggable-flatlist';
-
-interface Item {
-  name: string;
-  mail: string;
-}
-
-class Example extends React.Component {
-  state = {
-    data: [
-      { name: 'Esteban', mail: 'foo@foo.com' },
-      { name: 'Xavier', mail: 'foo2@foo.com' },
-    ]
-  };
-
-  renderItem({ item, index, move, moveEnd, isActive }: RenderItemInfo<Item>) {
-    return (
-      <TouchableOpacity
-        onLongPress={move}
-        onPressOut={moveEnd}
-      >
-        <Text>{index}</Text>
-        <Text>{item.name}</Text>
-        <Text>{item.mail}</Text>
-      </TouchableOpacity>
-    );
-  }
-
-  render() {
-    const { data } = this.state;
-    return (
-      <DraggableFlatList
-        data={data}
-        renderItem={this.renderItem}
-        keyExtractor={(_item, index) => `draggable-item-${index}`}
-        scrollPercent={10}
-        onMoveEnd={({ data }) => this.setState({ data })}
-        ListFooterComponent={<Text>{'Hello'}</Text>}
-      />
-    );
-  }
-}
diff --git a/types/react-native-draggable-flatlist/tsconfig.json b/types/react-native-draggable-flatlist/tsconfig.json
deleted file mode 100644
index b3c009feac..0000000000
--- a/types/react-native-draggable-flatlist/tsconfig.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true,
-        "jsx": "react-native"
-    },
-    "files": [
-        "index.d.ts",
-        "react-native-draggable-flatlist-tests.tsx"
-    ]
-}
diff --git a/types/react-native-draggable-flatlist/tslint.json b/types/react-native-draggable-flatlist/tslint.json
deleted file mode 100644
index 3db14f85ea..0000000000
--- a/types/react-native-draggable-flatlist/tslint.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "extends": "dtslint/dt.json" }

From c907a148f89eefc1c82ed74c8392367835f7bfbb Mon Sep 17 00:00:00 2001
From: Andrew Goodale <andrewgoodale@upserve.com>
Date: Tue, 20 Nov 2018 14:11:05 -0500
Subject: [PATCH 122/836] Add declarations for XMLHttpRequest from DOM lib

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

diff --git a/types/react-native/globals.d.ts b/types/react-native/globals.d.ts
index f5dcb25382..39723fcde1 100644
--- a/types/react-native/globals.d.ts
+++ b/types/react-native/globals.d.ts
@@ -119,3 +119,92 @@ type HeadersInit_ = Headers | string[][] | { [key: string]: string };
 type RequestCredentials_ = "omit" | "same-origin" | "include";
 type RequestMode_ = "navigate" | "same-origin" | "no-cors" | "cors";
 type ResponseType_ = "basic" | "cors" | "default" | "error" | "opaque" | "opaqueredirect";
+
+//
+// XMLHttpRequest
+//
+
+interface XMLHttpRequestEventMap extends XMLHttpRequestEventTargetEventMap {
+  "readystatechange": Event;
+}
+
+interface XMLHttpRequest extends EventTarget, XMLHttpRequestEventTarget {
+//  msCaching: string;
+  onreadystatechange: ((this: XMLHttpRequest, ev: Event) => any) | null;
+  readonly readyState: number;
+  readonly response: any;
+  readonly responseText: string;
+  responseType: XMLHttpRequestResponseType;
+  readonly responseURL: string;
+  readonly responseXML: Document | null;
+  readonly status: number;
+  readonly statusText: string;
+  timeout: number;
+  readonly upload: XMLHttpRequestUpload;
+  withCredentials: boolean;
+  abort(): void;
+  getAllResponseHeaders(): string;
+  getResponseHeader(header: string): string | null;
+//  msCachingEnabled(): boolean;
+  open(method: string, url: string, async?: boolean, user?: string | null, password?: string | null): void;
+  overrideMimeType(mime: string): void;
+  send(data?: any): void;
+  setRequestHeader(header: string, value: string): void;
+  readonly DONE: number;
+  readonly HEADERS_RECEIVED: number;
+  readonly LOADING: number;
+  readonly OPENED: number;
+  readonly UNSENT: number;
+  addEventListener<K extends keyof XMLHttpRequestEventMap>(type: K, listener: (this: XMLHttpRequest, ev: XMLHttpRequestEventMap[K]) => any): void;
+//  addEventListener(type: string, listener: EventListenerOrEventListenerObject): void;
+  removeEventListener<K extends keyof XMLHttpRequestEventMap>(type: K, listener: (this: XMLHttpRequest, ev: XMLHttpRequestEventMap[K]) => any): void;
+//  removeEventListener(type: string, listener: EventListenerOrEventListenerObject): void;
+}
+
+declare var XMLHttpRequest: {
+  prototype: XMLHttpRequest;
+  new(): XMLHttpRequest;
+  readonly DONE: number;
+  readonly HEADERS_RECEIVED: number;
+  readonly LOADING: number;
+  readonly OPENED: number;
+  readonly UNSENT: number;
+};
+
+interface XMLHttpRequestEventTargetEventMap {
+  "abort": Event;
+  "error": Event;
+  "load": Event;
+  "loadend": Event;
+  "loadstart": Event;
+  "progress": Event;
+  "timeout": Event;
+}
+
+interface XMLHttpRequestEventTarget {
+  onabort: ((this: XMLHttpRequest, ev: Event) => any) | null;
+  onerror: ((this: XMLHttpRequest, ev: Event) => any) | null;
+  onload: ((this: XMLHttpRequest, ev: Event) => any) | null;
+  onloadend: ((this: XMLHttpRequest, ev: Event) => any) | null;
+  onloadstart: ((this: XMLHttpRequest, ev: Event) => any) | null;
+  onprogress: ((this: XMLHttpRequest, ev: Event) => any) | null;
+  ontimeout: ((this: XMLHttpRequest, ev: Event) => any) | null;
+  addEventListener<K extends keyof XMLHttpRequestEventTargetEventMap>(type: K, listener: (this: XMLHttpRequestEventTarget, ev: XMLHttpRequestEventTargetEventMap[K]) => any): void;
+//  addEventListener(type: string, listener: EventListenerOrEventListenerObject): void;
+  removeEventListener<K extends keyof XMLHttpRequestEventTargetEventMap>(type: K, listener: (this: XMLHttpRequestEventTarget, ev: XMLHttpRequestEventTargetEventMap[K]) => any): void;
+//  removeEventListener(type: string, listener: EventListenerOrEventListenerObject): void;
+}
+
+interface XMLHttpRequestUpload extends EventTarget, XMLHttpRequestEventTarget {
+  addEventListener<K extends keyof XMLHttpRequestEventTargetEventMap>(type: K, listener: (this: XMLHttpRequestUpload, ev: XMLHttpRequestEventTargetEventMap[K]) => any): void;
+//  addEventListener(type: string, listener: EventListenerOrEventListenerObject): void;
+  removeEventListener<K extends keyof XMLHttpRequestEventTargetEventMap>(type: K, listener: (this: XMLHttpRequestUpload, ev: XMLHttpRequestEventTargetEventMap[K]) => any): void;
+//  removeEventListener(type: string, listener: EventListenerOrEventListenerObject): void;
+}
+
+declare var XMLHttpRequestUpload: {
+  prototype: XMLHttpRequestUpload;
+  new(): XMLHttpRequestUpload;
+};
+
+type XMLHttpRequestResponseType = "" | "arraybuffer" | "blob" | "document" | "json" | "text";

From 1a8e6368f6165ba14733ebc272188d6a7d192b03 Mon Sep 17 00:00:00 2001
From: "jan@pidgin" <jan@esserjan.de>
Date: Tue, 20 Nov 2018 21:41:55 +0100
Subject: [PATCH 123/836] Fixing dynamic validation schema and  typing.

---
 types/vuelidate/vue.d.ts           | 15 ++++-----
 types/vuelidate/vuelidate-tests.ts | 53 +++++++++++++++---------------
 2 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/types/vuelidate/vue.d.ts b/types/vuelidate/vue.d.ts
index d1ef01e7bc..8232d96038 100644
--- a/types/vuelidate/vue.d.ts
+++ b/types/vuelidate/vue.d.ts
@@ -5,20 +5,18 @@ import { ValidationRule } from './lib/validators'
 import { Validation } from './vuelidate'
 
 declare module 'vue/types/vue' {
-    type ValidationProperties<V extends Vue> = {
-        [P in keyof V]?: Validation
+    type ValidationProperties<V> = {
+        [P in keyof V]?: Validation & ValidationProperties<V[P]>
     }
 
-    interface ValidationGroups<V extends Vue> {
-        [groupName: string]: ValidationProperties<V>
+    interface ValidationGroups {
+        [groupName: string]: Validation & ValidationProperties<any>
     }
 
     interface Vue {
-        $v: ValidationProperties<this> & ValidationGroups<this> & Validation
+        $v: ValidationProperties<this> & ValidationGroups & Validation
 
         delayTouch(v: Validation): void
-
-        validations(): any // unknown
     }
 }
 
@@ -35,11 +33,12 @@ declare module 'vue/types/options' {
     type GroupDecl = string[]
     type AsyncDecl = (...args: any[]) => boolean | Promise<boolean>
     type NestedDecl = RuleDecl
+    type DynamicDecl = () => RuleDecl
     interface RuleDecl {
         [rule: string]: ValidationDecl | GroupDecl | AsyncDecl | NestedDecl
     }
 
     interface ComponentOptions<V extends Vue> {
-        validations?: RuleDecl
+        validations?: RuleDecl | DynamicDecl
     }
 }
diff --git a/types/vuelidate/vuelidate-tests.ts b/types/vuelidate/vuelidate-tests.ts
index 20e320b3a7..43cf5f5648 100644
--- a/types/vuelidate/vuelidate-tests.ts
+++ b/types/vuelidate/vuelidate-tests.ts
@@ -116,19 +116,23 @@ export class ValidComponent extends Vue {
     myField = ''
 
     touchMap = new WeakMap()
-    delayTouch($v: Validation) {
-        $v.$reset()
-        if (this.touchMap.has($v)) {
-            clearTimeout(this.touchMap.get($v))
+    delayTouch(v: Validation) {
+        v.$reset()
+        if (this.touchMap.has(v)) {
+            clearTimeout(this.touchMap.get(v))
         }
-        this.touchMap.set($v, setTimeout($v.$touch, 1000))
+        this.touchMap.set(v, setTimeout(v.$touch, 1000))
     }
 
     accessValidatorParams() {
-        console.log(this.$v.$params.username)
-        if (this.$v.username) {
-            console.log(this.$v.username.$params)
+        console.log(this.$v.$params.form)
+
+        if (this.$v.form) {
+            console.log(this.$v.form.$params)
+            console.log(this.$v.form.$params.nestedA)
+            console.log(this.$v.form.nestedA)
         }
+        console.log(this.$v.validationGroup.$params)
     }
 
     accessGroups() {
@@ -140,25 +144,22 @@ export class ValidComponent extends Vue {
     }
 
     hasDescription = false
-    validations() {
-        if (!this.hasDescription) {
-            return {
-                name: {
-                    required
-                }
-            }
-        } else {
-            return {
-                name: {
-                    required
-                },
-                description: {
-                    required
-                }
-            }
-        }
-    }
+
     get isRepoValid() {
         return !this.$v.$invalid
     }
 }
+
+@Component({
+    validations() {
+        const self = this as Valid2Component // assert
+        return self.myToggle
+            ? { myField1: required, myField2: contains('maybe') }
+            : { myField1: contains('maybe'), myField2: required }
+    }
+})
+export class Valid2Component extends Vue {
+    myToggle = false
+    myField1 = ''
+    myField2 = ''
+}

From 91af0af03949ade47e77370d04b3922e543550ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andi=20P=C3=A4tzold?= <andi.paetzold@gmail.com>
Date: Tue, 20 Nov 2018 21:54:08 +0100
Subject: [PATCH 124/836] fix(mailgun-js) fix validate return value for
 callbacks

---
 types/mailgun-js/index.d.ts          | 36 +++++++++-------------------
 types/mailgun-js/mailgun-js-tests.ts | 19 +++++++--------
 2 files changed, 20 insertions(+), 35 deletions(-)

diff --git a/types/mailgun-js/index.d.ts b/types/mailgun-js/index.d.ts
index 82a75913cf..eaa210e6e1 100644
--- a/types/mailgun-js/index.d.ts
+++ b/types/mailgun-js/index.d.ts
@@ -126,6 +126,8 @@ declare namespace Mailgun {
             unparseable: string[];
         }
 
+        type ValidationCallback = (error: Error, body: ValidateResponse) => void;
+
         interface ValidateResponse {
             address: string;
             did_you_mean: string | null;
@@ -151,32 +153,16 @@ declare namespace Mailgun {
             bodySignature: string
         ): boolean;
 
-        parse(
-            addressList: string[],
-            callback?: (error: Error, body: validation.ValidateResponse) => void
-        ): Promise<validation.ParseResponse>;
+        parse(addressList: string[], callback?: validation.ValidationCallback): Promise<validation.ParseResponse>;
 
-        validate(
-            address: string,
-            callback?: (error: Error, body: validation.ValidateResponse) => void
-        ): Promise<validation.ValidateResponse>;
-        validate(
-            address: string,
-            isPrivate: boolean,
-            callback?: (error: Error, body: validation.ValidateResponse) => void
-        ): Promise<validation.ValidateResponse>;
-        validate(
-            address: string,
-            // tslint:disable-next-line unified-signatures
-            opts: { [key: string]: any },
-            callback?: (error: Error, body: validation.ValidateResponse) => void
-        ): Promise<validation.ValidateResponse>;
-        validate(
-            address: string,
-            isPrivate: boolean,
-            opts: { [key: string]: any },
-            callback?: (error: Error, body: validation.ValidateResponse) => void
-        ): Promise<validation.ValidateResponse>;
+        validate(address: string, callback: validation.ValidationCallback): void;
+        validate(address: string, opts: { [key: string]: any }, callback: validation.ValidationCallback): void;
+        // tslint:disable-next-line unified-signatures
+        validate(address: string, isPrivate: boolean, callback: validation.ValidationCallback): void;
+        validate(address: string, isPrivate: boolean, opts: { [key: string]: any }, callback: validation.ValidationCallback): void;
+
+        validate(address: string, isPrivate?: boolean, opts?: { [key: string]: any }): Promise<validation.ValidateResponse>;
+        validate(address: string, opts: { [key: string]: any }): Promise<validation.ValidateResponse>;
     }
 
     interface Lists {
diff --git a/types/mailgun-js/mailgun-js-tests.ts b/types/mailgun-js/mailgun-js-tests.ts
index e2bef4cab3..12bf18e437 100644
--- a/types/mailgun-js/mailgun-js-tests.ts
+++ b/types/mailgun-js/mailgun-js-tests.ts
@@ -30,16 +30,15 @@ const exampleSendData: mailgunFactory.messages.SendData = {
 
 mailgun.messages().send(exampleSendData, (err, body) => {});
 
-const validationResult1: Promise<mailgunFactory.validation.ValidateResponse> =
-    mailgun.validate("foo@mailgun.net");
-const validationResult2: Promise<mailgunFactory.validation.ValidateResponse> =
-    mailgun.validate("foo@mailgun.net", (error, body) => {});
-const validationResult3: Promise<mailgunFactory.validation.ValidateResponse> =
-    mailgun.validate("foo@mailgun.net", true);
-const validationResult4: Promise<mailgunFactory.validation.ValidateResponse> =
-    mailgun.validate("foo@mailgun.net", true, (error, body) => {});
-const validationResult5: Promise<mailgunFactory.validation.ValidateResponse> =
-    mailgun.validate("foo@mailgun.net", true, { option: "option" }, (error, body) => {});
+let validationResultPromise: Promise<mailgunFactory.validation.ValidateResponse>;
+validationResultPromise = mailgun.validate("foo@mailgun.net");
+validationResultPromise = mailgun.validate("foo@mailgun.net", true);
+validationResultPromise = mailgun.validate("foo@mailgun.net", true, { option: "option" });
+validationResultPromise = mailgun.validate("foo@mailgun.net", { option: "option" });
+mailgun.validate("foo@mailgun.net", (error, body) => {});
+mailgun.validate("foo@mailgun.net", true, (error, body) => {});
+mailgun.validate("foo@mailgun.net", true, { option: "option" }, (error, body) => {});
+mailgun.validate("foo@mailgun.net", { option: "option" }, (error, body) => {});
 
 const validationResult6: mailgunFactory.validation.ValidateResponse = {
     address: "foo@mailgun.net",

From 35bca8038a202d1676cd68ce5c05409a2ee151a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andi=20P=C3=A4tzold?= <andi.paetzold@gmail.com>
Date: Tue, 20 Nov 2018 22:06:08 +0100
Subject: [PATCH 125/836] feat(mailgun-js) specify validation options

---
 types/mailgun-js/index.d.ts          | 19 +++++++++++++++----
 types/mailgun-js/mailgun-js-tests.ts |  8 ++++----
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/types/mailgun-js/index.d.ts b/types/mailgun-js/index.d.ts
index eaa210e6e1..0c6ef0eef3 100644
--- a/types/mailgun-js/index.d.ts
+++ b/types/mailgun-js/index.d.ts
@@ -128,6 +128,15 @@ declare namespace Mailgun {
 
         type ValidationCallback = (error: Error, body: ValidateResponse) => void;
 
+        interface ValidationOptionsPublic {
+            api_key?: string;
+            mailbox_verification?: boolean | "true" | "false";
+        }
+
+        interface ValidationOptionsPrivate {
+            mailbox_verification?: boolean | "true" | "false";
+        }
+
         interface ValidateResponse {
             address: string;
             did_you_mean: string | null;
@@ -156,13 +165,15 @@ declare namespace Mailgun {
         parse(addressList: string[], callback?: validation.ValidationCallback): Promise<validation.ParseResponse>;
 
         validate(address: string, callback: validation.ValidationCallback): void;
-        validate(address: string, opts: { [key: string]: any }, callback: validation.ValidationCallback): void;
+        validate(address: string, opts: validation.ValidationOptionsPublic, callback: validation.ValidationCallback): void;
         // tslint:disable-next-line unified-signatures
         validate(address: string, isPrivate: boolean, callback: validation.ValidationCallback): void;
-        validate(address: string, isPrivate: boolean, opts: { [key: string]: any }, callback: validation.ValidationCallback): void;
+        validate(address: string, isPrivate: false, opts: validation.ValidationOptionsPublic, callback: validation.ValidationCallback): void;
+        validate(address: string, isPrivate: true, opts: validation.ValidationOptionsPrivate, callback: validation.ValidationCallback): void;
 
-        validate(address: string, isPrivate?: boolean, opts?: { [key: string]: any }): Promise<validation.ValidateResponse>;
-        validate(address: string, opts: { [key: string]: any }): Promise<validation.ValidateResponse>;
+        validate(address: string, opts?: validation.ValidationOptionsPublic): Promise<validation.ValidateResponse>;
+        validate(address: string, isPrivate: false, opts?: validation.ValidationOptionsPublic): Promise<validation.ValidateResponse>;
+        validate(address: string, isPrivate: true, opts?: validation.ValidationOptionsPrivate): Promise<validation.ValidateResponse>;
     }
 
     interface Lists {
diff --git a/types/mailgun-js/mailgun-js-tests.ts b/types/mailgun-js/mailgun-js-tests.ts
index 12bf18e437..e06e683248 100644
--- a/types/mailgun-js/mailgun-js-tests.ts
+++ b/types/mailgun-js/mailgun-js-tests.ts
@@ -33,12 +33,12 @@ mailgun.messages().send(exampleSendData, (err, body) => {});
 let validationResultPromise: Promise<mailgunFactory.validation.ValidateResponse>;
 validationResultPromise = mailgun.validate("foo@mailgun.net");
 validationResultPromise = mailgun.validate("foo@mailgun.net", true);
-validationResultPromise = mailgun.validate("foo@mailgun.net", true, { option: "option" });
-validationResultPromise = mailgun.validate("foo@mailgun.net", { option: "option" });
+validationResultPromise = mailgun.validate("foo@mailgun.net", true, { mailbox_verification: true });
+validationResultPromise = mailgun.validate("foo@mailgun.net", { mailbox_verification: false, api_key: "..." });
 mailgun.validate("foo@mailgun.net", (error, body) => {});
 mailgun.validate("foo@mailgun.net", true, (error, body) => {});
-mailgun.validate("foo@mailgun.net", true, { option: "option" }, (error, body) => {});
-mailgun.validate("foo@mailgun.net", { option: "option" }, (error, body) => {});
+mailgun.validate("foo@mailgun.net", true, { mailbox_verification: true }, (error, body) => {});
+mailgun.validate("foo@mailgun.net", { mailbox_verification: false, api_key: "..." }, (error, body) => {});
 
 const validationResult6: mailgunFactory.validation.ValidateResponse = {
     address: "foo@mailgun.net",

From 02ac8504a80ccb230ca6daae11ddb8b42325bbeb Mon Sep 17 00:00:00 2001
From: Kenza Iraki <kirakik@gmail.com>
Date: Tue, 20 Nov 2018 16:28:33 -0500
Subject: [PATCH 126/836] Fixed @feathersjs/feathers find service method return
 type

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

diff --git a/types/feathersjs__feathers/index.d.ts b/types/feathersjs__feathers/index.d.ts
index 53cdf182a1..5948eadc27 100644
--- a/types/feathersjs__feathers/index.d.ts
+++ b/types/feathersjs__feathers/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for @feathersjs/feathers 3.0
+// Type definitions for @feathersjs/feathers 3.1
 // Project: http://feathersjs.com/
 // Definitions by:  Jan Lohage <https://github.com/j2L4e>
 //                  Abraao Alves <https://github.com/AbraaoAlves>
@@ -138,7 +138,7 @@ export interface HooksObject {
 
 // todo: figure out what to do: These methods don't actually need to be implemented, so they can be undefined at runtime. Yet making them optional gets cumbersome in strict mode.
 export interface ServiceMethods<T> {
-    find(params?: Params): Promise<T[] | Paginated<T>>;
+    find(params?: Params): Promise<T | T[] | Paginated<T>>;
 
     get(id: Id, params?: Params): Promise<T>;
 

From 73cfb3d8b8cf0752eca211124922fdfd140a8439 Mon Sep 17 00:00:00 2001
From: Ulrich Buchgraber <ulrich.b@gmx.at>
Date: Tue, 20 Nov 2018 13:26:05 +0100
Subject: [PATCH 127/836] Add `spawn()` overload which takes `options` but no
 `args`

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

diff --git a/types/node/index.d.ts b/types/node/index.d.ts
index fdda9e948a..0f6698035d 100644
--- a/types/node/index.d.ts
+++ b/types/node/index.d.ts
@@ -2655,6 +2655,7 @@ declare module "child_process" {
         windowsHide?: boolean;
     }
 
+    function spawn(command: string, options?: SpawnOptions): ChildProcess;
     function spawn(command: string, args?: ReadonlyArray<string>, options?: SpawnOptions): ChildProcess;
 
     interface ExecOptions {
diff --git a/types/node/node-tests.ts b/types/node/node-tests.ts
index 20159c70d9..c59ed08064 100644
--- a/types/node/node-tests.ts
+++ b/types/node/node-tests.ts
@@ -2636,6 +2636,8 @@ async function asyncStreamPipelineFinished() {
     {
         childProcess.exec("echo test");
         childProcess.exec("echo test", { windowsHide: true });
+        childProcess.spawn("echo");
+        childProcess.spawn("echo", { windowsHide: true });
         childProcess.spawn("echo", ["test"], { windowsHide: true });
         childProcess.spawn("echo", ["test"], { windowsHide: true, argv0: "echo-test" });
         childProcess.spawn("echo", ["test"], { stdio: [0xdeadbeef, "inherit", undefined, "pipe"] });

From 1b9be406451a0a5a51d8d9fc3f365644c4e6dcce Mon Sep 17 00:00:00 2001
From: Kenza Iraki <kirakik@gmail.com>
Date: Tue, 20 Nov 2018 16:48:36 -0500
Subject: [PATCH 128/836] Fixed missing/inaccurate properties in analytics-node

---
 types/analytics-node/index.d.ts | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/types/analytics-node/index.d.ts b/types/analytics-node/index.d.ts
index 6834087ff7..cc9e5386e2 100644
--- a/types/analytics-node/index.d.ts
+++ b/types/analytics-node/index.d.ts
@@ -22,8 +22,8 @@ declare namespace AnalyticsNode {
     },
     timestamp?: Date;
     messageId?: string;
-    anonymousId: string | number;
-    userId: string | number;
+    anonymousId?: string | number;
+    userId?: string | number;
   }
 
   interface Data {
@@ -47,7 +47,8 @@ declare namespace AnalyticsNode {
     /* The identify method lets you tie a user to their actions and record
        traits about them. */
     identify(message: {
-      userId: string | number;
+      userId?: string | number;
+      anonymousId?: string | number;
       traits?: Object;
       timestamp?: Date;
       context?: Object;
@@ -56,7 +57,8 @@ declare namespace AnalyticsNode {
 
     /* The track method lets you record the actions your users perform. */
     track(message: {
-      userId: string | number;
+      userId?: string | number;
+      anonymousId?: string | number;
       event: string;
       properties?: Object;
       timestamp?: Date;
@@ -67,7 +69,8 @@ declare namespace AnalyticsNode {
     /* The page method lets you record page views on your website, along with
        optional extra information about the page being viewed. */
     page(message: {
-      userId: string | number;
+      userId?: string | number;
+      anonymousId?: string | number;
       category?: string;
       name?: string;
       properties?: Object;
@@ -79,19 +82,20 @@ declare namespace AnalyticsNode {
     /* alias is how you associate one identity with another. */
     alias(message: {
       previousId: string | number;
-      userId: string | number;
+      userId?: string | number;
+      anonymousId?: string | number;
       integrations?: Integrations;
     }, callback?: (err: Error, data: Data) => void): Analytics;
 
     /* Group calls can be used to associate individual users with shared
        accounts or companies. */
     group(message: {
-      userId: string | number;
+      userId?: string | number;
+      anonymousId?: string | number;
       groupId: string | number;
       traits?: Object;
       context?: Object;
       timestamp?: Date;
-      anonymous_id?: string | number;
       integrations?: Integrations;
     }, callback?: (err: Error, data: Data) => void): Analytics;
 

From ea41934fb03b6253b574329347192fa34c7a185e Mon Sep 17 00:00:00 2001
From: Boris Sergeyev <surgeboris@gmail.com>
Date: Tue, 20 Nov 2018 22:41:35 +0100
Subject: [PATCH 129/836] [react-redux] improved linting

---
 types/react-redux/index.d.ts            | 110 ++---
 types/react-redux/react-redux-tests.tsx | 567 +++++++++++-------------
 types/react-redux/tslint.json           |  80 +---
 3 files changed, 302 insertions(+), 455 deletions(-)

diff --git a/types/react-redux/index.d.ts b/types/react-redux/index.d.ts
index d1889b54fe..2f919581f4 100644
--- a/types/react-redux/index.d.ts
+++ b/types/react-redux/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for react-redux 6.0.5
+// Type definitions for react-redux 6.0
 // Project: https://github.com/reduxjs/react-redux
 // Definitions by: Qubo <https://github.com/tkqubo>,
 //                 Kenzie Togami <https://github.com/kenzierocks>,
@@ -43,15 +43,14 @@ import {
 } from 'redux';
 
 // Omit taken from https://www.typescriptlang.org/docs/handbook/release-notes/typescript-2-8.html
-type Omit<T, K extends keyof T> = Pick<T, Exclude<keyof T, K>>;
+export type Omit<T, K extends keyof T> = Pick<T, Exclude<keyof T, K>>;
 
 export interface DispatchProp<A extends Action = AnyAction> {
     dispatch: Dispatch<A>;
 }
 
-interface AdvancedComponentDecorator<TProps, TOwnProps> {
-    (component: ComponentType<TProps>): ComponentClass<TOwnProps>;
-}
+export type AdvancedComponentDecorator<TProps, TOwnProps> =
+    (component: ComponentType<TProps>) => ComponentClass<TOwnProps>;
 
 /**
  * A property P will be present if:
@@ -65,7 +64,7 @@ interface AdvancedComponentDecorator<TProps, TOwnProps> {
  * - if property P is present in InjectedProps but does not extend the
  *   DecorationTargetProps[P] definition, its definition will be that of InjectedProps[P]
  */
-type Matching<InjectedProps, DecorationTargetProps> = {
+export type Matching<InjectedProps, DecorationTargetProps> = {
 	[P in keyof DecorationTargetProps]: P extends keyof InjectedProps
 		? InjectedProps[P] extends DecorationTargetProps[P]
 			? DecorationTargetProps[P]
@@ -83,7 +82,7 @@ type Matching<InjectedProps, DecorationTargetProps> = {
  * required by the decorated (right hand side) component.
  * But any property required by the decorated component must be satisfied by the injected property.
  */
-type Shared<
+export type Shared<
     InjectedProps,
     DecorationTargetProps extends Shared<InjectedProps, DecorationTargetProps>
     > = {
@@ -91,43 +90,41 @@ type Shared<
     };
 
 // Infers prop type from component C
-type GetProps<C> = C extends ComponentType<infer P> ? P : never;
+export type GetProps<C> = C extends ComponentType<infer P> ? P : never;
 
 // Applies LibraryManagedAttributes (proper handling of defaultProps
 // and propTypes), as well as defines WrappedComponent.
-type ConnectedComponentClass<C, P> = ComponentClass<JSX.LibraryManagedAttributes<C, P>> & {
+export type ConnectedComponentClass<C, P> = ComponentClass<JSX.LibraryManagedAttributes<C, P>> & {
 	WrappedComponent: C;
-}
+};
 
 // Injects props and removes them from the prop requirements.
 // Will not pass through the injected props if they are passed in during
 // render. Also adds new prop requirements from TNeedsProps.
-export interface InferableComponentEnhancerWithProps<TInjectedProps, TNeedsProps> {
-    <C extends ComponentType<Matching<TInjectedProps, GetProps<C>>>>(
+export type InferableComponentEnhancerWithProps<TInjectedProps, TNeedsProps> =
+	<C extends ComponentType<Matching<TInjectedProps, GetProps<C>>>>(
 		component: C
-	): ConnectedComponentClass<C, Omit<GetProps<C>, keyof Shared<TInjectedProps, GetProps<C>>> & TNeedsProps>
-}
+	) => ConnectedComponentClass<C, Omit<GetProps<C>, keyof Shared<TInjectedProps, GetProps<C>>> & TNeedsProps>;
 
 // Injects props and removes them from the prop requirements.
 // Will not pass through the injected props if they are passed in during
 // render.
 export type InferableComponentEnhancer<TInjectedProps> =
-    InferableComponentEnhancerWithProps<TInjectedProps, {}>
+    InferableComponentEnhancerWithProps<TInjectedProps, {}>;
 
-type HandleThunkActionCreator<TActionCreator> =
+export type HandleThunkActionCreator<TActionCreator> =
     TActionCreator extends (...args: any[]) => (...args: any[]) => any
         ? ReturnType<TActionCreator>
-        : TActionCreator
+        : TActionCreator;
 
 // redux-thunk middleware returns thunk's return value from dispatch call
 // https://github.com/reduxjs/redux-thunk#composition
-type WithThunkActionCreators<TDispatchProps> =
+export type WithThunkActionCreators<TDispatchProps> =
     TDispatchProps extends { [key: string]: any }
         ? {
             [C in keyof TDispatchProps]: HandleThunkActionCreator<TDispatchProps[C]>
         }
-        : TDispatchProps
-
+        : TDispatchProps;
 
 /**
  * Connects a React component to a Redux store.
@@ -149,6 +146,7 @@ type WithThunkActionCreators<TDispatchProps> =
  * @param options
  */
 export interface Connect {
+    // tslint:disable:no-unnecessary-generics
     (): InferableComponentEnhancer<DispatchProp>;
 
     <TStateProps = {}, no_dispatch = {}, TOwnProps = {}, State = {}>(
@@ -193,6 +191,7 @@ export interface Connect {
         mapStateToProps: MapStateToPropsParam<TStateProps, TOwnProps, State>,
         mapDispatchToProps: MapDispatchToPropsParam<TDispatchProps, TOwnProps>,
         mergeProps: MergeProps<TStateProps, TDispatchProps, TOwnProps, TMergedProps>,
+        options?: Options<State, TStateProps, TOwnProps, TMergedProps>
     ): InferableComponentEnhancerWithProps<TMergedProps, TOwnProps>;
 
     <TStateProps = {}, no_dispatch = {}, TOwnProps = {}, State = {}>(
@@ -221,48 +220,37 @@ export interface Connect {
         TStateProps & WithThunkActionCreators<TDispatchProps>,
         TOwnProps
     >;
-
-    <TStateProps = {}, TDispatchProps = {}, TOwnProps = {}, TMergedProps = {}, State = {}>(
-        mapStateToProps: MapStateToPropsParam<TStateProps, TOwnProps, State>,
-        mapDispatchToProps: MapDispatchToPropsParam<TDispatchProps, TOwnProps>,
-        mergeProps: MergeProps<TStateProps, TDispatchProps, TOwnProps, TMergedProps>,
-        options: Options<State, TStateProps, TOwnProps, TMergedProps>
-    ): InferableComponentEnhancerWithProps<TMergedProps, TOwnProps>;
+    // tslint:enable:no-unnecessary-generics
 }
 
 /**
  * The connect function. See {@type Connect} for details.
  */
-export declare const connect: Connect;
+export const connect: Connect;
 
-interface MapStateToProps<TStateProps, TOwnProps, State> {
-    (state: State, ownProps: TOwnProps): TStateProps;
-}
+export type MapStateToProps<TStateProps, TOwnProps, State> =
+    (state: State, ownProps: TOwnProps) => TStateProps;
 
-interface MapStateToPropsFactory<TStateProps, TOwnProps, State> {
-    (initialState: State, ownProps: TOwnProps): MapStateToProps<TStateProps, TOwnProps, State>;
-}
+export type MapStateToPropsFactory<TStateProps, TOwnProps, State> =
+    (initialState: State, ownProps: TOwnProps) => MapStateToProps<TStateProps, TOwnProps, State>;
 
-type MapStateToPropsParam<TStateProps, TOwnProps, State> = MapStateToPropsFactory<TStateProps, TOwnProps, State> | MapStateToProps<TStateProps, TOwnProps, State> | null | undefined;
+export type MapStateToPropsParam<TStateProps, TOwnProps, State> = MapStateToPropsFactory<TStateProps, TOwnProps, State> | MapStateToProps<TStateProps, TOwnProps, State> | null | undefined;
 
-interface MapDispatchToPropsFunction<TDispatchProps, TOwnProps> {
-    (dispatch: Dispatch<Action>, ownProps: TOwnProps): TDispatchProps;
-}
+export type MapDispatchToPropsFunction<TDispatchProps, TOwnProps> =
+    (dispatch: Dispatch<Action>, ownProps: TOwnProps) => TDispatchProps;
 
-type MapDispatchToProps<TDispatchProps, TOwnProps> =
+export type MapDispatchToProps<TDispatchProps, TOwnProps> =
     MapDispatchToPropsFunction<TDispatchProps, TOwnProps> | TDispatchProps;
 
-interface MapDispatchToPropsFactory<TDispatchProps, TOwnProps> {
-    (dispatch: Dispatch<Action>, ownProps: TOwnProps): MapDispatchToProps<TDispatchProps, TOwnProps>;
-}
+export type MapDispatchToPropsFactory<TDispatchProps, TOwnProps> =
+    (dispatch: Dispatch<Action>, ownProps: TOwnProps) => MapDispatchToProps<TDispatchProps, TOwnProps>;
 
-type MapDispatchToPropsParam<TDispatchProps, TOwnProps> = MapDispatchToPropsFactory<TDispatchProps, TOwnProps> | MapDispatchToProps<TDispatchProps, TOwnProps>;
+export type MapDispatchToPropsParam<TDispatchProps, TOwnProps> = MapDispatchToPropsFactory<TDispatchProps, TOwnProps> | MapDispatchToProps<TDispatchProps, TOwnProps>;
 
-interface MergeProps<TStateProps, TDispatchProps, TOwnProps, TMergedProps> {
-    (stateProps: TStateProps, dispatchProps: TDispatchProps, ownProps: TOwnProps): TMergedProps;
-}
+export type MergeProps<TStateProps, TDispatchProps, TOwnProps, TMergedProps> =
+    (stateProps: TStateProps, dispatchProps: TDispatchProps, ownProps: TOwnProps) => TMergedProps;
 
-interface Options<State = {}, TStateProps = {}, TOwnProps = {}, TMergedProps = {}> extends ConnectOptions {
+export interface Options<State = {}, TStateProps = {}, TOwnProps = {}, TMergedProps = {}> extends ConnectOptions {
     /**
      * If true, implements shouldComponentUpdate and shallowly compares the result of mergeProps,
      * preventing unnecessary updates, assuming that the component is a “pure” component
@@ -303,11 +291,12 @@ interface Options<State = {}, TStateProps = {}, TOwnProps = {}, TMergedProps = {
  * assumptions about defaults or memoization of results, leaving those responsibilities to the caller.It does not
  * modify the component class passed to it; instead, it returns a new, connected component class for you to use.
  *
- * @param selectorFactory The selector factory. See {@type SelectorFactory} for details.
+ * @param selectorFactory The selector factory. See SelectorFactory type for details.
  * @param connectOptions If specified, further customizes the behavior of the connector. Additionally, any extra
  *     options will be passed through to your <code>selectorFactory</code> in the <code>factoryOptions</code> argument.
  */
-export declare function connectAdvanced<S, TProps, TOwnProps, TFactoryOptions = {}>(
+export function connectAdvanced<S, TProps, TOwnProps, TFactoryOptions = {}>(
+    // tslint:disable-next-line no-unnecessary-generics
     selectorFactory: SelectorFactory<S, TProps, TOwnProps, TFactoryOptions>,
     connectOptions?: ConnectOptions & TFactoryOptions
 ): AdvancedComponentDecorator<TProps, TOwnProps>;
@@ -320,13 +309,10 @@ export declare function connectAdvanced<S, TProps, TOwnProps, TFactoryOptions =
  * call, the component will not be re-rendered. It's the responsibility of <code>selector</code> to return that
  * previous object when appropriate.
  */
-export interface SelectorFactory<S, TProps, TOwnProps, TFactoryOptions> {
-    (dispatch: Dispatch<Action>, factoryOptions: TFactoryOptions): Selector<S, TProps, TOwnProps>
-}
+export type SelectorFactory<S, TProps, TOwnProps, TFactoryOptions> =
+    (dispatch: Dispatch<Action>, factoryOptions: TFactoryOptions) => Selector<S, TProps, TOwnProps>;
 
-export interface Selector<S, TProps, TOwnProps> {
-    (state: S, ownProps: TOwnProps): TProps
-}
+export type Selector<S, TProps, TOwnProps> = (state: S, ownProps: TOwnProps) => TProps;
 
 export interface ConnectOptions {
     /**
@@ -336,13 +322,13 @@ export interface ConnectOptions {
      * @default name => 'ConnectAdvanced('+name+')'
      * @param componentName
      */
-    getDisplayName?: (componentName: string) => string
+    getDisplayName?: (componentName: string) => string;
     /**
      * Shown in error messages. Usually overridden by wrapper functions.
      *
      * @default 'connectAdvanced'
      */
-    methodName?: string
+    methodName?: string;
     /**
      * If defined, a property named this value will be added to the props passed to the wrapped component. Its value
      * will be the number of times the component has been rendered, which can be useful for tracking down unnecessary
@@ -350,27 +336,27 @@ export interface ConnectOptions {
      *
      * @default undefined
      */
-    renderCountProp?: string
+    renderCountProp?: string;
     /**
      * Controls whether the connector component subscribes to redux store state changes. If set to false, it will only
      * re-render on <code>componentWillReceiveProps</code>.
      *
      * @default true
      */
-    shouldHandleStateChanges?: boolean
+    shouldHandleStateChanges?: boolean;
     /**
      * The key of props/context to get the store. You probably only need this if you are in the inadvisable position of
      * having multiple stores.
      *
      * @default 'store'
      */
-    storeKey?: string
+    storeKey?: string;
     /**
      * If true, stores a ref to the wrapped component instance and makes it available via getWrappedInstance() method.
      *
      * @default false
      */
-    withRef?: boolean
+    withRef?: boolean;
 }
 
 export interface ProviderProps<A extends Action = AnyAction> {
@@ -392,4 +378,4 @@ export class Provider<A extends Action = AnyAction> extends Component<ProviderPr
  *
  * @param storeKey The key of the context on which to set the store.
  */
-export declare function createProvider(storeKey: string): typeof Provider;
+export function createProvider(storeKey: string): typeof Provider;
diff --git a/types/react-redux/react-redux-tests.tsx b/types/react-redux/react-redux-tests.tsx
index a2fad70440..6758f1a4a8 100644
--- a/types/react-redux/react-redux-tests.tsx
+++ b/types/react-redux/react-redux-tests.tsx
@@ -1,4 +1,3 @@
-import { Component, ReactElement } from 'react';
 import * as React from 'react';
 import * as ReactDOM from 'react-dom';
 import { Store, Dispatch, AnyAction, ActionCreator, createStore, bindActionCreators, ActionCreatorsMapObject, Reducer } from 'redux';
@@ -13,272 +12,273 @@ import objectAssign = require('object-assign');
 // Test cases written in a way to isolate types and variables and verify the
 // output of `connect` to make sure the signature is what is expected
 
-namespace Empty {
-    interface OwnProps { foo: string, dispatch: Dispatch }
+function Empty() {
+    interface OwnProps {
+        dispatch: Dispatch;
+        foo: string;
+    }
 
-    class TestComponent extends Component<OwnProps> {}
+    class TestComponent extends React.Component<OwnProps> {}
 
-    const Test = connect()(TestComponent)
+    const Test = connect()(TestComponent);
 
-    const verify = <Test foo='bar' />
+    const verify = <Test foo='bar' />;
 }
 
-namespace MapState {
-    interface OwnProps { foo: string }
-    interface StateProps { bar: number }
+function MapState() {
+    interface OwnProps { foo: string; }
+    interface StateProps { bar: number; }
 
-    class TestComponent extends Component<OwnProps & StateProps> {}
+    class TestComponent extends React.Component<OwnProps & StateProps> {}
 
     const mapStateToProps = (_: any) => ({
         bar: 1
-    })
+    });
 
     const Test = connect(
         mapStateToProps
-    )(TestComponent)
+    )(TestComponent);
 
-    const verify = <Test foo='bar' />
+    const verify = <Test foo='bar' />;
 }
 
-namespace MapStateWithDispatchProp {
-    interface OwnProps { foo: string }
-    interface StateProps { bar: number, dispatch: Dispatch }
+function MapStateWithDispatchProp() {
+    interface OwnProps { foo: string; }
+    interface StateProps { bar: number; dispatch: Dispatch; }
 
-    class TestComponent extends Component<OwnProps & StateProps> {}
+    class TestComponent extends React.Component<OwnProps & StateProps> {}
 
     const mapStateToProps = (_: any) => ({
         bar: 1
-    })
+    });
 
     const Test = connect(
         mapStateToProps
-    )(TestComponent)
+    )(TestComponent);
 
-    const verify = <Test foo='bar' />
+    const verify = <Test foo='bar' />;
 }
 
-namespace MapStateFactory {
-    interface OwnProps { foo: string }
-    interface StateProps { bar: number }
+function MapStateFactory() {
+    interface OwnProps { foo: string; }
+    interface StateProps { bar: number; }
 
-    class TestComponent extends Component<OwnProps & StateProps> {}
+    class TestComponent extends React.Component<OwnProps & StateProps> {}
 
     const mapStateToProps = () => () => ({
         bar: 1
-    })
+    });
 
     const Test = connect(
         mapStateToProps
-    )(TestComponent)
+    )(TestComponent);
 
-    const verify = <Test foo='bar' />
+    const verify = <Test foo='bar' />;
 }
 
-namespace MapDispatch {
-    interface OwnProps { foo: string }
-    interface DispatchProps { onClick: () => void }
+function MapDispatch() {
+    interface OwnProps { foo: string; }
+    interface DispatchProps { onClick: () => void; }
 
-    class TestComponent extends Component<OwnProps & DispatchProps> {}
+    class TestComponent extends React.Component<OwnProps & DispatchProps> {}
 
     const mapDispatchToProps = () => ({
         onClick: () => {}
-    })
+    });
 
     const TestNull = connect(
         null,
         mapDispatchToProps,
-    )(TestComponent)
+    )(TestComponent);
 
-    const verifyNull = <TestNull foo='bar' />
+    const verifyNull = <TestNull foo='bar' />;
 
     const TestUndefined = connect(
         undefined,
         mapDispatchToProps,
-    )(TestComponent)
+    )(TestComponent);
 
-    const verifyUndefined = <TestUndefined foo='bar' />
+    const verifyUndefined = <TestUndefined foo='bar' />;
 }
 
-
-namespace MapDispatchWithThunkActionCreators {
-    class TestComponent extends Component<{
+function MapDispatchWithThunkActionCreators() {
+    class TestComponent extends React.Component<{
         foo: string,
         onClick(): void,
         thunkAction(): Promise<void>
-    }>{}
+    }> {}
 
     const mapDispatchToProps = () => ({
         onClick: () => {},
         thunkAction: () => async () => {}
-    })
+    });
 
     const Test = connect(
         null,
         mapDispatchToProps,
-    )(TestComponent)
+    )(TestComponent);
 
-    const verify = <Test foo='bar' />
+    const verify = <Test foo='bar' />;
 }
 
-
-namespace MapStateAndDispatchObject {
-    interface ClickPayload { count: number }
+function MapStateAndDispatchObject() {
+    interface ClickPayload { count: number; }
     const onClick: ActionCreator<ClickPayload> = () => ({ count: 1 });
     const dispatchToProps = {
         onClick,
     };
 
-    interface OwnProps { foo: string }
-    interface StateProps { bar: number }
-    interface DispatchProps { onClick: ActionCreator<ClickPayload> }
+    interface OwnProps { foo: string; }
+    interface StateProps { bar: number; }
+    interface DispatchProps { onClick: ActionCreator<ClickPayload>; }
 
     const mapStateToProps = (_: any, __: OwnProps): StateProps => ({
         bar: 1
-    })
+    });
 
-    class TestComponent extends Component<OwnProps & StateProps & DispatchProps> {}
+    class TestComponent extends React.Component<OwnProps & StateProps & DispatchProps> {}
 
     const Test = connect(
         mapStateToProps,
         dispatchToProps,
-    )(TestComponent)
+    )(TestComponent);
 
-    const verify = <Test foo='bar' />
+    const verify = <Test foo='bar' />;
 }
 
-namespace MapDispatchFactory {
-    interface OwnProps { foo: string }
-    interface DispatchProps { onClick: () => void }
+function MapDispatchFactory() {
+    interface OwnProps { foo: string; }
+    interface DispatchProps { onClick: () => void; }
 
-    class TestComponent extends Component<OwnProps & DispatchProps> {}
+    class TestComponent extends React.Component<OwnProps & DispatchProps> {}
 
     const mapDispatchToPropsFactory = () => () => ({
         onClick: () => {}
-    })
+    });
 
     const TestNull = connect(
         null,
         mapDispatchToPropsFactory,
-    )(TestComponent)
+    )(TestComponent);
 
-    const verifyNull = <TestNull foo='bar' />
+    const verifyNull = <TestNull foo='bar' />;
 
     const TestUndefined = connect(
         undefined,
         mapDispatchToPropsFactory,
-    )(TestComponent)
+    )(TestComponent);
 
-    const verifyUndefined = <TestUndefined foo='bar' />
+    const verifyUndefined = <TestUndefined foo='bar' />;
 }
 
-namespace MapStateAndDispatch {
-    interface OwnProps { foo: string }
-    interface StateProps { bar: number }
-    interface DispatchProps { onClick: () => void }
+function MapStateAndDispatch() {
+    interface OwnProps { foo: string; }
+    interface StateProps { bar: number; }
+    interface DispatchProps { onClick: () => void; }
 
-    class TestComponent extends Component<OwnProps & StateProps & DispatchProps> {}
+    class TestComponent extends React.Component<OwnProps & StateProps & DispatchProps> {}
 
     const mapStateToProps = () => ({
         bar: 1
-    })
+    });
 
     const mapDispatchToProps = () => ({
         onClick: () => {}
-    })
+    });
 
     const Test = connect(
         mapStateToProps,
         mapDispatchToProps,
-    )(TestComponent)
+    )(TestComponent);
 
-    const verify = <Test foo='bar' />
+    const verify = <Test foo='bar' />;
 }
 
-namespace MapStateFactoryAndDispatch {
-    interface OwnProps { foo: string }
-    interface StateProps { bar: number }
-    interface DispatchProps { onClick: () => void }
+function MapStateFactoryAndDispatch() {
+    interface OwnProps { foo: string; }
+    interface StateProps { bar: number; }
+    interface DispatchProps { onClick: () => void; }
 
-    const mapStateToPropsFactory = () => () =>({
+    const mapStateToPropsFactory = () => () => ({
         bar: 1
-    })
+    });
 
     const mapDispatchToProps = () => ({
         onClick: () => {}
-    })
+    });
 
-    class TestComponent extends Component<OwnProps & StateProps & DispatchProps> {}
+    class TestComponent extends React.Component<OwnProps & StateProps & DispatchProps> {}
 
     const Test = connect(
         mapStateToPropsFactory,
         mapDispatchToProps,
-    )(TestComponent)
+    )(TestComponent);
 
-    const verify = <Test foo='bar' />
+    const verify = <Test foo='bar' />;
 }
 
-namespace MapStateFactoryAndDispatchFactory {
-    interface OwnProps { foo: string }
-    interface StateProps { bar: number }
-    interface DispatchProps { onClick: () => void }
+function MapStateFactoryAndDispatchFactory() {
+    interface OwnProps { foo: string; }
+    interface StateProps { bar: number; }
+    interface DispatchProps { onClick: () => void; }
 
-    const mapStateToPropsFactory = () => () =>({
+    const mapStateToPropsFactory = () => () => ({
         bar: 1
-    })
+    });
 
     const mapDispatchToPropsFactory = () => () => ({
         onClick: () => {}
-    })
+    });
 
-    class TestComponent extends Component<OwnProps & StateProps & DispatchProps> {}
+    class TestComponent extends React.Component<OwnProps & StateProps & DispatchProps> {}
 
     const Test = connect(
         mapStateToPropsFactory,
         mapDispatchToPropsFactory,
-    )(TestComponent)
+    )(TestComponent);
 
-    const verify = <Test foo='bar' />
+    const verify = <Test foo='bar' />;
 }
 
-namespace MapStateAndDispatchAndMerge {
-    interface OwnProps { foo: string }
-    interface StateProps { bar: number }
-    interface DispatchProps { onClick: () => void }
+function MapStateAndDispatchAndMerge() {
+    interface OwnProps { foo: string; }
+    interface StateProps { bar: number; }
+    interface DispatchProps { onClick: () => void; }
 
-    class TestComponent extends Component<OwnProps & StateProps & DispatchProps> {}
+    class TestComponent extends React.Component<OwnProps & StateProps & DispatchProps> {}
 
     const mapStateToProps = () => ({
         bar: 1
-    })
+    });
 
     const mapDispatchToProps = () => ({
         onClick: () => {}
-    })
+    });
 
     const mergeProps = (stateProps: StateProps, dispatchProps: DispatchProps) => (
-        Object.assign({}, stateProps, dispatchProps)
-    )
+        { ...stateProps, ...dispatchProps }
+    );
 
     const Test = connect(
         mapStateToProps,
         mapDispatchToProps,
         mergeProps,
-    )(TestComponent)
+    )(TestComponent);
 
-    const verify = <Test foo='bar' />
+    const verify = <Test foo='bar' />;
 }
 
-namespace MapStateAndOptions {
+function MapStateAndOptions() {
     interface State { state: string; }
-    interface OwnProps { foo: string }
-    interface StateProps { bar: number }
-    interface DispatchProps { dispatch: Dispatch }
+    interface OwnProps { foo: string; }
+    interface StateProps { bar: number; }
+    interface DispatchProps { dispatch: Dispatch; }
 
-    class TestComponent extends Component<OwnProps & StateProps & DispatchProps> {}
+    class TestComponent extends React.Component<OwnProps & StateProps & DispatchProps> {}
 
     const mapStateToProps = (state: State) => ({
         bar: 1
-    })
+    });
 
     const areStatePropsEqual = (next: StateProps, current: StateProps) => true;
 
@@ -290,17 +290,17 @@ namespace MapStateAndOptions {
             pure: true,
             areStatePropsEqual,
         }
-    )(TestComponent)
+    )(TestComponent);
 
-    const verify = <Test foo='bar' />
+    const verify = <Test foo='bar' />;
 }
 
 interface CounterState {
     counter: number;
 }
-declare var increment: Function;
+declare var increment: () => { type: string };
 
-class Counter extends Component<any, any> {
+class Counter extends React.Component<any, any> {
     render() {
         return (
             <button onClick={this.props.onIncrement}>
@@ -328,49 +328,46 @@ connect(
     mapDispatchToProps
 )(Counter);
 
-
 @connect(mapStateToProps)
-class CounterContainer extends Component<any, any> {
-
+class CounterContainer extends React.Component<any, any> {
 }
 
 // Ensure connect's first two arguments can be replaced by wrapper functions
-interface ICounterStateProps {
-    value: number
+interface CounterStateProps {
+    value: number;
 }
-interface ICounterDispatchProps {
-    onIncrement: () => void
+interface CounterDispatchProps {
+    onIncrement: () => void;
 }
 // with higher order functions
-connect<ICounterStateProps, ICounterDispatchProps, {}, CounterState>(
+connect<CounterStateProps, CounterDispatchProps, {}, CounterState>(
     () => mapStateToProps,
     () => mapDispatchToProps
 )(Counter);
 // with higher order functions using parameters
-connect<ICounterStateProps, ICounterDispatchProps, {}, CounterState>(
+connect<CounterStateProps, CounterDispatchProps, {}, CounterState>(
     (initialState: CounterState, ownProps) => mapStateToProps,
     (dispatch: Dispatch, ownProps) => mapDispatchToProps
 )(Counter);
 // only first argument
-connect<ICounterStateProps, {}, {}, CounterState>(
+connect<CounterStateProps, {}, {}, CounterState>(
     () => mapStateToProps
 )(Counter);
 // wrap only one argument
-connect<ICounterStateProps, ICounterDispatchProps, {}, CounterState>(
+connect<CounterStateProps, CounterDispatchProps, {}, CounterState>(
     mapStateToProps,
     () => mapDispatchToProps
 )(Counter);
 // with extra arguments
-connect<ICounterStateProps, ICounterDispatchProps, {}, ICounterStateProps & ICounterDispatchProps, CounterState>(
+connect<CounterStateProps, CounterDispatchProps, {}, CounterStateProps & CounterDispatchProps, CounterState>(
     () => mapStateToProps,
     () => mapDispatchToProps,
-    (s: ICounterStateProps, d: ICounterDispatchProps) =>
+    (s: CounterStateProps, d: CounterDispatchProps) =>
         objectAssign({}, s, d),
     { pure: true }
 )(Counter);
 
-
-class App extends Component<any, any> {
+class App extends React.Component<any, any> {
     render() {
         return null;
     }
@@ -389,10 +386,9 @@ ReactDOM.render((
 // https://github.com/rackt/react-redux/blob/master/docs/api.md
 //
 declare var store: Store<TodoState>;
-class MyRootComponent extends Component<any, any> {
-
+class MyRootComponent extends React.Component<any, any> {
 }
-class TodoApp extends Component<any, any> {}
+class TodoApp extends React.Component<any, any> {}
 interface TodoState {
     todos: string[]|string;
 }
@@ -401,11 +397,11 @@ interface TodoProps {
 }
 interface DispatchProps {
     addTodo(userId: number, text: string): void;
-    action: Function;
+    action: () => any;
 }
 declare var actionCreators: () => {
-    action: Function;
-}
+    action: () => any;
+};
 declare var dispatchActionCreators: () => DispatchProps;
 declare var addTodo: () => { type: string; };
 declare var todoActionCreators: { [type: string]: (...args: any[]) => any; };
@@ -418,28 +414,12 @@ ReactDOM.render(
     document.body
 );
 
-//TODO: for React Router 0.13
-////TODO: error TS2339: Property 'run' does not exist on type 'typeof "react-router"'.
-////TODO: error TS2339: Property 'HistoryLocation' does not exist on type 'typeof "react-router"'.
-//declare var routes: any;
-//Router.run(routes, Router.HistoryLocation, (Handler, routerState) => { // note "routerState" here
-//    ReactDOM.render(
-//        <Provider store={store}>
-//            {/*
-//             //TODO: error TS2339: Property 'routerState' does not exist on type 'RouteProp'.
-//             {() => <Handler routerState={routerState} />} // note "routerState" here: important to pass it down
-//            */}
-//        </Provider>,
-//        document.getElementById('root')
-//    );
-//});
-
 // Inject just dispatch and don't listen to store
 
-const AppWrap = (props: DispatchProp & { children?: React.ReactNode }) => <div />
+const AppWrap = (props: DispatchProp & { children?: React.ReactNode }) => <div />;
 const WrappedApp = connect()(AppWrap);
 
-<WrappedApp />
+<WrappedApp />;
 
 // Inject dispatch and every field in the global state
 
@@ -453,20 +433,8 @@ function mapStateToProps2(state: TodoState) {
 
 export default connect(mapStateToProps2)(TodoApp);
 
-// Inject todos and all action creators (addTodo, completeTodo, ...)
-
-//function mapStateToProps(state) {
-//    return { todos: state.todos };
-//}
-
 connect(mapStateToProps2, actionCreators)(TodoApp);
 
-// Inject todos and all action creators (addTodo, completeTodo, ...) as actions
-
-//function mapStateToProps(state) {
-//    return { todos: state.todos };
-//}
-
 function mapDispatchToProps2(dispatch: Dispatch) {
     return { actions: bindActionCreators(actionCreators, dispatch) };
 }
@@ -475,10 +443,6 @@ connect(mapStateToProps2, mapDispatchToProps2)(TodoApp);
 
 // Inject todos and a specific action creator (addTodo)
 
-//function mapStateToProps(state) {
-//    return { todos: state.todos };
-//}
-
 function mapDispatchToProps3(dispatch: Dispatch) {
     return bindActionCreators({ addTodo }, dispatch);
 }
@@ -487,10 +451,6 @@ connect(mapStateToProps2, mapDispatchToProps3)(TodoApp);
 
 // Inject todos, todoActionCreators as todoActions, and counterActionCreators as counterActions
 
-//function mapStateToProps(state) {
-//    return { todos: state.todos };
-//}
-
 function mapDispatchToProps4(dispatch: Dispatch) {
     return {
         todoActions: bindActionCreators(todoActionCreators, dispatch),
@@ -502,10 +462,6 @@ connect(mapStateToProps2, mapDispatchToProps4)(TodoApp);
 
 // Inject todos, and todoActionCreators and counterActionCreators together as actions
 
-//function mapStateToProps(state) {
-//    return { todos: state.todos };
-//}
-
 function mapDispatchToProps5(dispatch: Dispatch) {
     return {
         actions: bindActionCreators(objectAssign({}, todoActionCreators, counterActionCreators), dispatch)
@@ -516,10 +472,6 @@ connect(mapStateToProps2, mapDispatchToProps5)(TodoApp);
 
 // Inject todos, and all todoActionCreators and counterActionCreators directly as props
 
-//function mapStateToProps(state) {
-//    return { todos: state.todos };
-//}
-
 function mapDispatchToProps6(dispatch: Dispatch) {
     return bindActionCreators(objectAssign({}, todoActionCreators, counterActionCreators), dispatch);
 }
@@ -536,10 +488,6 @@ connect(mapStateToProps3)(TodoApp);
 
 // Inject todos of a specific user depending on props, and inject props.userId into the action
 
-//function mapStateToProps(state) {
-//    return { todos: state.todos };
-//}
-
 function mergeProps(stateProps: TodoState, dispatchProps: DispatchProps, ownProps: TodoProps): DispatchProps & TodoState & TodoProps {
     return objectAssign({}, ownProps, dispatchProps, {
         todos: stateProps.todos[ownProps.userId],
@@ -549,9 +497,8 @@ function mergeProps(stateProps: TodoState, dispatchProps: DispatchProps, ownProp
 
 connect(mapStateToProps2, dispatchActionCreators, mergeProps)(MyRootComponent);
 
-
-//https://github.com/DefinitelyTyped/DefinitelyTyped/issues/14622#issuecomment-279820358
-//Allow for undefined mapStateToProps
+// https://github.com/DefinitelyTyped/DefinitelyTyped/issues/14622#issuecomment-279820358
+// Allow for undefined mapStateToProps
 connect(undefined, mapDispatchToProps6)(TodoApp);
 
 interface TestProp {
@@ -562,7 +509,7 @@ interface TestState {
     isLoaded: boolean;
     state1: number;
 }
-class TestComponent extends Component<TestProp & DispatchProp, TestState> { }
+class TestComponent extends React.Component<TestProp & DispatchProp, TestState> { }
 const WrappedTestComponent = connect()(TestComponent);
 
 // return value of the connect()(TestComponent) is assignable to a ComponentClass<TestProp>
@@ -572,23 +519,19 @@ const ADecoratedTestComponent: React.ComponentClass<TestProp> = WrappedTestCompo
 
 const ATestComponent: React.ComponentClass<TestProp> = TestComponent;  // $ExpectError
 
-class NonComponent {}
-// this doesn't compile
-//connect()(NonComponent);
-
 // stateless functions
 interface HelloMessageProps {
-    dispatch: Dispatch
+    dispatch: Dispatch;
     name: string;
  }
 const HelloMessage: React.StatelessComponent<HelloMessageProps> = (props) => {
     return <div>Hello {props.name}</div>;
-}
-let ConnectedHelloMessage = connect()(HelloMessage);
+};
+const ConnectedHelloMessage = connect()(HelloMessage);
 ReactDOM.render(<ConnectedHelloMessage name="Sebastian" />, document.getElementById('content'));
 
 // stateless functions that uses mapStateToProps and mapDispatchToProps
-namespace TestStatelessFunctionWithMapArguments {
+function TestStatelessFunctionWithMapArguments() {
     interface GreetingProps {
         name: string;
         onClick: () => void;
@@ -619,7 +562,7 @@ namespace TestStatelessFunctionWithMapArguments {
 }
 
 // https://github.com/DefinitelyTyped/DefinitelyTyped/issues/8787
-namespace TestTOwnPropsInference {
+function TestTOwnPropsInference() {
     interface OwnProps {
         own: string;
     }
@@ -662,8 +605,8 @@ namespace TestTOwnPropsInference {
     // React.createElement(ConnectedWithTypeHint, { anything: 'goes!' });
 
     interface AllProps {
-        own: string
-        state: string
+        own: string;
+        state: string;
     }
 
     class AllPropsComponent extends React.Component<AllProps & DispatchProp> {
@@ -672,18 +615,18 @@ namespace TestTOwnPropsInference {
         }
     }
 
-    type PickedOwnProps = Pick<AllProps, "own">
-    type PickedStateProps = Pick<AllProps, "state">
+    type PickedOwnProps = Pick<AllProps, "own">;
+    type PickedStateProps = Pick<AllProps, "state">;
 
     const mapStateToPropsForPicked: MapStateToProps<PickedStateProps, PickedOwnProps, {}> = (state: any): PickedStateProps => {
-        return { state: "string" }
-    }
+        return { state: "string" };
+    };
     const ConnectedWithPickedOwnProps = connect(mapStateToPropsForPicked)(AllPropsComponent);
-    <ConnectedWithPickedOwnProps own="blah" />
+    <ConnectedWithPickedOwnProps own="blah" />;
 }
 
 // https://github.com/DefinitelyTyped/DefinitelyTyped/issues/16021
-namespace TestMergedPropsInference {
+function TestMergedPropsInference() {
     interface StateProps {
         state: string;
     }
@@ -739,13 +682,13 @@ namespace TestMergedPropsInference {
     )(MergedPropsComponent);
 }
 
-namespace Issue16652 {
+function Issue16652() {
     interface PassedProps {
         commentIds: string[];
     }
 
     interface GeneratedStateProps {
-        comments: ({ id: string } | undefined)[];
+        comments: Array<({ id: string } | undefined)>;
     }
 
     class CommentList extends React.Component<PassedProps & GeneratedStateProps & DispatchProp> {}
@@ -760,47 +703,46 @@ namespace Issue16652 {
         CommentList
     );
 
-    <ConnectedCommentList commentIds={['a', 'b', 'c']} />
+    <ConnectedCommentList commentIds={['a', 'b', 'c']} />;
 }
 
-namespace Issue15463 {
-    interface ISpinnerProps{
+function Issue15463() {
+    interface SpinnerProps {
         showGlobalSpinner: boolean;
     }
 
-    class SpinnerClass extends React.Component<ISpinnerProps & DispatchProp> {
+    class SpinnerClass extends React.Component<SpinnerProps & DispatchProp> {
         render() {
             return (<div />);
         }
     }
 
-    export const Spinner = connect((state: any) => {
+    const Spinner = connect((state: any) => {
         return { showGlobalSpinner: true };
     })(SpinnerClass);
 
-    <Spinner />
+    <Spinner />;
 }
 
-namespace RemoveInjectedAndPassOnRest {
+function RemoveInjectedAndPassOnRest() {
     interface TProps {
         showGlobalSpinner: boolean;
         foo: string;
     }
-    class SpinnerClass extends React.Component<TProps & DispatchProp, {}> {
+    class SpinnerClass extends React.Component<TProps & DispatchProp> {
         render() {
             return (<div />);
         }
     }
 
-    export const Spinner = connect((state: any) => {
+    const Spinner = connect((state: any) => {
         return { showGlobalSpinner: true };
     })(SpinnerClass);
 
-    <Spinner foo='bar' />
+    <Spinner foo='bar' />;
 }
 
-namespace TestControlledComponentWithoutDispatchProp {
-
+function TestControlledComponentWithoutDispatchProp() {
     interface MyState {
         count: number;
     }
@@ -817,7 +759,7 @@ namespace TestControlledComponentWithoutDispatchProp {
     function mapStateToProps(state: MyState) {
         return {
             label: `The count is ${state.count}`,
-        }
+        };
     }
 
     class MyComponent extends React.Component<MyProps> {
@@ -834,7 +776,7 @@ namespace TestControlledComponentWithoutDispatchProp {
     const MyControlledFuncComponent = connect(mapStateToProps)(MyFuncComponent);
 }
 
-namespace TestDispatchToPropsAsObject {
+function TestDispatchToPropsAsObject() {
 	const onClick: ActionCreator<{}> = () => ({});
 	const mapStateToProps = (state: any) => {
 		return {
@@ -848,18 +790,18 @@ namespace TestDispatchToPropsAsObject {
 	type Props = { title: string; } & typeof dispatchToProps;
 	const HeaderComponent: React.StatelessComponent<Props> = (props) => {
 		return <h1>{props.title}</h1>;
-	}
+	};
 
 	const Header = connect(mapStateToProps, dispatchToProps)(HeaderComponent);
-	<Header />
+    <Header />;
 }
 
-namespace TestInferredFunctionalComponentWithExplicitOwnProps {
-  type Props = {
-    title: string,
-    extraText: string,
-    onClick: () => void,
-  };
+function TestInferredFunctionalComponentWithExplicitOwnProps() {
+  interface Props {
+    title: string;
+    extraText: string;
+    onClick: () => void;
+  }
 
 	const Header = connect(
 		(
@@ -875,16 +817,15 @@ namespace TestInferredFunctionalComponentWithExplicitOwnProps {
 	)(({ title, extraText, onClick }: Props) => {
 		return <h1 onClick={onClick}>{title} {extraText}</h1>;
 	});
-	<Header extraText='text'/>
+    <Header extraText='text'/>;
 }
 
-namespace TestInferredFunctionalComponentWithImplicitOwnProps {
-
-  type Props = {
-    title: string,
-    extraText: string,
-    onClick: () => void,
-  };
+function TestInferredFunctionalComponentWithImplicitOwnProps() {
+  interface Props {
+    title: string;
+    extraText: string;
+    onClick: () => void;
+  }
 
 	const Header = connect(
 		(
@@ -898,16 +839,16 @@ namespace TestInferredFunctionalComponentWithImplicitOwnProps {
 	)(({ title, extraText, onClick }: Props) => {
 		return <h1 onClick={onClick}>{title} {extraText}</h1>;
 	});
-	<Header extraText='text'/>
+    <Header extraText='text'/>;
 }
 
-namespace TestWrappedComponent {
-    type InnerProps = {
-        name: string,
-    };
+function TestWrappedComponent() {
+    interface InnerProps {
+        name: string;
+    }
     const Inner: React.StatelessComponent<InnerProps> = (props) => {
         return <h1>{props.name}</h1>;
-    }
+    };
 
     const mapStateToProps = (state: any) => {
         return {
@@ -923,17 +864,17 @@ namespace TestWrappedComponent {
     const TestConnected = (props: any) => <Connected />;
 }
 
-namespace TestCreateProvider {
+function TestCreateProvider() {
     const STORE_KEY = 'myStore';
 
     const MyStoreProvider = createProvider(STORE_KEY);
 
-    const myStoreConnect: Connect = function(
+    const myStoreConnect: Connect = (
         mapStateToProps?: any,
         mapDispatchToProps?: any,
         mergeProps?: any,
         options: Options = {},
-    ) {
+    ) => {
         options.storeKey = STORE_KEY;
         return connect(
             mapStateToProps,
@@ -943,11 +884,11 @@ namespace TestCreateProvider {
         );
     };
 
-    interface State { a: number };
+    interface State { a: number; }
     const store = createStore<State, AnyAction, {}, {}>(() => ({ a: 1 }));
     const myStore = createStore<State, AnyAction, {}, {}>(() => ({ a: 2 }));
 
-    interface AProps { a: number };
+    interface AProps { a: number; }
     const A = (props: AProps) => (<h1>A is {props.a}</h1>);
     const A1 = connect<AProps, {}, {}, State>(state => state)(A);
     const A2 = myStoreConnect<AProps, {}, {}, State>(state => state)(A);
@@ -967,8 +908,7 @@ namespace TestCreateProvider {
     ReactDOM.render(<Combined />, document.body);
 }
 
-namespace TestWithoutTOwnPropsDecoratedInference {
-
+function TestWithoutTOwnPropsDecoratedInference() {
     interface ForwardedProps {
         forwarded: string;
     }
@@ -1016,8 +956,8 @@ namespace TestWithoutTOwnPropsDecoratedInference {
     React.createElement(ConnectedWithTypeHintStateless, { own: 'string' });  // $ExpectError
 
     interface AllProps {
-        own: string
-        state: string
+        own: string;
+        state: string;
     }
 
     class AllPropsComponent extends React.Component<AllProps & DispatchProp<any>> {
@@ -1026,18 +966,18 @@ namespace TestWithoutTOwnPropsDecoratedInference {
         }
     }
 
-    type PickedOwnProps = Pick<AllProps, "own">
-    type PickedStateProps = Pick<AllProps, "state">
+    type PickedOwnProps = Pick<AllProps, "own">;
+    type PickedStateProps = Pick<AllProps, "state">;
 
     const mapStateToPropsForPicked: MapStateToProps<PickedStateProps, PickedOwnProps, {}> = (state: any): PickedStateProps => {
-        return { state: "string" }
-    }
+        return { state: "string" };
+    };
     const ConnectedWithPickedOwnProps = connect(mapStateToPropsForPicked)(AllPropsComponent);
-    <ConnectedWithPickedOwnProps own="blah" />
+    <ConnectedWithPickedOwnProps own="blah" />;
 }
 
 // https://github.com/DefinitelyTyped/DefinitelyTyped/issues/25321#issuecomment-387659500
-namespace ProviderAcceptsStoreWithCustomAction {
+function ProviderAcceptsStoreWithCustomAction() {
     const reducer: Reducer<
         { foo: number } | undefined,
         { type: "foo"; payload: number }
@@ -1052,31 +992,31 @@ namespace ProviderAcceptsStoreWithCustomAction {
     );
 }
 
-namespace TestOptionalPropsMergedCorrectly {
+function TestOptionalPropsMergedCorrectly() {
   interface OptionalDecorationProps {
-    foo: string,
-    bar: number,
-    optionalProp?: boolean,
-    dependsOnDispatch?: () => void,
+    foo: string;
+    bar: number;
+    optionalProp?: boolean;
+    dependsOnDispatch?: () => void;
   }
 
   class Component extends React.Component<OptionalDecorationProps> {
-      render () {
+      render() {
           return <div />;
       }
   }
 
-  type MapStateProps = {
-      foo: string,
-      bar: number,
-      optionalProp: boolean,
+  interface MapStateProps {
+      foo: string;
+      bar: number;
+      optionalProp: boolean;
   }
 
-  type MapDispatchProps = {
-    dependsOnDispatch: () => void
+  interface MapDispatchProps {
+    dependsOnDispatch: () => void;
   }
 
-  function mapStateToProps (state: any): MapStateProps {
+  function mapStateToProps(state: any): MapStateProps {
     return {
         foo: 'foo',
         bar: 42,
@@ -1084,43 +1024,43 @@ namespace TestOptionalPropsMergedCorrectly {
     };
   }
 
-  function mapDispatchToProps (dispatch: any): MapDispatchProps {
+  function mapDispatchToProps(dispatch: any): MapDispatchProps {
     return {
       dependsOnDispatch: () => {}
     };
   }
 
-  connect(mapStateToProps, mapDispatchToProps)(Component)
+  connect(mapStateToProps, mapDispatchToProps)(Component);
 }
 
-namespace TestMoreGeneralDecorationProps {
+function TestMoreGeneralDecorationProps() {
   // connect() should support decoration props that are more permissive
   // than the injected props, as long as the injected props can satisfy
   // the decoration props.
   interface MoreGeneralDecorationProps {
-    foo: string | number,
-    bar: number | 'foo',
-    optionalProp?: boolean | Object,
-    dependsOnDispatch?: () => void,
+    foo: string | number;
+    bar: number | 'foo';
+    optionalProp?: boolean | object;
+    dependsOnDispatch?: () => void;
   }
 
   class Component extends React.Component<MoreGeneralDecorationProps> {
-      render () {
+      render() {
           return <div />;
       }
   }
 
-  type MapStateProps = {
-      foo: string,
-      bar: number,
-      optionalProp: boolean,
+  interface MapStateProps {
+      foo: string;
+      bar: number;
+      optionalProp: boolean;
   }
 
-  type MapDispatchProps = {
-    dependsOnDispatch: () => void
+  interface MapDispatchProps {
+      dependsOnDispatch: () => void;
   }
 
-  function mapStateToProps (state: any): MapStateProps {
+  function mapStateToProps(state: any): MapStateProps {
     return {
         foo: 'foo',
         bar: 42,
@@ -1128,46 +1068,46 @@ namespace TestMoreGeneralDecorationProps {
     };
   }
 
-  function mapDispatchToProps (dispatch: any): MapDispatchProps {
+  function mapDispatchToProps(dispatch: any): MapDispatchProps {
     return {
       dependsOnDispatch: () => {}
     };
   }
 
-  connect(mapStateToProps, mapDispatchToProps)(Component)
+  connect(mapStateToProps, mapDispatchToProps)(Component);
 }
 
-namespace TestFailsMoreSpecificInjectedProps {
+function TestFailsMoreSpecificInjectedProps() {
   interface MoreSpecificDecorationProps {
-    foo: string,
-    bar: number,
-    dependsOnDispatch: () => void,
+    foo: string;
+    bar: number;
+    dependsOnDispatch: () => void;
   }
 
   class Component extends React.Component<MoreSpecificDecorationProps> {
-      render () {
+      render() {
           return <div />;
       }
   }
 
-  type MapStateProps = {
-    foo: string | number,
-    bar: number | 'foo',
-    dependsOnDispatch?: () => void,
+  interface MapStateProps {
+    foo: string | number;
+    bar: number | 'foo';
+    dependsOnDispatch?: () => void;
   }
 
-  type MapDispatchProps = {
-    dependsOnDispatch?: () => void
+  interface MapDispatchProps {
+    dependsOnDispatch?: () => void;
   }
 
-  function mapStateToProps (state: any): MapStateProps {
+  function mapStateToProps(state: any): MapStateProps {
     return {
         foo: 'foo',
         bar: 42,
     };
   }
 
-  function mapDispatchToProps (dispatch: any): MapDispatchProps {
+  function mapDispatchToProps(dispatch: any): MapDispatchProps {
     return {
       dependsOnDispatch: () => {}
     };
@@ -1175,43 +1115,42 @@ namespace TestFailsMoreSpecificInjectedProps {
 
   // Since it is possible the injected props could fail to satisfy the decoration props,
   // the following line should fail to compile.
-  connect(mapStateToProps, mapDispatchToProps)(Component) // $ExpectError
+  connect(mapStateToProps, mapDispatchToProps)(Component); // $ExpectError
 
   // Confirm that this also fails with functional components
-  const FunctionalComponent = (props: MoreSpecificDecorationProps) => null
-  connect(mapStateToProps, mapDispatchToProps)(Component) // $ExpectError
-
+    const FunctionalComponent = (props: MoreSpecificDecorationProps) => null;
+  connect(mapStateToProps, mapDispatchToProps)(Component); // $ExpectError
 }
 
-namespace TestLibraryManagedAttributes {
+function TestLibraryManagedAttributes() {
 	interface OwnProps {
-		bar: number,
-		fn: () => void,
+		bar: number;
+		fn: () => void;
 	}
 
-	type MapStateProps = {
-		foo: string,
+	interface MapStateProps {
+		foo: string;
 	}
 
 	class Component extends React.Component<OwnProps & MapStateProps> {
 		static defaultProps = {
 			bar: 0,
-		}
+		};
 
-		render () {
+		render() {
 			return <div />;
 		}
 	}
 
-	function mapStateToProps (state: any): MapStateProps {
+	function mapStateToProps(state: any): MapStateProps {
 		return {
 			foo: 'foo',
 		};
 	}
 
 	const ConnectedComponent = connect(mapStateToProps)(Component);
-	<ConnectedComponent fn={() => {}} />
+	<ConnectedComponent fn={() => {}} />;
 
 	const ConnectedComponent2 = connect<MapStateProps, void, OwnProps>(mapStateToProps)(Component);
-	<ConnectedComponent2 fn={() => {}} />
+	<ConnectedComponent2 fn={() => {}} />;
 }
diff --git a/types/react-redux/tslint.json b/types/react-redux/tslint.json
index 5a8bb3dd4d..f93cf8562a 100644
--- a/types/react-redux/tslint.json
+++ b/types/react-redux/tslint.json
@@ -1,81 +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-object-spread": false,
-        "prefer-template": false,
-        "radix": false,
-        "semicolon": false,
-        "space-before-function-paren": false,
-        "space-within-parens": false,
-        "strict-export-declare-modifiers": false,
-        "trim-file": false,
-        "triple-equals": false,
-        "typedef-whitespace": false,
-        "unified-signatures": false,
-        "use-default-type-parameter": false,
-        "void-return": false,
-        "whitespace": false
-    }
+    "extends": "dtslint/dt.json"
 }

From 0a2e42f4412047bdd881077c7e26eaaa9ea7698a Mon Sep 17 00:00:00 2001
From: Boris Sergeyev <surgeboris@gmail.com>
Date: Tue, 20 Nov 2018 22:48:28 +0100
Subject: [PATCH 130/836] [react-redux] used whitespace consistently (no tabs)

---
 types/react-redux/react-redux-tests.tsx | 352 ++++++++++++------------
 1 file changed, 176 insertions(+), 176 deletions(-)

diff --git a/types/react-redux/react-redux-tests.tsx b/types/react-redux/react-redux-tests.tsx
index 6758f1a4a8..aff8515e87 100644
--- a/types/react-redux/react-redux-tests.tsx
+++ b/types/react-redux/react-redux-tests.tsx
@@ -523,7 +523,7 @@ const ATestComponent: React.ComponentClass<TestProp> = TestComponent;  // $Expec
 interface HelloMessageProps {
     dispatch: Dispatch;
     name: string;
- }
+}
 const HelloMessage: React.StatelessComponent<HelloMessageProps> = (props) => {
     return <div>Hello {props.name}</div>;
 };
@@ -777,68 +777,68 @@ function TestControlledComponentWithoutDispatchProp() {
 }
 
 function TestDispatchToPropsAsObject() {
-	const onClick: ActionCreator<{}> = () => ({});
-	const mapStateToProps = (state: any) => {
-		return {
-			title: state.app.title as string,
-		};
-	};
-	const dispatchToProps = {
-		onClick,
-	};
+    const onClick: ActionCreator<{}> = () => ({});
+    const mapStateToProps = (state: any) => {
+        return {
+            title: state.app.title as string,
+        };
+    };
+    const dispatchToProps = {
+        onClick,
+    };
 
-	type Props = { title: string; } & typeof dispatchToProps;
-	const HeaderComponent: React.StatelessComponent<Props> = (props) => {
-		return <h1>{props.title}</h1>;
-	};
+    type Props = { title: string; } & typeof dispatchToProps;
+    const HeaderComponent: React.StatelessComponent<Props> = (props) => {
+        return <h1>{props.title}</h1>;
+    };
 
-	const Header = connect(mapStateToProps, dispatchToProps)(HeaderComponent);
+    const Header = connect(mapStateToProps, dispatchToProps)(HeaderComponent);
     <Header />;
 }
 
 function TestInferredFunctionalComponentWithExplicitOwnProps() {
-  interface Props {
-    title: string;
-    extraText: string;
-    onClick: () => void;
-  }
+    interface Props {
+        title: string;
+        extraText: string;
+        onClick: () => void;
+    }
 
-	const Header = connect(
-		(
-			{ app: { title }}: { app: { title: string }},
-			{ extraText }: { extraText: string }
-		) => ({
-			title,
-			extraText
-		}),
-		(dispatch) => ({
-			onClick: () => dispatch({ type: 'test' })
-		})
-	)(({ title, extraText, onClick }: Props) => {
-		return <h1 onClick={onClick}>{title} {extraText}</h1>;
-	});
+    const Header = connect(
+        (
+            { app: { title }}: { app: { title: string }},
+            { extraText }: { extraText: string }
+        ) => ({
+            title,
+            extraText
+        }),
+        (dispatch) => ({
+            onClick: () => dispatch({ type: 'test' })
+        })
+    )(({ title, extraText, onClick }: Props) => {
+        return <h1 onClick={onClick}>{title} {extraText}</h1>;
+    });
     <Header extraText='text'/>;
 }
 
 function TestInferredFunctionalComponentWithImplicitOwnProps() {
-  interface Props {
-    title: string;
-    extraText: string;
-    onClick: () => void;
-  }
+    interface Props {
+        title: string;
+        extraText: string;
+        onClick: () => void;
+    }
 
-	const Header = connect(
-		(
-			{ app: { title }}: { app: { title: string }},
-		) => ({
-			title,
-		}),
-		(dispatch) => ({
-			onClick: () => dispatch({ type: 'test' })
-		})
-	)(({ title, extraText, onClick }: Props) => {
-		return <h1 onClick={onClick}>{title} {extraText}</h1>;
-	});
+    const Header = connect(
+        (
+            { app: { title }}: { app: { title: string }},
+        ) => ({
+            title,
+        }),
+        (dispatch) => ({
+            onClick: () => dispatch({ type: 'test' })
+        })
+    )(({ title, extraText, onClick }: Props) => {
+        return <h1 onClick={onClick}>{title} {extraText}</h1>;
+    });
     <Header extraText='text'/>;
 }
 
@@ -993,164 +993,164 @@ function ProviderAcceptsStoreWithCustomAction() {
 }
 
 function TestOptionalPropsMergedCorrectly() {
-  interface OptionalDecorationProps {
-    foo: string;
-    bar: number;
-    optionalProp?: boolean;
-    dependsOnDispatch?: () => void;
-  }
+    interface OptionalDecorationProps {
+        foo: string;
+        bar: number;
+        optionalProp?: boolean;
+        dependsOnDispatch?: () => void;
+    }
 
-  class Component extends React.Component<OptionalDecorationProps> {
-      render() {
-          return <div />;
-      }
-  }
+    class Component extends React.Component<OptionalDecorationProps> {
+        render() {
+            return <div />;
+        }
+    }
 
-  interface MapStateProps {
-      foo: string;
-      bar: number;
-      optionalProp: boolean;
-  }
+    interface MapStateProps {
+        foo: string;
+        bar: number;
+        optionalProp: boolean;
+    }
 
-  interface MapDispatchProps {
-    dependsOnDispatch: () => void;
-  }
+    interface MapDispatchProps {
+        dependsOnDispatch: () => void;
+    }
 
-  function mapStateToProps(state: any): MapStateProps {
-    return {
-        foo: 'foo',
-        bar: 42,
-        optionalProp: true,
-    };
-  }
+    function mapStateToProps(state: any): MapStateProps {
+        return {
+            foo: 'foo',
+            bar: 42,
+            optionalProp: true,
+        };
+    }
 
-  function mapDispatchToProps(dispatch: any): MapDispatchProps {
-    return {
-      dependsOnDispatch: () => {}
-    };
-  }
+    function mapDispatchToProps(dispatch: any): MapDispatchProps {
+        return {
+            dependsOnDispatch: () => {}
+        };
+    }
 
-  connect(mapStateToProps, mapDispatchToProps)(Component);
+    connect(mapStateToProps, mapDispatchToProps)(Component);
 }
 
 function TestMoreGeneralDecorationProps() {
-  // connect() should support decoration props that are more permissive
-  // than the injected props, as long as the injected props can satisfy
-  // the decoration props.
-  interface MoreGeneralDecorationProps {
-    foo: string | number;
-    bar: number | 'foo';
-    optionalProp?: boolean | object;
-    dependsOnDispatch?: () => void;
-  }
+    // connect() should support decoration props that are more permissive
+    // than the injected props, as long as the injected props can satisfy
+    // the decoration props.
+    interface MoreGeneralDecorationProps {
+        foo: string | number;
+        bar: number | 'foo';
+        optionalProp?: boolean | object;
+        dependsOnDispatch?: () => void;
+    }
 
-  class Component extends React.Component<MoreGeneralDecorationProps> {
-      render() {
-          return <div />;
-      }
-  }
+    class Component extends React.Component<MoreGeneralDecorationProps> {
+        render() {
+            return <div />;
+        }
+    }
 
-  interface MapStateProps {
-      foo: string;
-      bar: number;
-      optionalProp: boolean;
-  }
+    interface MapStateProps {
+        foo: string;
+        bar: number;
+        optionalProp: boolean;
+    }
 
-  interface MapDispatchProps {
-      dependsOnDispatch: () => void;
-  }
+    interface MapDispatchProps {
+        dependsOnDispatch: () => void;
+    }
 
-  function mapStateToProps(state: any): MapStateProps {
-    return {
-        foo: 'foo',
-        bar: 42,
-        optionalProp: true,
-    };
-  }
+    function mapStateToProps(state: any): MapStateProps {
+        return {
+            foo: 'foo',
+            bar: 42,
+            optionalProp: true,
+        };
+    }
 
-  function mapDispatchToProps(dispatch: any): MapDispatchProps {
-    return {
-      dependsOnDispatch: () => {}
-    };
-  }
+    function mapDispatchToProps(dispatch: any): MapDispatchProps {
+        return {
+            dependsOnDispatch: () => {}
+        };
+    }
 
-  connect(mapStateToProps, mapDispatchToProps)(Component);
+    connect(mapStateToProps, mapDispatchToProps)(Component);
 }
 
 function TestFailsMoreSpecificInjectedProps() {
-  interface MoreSpecificDecorationProps {
-    foo: string;
-    bar: number;
-    dependsOnDispatch: () => void;
-  }
+    interface MoreSpecificDecorationProps {
+        foo: string;
+        bar: number;
+        dependsOnDispatch: () => void;
+    }
 
-  class Component extends React.Component<MoreSpecificDecorationProps> {
-      render() {
-          return <div />;
-      }
-  }
+    class Component extends React.Component<MoreSpecificDecorationProps> {
+        render() {
+            return <div />;
+        }
+    }
 
-  interface MapStateProps {
-    foo: string | number;
-    bar: number | 'foo';
-    dependsOnDispatch?: () => void;
-  }
+    interface MapStateProps {
+        foo: string | number;
+        bar: number | 'foo';
+        dependsOnDispatch?: () => void;
+    }
 
-  interface MapDispatchProps {
-    dependsOnDispatch?: () => void;
-  }
+    interface MapDispatchProps {
+        dependsOnDispatch?: () => void;
+    }
 
-  function mapStateToProps(state: any): MapStateProps {
-    return {
-        foo: 'foo',
-        bar: 42,
-    };
-  }
+    function mapStateToProps(state: any): MapStateProps {
+        return {
+            foo: 'foo',
+            bar: 42,
+        };
+    }
 
-  function mapDispatchToProps(dispatch: any): MapDispatchProps {
-    return {
-      dependsOnDispatch: () => {}
-    };
-  }
+    function mapDispatchToProps(dispatch: any): MapDispatchProps {
+        return {
+            dependsOnDispatch: () => {}
+        };
+    }
 
-  // Since it is possible the injected props could fail to satisfy the decoration props,
-  // the following line should fail to compile.
-  connect(mapStateToProps, mapDispatchToProps)(Component); // $ExpectError
+    // Since it is possible the injected props could fail to satisfy the decoration props,
+    // the following line should fail to compile.
+    connect(mapStateToProps, mapDispatchToProps)(Component); // $ExpectError
 
-  // Confirm that this also fails with functional components
+    // Confirm that this also fails with functional components
     const FunctionalComponent = (props: MoreSpecificDecorationProps) => null;
-  connect(mapStateToProps, mapDispatchToProps)(Component); // $ExpectError
+    connect(mapStateToProps, mapDispatchToProps)(Component); // $ExpectError
 }
 
 function TestLibraryManagedAttributes() {
-	interface OwnProps {
-		bar: number;
-		fn: () => void;
-	}
+    interface OwnProps {
+        bar: number;
+        fn: () => void;
+    }
 
-	interface MapStateProps {
-		foo: string;
-	}
+    interface MapStateProps {
+        foo: string;
+    }
 
-	class Component extends React.Component<OwnProps & MapStateProps> {
-		static defaultProps = {
-			bar: 0,
-		};
+    class Component extends React.Component<OwnProps & MapStateProps> {
+        static defaultProps = {
+            bar: 0,
+        };
 
-		render() {
-			return <div />;
-		}
-	}
+        render() {
+            return <div />;
+        }
+    }
 
-	function mapStateToProps(state: any): MapStateProps {
-		return {
-			foo: 'foo',
-		};
-	}
+    function mapStateToProps(state: any): MapStateProps {
+        return {
+            foo: 'foo',
+        };
+    }
 
-	const ConnectedComponent = connect(mapStateToProps)(Component);
-	<ConnectedComponent fn={() => {}} />;
+    const ConnectedComponent = connect(mapStateToProps)(Component);
+    <ConnectedComponent fn={() => {}} />;
 
-	const ConnectedComponent2 = connect<MapStateProps, void, OwnProps>(mapStateToProps)(Component);
-	<ConnectedComponent2 fn={() => {}} />;
+    const ConnectedComponent2 = connect<MapStateProps, void, OwnProps>(mapStateToProps)(Component);
+    <ConnectedComponent2 fn={() => {}} />;
 }

From f2b6c010d2628e3826527e32ecb69930008559c1 Mon Sep 17 00:00:00 2001
From: levan basharuli <l.basharuli@gmail.com>
Date: Wed, 21 Nov 2018 02:07:57 +0400
Subject: [PATCH 131/836] added expo/ImageManipulator.manipulateAsync

---
 types/expo/expo-tests.tsx | 15 +++++++++++++++
 types/expo/index.d.ts     |  3 +++
 2 files changed, 18 insertions(+)

diff --git a/types/expo/expo-tests.tsx b/types/expo/expo-tests.tsx
index 61467bd5d1..5bb6b5abc4 100644
--- a/types/expo/expo-tests.tsx
+++ b/types/expo/expo-tests.tsx
@@ -413,6 +413,21 @@ async () => {
     result.width;
 };
 
+async () => {
+    const result = await ImageManipulator.manipulateAsync('url', [
+        { rotate: 360 },
+        { resize: { width: 300 } },
+        { resize: { height: 300 } },
+        { resize: { height: 300, width: 300 } },
+    ], {
+        compress: 0.75
+    });
+
+    result.height;
+    result.uri;
+    result.width;
+};
+
 FaceDetector.Constants.Mode.fast;
 FaceDetector.Constants.Mode.accurate;
 FaceDetector.Constants.Landmarks.all;
diff --git a/types/expo/index.d.ts b/types/expo/index.d.ts
index d5891bad2d..45f20d6d10 100644
--- a/types/expo/index.d.ts
+++ b/types/expo/index.d.ts
@@ -11,6 +11,7 @@
 //                 Tina Roh <https://github.com/tinaroh>
 //                 Nathan Phillip Brink <https://github.com/binki>
 //                 Martin Olsson <https://github.com/mo>
+//                 Levan Basharuli <https://github.com/levansuper>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 
@@ -1559,6 +1560,8 @@ export namespace ImageManipulator {
     }
 
     function manipulate(uri: string, actions: Action[], saveOptions?: SaveOptions): Promise<ImageResult>;
+
+    function manipulateAsync(uri: string, actions: Action[], saveOptions?: SaveOptions): Promise<ImageResult>;
 }
 
 /**

From 15e5857298d7aba9e260a5234972ba8e1ef8b83e Mon Sep 17 00:00:00 2001
From: levan basharuli <l.basharuli@gmail.com>
Date: Wed, 21 Nov 2018 02:31:15 +0400
Subject: [PATCH 132/836] added expo verion 31.0

---
 types/expo/index.d.ts         |    2 +-
 types/expo/v30/expo-tests.tsx |  953 ++++++++++
 types/expo/v30/index.d.ts     | 3147 +++++++++++++++++++++++++++++++++
 types/expo/v30/tsconfig.json  |   30 +
 types/expo/v30/tslint.json    |    7 +
 5 files changed, 4138 insertions(+), 1 deletion(-)
 create mode 100644 types/expo/v30/expo-tests.tsx
 create mode 100644 types/expo/v30/index.d.ts
 create mode 100644 types/expo/v30/tsconfig.json
 create mode 100644 types/expo/v30/tslint.json

diff --git a/types/expo/index.d.ts b/types/expo/index.d.ts
index 45f20d6d10..b406b4e8ec 100644
--- a/types/expo/index.d.ts
+++ b/types/expo/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for expo 30.0
+// Type definitions for expo 31.0
 // Project: https://github.com/expo/expo-sdk
 // Definitions by: Konstantin Kai <https://github.com/KonstantinKai>
 //                 Martynas Kadiša <https://github.com/martynaskadisa>
diff --git a/types/expo/v30/expo-tests.tsx b/types/expo/v30/expo-tests.tsx
new file mode 100644
index 0000000000..61467bd5d1
--- /dev/null
+++ b/types/expo/v30/expo-tests.tsx
@@ -0,0 +1,953 @@
+import * as React from 'react';
+import { Text } from 'react-native';
+
+import {
+    Accelerometer,
+    AdMobAppEvent,
+    AdMobBanner,
+    AdMobInterstitial,
+    AdMobRewarded,
+    Amplitude,
+    Asset,
+    AuthSession,
+    Audio,
+    AppLoading,
+    BarCodeScanner,
+    BlurViewProps,
+    BlurView,
+    Brightness,
+    Camera,
+    CameraObject,
+    DocumentPicker,
+    Facebook,
+    FacebookAds,
+    FileSystem,
+    ImagePicker,
+    ImageManipulator,
+    FaceDetector,
+    Linking,
+    Svg,
+    IntentLauncherAndroid,
+    KeepAwake,
+    LinearGradient,
+    Permissions,
+    PublisherBanner,
+    registerRootComponent,
+    ScreenOrientation,
+    SQLite,
+    Calendar,
+    MailComposer,
+    Location,
+    Updates,
+    MediaLibrary,
+    Haptic,
+    Constants
+} from 'expo';
+
+const reverseGeocode: Promise<Location.GeocodeData[]> = Location.reverseGeocodeAsync({
+    latitude: 0,
+    longitude: 0
+});
+
+Accelerometer.addListener((obj) => {
+    obj.x;
+    obj.y;
+    obj.z;
+});
+Accelerometer.removeAllListeners();
+Accelerometer.setUpdateInterval(1000);
+
+() => (
+    <AdMobBanner
+        bannerSize="leaderboard"
+        adUnitID="ca-app-pub-3940256099942544/6300978111"
+        testDeviceID="EMULATOR"
+        didFailToReceiveAdWithError={(error: string) => console.log(error)}
+        style={{ flex: 1 }}
+    />
+);
+
+() => (
+    <PublisherBanner
+        bannerSize="leaderboard"
+        adUnitID="ca-app-pub-3940256099942544/6300978111"
+        testDeviceID="EMULATOR"
+        didFailToReceiveAdWithError={(error: string) => console.log(error)}
+        onAdMobDispatchAppEvent={(event: AdMobAppEvent) => console.log(event)}
+        style={{ flex: 1 }}
+    />
+);
+
+AdMobInterstitial.setAdUnitID('ca-app-pub-3940256099942544/1033173712'); // Test ID, Replace with your-admob-unit-id
+AdMobInterstitial.setTestDeviceID('EMULATOR');
+async () => {
+    await AdMobInterstitial.requestAdAsync();
+    await AdMobInterstitial.showAdAsync();
+};
+
+AdMobRewarded.setAdUnitID('ca-app-pub-3940256099942544/1033173712'); // Test ID, Replace with your-admob-unit-id
+AdMobRewarded.setTestDeviceID('EMULATOR');
+async () => {
+    await AdMobRewarded.requestAdAsync();
+    await AdMobRewarded.showAdAsync();
+};
+
+Amplitude.initialize('key');
+Amplitude.setUserId('userId');
+Amplitude.setUserProperties({key: 1});
+Amplitude.clearUserProperties();
+Amplitude.logEvent('name');
+Amplitude.logEventWithProperties('event', {key: 'value'});
+Amplitude.setGroup('type', ['value']);
+
+const asset = Asset.fromModule(1);
+asset.downloadAsync();
+Asset.loadAsync(1);
+Asset.loadAsync([1, 2, 3]);
+const asset1 = new Asset({
+    uri: 'uri',
+    type: 'type',
+    name: 'name',
+    hash: 'hash',
+    width: 122,
+    height: 122
+});
+
+const url = AuthSession.getRedirectUrl();
+AuthSession.dismiss();
+AuthSession.startAsync({
+    authUrl: 'url1',
+    returnUrl: 'url2'
+}).then(result => {
+    switch (result.type) {
+        case 'success':
+            result.event;
+            result.params;
+            break;
+        case 'error':
+            result.errorCode;
+            result.params;
+            result.event;
+            break;
+        case 'dismissed':
+        case 'cancel':
+            result.type;
+            break;
+    }
+});
+AuthSession.startAsync({
+    authUrl: 'url1',
+    returnUrl: undefined
+});
+
+Audio.setAudioModeAsync({
+    shouldDuckAndroid: false,
+    playsInSilentModeIOS: true,
+    interruptionModeIOS: 2,
+    interruptionModeAndroid: 1,
+    allowsRecordingIOS: true
+});
+Audio.setIsEnabledAsync(true);
+
+Audio.INTERRUPTION_MODE_IOS_MIX_WITH_OTHERS === 0;
+Audio.INTERRUPTION_MODE_IOS_DO_NOT_MIX === 1;
+Audio.INTERRUPTION_MODE_IOS_DUCK_OTHERS === 2;
+
+Audio.INTERRUPTION_MODE_ANDROID_DO_NOT_MIX === 1;
+Audio.INTERRUPTION_MODE_ANDROID_DUCK_OTHERS === 2;
+
+Audio.RECORDING_OPTION_ANDROID_OUTPUT_FORMAT_DEFAULT === 0;
+Audio.RECORDING_OPTION_ANDROID_OUTPUT_FORMAT_THREE_GPP === 1;
+Audio.RECORDING_OPTION_ANDROID_OUTPUT_FORMAT_MPEG_4 === 2;
+Audio.RECORDING_OPTION_ANDROID_OUTPUT_FORMAT_AMR_NB === 3;
+Audio.RECORDING_OPTION_ANDROID_OUTPUT_FORMAT_AMR_WB === 4;
+Audio.RECORDING_OPTION_ANDROID_OUTPUT_FORMAT_AAC_ADIF === 5;
+Audio.RECORDING_OPTION_ANDROID_OUTPUT_FORMAT_AAC_ADTS === 6;
+Audio.RECORDING_OPTION_ANDROID_OUTPUT_FORMAT_RTP_AVP === 7;
+Audio.RECORDING_OPTION_ANDROID_OUTPUT_FORMAT_MPEG2TS === 8;
+Audio.RECORDING_OPTION_ANDROID_OUTPUT_FORMAT_WEBM === 9;
+
+Audio.RECORDING_OPTION_ANDROID_AUDIO_ENCODER_DEFAULT === 0;
+Audio.RECORDING_OPTION_ANDROID_AUDIO_ENCODER_AMR_NB === 1;
+Audio.RECORDING_OPTION_ANDROID_AUDIO_ENCODER_AMR_WB === 2;
+Audio.RECORDING_OPTION_ANDROID_AUDIO_ENCODER_AAC === 3;
+Audio.RECORDING_OPTION_ANDROID_AUDIO_ENCODER_HE_AAC === 4;
+Audio.RECORDING_OPTION_ANDROID_AUDIO_ENCODER_AAC_ELD === 5;
+Audio.RECORDING_OPTION_ANDROID_AUDIO_ENCODER_VORBIS === 6;
+
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_LINEARPCM === 'lpcm';
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_AC3 === 'ac-3';
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_60958AC3 === 'cac3';
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_APPLEIMA4 === 'ima4';
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_MPEG4AAC === 'aac ';
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_MPEG4CELP === 'celp';
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_MPEG4HVXC === 'hvxc';
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_MPEG4TWINVQ === 'twvq';
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_MACE3 === 'MAC3';
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_MACE6 === 'MAC6';
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_ULAW === 'ulaw';
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_ALAW === 'alaw';
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_QDESIGN === 'QDMC';
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_QDESIGN2 === 'QDM2';
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_QUALCOMM === 'Qclp';
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_MPEGLAYER1 === '.mp1';
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_MPEGLAYER2 === '.mp2';
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_MPEGLAYER3 === '.mp3';
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_APPLELOSSLESS === 'alac';
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_MPEG4AAC_HE === 'aach';
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_MPEG4AAC_LD === 'aacl';
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_MPEG4AAC_ELD === 'aace';
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_MPEG4AAC_ELD_SBR === 'aacf';
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_MPEG4AAC_ELD_V2 === 'aacg';
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_MPEG4AAC_HE_V2 === 'aacp';
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_MPEG4AAC_SPATIAL === 'aacs';
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_AMR === 'samr';
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_AMR_WB === 'sawb';
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_AUDIBLE === 'AUDB';
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_ILBC === 'ilbc';
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_DVIINTELIMA === 0x6d730011;
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_MICROSOFTGSM === 0x6d730031;
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_AES3 === 'aes3';
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_ENHANCEDAC3 === 'ec-3';
+
+Audio.RECORDING_OPTION_IOS_AUDIO_QUALITY_MIN === 0;
+Audio.RECORDING_OPTION_IOS_AUDIO_QUALITY_LOW === 0x20;
+Audio.RECORDING_OPTION_IOS_AUDIO_QUALITY_MEDIUM === 0x40;
+Audio.RECORDING_OPTION_IOS_AUDIO_QUALITY_HIGH === 0x60;
+Audio.RECORDING_OPTION_IOS_AUDIO_QUALITY_MAX === 0x7f;
+
+Audio.RECORDING_OPTION_IOS_BIT_RATE_STRATEGY_CONSTANT === 0;
+Audio.RECORDING_OPTION_IOS_BIT_RATE_STRATEGY_LONG_TERM_AVERAGE === 1;
+Audio.RECORDING_OPTION_IOS_BIT_RATE_STRATEGY_VARIABLE_CONSTRAINED === 2;
+Audio.RECORDING_OPTION_IOS_BIT_RATE_STRATEGY_VARIABLE === 3;
+
+Audio.RECORDING_OPTIONS_PRESET_HIGH_QUALITY;
+Audio.RECORDING_OPTIONS_PRESET_LOW_QUALITY;
+async () => {
+    const result = await Audio.Sound.create({uri: 'uri'}, {
+        volume: 0.55,
+        rate: 16.5
+    }, null, true);
+
+    const sound = result.sound;
+    const status = result.status;
+
+    if (!status.isLoaded) {
+        status.error;
+    } else {
+        status.didJustFinish;
+        // etc.
+    }
+
+    const _status = await sound.getStatusAsync();
+    await sound.loadAsync({uri: 'uri'});
+};
+
+() => (
+    <AppLoading
+        startAsync={() => Promise.resolve()}
+        onFinish={() => {}}
+        onError={(error) => console.log(error)} />
+);
+() => (
+    <AppLoading />
+);
+
+const barcodeReadCallback = () => {};
+() => (
+    <BarCodeScanner
+        type="front"
+        torchMode="off"
+        barCodeTypes={[BarCodeScanner.Constants.BarCodeType.aztec]}
+        onBarCodeRead={barcodeReadCallback} />
+);
+
+() => (
+    <BlurView
+        tint="dark"
+        intensity={2} />
+);
+
+async () => {
+    await Brightness.setBrightnessAsync(0.65);
+    await Brightness.setSystemBrightnessAsync(0.75);
+    const br1 = await Brightness.getBrightnessAsync();
+    const br2 = await Brightness.getSystemBrightnessAsync();
+};
+
+Camera.Constants.AutoFocus;
+Camera.Constants.Type;
+Camera.Constants.FlashMode;
+Camera.Constants.WhiteBalance;
+Camera.Constants.VideoQuality;
+Camera.Constants.BarCodeType;
+() => {
+    return(<Camera ref={(component: any) => {
+        if (component) {
+            component.recordAsync();
+        }
+    }} />);
+};
+async (camera: CameraObject) => {
+    const picture = await camera.takePictureAsync({
+        quality: 0.5,
+        base64: true,
+        exif: true
+    });
+
+    picture.uri;
+    picture.width;
+    picture.height;
+    picture.exif;
+    picture.base64;
+
+    camera.takePictureAsync({
+        quality: 1,
+        onPictureSaved: pic => {
+            pic.uri;
+            pic.width;
+            pic.height;
+            pic.exif;
+            pic.base64;
+        }
+    });
+};
+
+async () => {
+    const result = await DocumentPicker.getDocumentAsync();
+
+    if (result.type === 'success') {
+        result.name;
+        result.uri;
+        result.size;
+    }
+};
+
+async () => {
+    const { type, expires, token } = await Facebook.logInWithReadPermissionsAsync("appId");
+};
+
+() => (
+    <FacebookAds.BannerView
+        type="large"
+        placementId="str"
+        onPress={() => {}}
+        onError={() => {}} />
+);
+
+async () => {
+    const info = await FileSystem.getInfoAsync('file');
+
+    info.exists;
+    info.isDirectory;
+
+    if (info.exists) {
+        info.md5;
+        info.uri;
+        info.size;
+        info.modificationTime;
+    }
+
+    const string: string = await FileSystem.readAsStringAsync('file');
+    await FileSystem.writeAsStringAsync('file', 'content');
+    await FileSystem.deleteAsync('file');
+    await FileSystem.moveAsync({ from: 'from', to: 'to'});
+    await FileSystem.copyAsync({ from: 'from', to: 'to' });
+    await FileSystem.makeDirectoryAsync('dir');
+    const dirs: string[] = await FileSystem.readDirectoryAsync('dir');
+    const result = await FileSystem.downloadAsync('from', 'to');
+
+    result.headers;
+    result.status;
+    result.uri;
+    result.md5;
+};
+
+async () => {
+    // Video test
+    const result = await ImagePicker.launchImageLibraryAsync({
+        mediaTypes: ImagePicker.MediaTypeOptions.Videos,
+    });
+
+    if (!result.cancelled) {
+        result.uri;
+        result.width;
+        result.height;
+        result.duration;
+        result.type;
+    }
+};
+
+async () => {
+    // Image test
+    const result = await ImagePicker.launchImageLibraryAsync({
+        mediaTypes: ImagePicker.MediaTypeOptions.Images,
+        base64: true,
+        aspect: [4, 3],
+        quality: 1,
+        exif: true,
+    });
+
+    if (!result.cancelled) {
+        result.uri;
+        result.width;
+        result.height;
+        result.exif;
+        result.base64;
+        result.type;
+    }
+};
+
+async () => {
+    const result = await ImageManipulator.manipulate('url', [
+        { rotate: 90 },
+        { resize: { width: 300 } },
+        { resize: { height: 300 } },
+        { resize: { height: 300, width: 300 } },
+    ], {
+        compress: 0.75
+    });
+
+    result.height;
+    result.uri;
+    result.width;
+};
+
+FaceDetector.Constants.Mode.fast;
+FaceDetector.Constants.Mode.accurate;
+FaceDetector.Constants.Landmarks.all;
+FaceDetector.Constants.Landmarks.none;
+FaceDetector.Constants.Classifications.all;
+FaceDetector.Constants.Classifications.none;
+async () => {
+    const result = await FaceDetector.detectFaces('url', {
+        mode: FaceDetector.Constants.Mode.fast,
+        detectLandmarks: FaceDetector.Constants.Landmarks.all,
+        runClassifications: FaceDetector.Constants.Classifications.none
+    });
+
+    result.faces[0];
+};
+
+async () => {
+    function isBoolean(x: boolean) {
+    }
+    function isString(x: string) {
+    }
+    // Two examples of members inherited from react-native Linking
+    // to prove that inheritence is working.
+    Linking.addEventListener('url', (e) => {
+        e.url === '';
+    });
+    isBoolean(await Linking.canOpenURL('expo://'));
+
+    // Extensions added by expo.
+
+    isString(Linking.makeUrl('path'));
+    isString(Linking.makeUrl('path', { q: 2, u: 'ery', }));
+
+    const {
+        path,
+        queryParams,
+    } = Linking.parse('');
+    isString(path);
+    isString(queryParams['x'] || '');
+
+    const {
+        path: path2,
+        queryParams: queryParams2,
+    } = await Linking.parseInitialURLAsync();
+    isString(path2);
+    isString(queryParams2['y'] || '');
+};
+
+() => (
+    <Svg width={100} height={50}>
+        <Svg.Rect
+            x={25}
+            y={5}
+            width={150}
+            height={50}
+            fill='rgb(0,0,255)'
+            strokeWidth={3}
+            stroke='rgb(0,0,0)'
+            transform="translate(0, 0)"
+        />
+        <Svg.Circle
+            cx={50}
+            cy={50}
+            r={50}
+            fill="pink"
+            transform="translate(0, 0)"
+        />
+        <Svg.Ellipse
+            cx={55}
+            cy={55}
+            rx={50}
+            ry={30}
+            stroke="purple"
+            strokeWidth={2}
+            fill="yellow"
+            transform="translate(0, 0)"
+        />
+        <Svg.Line
+            x1={0}
+            y1={0}
+            x2={100}
+            y2={100}
+            stroke="red"
+            strokeWidth={2}
+            transform="translate(0, 0)"
+        />
+        <Svg.Polygon
+            points="40,5 70,80 25,95"
+            fill="lime"
+            stroke="purple"
+            strokeWidth={1}
+            transform="translate(0, 0)"
+        />
+        <Svg.Polyline
+            points="10,10 20,12 30,20 40,60 60,70 95,90"
+            fill="none"
+            stroke="black"
+            strokeWidth={3}
+            transform="translate(0, 0)"
+        />
+        <Svg.Text
+            fill="none"
+            stroke="purple"
+            fontSize={20}
+            fontWeight="bold"
+            x={100}
+            y={20}
+            textAnchor="middle"
+            transform="translate(0, 0)"
+        >
+            STROKED TEXT
+        </Svg.Text>
+        <Svg.Defs>
+            <Svg.Path
+                id="path"
+                d=""
+            />
+        </Svg.Defs>
+        <Svg.G transform="translate(0, 0)" y={20}>
+            <Svg.Text fill="blue" transform={{ translateX: 0, translateY: 0 }}>
+                <Svg.TextPath href="#path" startOffset="-10%">
+                    We go up and down,
+                    <Svg.TSpan fill="red" dy="5,5,5">then up again</Svg.TSpan>
+                </Svg.TextPath>
+            </Svg.Text>
+            <Svg.Path
+                d=""
+                fill="none"
+                stroke="red"
+                strokeWidth={1}
+            />
+        </Svg.G>
+        <Svg.Use href="#shape" transform="translate(0, 0)" x="20" y="0" />
+        <Svg.Use href="#shape" transform={{ translateX: 0, translateY: 0 }} x="20" y="0" width="20" height="20"/>
+        <Svg.Symbol id="symbol" viewBox="0 0 150 110" width="100" height="50">
+            <Svg.Circle cx="50" cy="50" r="40" strokeWidth="8" stroke="red" fill="red"/>
+            <Svg.Circle cx="90" cy="60" r="40" strokeWidth="8" stroke="green" fill="white"/>
+        </Svg.Symbol>
+        <Svg.Defs>
+            <Svg.ClipPath id="clip">
+                <Svg.Circle cx="50%" cy="50%" r="40%"/>
+            </Svg.ClipPath>
+            <Svg.RadialGradient id="grad" cx="50%" cy="50%" rx="50%" ry="50%" fx="50%" fy="50%" gradientUnits="userSpaceOnUse">
+                <Svg.Stop
+                    offset="0%"
+                    stopColor="#ff0"
+                    stopOpacity="1"
+                />
+            </Svg.RadialGradient>
+            <Svg.LinearGradient id="grad" x1="0" y1="0" x2="170" y2="0">
+                <Svg.Stop offset="1" stopColor="red" stopOpacity="1" />
+            </Svg.LinearGradient>
+        </Svg.Defs>
+    </Svg>
+);
+
+() => (
+    <Svg width={100} height={50} preserveAspectRatio="none" />
+);
+
+IntentLauncherAndroid.ACTION_ACCESSIBILITY_SETTINGS === 'android.settings.ACCESSIBILITY_SETTINGS';
+IntentLauncherAndroid.ACTION_APP_NOTIFICATION_REDACTION === 'android.settings.ACTION_APP_NOTIFICATION_REDACTION';
+IntentLauncherAndroid.ACTION_CONDITION_PROVIDER_SETTINGS === 'android.settings.ACTION_CONDITION_PROVIDER_SETTINGS';
+IntentLauncherAndroid.ACTION_NOTIFICATION_LISTENER_SETTINGS === 'android.settings.ACTION_NOTIFICATION_LISTENER_SETTINGS';
+IntentLauncherAndroid.ACTION_PRINT_SETTINGS === 'android.settings.ACTION_PRINT_SETTINGS';
+IntentLauncherAndroid.ACTION_ADD_ACCOUNT_SETTINGS === 'android.settings.ADD_ACCOUNT_SETTINGS';
+IntentLauncherAndroid.ACTION_AIRPLANE_MODE_SETTINGS === 'android.settings.AIRPLANE_MODE_SETTINGS';
+IntentLauncherAndroid.ACTION_APN_SETTINGS === 'android.settings.APN_SETTINGS';
+IntentLauncherAndroid.ACTION_APPLICATION_DETAILS_SETTINGS === 'android.settings.APPLICATION_DETAILS_SETTINGS';
+IntentLauncherAndroid.ACTION_APPLICATION_DEVELOPMENT_SETTINGS === 'android.settings.APPLICATION_DEVELOPMENT_SETTINGS';
+IntentLauncherAndroid.ACTION_APPLICATION_SETTINGS === 'android.settings.APPLICATION_SETTINGS';
+IntentLauncherAndroid.ACTION_APP_NOTIFICATION_SETTINGS === 'android.settings.APP_NOTIFICATION_SETTINGS';
+IntentLauncherAndroid.ACTION_APP_OPS_SETTINGS === 'android.settings.APP_OPS_SETTINGS';
+IntentLauncherAndroid.ACTION_BATTERY_SAVER_SETTINGS === 'android.settings.BATTERY_SAVER_SETTINGS';
+IntentLauncherAndroid.ACTION_BLUETOOTH_SETTINGS === 'android.settings.BLUETOOTH_SETTINGS';
+IntentLauncherAndroid.ACTION_CAPTIONING_SETTINGS === 'android.settings.CAPTIONING_SETTINGS';
+IntentLauncherAndroid.ACTION_CAST_SETTINGS === 'android.settings.CAST_SETTINGS';
+IntentLauncherAndroid.ACTION_DATA_ROAMING_SETTINGS === 'android.settings.DATA_ROAMING_SETTINGS';
+IntentLauncherAndroid.ACTION_DATE_SETTINGS === 'android.settings.DATE_SETTINGS';
+IntentLauncherAndroid.ACTION_DEVICE_INFO_SETTINGS === 'android.settings.DEVICE_INFO_SETTINGS';
+IntentLauncherAndroid.ACTION_DEVICE_NAME === 'android.settings.DEVICE_NAME';
+IntentLauncherAndroid.ACTION_DISPLAY_SETTINGS === 'android.settings.DISPLAY_SETTINGS';
+IntentLauncherAndroid.ACTION_DREAM_SETTINGS === 'android.settings.DREAM_SETTINGS';
+IntentLauncherAndroid.ACTION_HARD_KEYBOARD_SETTINGS === 'android.settings.HARD_KEYBOARD_SETTINGS';
+IntentLauncherAndroid.ACTION_HOME_SETTINGS === 'android.settings.HOME_SETTINGS';
+IntentLauncherAndroid.ACTION_IGNORE_BACKGROUND_DATA_RESTRICTIONS_SETTINGS === 'android.settings.IGNORE_BACKGROUND_DATA_RESTRICTIONS_SETTINGS';
+IntentLauncherAndroid.ACTION_IGNORE_BATTERY_OPTIMIZATION_SETTINGS === 'android.settings.IGNORE_BATTERY_OPTIMIZATION_SETTINGS';
+IntentLauncherAndroid.ACTION_INPUT_METHOD_SETTINGS === 'android.settings.INPUT_METHOD_SETTINGS';
+IntentLauncherAndroid.ACTION_INPUT_METHOD_SUBTYPE_SETTINGS === 'android.settings.INPUT_METHOD_SUBTYPE_SETTINGS';
+IntentLauncherAndroid.ACTION_INTERNAL_STORAGE_SETTINGS === 'android.settings.INTERNAL_STORAGE_SETTINGS';
+IntentLauncherAndroid.ACTION_LOCALE_SETTINGS === 'android.settings.LOCALE_SETTINGS';
+IntentLauncherAndroid.ACTION_LOCATION_SOURCE_SETTINGS === 'android.settings.LOCATION_SOURCE_SETTINGS';
+IntentLauncherAndroid.ACTION_MANAGE_ALL_APPLICATIONS_SETTINGS === 'android.settings.MANAGE_ALL_APPLICATIONS_SETTINGS';
+IntentLauncherAndroid.ACTION_MANAGE_APPLICATIONS_SETTINGS === 'android.settings.MANAGE_APPLICATIONS_SETTINGS';
+IntentLauncherAndroid.ACTION_MANAGE_DEFAULT_APPS_SETTINGS === 'android.settings.MANAGE_DEFAULT_APPS_SETTINGS';
+IntentLauncherAndroid.ACTION_MEMORY_CARD_SETTINGS === 'android.settings.MEMORY_CARD_SETTINGS';
+IntentLauncherAndroid.ACTION_MONITORING_CERT_INFO === 'android.settings.MONITORING_CERT_INFO';
+IntentLauncherAndroid.ACTION_NETWORK_OPERATOR_SETTINGS === 'android.settings.NETWORK_OPERATOR_SETTINGS';
+IntentLauncherAndroid.ACTION_NFCSHARING_SETTINGS === 'android.settings.NFCSHARING_SETTINGS';
+IntentLauncherAndroid.ACTION_NFC_PAYMENT_SETTINGS === 'android.settings.NFC_PAYMENT_SETTINGS';
+IntentLauncherAndroid.ACTION_NFC_SETTINGS === 'android.settings.NFC_SETTINGS';
+IntentLauncherAndroid.ACTION_NIGHT_DISPLAY_SETTINGS === 'android.settings.NIGHT_DISPLAY_SETTINGS';
+IntentLauncherAndroid.ACTION_NOTIFICATION_POLICY_ACCESS_SETTINGS === 'android.settings.NOTIFICATION_POLICY_ACCESS_SETTINGS';
+IntentLauncherAndroid.ACTION_NOTIFICATION_SETTINGS === 'android.settings.NOTIFICATION_SETTINGS';
+IntentLauncherAndroid.ACTION_PAIRING_SETTINGS === 'android.settings.PAIRING_SETTINGS';
+IntentLauncherAndroid.ACTION_PRIVACY_SETTINGS === 'android.settings.PRIVACY_SETTINGS';
+IntentLauncherAndroid.ACTION_QUICK_LAUNCH_SETTINGS === 'android.settings.QUICK_LAUNCH_SETTINGS';
+IntentLauncherAndroid.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS === 'android.settings.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS';
+IntentLauncherAndroid.ACTION_SECURITY_SETTINGS === 'android.settings.SECURITY_SETTINGS';
+IntentLauncherAndroid.ACTION_SETTINGS === 'android.settings.SETTINGS';
+IntentLauncherAndroid.ACTION_SHOW_ADMIN_SUPPORT_DETAILS === 'android.settings.SHOW_ADMIN_SUPPORT_DETAILS';
+IntentLauncherAndroid.ACTION_SHOW_INPUT_METHOD_PICKER === 'android.settings.SHOW_INPUT_METHOD_PICKER';
+IntentLauncherAndroid.ACTION_SHOW_REGULATORY_INFO === 'android.settings.SHOW_REGULATORY_INFO';
+IntentLauncherAndroid.ACTION_SHOW_REMOTE_BUGREPORT_DIALOG === 'android.settings.SHOW_REMOTE_BUGREPORT_DIALOG';
+IntentLauncherAndroid.ACTION_SOUND_SETTINGS === 'android.settings.SOUND_SETTINGS';
+IntentLauncherAndroid.ACTION_STORAGE_MANAGER_SETTINGS === 'android.settings.STORAGE_MANAGER_SETTINGS';
+IntentLauncherAndroid.ACTION_SYNC_SETTINGS === 'android.settings.SYNC_SETTINGS';
+IntentLauncherAndroid.ACTION_SYSTEM_UPDATE_SETTINGS === 'android.settings.SYSTEM_UPDATE_SETTINGS';
+IntentLauncherAndroid.ACTION_TETHER_PROVISIONING_UI === 'android.settings.TETHER_PROVISIONING_UI';
+IntentLauncherAndroid.ACTION_TRUSTED_CREDENTIALS_USER === 'android.settings.TRUSTED_CREDENTIALS_USER';
+IntentLauncherAndroid.ACTION_USAGE_ACCESS_SETTINGS === 'android.settings.USAGE_ACCESS_SETTINGS';
+IntentLauncherAndroid.ACTION_USER_DICTIONARY_INSERT === 'android.settings.USER_DICTIONARY_INSERT';
+IntentLauncherAndroid.ACTION_USER_DICTIONARY_SETTINGS === 'android.settings.USER_DICTIONARY_SETTINGS';
+IntentLauncherAndroid.ACTION_USER_SETTINGS === 'android.settings.USER_SETTINGS';
+IntentLauncherAndroid.ACTION_VOICE_CONTROL_AIRPLANE_MODE === 'android.settings.VOICE_CONTROL_AIRPLANE_MODE';
+IntentLauncherAndroid.ACTION_VOICE_CONTROL_BATTERY_SAVER_MODE === 'android.settings.VOICE_CONTROL_BATTERY_SAVER_MODE';
+IntentLauncherAndroid.ACTION_VOICE_CONTROL_DO_NOT_DISTURB_MODE === 'android.settings.VOICE_CONTROL_DO_NOT_DISTURB_MODE';
+IntentLauncherAndroid.ACTION_VOICE_INPUT_SETTINGS === 'android.settings.VOICE_INPUT_SETTINGS';
+IntentLauncherAndroid.ACTION_VPN_SETTINGS === 'android.settings.VPN_SETTINGS';
+IntentLauncherAndroid.ACTION_VR_LISTENER_SETTINGS === 'android.settings.VR_LISTENER_SETTINGS';
+IntentLauncherAndroid.ACTION_WEBVIEW_SETTINGS === 'android.settings.WEBVIEW_SETTINGS';
+IntentLauncherAndroid.ACTION_WIFI_IP_SETTINGS === 'android.settings.WIFI_IP_SETTINGS';
+IntentLauncherAndroid.ACTION_WIFI_SETTINGS === 'android.settings.WIFI_SETTINGS';
+IntentLauncherAndroid.ACTION_WIRELESS_SETTINGS === 'android.settings.WIRELESS_SETTINGS';
+IntentLauncherAndroid.ACTION_ZEN_MODE_AUTOMATION_SETTINGS === 'android.settings.ZEN_MODE_AUTOMATION_SETTINGS';
+IntentLauncherAndroid.ACTION_ZEN_MODE_EVENT_RULE_SETTINGS === 'android.settings.ZEN_MODE_EVENT_RULE_SETTINGS';
+IntentLauncherAndroid.ACTION_ZEN_MODE_EXTERNAL_RULE_SETTINGS === 'android.settings.ZEN_MODE_EXTERNAL_RULE_SETTINGS';
+IntentLauncherAndroid.ACTION_ZEN_MODE_PRIORITY_SETTINGS === 'android.settings.ZEN_MODE_PRIORITY_SETTINGS';
+IntentLauncherAndroid.ACTION_ZEN_MODE_SCHEDULE_RULE_SETTINGS === 'android.settings.ZEN_MODE_SCHEDULE_RULE_SETTINGS';
+IntentLauncherAndroid.ACTION_ZEN_MODE_SETTINGS === 'android.settings.ZEN_MODE_SETTINGS';
+
+KeepAwake.activate();
+KeepAwake.deactivate();
+
+() => (
+    <LinearGradient
+        colors={['#fff']}
+        start={[1, 1]} />
+);
+
+() => (
+    <LinearGradient
+        colors={['#fff']}
+        style={{ flex: 1 }} />
+);
+
+Permissions.CAMERA === 'camera';
+Permissions.CAMERA_ROLL === 'cameraRoll';
+Permissions.AUDIO_RECORDING === 'audioRecording';
+Permissions.CONTACTS === 'contacts';
+Permissions.NOTIFICATIONS === 'remoteNotifications';
+Permissions.REMOTE_NOTIFICATIONS === 'remoteNotifications';
+Permissions.SYSTEM_BRIGHTNESS === 'systemBrightness';
+Permissions.USER_FACING_NOTIFICATIONS === 'userFacingNotifications';
+Permissions.REMINDERS === 'reminders';
+async () => {
+    const result = await Permissions.askAsync(Permissions.CAMERA);
+
+    result.status === 'granted';
+    result.status === 'denied';
+    result.status === 'undetermined';
+
+    result.expires === 'never';
+};
+
+ScreenOrientation.Orientation.ALL;
+ScreenOrientation.allow(ScreenOrientation.Orientation.ALL);
+
+class __TestEntry__ extends React.Component {
+    render() {
+        return(
+            <Text>test</Text>
+        );
+    }
+}
+registerRootComponent(__TestEntry__);
+
+Calendar.EntityTypes.EVENT === 'event';
+Calendar.EntityTypes.REMINDER === 'reminder';
+
+Calendar.CalendarType.LOCAL === 'local';
+Calendar.CalendarType.CALDAV === 'caldav';
+Calendar.CalendarType.EXCHANGE === 'exchange';
+Calendar.CalendarType.SUBSCRIBED === 'subscribed';
+Calendar.CalendarType.BIRTHDAYS === 'birthdays';
+
+async () => {
+    const result = await Calendar.getCalendarsAsync(Calendar.EntityTypes.EVENT);
+    result.length;
+
+    const calendar = result[0];
+    calendar.id === '';
+    calendar.title === '';
+    calendar.sourceId === '';
+    calendar.type === Calendar.CalendarType.BIRTHDAYS;
+    calendar.color === '';
+    calendar.entityType === Calendar.EntityTypes.EVENT;
+    calendar.allowsModifications === true;
+    calendar.allowedAvailabilities === [''];
+    calendar.isPrimary === true;
+    calendar.name === '';
+    calendar.ownerAccount === '';
+    calendar.timeZone === '';
+    calendar.allowedReminders === [''];
+    calendar.allowedAttendeeTypes === [''];
+    calendar.isVisible === false;
+    calendar.isSynced === false;
+    calendar.accessLevel === Calendar.CalendarAccessLevel.CONTRIBUTOR;
+
+    if (calendar.source) {
+        calendar.source.id === '';
+        calendar.source.type === '';
+        calendar.source.name === '';
+        calendar.source.isLocalAccount === false;
+    }
+
+    const id1 =  await Calendar.createCalendarAsync({
+        accessLevel: Calendar.CalendarAccessLevel.EDITOR
+    });
+
+    id1 === '';
+
+    const id2 = await Calendar.updateCalendarAsync('1234', {
+        isVisible: false
+    });
+
+    id2 === '';
+
+    const id3 = await Calendar.updateCalendarAsync('1234', null);
+
+    await Calendar.deleteCalendarAsync('1234');
+
+    const events = await Calendar.getEventsAsync(
+        ['123', '124'],
+        new Date(),
+        new Date()
+    );
+
+    const event1 = events[0];
+
+    event1.accessLevel === Calendar.EventAccessLevel.CONFIDENTIAL;
+    event1.alarms === [];
+    event1.allDay === true;
+    event1.availability === Calendar.Availability.FREE;
+    event1.calendarId === '';
+    event1.creationDate === '';
+    event1.endDate === '';
+    event1.endTimeZone === '';
+    event1.guestsCanInviteOthers === true;
+    event1.guestsCanModify === true;
+    event1.guestsCanSeeGuests === false;
+    event1.id === '';
+    event1.instanceId === '';
+    event1.isDetached === false;
+
+    const event2 = await Calendar.getEventAsync('123', {
+        futureEvents: true
+    });
+
+    const eventId1 = await Calendar.createEventAsync('123');
+
+    const eventId2 = await Calendar.updateEventAsync('1234');
+
+    await Calendar.deleteEventAsync('1234');
+
+    const attendees = await Calendar.getAttendeesForEventAsync('123');
+
+    const aId1 = await Calendar.createAttendeeAsync('123');
+
+    const aId2 = await Calendar.updateAttendeeAsync('123');
+
+    await Calendar.deleteAttendeeAsync('123');
+
+    const reminders = await Calendar.getRemindersAsync(['123']);
+
+    const reminder = await Calendar.getReminderAsync('123');
+
+    const remId1 = await Calendar.createReminderAsync('123');
+
+    const remId2 = await Calendar.updateReminderAsync('123');
+
+    await Calendar.deleteReminderAsync('123');
+
+    const sources = await Calendar.getSourcesAsync();
+
+    const source = await Calendar.getSourceAsync('123');
+
+    Calendar.openEventInCalendar('123');
+};
+
+async () => {
+    const result = await MailComposer.composeAsync({
+        subject: 'sss'
+    });
+
+    result.status === 'saved';
+};
+
+async () => {
+    const updateEventListener: Updates.UpdateEventListener = ({ type, manifest, message }) => {
+        switch (type) {
+            case Updates.EventType.DOWNLOAD_STARTED:
+            case Updates.EventType.DOWNLOAD_PROGRESS:
+            case Updates.EventType.DOWNLOAD_FINISHED:
+            case Updates.EventType.NO_UPDATE_AVAILABLE:
+            case Updates.EventType.ERROR:
+                return true;
+        }
+    };
+
+    Updates.reload();
+
+    Updates.reloadFromCache();
+
+    Updates.addListener(updateEventListener);
+
+    const updateCheckResult = await Updates.checkForUpdateAsync();
+
+    if (updateCheckResult.isAvailable) {
+        console.log(updateCheckResult.manifest);
+    }
+
+    Updates.fetchUpdateAsync({ eventListener: updateEventListener });
+
+    const bundleFetchResult = await Updates.fetchUpdateAsync();
+
+    if (bundleFetchResult.isNew) {
+        console.log(bundleFetchResult.manifest);
+    }
+};
+
+async () => {
+  const asset: MediaLibrary.Asset = await MediaLibrary.createAssetAsync('some-url');
+  const getAssetsOptions: MediaLibrary.GetAssetsOptions = {
+    first: 0,
+    after: 'lastAssetId',
+    album: 'albumId',
+    sortBy: MediaLibrary.SortBy.creationTime,
+    mediaType: MediaLibrary.MediaType.photo
+  };
+  const assetsList: MediaLibrary.GetAssetsResult = await MediaLibrary.getAssetsAsync(getAssetsOptions);
+  const endCursor: string = assetsList.endCursor;
+  const hasNextPage: boolean = assetsList.hasNextPage;
+  const totalCount: number = assetsList.totalCount;
+  const asset1: MediaLibrary.Asset = await MediaLibrary.getAssetInfoAsync(asset);
+  if (await MediaLibrary.deleteAssetsAsync(assetsList.assets)) {
+    console.log('assets deleted');
+  }
+  const albums: MediaLibrary.Album[] = await MediaLibrary.getAlbumsAsync();
+  const album: MediaLibrary.Album | null = await MediaLibrary.getAlbumAsync('albumName');
+  const album1: MediaLibrary.Album = await MediaLibrary.createAlbumAsync('albumName', asset1);
+  if (await MediaLibrary.addAssetsToAlbumAsync([asset, asset1], album1, true)) {
+    console.log('assets added');
+  }
+
+  const moments: MediaLibrary.Album[] = await MediaLibrary.getMomentsAsync();
+
+  switch (getAssetsOptions.mediaType) {
+    case MediaLibrary.MediaType.audio:
+    case MediaLibrary.MediaType.photo:
+    case MediaLibrary.MediaType.video:
+    case MediaLibrary.MediaType.unknow:
+      return true;
+  }
+
+  switch (getAssetsOptions.sortBy) {
+    case MediaLibrary.SortBy.default:
+    case MediaLibrary.SortBy.id:
+    case MediaLibrary.SortBy.creationTime:
+    case MediaLibrary.SortBy.modificationTime:
+    case MediaLibrary.SortBy.mediaType:
+    case MediaLibrary.SortBy.width:
+    case MediaLibrary.SortBy.height:
+    case MediaLibrary.SortBy.duration:
+      return true;
+  }
+};
+// #region MediaLibrary
+async () => {
+  const mlAsset: MediaLibrary.Asset = await MediaLibrary.createAssetAsync('localUri');
+  const mlAssetResult: MediaLibrary.GetAssetsResult = await MediaLibrary.getAssetsAsync({
+    first: 0,
+    after: '',
+    album: 'Album',
+    sortBy: MediaLibrary.SortBy.creationTime,
+    mediaType: MediaLibrary.MediaType.photo
+  });
+  const mlAsset1: MediaLibrary.Asset = await MediaLibrary.getAssetInfoAsync(mlAsset);
+  const areDeleted: boolean = await MediaLibrary.deleteAssetsAsync([mlAsset]);
+  const albums: MediaLibrary.Album[] = await MediaLibrary.getAlbumsAsync();
+  const album: MediaLibrary.Album = await MediaLibrary.getAlbumAsync('album');
+  const album1: MediaLibrary.Album = await MediaLibrary.createAlbumAsync('album', mlAsset);
+  const areAddedToAlbum: boolean = await MediaLibrary.addAssetsToAlbumAsync([mlAsset, mlAsset1], 'album');
+  const areDeletedFromAlbum: boolean = await MediaLibrary.removeAssetsFromAlbumAsync([mlAsset, mlAsset1], 'album');
+  const momuents: MediaLibrary.Album[] = await MediaLibrary.getMomentsAsync();
+};
+//#endregion
+
+// #region Haptic
+Haptic.impact(Haptic.ImpactStyles.Heavy);
+Haptic.impact(Haptic.ImpactStyles.Light);
+Haptic.impact(Haptic.ImpactStyles.Medium);
+
+Haptic.notification(Haptic.NotificationType.Error);
+Haptic.notification(Haptic.NotificationType.Success);
+Haptic.notification(Haptic.NotificationType.Error);
+
+Haptic.selection();
+// #endregion
+
+// #region Constants
+async () => {
+    const appOwnerShip = Constants.appOwnership;
+    const expoVersion = Constants.expoVersion;
+    const installationId = Constants.installationId;
+    const deviceId = Constants.deviceId;
+    const deviceName = Constants.deviceName;
+    const deviceYearClass = Constants.deviceYearClass;
+    const isDevice = Constants.isDevice;
+    const platform = Constants.platform;
+    const sessionId = Constants.sessionId;
+    const statusBarHeight = Constants.statusBarHeight;
+    const systemFonts = Constants.systemFonts;
+    const manifest = Constants.manifest;
+    const linkingUri = Constants.linkingUri;
+    const userAgent: string = await Constants.getWebViewUserAgentAsync();
+};
+// #endregion
diff --git a/types/expo/v30/index.d.ts b/types/expo/v30/index.d.ts
new file mode 100644
index 0000000000..d5891bad2d
--- /dev/null
+++ b/types/expo/v30/index.d.ts
@@ -0,0 +1,3147 @@
+// Type definitions for expo 30.0
+// Project: https://github.com/expo/expo-sdk
+// Definitions by: Konstantin Kai <https://github.com/KonstantinKai>
+//                 Martynas Kadiša <https://github.com/martynaskadisa>
+//                 Jan Aagaard <https://github.com/janaagaard75>
+//                 Sergio Sánchez <https://github.com/ssanchezmarc>
+//                 Fernando Helwanger <https://github.com/fhelwanger>
+//                 Umidbek Karimov <https://github.com/umidbekkarimov>
+//                 Moshe Feuchtwanger <https://github.com/moshfeu>
+//                 Michael Prokopchuk <https://github.com/prokopcm>
+//                 Tina Roh <https://github.com/tinaroh>
+//                 Nathan Phillip Brink <https://github.com/binki>
+//                 Martin Olsson <https://github.com/mo>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
+
+import { EventSubscription } from 'fbemitter';
+import { Component, ComponentClass, Ref, ComponentType } from 'react';
+import {
+    ColorPropType,
+    ImageRequireSource,
+    ImageURISource,
+    LinkingStatic as ReactNativeLinkingStatic,
+    NativeEventEmitter,
+    ViewProps,
+    ViewStyle,
+    Permission,
+    StyleProp
+} from 'react-native';
+
+export type Axis = number;
+export type BarCodeReadCallback = (params: { type: string; data: string; }) => void;
+export type Md5 = string;
+export type Orientation = 'portrait' | 'landscape';
+export type RequireSource = ImageRequireSource;
+export type ResizeModeContain = 'contain';
+export type ResizeModeCover = 'cover';
+export type ResizeModeStretch = 'stretch';
+export type URISource = ImageURISource;
+
+export interface HashMap { [key: string]: any; }
+export interface StringHashMap { [key: string]: string; }
+
+/** Access the device accelerometer sensor(s) to respond to changes in acceleration in 3d space. */
+export namespace Accelerometer {
+    interface AccelerometerObject {
+        x: Axis;
+        y: Axis;
+        z: Axis;
+    }
+
+    /**
+     * Subscribe for updates to the accelerometer.
+     * @param listener A callback that is invoked when an accelerometer update is available. When invoked, the listener is provided a single argumument that is an object containing keys x, y, z.
+     * @returns An EventSubscription object that you can call remove() on when you would like to unsubscribe the listener.
+     */
+    function addListener(listener: (obj: AccelerometerObject) => any): EventSubscription;
+
+    /** Remove all listeners. */
+    function removeAllListeners(): void;
+
+    /**
+     * Subscribe for updates to the accelerometer.
+     * @param intervalMs Desired interval in milliseconds between accelerometer updates.
+     */
+    function setUpdateInterval(intervalMs: number): void;
+}
+
+/**
+ * Admob
+ */
+export type AdMobBannerSize =
+    | 'banner'
+    | 'largeBanner'
+    | 'mediumRectangle'
+    | 'fullBanner'
+    | 'leaderboard'
+    | 'smartBannerPortrait'
+    | 'smartBannerLandscape';
+export interface AdMobBannerProperties extends ViewProps {
+    bannerSize?: AdMobBannerSize;
+    adUnitID?: string;
+    testDeviceID?: string;
+    didFailToReceiveAdWithError?(errorDescription: string): void;
+    adViewDidReceiveAd?(): void;
+    adViewWillPresentScreen?(): void;
+    adViewWillDismissScreen?(): void;
+    adViewDidDismissScreen?(): void;
+    adViewWillLeaveApplication?(): void;
+}
+
+export class AdMobBanner extends Component<AdMobBannerProperties> { }
+export interface AdMobAppEvent {
+    name: string;
+    info: string;
+}
+export interface PublisherBannerProperties extends AdMobBannerProperties {
+    onAdMobDispatchAppEvent?(event: AdMobAppEvent): void;
+}
+export class PublisherBanner extends Component<PublisherBannerProperties> { }
+
+export type AdMobInterstitialEmptyEvent =
+    | 'interstitialDidLoad'
+    | 'interstitialDidOpen'
+    | 'interstitialDidClose'
+    | 'interstitialWillLeaveApplication';
+export type AdMobInterstitialEvent = AdMobInterstitialEmptyEvent | 'interstitialDidFailToLoad';
+export namespace AdMobInterstitial {
+    function setAdUnitID(id: string): void;
+    function setTestDeviceID(id: string): void;
+    function requestAdAsync(): Promise<void>;
+    function showAdAsync(): Promise<void>;
+    function dismissAdAsync(): Promise<void>;
+    function getIsReadyAsync(): Promise<boolean>;
+    function addEventListener(event: 'interstitialDidFailToLoad', handler: (error: string) => void): void;
+    function addEventListener(event: AdMobInterstitialEmptyEvent, handler: () => void): void;
+    function removeEventListener(event: 'interstitialDidFailToLoad', handler: (error: string) => void): void;
+    function removeEventListener(event: AdMobInterstitialEmptyEvent, handler: () => void): void;
+    function removeAllListeners(): void;
+}
+
+export type AdMobRewardedEmptyEvent =
+    | 'rewardedVideoDidLoad'
+    | 'rewardedVideoDidOpen'
+    | 'rewardedVideoDidStart'
+    | 'rewardedVideoDidClose'
+    | 'rewardedVideoWillLeaveApplication';
+export type AdMobRewardedEvent = AdMobRewardedEmptyEvent | 'rewardedVideoDidRewardUser' | 'rewardedVideoDidFailToLoad';
+export namespace AdMobRewarded {
+    function setAdUnitID(id: string): void;
+    function setTestDeviceID(id: string): void;
+    function requestAdAsync(): Promise<void>;
+    function showAdAsync(): Promise<void>;
+    function dismissAdAsync(): Promise<void>;
+    function getIsReadyAsync(): Promise<boolean>;
+    function addEventListener(event: 'rewardedVideoDidRewardUser', handler: (type: string, amount: number) => void): void;
+    function addEventListener(event: 'rewardedVideoDidFailToLoad', handler: (error: string) => void): void;
+    function addEventListener(event: AdMobRewardedEmptyEvent, handler: () => void): void;
+    function removeEventListener(event: 'rewardedVideoDidRewardUser', handler: (type: string, amount: number) => void): void;
+    function removeEventListener(event: 'rewardedVideoDidFailToLoad', handler: (error: string) => void): void;
+    function removeEventListener(event: AdMobRewardedEmptyEvent, handler: () => void): void;
+    function removeAllListeners(): void;
+}
+
+/**
+ * Provides access to Amplitude mobile analytics which basically lets you log various events to the Cloud. This module wraps Amplitude’s iOS and Android SDKs.
+ *
+ * Note: Session tracking may not work correctly when running Experiences in the main Expo app. It will work correctly if you create a standalone app.
+ */
+export namespace Amplitude {
+    /** Initializes Amplitude with your Amplitude API key. */
+    function initialize(apiKey: string): void;
+
+    /** Assign a user ID to the current user. If you don’t have a system for user IDs you don’t need to call this. */
+    function setUserId(userId: string): void;
+
+    /** Set properties for the current user. */
+    function setUserProperties(userProperties: HashMap): void;
+
+    /** Clear properties set by `setUserProperties()`. */
+    function clearUserProperties(): void;
+
+    /** Log an event to Amplitude. */
+    function logEvent(eventName: string): void;
+
+    /** Log an event to Amplitude with custom properties. */
+    function logEventWithProperties(
+        eventName: string,
+
+        /** A map of custom properties. */
+        properties: HashMap
+    ): void;
+
+    /** Add the current user to a group. */
+    function setGroup(
+        /** The group name, e.g. `'sports'`. */
+        groupType: string,
+
+        /** An array of group names, e.g. `['tennis', 'soccer']`. */
+        groupNames: string[]
+    ): void;
+}
+
+// #region AppLoading
+/** The following props are recommended, but optional for the sake of backwards compatibility (they were introduced in SDK21). If you do not provide any props, you are responsible for coordinating loading assets, handling errors, and updating state to unmount the `AppLoading` component. */
+export interface AppLoadingProps {
+    /** A `function` that returns a `Promise`. The `Promise` should resolve when the app is done loading data and assets. */
+    startAsync?: () => Promise<void>;
+
+    /** Required if you provide `startAsync`. Called when `startAsync` resolves or rejects. This should be used to set state and unmount the `AppLoading` component. */
+    onFinish?: () => void;
+
+    /** If `startAsync` throws an error, it is caught and passed into the function provided to `onError`. */
+    onError?: (error: Error) => void;
+}
+
+/**
+ * A React component that tells Expo to keep the app loading screen open if it is the first and only component rendered in your app. When it is removed, the loading screen will disappear and your app will be visible.
+ *
+ * This is incredibly useful to let you download and cache fonts, logo and icon images and other assets that you want to be sure the user has on their device for an optimal experience before rendering they start using the app.
+ */
+export class AppLoading extends Component<AppLoadingProps> { }
+// #endregion AppLoading
+
+/** This module provides an interface to Expo’s asset system. An asset is any file that lives alongside the source code of your app that the app needs at runtime. Examples include images, fonts and sounds. Expo’s asset system integrates with React Native’s, so that you can refer to files with require('path/to/file'). This is how you refer to static image files in React Native for use in an Image component, for example. */
+export class Asset {
+    constructor({ name, type, hash, uri, width, height }: {
+        name: string;
+        type: string;
+        hash: string;
+        uri: string;
+        width?: number;
+        height?: number;
+    });
+
+    /** The MD5 hash of the asset’s data. */
+    hash: Md5;
+
+    /** The name of the asset file without the extension. Also without the part from @ onward in the filename (used to specify scale factor for images). */
+    name: string;
+
+    /** The extension of the asset filename. */
+    type: string;
+
+    /** A URI that points to the asset’s data on the remote server. When running the published version of your app, this refers to the the location on Expo’s asset server where Expo has stored your asset. When running the app from XDE during development, this URI points to XDE’s server running on your computer and the asset is served directly from your computer. */
+    uri: string;
+
+    /** If the asset has been downloaded (by calling `downloadAsync()`), the `file://` URI pointing to the local file on the device that contains the asset data. */
+    localUri: string;
+
+    /** If the asset is an image, the width of the image data divided by the scale factor. The scale factor is the number after `@` in the filename, or `1` if not present. */
+    width?: number;
+
+    /** If the asset is an image, the height of the image data divided by the scale factor. The scale factor is the number after `@` in the filename, or `1` if not present. */
+    height?: number;
+
+    downloading: boolean;
+    downloaded: boolean;
+    downloadCallbacks: Array<{ resolve: () => any, reject: (e?: any) => any }>;
+
+    /** Downloads the asset data to a local file in the device’s cache directory. Once the returned promise is fulfilled without error, the localUri field of this asset points to a local file containing the asset data. The asset is only downloaded if an up-to-date local file for the asset isn’t already present due to an earlier download. */
+    downloadAsync(): Promise<void>;
+
+    /** Returns the `Expo.Asset` instance representing an asset given its module. */
+    static fromModule(module: RequireSource): Asset;
+
+    /**
+     * A helper that wraps `Expo.Asset.fromModule(module).downloadAsync` for convenience.
+     * @param moduleIds An array of `require('path/to/file')`. Can also be just one module without an Array.
+     */
+    static loadAsync(module: RequireSource[] | RequireSource): Promise<void>;
+}
+
+/**
+ * Provides basic sample playback and recording.
+ *
+ * Note that Expo does not yet support backgrounding, so audio is not available to play in the background of your experience. Audio also automatically stops if headphones / bluetooth audio devices are disconnected.
+ */
+export namespace Audio {
+    enum InterruptionModeIos {
+        /** This is the default option. If this option is set, your experience’s audio is mixed with audio playing in background apps. */
+        INTERRUPTION_MODE_IOS_MIX_WITH_OTHERS = 0,
+
+        /** If this option is set, your experience’s audio interrupts audio from other apps. */
+        INTERRUPTION_MODE_IOS_DO_NOT_MIX = 1,
+
+        /** If this option is set, your experience’s audio lowers the volume ("ducks") of audio from other apps while your audio plays. */
+        INTERRUPTION_MODE_IOS_DUCK_OTHERS = 2
+    }
+
+    const INTERRUPTION_MODE_IOS_MIX_WITH_OTHERS: 0;
+    const INTERRUPTION_MODE_IOS_DO_NOT_MIX: 1;
+    const INTERRUPTION_MODE_IOS_DUCK_OTHERS: 2;
+
+    enum InterruptionModeAndroid {
+        /** If this option is set, your experience’s audio interrupts audio from other apps. */
+        INTERRUPTION_MODE_ANDROID_DO_NOT_MIX = 1,
+
+        /** This is the default option. If this option is set, your experience’s audio lowers the volume ("ducks") of audio from other apps while your audio plays. */
+        INTERRUPTION_MODE_ANDROID_DUCK_OTHERS = 2
+    }
+
+    const INTERRUPTION_MODE_ANDROID_DO_NOT_MIX: 1;
+    const INTERRUPTION_MODE_ANDROID_DUCK_OTHERS: 2;
+
+    const RECORDING_OPTION_ANDROID_OUTPUT_FORMAT_DEFAULT: 0;
+    const RECORDING_OPTION_ANDROID_OUTPUT_FORMAT_THREE_GPP: 1;
+    const RECORDING_OPTION_ANDROID_OUTPUT_FORMAT_MPEG_4: 2;
+    const RECORDING_OPTION_ANDROID_OUTPUT_FORMAT_AMR_NB: 3;
+    const RECORDING_OPTION_ANDROID_OUTPUT_FORMAT_AMR_WB: 4;
+    const RECORDING_OPTION_ANDROID_OUTPUT_FORMAT_AAC_ADIF: 5;
+    const RECORDING_OPTION_ANDROID_OUTPUT_FORMAT_AAC_ADTS: 6;
+    const RECORDING_OPTION_ANDROID_OUTPUT_FORMAT_RTP_AVP: 7;
+    const RECORDING_OPTION_ANDROID_OUTPUT_FORMAT_MPEG2TS: 8;
+    const RECORDING_OPTION_ANDROID_OUTPUT_FORMAT_WEBM: 9;
+
+    const RECORDING_OPTION_ANDROID_AUDIO_ENCODER_DEFAULT: 0;
+    const RECORDING_OPTION_ANDROID_AUDIO_ENCODER_AMR_NB: 1;
+    const RECORDING_OPTION_ANDROID_AUDIO_ENCODER_AMR_WB: 2;
+    const RECORDING_OPTION_ANDROID_AUDIO_ENCODER_AAC: 3;
+    const RECORDING_OPTION_ANDROID_AUDIO_ENCODER_HE_AAC: 4;
+    const RECORDING_OPTION_ANDROID_AUDIO_ENCODER_AAC_ELD: 5;
+    const RECORDING_OPTION_ANDROID_AUDIO_ENCODER_VORBIS: 6;
+
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_LINEARPCM: 'lpcm';
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_AC3: 'ac-3';
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_60958AC3: 'cac3';
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_APPLEIMA4: 'ima4';
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_MPEG4AAC: 'aac ';
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_MPEG4CELP: 'celp';
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_MPEG4HVXC: 'hvxc';
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_MPEG4TWINVQ: 'twvq';
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_MACE3: 'MAC3';
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_MACE6: 'MAC6';
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_ULAW: 'ulaw';
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_ALAW: 'alaw';
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_QDESIGN: 'QDMC';
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_QDESIGN2: 'QDM2';
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_QUALCOMM: 'Qclp';
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_MPEGLAYER1: '.mp1';
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_MPEGLAYER2: '.mp2';
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_MPEGLAYER3: '.mp3';
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_APPLELOSSLESS: 'alac';
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_MPEG4AAC_HE: 'aach';
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_MPEG4AAC_LD: 'aacl';
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_MPEG4AAC_ELD: 'aace';
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_MPEG4AAC_ELD_SBR: 'aacf';
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_MPEG4AAC_ELD_V2: 'aacg';
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_MPEG4AAC_HE_V2: 'aacp';
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_MPEG4AAC_SPATIAL: 'aacs';
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_AMR: 'samr';
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_AMR_WB: 'sawb';
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_AUDIBLE: 'AUDB';
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_ILBC: 'ilbc';
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_DVIINTELIMA: 0x6d730011;
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_MICROSOFTGSM: 0x6d730031;
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_AES3: 'aes3';
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_ENHANCEDAC3: 'ec-3';
+
+    const RECORDING_OPTION_IOS_AUDIO_QUALITY_MIN: 0;
+    const RECORDING_OPTION_IOS_AUDIO_QUALITY_LOW: 0x20;
+    const RECORDING_OPTION_IOS_AUDIO_QUALITY_MEDIUM: 0x40;
+    const RECORDING_OPTION_IOS_AUDIO_QUALITY_HIGH: 0x60;
+    const RECORDING_OPTION_IOS_AUDIO_QUALITY_MAX: 0x7f;
+
+    const RECORDING_OPTION_IOS_BIT_RATE_STRATEGY_CONSTANT: 0;
+    const RECORDING_OPTION_IOS_BIT_RATE_STRATEGY_LONG_TERM_AVERAGE: 1;
+    const RECORDING_OPTION_IOS_BIT_RATE_STRATEGY_VARIABLE_CONSTRAINED: 2;
+    const RECORDING_OPTION_IOS_BIT_RATE_STRATEGY_VARIABLE: 3;
+
+    type RecordingStatus = {
+        canRecord: false,
+        isDoneRecording: false
+    } | {
+        canRecord: true,
+        isRecording: boolean,
+        durationMillis: number
+    } | {
+        canRecord: false,
+        isDoneRecording: true,
+        durationMillis: number
+    };
+
+    const RECORDING_OPTIONS_PRESET_HIGH_QUALITY: RecordingOptions;
+    const RECORDING_OPTIONS_PRESET_LOW_QUALITY: RecordingOptions;
+
+    interface RecordingOptions {
+        android: {
+            extension: string;
+            outputFormat: number;
+            audioEncoder: number;
+            sampleRate?: number;
+            numberOfChannels?: number;
+            bitRate?: number;
+            maxFileSize?: number;
+        };
+        ios: {
+            extension: string;
+            outputFormat?: string | number;
+            audioQuality: number;
+            sampleRate: number;
+            numberOfChannels: number;
+            bitRate: number;
+            bitRateStrategy?: number;
+            bitDepthHint?: number;
+            linearPCMBitDepth?: number;
+            linearPCMIsBigEndian?: boolean;
+            linearPCMIsFloat?: boolean;
+        };
+    }
+
+    interface AudioMode {
+        /** Boolean selecting if your experience’s audio should play in silent mode on iOS. This value defaults to `false`. */
+        playsInSilentModeIOS: boolean;
+
+        /** Boolean selecting if recording is enabled on iOS. This value defaults to `false`. NOTE: when this flag is set to true, playback may be routed to the phone receiver instead of to the speaker. */
+        allowsRecordingIOS: boolean;
+
+        /** Enum selecting how your experience’s audio should interact with the audio from other apps on iOS. */
+        interruptionModeIOS: InterruptionModeIos;
+
+        /** Boolean selecting if your experience’s audio should automatically be lowered in volume ("duck") if audio from another app interrupts your experience. This value defaults to true. If false, audio from other apps will pause your audio. */
+        shouldDuckAndroid: boolean;
+
+        /** an enum selecting how your experience’s audio should interact with the audio from other apps on Android: */
+        interruptionModeAndroid: InterruptionModeAndroid;
+    }
+
+    function setIsEnabledAsync(value: boolean): Promise<void>;
+    function setAudioModeAsync(mode: AudioMode): Promise<void>;
+
+    /** This class represents a sound corresponding to an Asset or URL. */
+    class Sound extends PlaybackObject {
+        constructor();
+
+        /**
+         * Creates and loads a sound from source, with optional `initialStatus`, `onPlaybackStatusUpdate`, and `downloadFirst`.
+         *
+         * @returns A `Promise` that is rejected if creation failed, or fulfilled with the following dictionary if creation succeeded:
+         * - `sound`: The newly created and loaded Sound object.
+         * - `status`: The PlaybackStatus of the Sound object. See the AV documentation for further information.
+         */
+        static create(
+            /**
+             * The source of the sound. The following forms are supported:
+             *
+             * - A dictionary of the form `{ uri: 'http://path/to/file' }` with a network URL pointing to an audio file on the web.
+             * - `require('path/to/file')` for an audio file asset in the source code directory.
+             * - An `Expo.Asset` object for an audio file asset.
+             */
+            source: PlaybackSource,
+
+            /** The initial intended PlaybackStatusToSet of the sound, whose values will override the default initial playback status. This value defaults to `{}` if no parameter is passed. */
+            initialStatus?: PlaybackStatusToSet,
+
+            /** A function taking a single parameter PlaybackStatus. This value defaults to `null` if no parameter is passed. */
+            onPlaybackStatusUpdate?: ((status: PlaybackStatus) => void) | null,
+
+            /** If set to true, the system will attempt to download the resource to the device before loading. This value defaults to `true`. Note that at the moment, this will only work for `source`s of the form `require('path/to/file')` or `Asset` objects. */
+            downloadFirst?: boolean
+        ): Promise<{ sound: Sound, status: PlaybackStatus }>;
+    }
+
+    class Recording {
+        constructor();
+
+        /** Gets the `status` of the `Recording`. */
+        getStatusAsync(): Promise<RecordingStatus>;
+
+        /** Sets a function to be called regularly with the `status` of the `Recording`. */
+        setOnRecordingStatusUpdate(onRecordingStatusUpdate?: (status: RecordingStatus) => void): void;
+
+        /** Sets the interval with which onRecordingStatusUpdate is called while the recording can record. This value defaults to 500 milliseconds. */
+        setProgressUpdateInterval(progressUpdateIntervalMillis: number): void;
+
+        /** Loads the recorder into memory and prepares it for recording. This must be called before calling `startAsync()`. This method can only be called if the `Recording` instance has never yet been prepared. */
+        prepareToRecordAsync(
+            /** Options for the recording, including sample rate, bitrate, channels, format, encoder, and extension. If no options are passed to `prepareToRecordAsync()`, the recorder will be created with options `Expo.Audio.RECORDING_OPTIONS_PRESET_LOW_QUALITY`. */
+            options?: RecordingOptions
+        ): Promise<RecordingStatus>;
+
+        /** Begins recording. This method can only be called if the `Recording` has been prepared. */
+        startAsync(): Promise<RecordingStatus>;
+
+        /**
+         * Pauses recording. This method can only be called if the Recording has been prepared.
+         *
+         * NOTE: This is only available on Android API version 24 and later.
+         */
+        pauseAsync(): Promise<RecordingStatus>;
+
+        /** Stops the recording and deallocates the recorder from memory. This reverts the Recording instance to an unprepared state, and another Recording instance must be created in order to record again. This method can only be called if the `Recording` has been prepared. */
+        stopAndUnloadAsync(): Promise<RecordingStatus>;
+
+        /**
+         * Gets the local URI of the Recording. Note that this will only succeed once the Recording is prepared to record.
+         *
+         * @returns A string with the local URI of the `Recording`, or `null` if the `Recording` is not prepared to record.
+         */
+        getURI(): string | null | undefined;
+
+        /**
+         * Creates and loads a new `Sound` object to play back the `Recording`. Note that this will only succeed once the `Recording` is done recording (once `stopAndUnloadAsync()` has been called).
+         *
+         * @returns A Promise that is rejected if creation failed, or fulfilled with the following dictionary if creation succeeded:
+         * - `sound`: the newly created and loaded Sound object.
+         * - `status`: the PlaybackStatus of the Sound object.
+         */
+        createNewLoadedSound(
+            /** The initial intended `PlaybackStatusToSet` of the sound, whose values will override the default initial playback status. This value defaults to `{}` if no parameter is passed. */
+            initialStatus?: PlaybackStatusToSet,
+
+            /** A function taking a single parameter `PlaybackStatus`. This value defaults to `null` if no parameter is passed. */
+            onPlaybackStatusUpdate?: ((status: PlaybackStatus) => void) | null
+        ): Promise<{ sound: Sound, status: PlaybackStatus }>;
+    }
+}
+
+/**
+ * AuthSession
+ */
+export namespace AuthSession {
+    type StartAsyncResponse = {
+        type: 'cancel';
+    } | {
+        type: 'dismissed';
+    } | {
+        type: 'success';
+        params: HashMap;
+        event: HashMap;
+    } | {
+        type: 'error';
+        params: HashMap;
+        errorCode: string;
+        event: HashMap;
+    };
+
+    function startAsync(options: { authUrl: string; returnUrl?: string; }): Promise<StartAsyncResponse>;
+    function dismiss(): void;
+    function getRedirectUrl(): string;
+}
+
+// #region AV
+/**
+ * AV
+ */
+export type PlaybackStatus = {
+    isLoaded: false;
+    androidImplementation?: string;
+
+    /** Populated exactly once when an error forces the object to unload. */
+    error?: string;
+} | {
+    isLoaded: true;
+    androidImplementation?: string;
+    uri: string;
+    progressUpdateIntervalMillis: number;
+    durationMillis?: number;
+    positionMillis: number;
+    playableDurationMillis?: number;
+    shouldPlay: boolean;
+    isPlaying: boolean;
+    isBuffering: boolean;
+    rate: number;
+    shouldCorrectPitch: boolean;
+    volume: number;
+    isMuted: boolean;
+    isLooping: boolean;
+
+    /** True exactly once when the track plays to finish. */
+    didJustFinish: boolean;
+};
+
+export interface PlaybackStatusToSet {
+    androidImplementation?: string;
+    isLooping?: boolean;
+    isMuted?: boolean;
+    positionMillis?: number;
+    progressUpdateIntervalMillis?: number;
+    /** The desired playback rate of the media. This value must be between `0.0` and `32.0`. Only available on Android API version 23 and later and iOS. */
+    rate?: number;
+    shouldCorrectPitch?: boolean;
+    shouldPlay?: boolean;
+    /** A number between `0.0` (silence) and `1.0` (maximum volume). */
+    volume?: number;
+}
+
+export type PlaybackSource = RequireSource | { uri: string } | Asset;
+
+export class PlaybackObject {
+    /**
+     * Gets the `PlaybackStatus` of the `playbackObject`.
+     *
+     * Returns a `Promise` that is fulfilled with the `PlaybackStatus` of the `playbackObject`.
+     */
+    getStatusAsync(): Promise<PlaybackStatus>;
+
+    /**
+     * Loads the media from source into memory and prepares it for playing. This must be called before calling setStatusAsync() or any of the convenience set status methods. This method can only be called if the playbackObject is in an unloaded state.
+     *
+     * Returns a `Promise` that is fulfilled with the `PlaybackStatus` of the `playbackObject` once it is loaded, or rejects if loading failed. The `Promise` will also reject if the `playbackObject` was already loaded. See below for details on `PlaybackStatus`.
+     */
+    loadAsync(
+        /**
+         * The source of the media. The following forms are supported:
+         * - A dictionary of the form `{ uri: 'http://path/to/file' }` with a network URL pointing to a media file on the web.
+         * - `require('path/to/file')` for a media file asset in the source code directory.
+         * - An `Expo.Asset object` for a media file asset.
+         */
+        source: PlaybackSource,
+
+        /** The initial intended `PlaybackStatusToSet` of the `playbackObject`, whose values will override the default initial playback status. This value defaults to `{}` if no parameter is passed. See below for details on `PlaybackStatusToSet` and the default initial playback status. */
+        initialStatus?: PlaybackStatusToSet,
+
+        /** If set to `true`, the system will attempt to download the resource to the device before loading. This value defaults to true. Note that at the moment, this will only work for sources of the form `require('path/to/file')` or `Expo.Asset` objects. */
+        downloadFirst?: boolean
+    ): Promise<PlaybackStatus>;
+
+    /** This is equivalent to `playbackObject.setStatusAsync({ shouldPlay: false })`. */
+    pauseAsync(): Promise<PlaybackStatus>;
+
+    /**
+     * This is equivalent to `playbackObject.setStatusAsync({ shouldPlay: true })`.
+     *
+     * Playback may not start immediately after calling this function for reasons such as buffering. Make sure to update your UI based on the `isPlaying` and `isBuffering` properties of the `PlaybackStatus`.
+     */
+    playAsync(): Promise<PlaybackStatus>;
+
+    /**
+     * This is equivalent to `playbackObject.setStatusAsync({ shouldPlay: true, positionMillis: millis })`.
+     *
+     * Playback may not start immediately after calling this function for reasons such as buffering. Make sure to update your UI based on the isPlaying and `isBuffering` properties of the `PlaybackStatus`.
+     */
+    playFromPositionAsync(
+        /** The desired position of playback in milliseconds. */
+        positionMillis: number,
+
+        /** This is equivalent to `playbackObject.setStatusAsync({ positionMillis: millis, seekMillisToleranceBefore: toleranceMillisBefore, seekMillisToleranceAfter: toleranceMillisAfter })`. The tolerances are used only on iOS. */
+        tolerances?: {
+            toleranceMillisBefore: number,
+            toleranceMillisAfter: number
+        }
+    ): Promise<PlaybackStatus>;
+
+    /**
+     * Replays the item. When using `playFromPositionAsync(0)` the item is seeked to the position at `0` ms. On iOS this method uses internal implementation of the player and is able to play the item from the beginning immediately.
+     *
+     * Returns a `Promise` that is fulfilled with the `PlaybackStatus` of the `playbackObject` once the new status has been set successfully, or rejects if setting the new status failed.
+     */
+    replayAsync(
+        /** The new `PlaybackStatusToSet` of the `playbackObject`, whose values will override the current playback status. */
+        status: PlaybackStatusToSet
+    ): Promise<PlaybackStatus>;
+
+    /** This is equivalent to `playbackObject.setStatusAsync({ isLooping: value })`. */
+    setIsLoopingAsync(
+        /** A boolean describing if the media should play once (`false`) or loop indefinitely (`true`). */
+        isLooping: boolean
+    ): Promise<PlaybackStatus>;
+
+    /** This is equivalent to `playbackObject.setStatusAsync({ isMuted: value })`. */
+    setIsMutedAsync(
+        /**  A boolean describing if the audio of this media should be muted. */
+        isMuted: boolean
+    ): Promise<PlaybackStatus>;
+
+    /**
+     * Sets a function to be called regularly with the `PlaybackStatus` of the `playbackObject`. See below for details on `PlaybackStatus` and an example use case of this function.
+     *
+     * `onPlaybackStatusUpdate` will be called whenever a call to the API for this `playbackObject` completes (such as `setStatusAsync()`, `getStatusAsync()`, or `unloadAsync()`), and will also be called at regular intervals while the media is in the loaded state. Set `progressUpdateIntervalMillis` via `setStatusAsync()` or `setProgressUpdateIntervalAsync()` to modify the interval with which `onPlaybackStatusUpdate` is called while loaded.
+     */
+    setOnPlaybackStatusUpdate(
+        /** A function taking a single parameter `PlaybackStatus`. */
+        onPlaybackStatusUpdate?: (status: PlaybackStatus) => void
+    ): void;
+
+    /** This is equivalent to `playbackObject.setStatusAsync({ positionMillis: millis })`. */
+    setPositionAsync(
+        positionMillis: number,
+
+        /** This is equivalent to `playbackObject.setStatusAsync({ positionMillis: millis, seekMillisToleranceBefore: toleranceMillisBefore, seekMillisToleranceAfter: toleranceMillisAfter })`. The tolerances are used only on iOS. */
+        tolerances?: {
+            toleranceMillisBefore: number,
+            toleranceMillisAfter: number
+        }
+    ): Promise<PlaybackStatus>;
+
+    /** This is equivalent to `playbackObject.setStatusAsync({ progressUpdateIntervalMillis: millis })`. */
+    setProgressUpdateIntervalAsync(
+        /** The new minimum interval in milliseconds between calls of `onPlaybackStatusUpdate`. */
+        progressUpdateIntervalMillis: number
+    ): Promise<PlaybackStatus>;
+
+    /** This is equivalent to `playbackObject.setStatusAsync({ rate: value, shouldCorrectPitch: shouldCorrectPitch })`. */
+    setRateAsync(
+        /** The desired playback rate of the media. This value must be between `0.0` and `32.0`. Only available on Android API version 23 and later and iOS. */
+        rate: number,
+        /** A boolean describing if we should correct the pitch for a changed rate. If set to `true`, the pitch of the audio will be corrected (so a rate different than `1.0` will timestretch the audio). */
+        shouldCorrectPitch: boolean
+    ): Promise<PlaybackStatus>;
+
+    /** Sets a new `PlaybackStatusToSet` on the `playbackObject`. This method can only be called if the media has been loaded. Return a `Promise` that is fulfilled with the `PlaybackStatus` of the `playbackObject` once the new status has been set successfully, or rejects if setting the new status failed. */
+    setStatusAsync(
+        /** The new `PlaybackStatusToSet` of the `playbackObject`, whose values will override the current playback status. */
+        status: PlaybackStatusToSet
+    ): Promise<PlaybackStatus>;
+
+    /** This is equivalent to `playbackObject.setStatusAsync({ volume: value })`. */
+    setVolumeAsync(
+        /** A number between `0.0` (silence) and `1.0` (maximum volume). */
+        volume: number
+    ): Promise<PlaybackStatus>;
+
+    /** This is equivalent to `playbackObject.setStatusAsync({ shouldPlay: false, positionMillis: 0 })`. */
+    stopAsync(): Promise<PlaybackStatus>;
+
+    /**
+     * Unloads the media from memory. `loadAsync()` must be called again in order to be able to play the media.
+     *
+     * Returns a `Promise` that is fulfilled with the `PlaybackStatus` of the `playbackObject` once it is unloaded, or rejects if unloading failed. See below for details on `PlaybackStatus`.
+     */
+    unloadAsync(): Promise<PlaybackStatus>;
+}
+// #endregion
+
+// #region BarCodeScanner
+/**
+ * BarCodeScanner
+ */
+export interface BarCodeScannerProps extends ViewProps {
+    type?: 'front' | 'back';
+    torchMode?: 'on' | 'off';
+    barCodeTypes?: string[];
+    onBarCodeRead?: BarCodeReadCallback;
+}
+
+export class BarCodeScanner extends Component<BarCodeScannerProps> {
+    static Constants: {
+        TorchMode: {
+            on: string;
+            off: string
+        }
+    } & CameraConstants;
+}
+// #endregion
+
+// #region BlurView
+/**
+ * BlurView
+ */
+export interface BlurViewProps extends ViewProps {
+    tint: 'light' | 'default' | 'dark';
+    intensity: number;
+}
+export class BlurView extends Component<BlurViewProps> { }
+// #endregion
+
+/**
+ * An API to get and set screen brightness.
+ */
+export namespace Brightness {
+    /** Sets screen brightness. */
+    function setBrightnessAsync(
+        /** A number between `0` and `1`, representing the desired screen brightness. */
+        brightnessValue: number
+    ): Promise<void>;
+
+    /**
+     * Gets screen brightness.
+     * @returns A Promise that is resolved with a number between `0` and `1`, representing the current screen brightness.
+     */
+    function getBrightnessAsync(): Promise<number>;
+
+    /**
+     * Gets global system screen brightness.
+     * @returns A Promise that is resolved with a number between `0` and `1`, representing the current system screen brightness.
+     */
+    function getSystemBrightnessAsync(): Promise<number>;
+
+    /** Sets global system screen brightness, requires `WRITE_SETTINGS` permissions on Android. */
+    function setSystemBrightnessAsync(
+        /** A number between `0` and `1`, representing the desired screen brightness. */
+        brightnessValue: number
+    ): Promise<void>;
+}
+
+// #region Camera
+/**
+ * Camera
+ */
+export interface PictureOptions {
+    quality?: number;
+    base64?: boolean;
+    exif?: boolean;
+    onPictureSaved?: (data: PictureResponse) => void;
+}
+
+export interface PictureResponse {
+    uri: string;
+    width: number;
+    height: number;
+    exif: string;
+    base64: string;
+}
+
+export interface RecordingOptions {
+    quality?: string | number;
+    maxDuration?: number;
+    maxFileSize?: number;
+}
+
+export class CameraObject {
+    takePictureAsync(options?: PictureOptions): Promise<PictureResponse>;
+    recordAsync(options: RecordingOptions): Promise<{ uri: string; }>;
+    stopRecording(): void;
+    getSupportedRatiosAsync(): Promise<string[]>; // Android only
+}
+
+export interface CameraProps extends ViewProps {
+    autoFocus?: string | number | boolean;
+    barCodeTypes?: Array<string | number>;
+    faceDetectionClassifications?: number;
+    faceDetectionLandmarks?: number;
+    faceDetectionMode?: number;
+    flashMode?: string | number;
+    /** Distance to plane of sharpest focus. A value between `0` and `1`. `0`: infinity focus, `1`: focus as close as possible. Default: `0`. For Android this is available only for some devices and when `useCamera2Api` is set to `true`. */
+    focusDepth?: number;
+    onBarCodeRead?: BarCodeReadCallback;
+    onCameraReady?: () => void;
+    onFacesDetected?: (options: { faces: TrackedFaceFeature[] }) => void;
+    onMountError?: () => void;
+    ratio?: string;
+    ref?: Ref<CameraObject>;
+    type?: string | number;
+    whiteBalance?: string | number;
+    /** A value between `0` and `1` being a percentage of device's max zoom. `0`: not zoomed, `1`: maximum zoom. Default: `0`. */
+    zoom?: number;
+}
+
+export interface CameraConstants {
+    readonly Type: {
+        back: string;
+        front: string;
+    };
+    readonly FlashMode: {
+        on: string;
+        off: string;
+        auto: string;
+        torch: string;
+    };
+    readonly AutoFocus: {
+        on: string;
+        off: string;
+    };
+    readonly WhiteBalance: {
+        auto: string;
+        sunny: string;
+        cloudy: string;
+        shadow: string;
+        fluorescent: string;
+        incandescent: string;
+    };
+    readonly VideoQuality: {
+        [videoQuality: string]: number;
+    };
+    readonly BarCodeType: {
+        aztec: string;
+        codabar: string;
+        code39: string;
+        code93: string;
+        code128: string;
+        code138: string;
+        code39mod43: string;
+        datamatrix: string;
+        ean13: string;
+        ean8: string;
+        interleaved2of5: string;
+        itf14: string;
+        maxicode: string;
+        pdf417: string;
+        rss14: string;
+        rssexpanded: string;
+        upc_a: string;
+        upc_e: string;
+        upc_ean: string;
+        qr: string;
+    };
+}
+
+export class Camera extends Component<CameraProps> {
+    static readonly Constants: CameraConstants;
+}
+// #endregion
+
+/**
+ * Constants
+ */
+export namespace Constants {
+    const appOwnership: 'expo' | 'standalone' | 'guest';
+    const expoVersion: string;
+    const installationId: string;
+    const deviceId: string;
+    const deviceName: string;
+    const deviceYearClass: number;
+    const isDevice: boolean;
+
+    interface Platform {
+        ios?: {
+            platform: string;
+            model: string;
+            userInterfaceIdiom: string;
+            buildNumber: string;
+        };
+        android?: {
+            versionCode: string;
+        };
+    }
+    const platform: Platform;
+    const sessionId: string;
+    const statusBarHeight: number;
+    const systemFonts: string[];
+
+    interface Manifest {
+        name: string;
+        description?: string;
+        slug?: string;
+        sdkVersion?: string;
+        version?: string;
+        orientation?: Orientation;
+        primaryColor?: string;
+        privacy?: 'public' | 'unlisted';
+        scheme?: string;
+        icon?: string;
+        platforms?: string[];
+        githubUrl?: string;
+        notification?: {
+            icon?: string,
+            color?: string,
+            androidMode?: 'default' | 'collapse',
+            androidCollapsedTitle?: string
+        };
+        loading?: {
+            icon?: string,
+            exponentIconColor?: 'white' | 'blue',
+            exponentIconGrayscale?: 1 | 0,
+            backgroundImage?: string,
+            backgroundColor?: string,
+            hideExponentText?: boolean
+        };
+        appKey?: string;
+        androidStatusBar?: {
+            barStyle?: 'light-content' | 'dark-content',
+            backgroundColor?: string
+        };
+        androidShowExponentNotificationInShellApp?: boolean;
+        extra?: {
+            [propName: string]: any
+        };
+        rnCliPath?: any;
+        entryPoint?: string;
+        packagerOpts?: {
+            hostType?: string,
+            dev?: boolean,
+            strict?: boolean,
+            minify?: boolean,
+            urlType?: string,
+            urlRandomness?: string,
+            lanType?: string,
+            [propName: string]: any
+        };
+        ignoreNodeModulesValidation?: any;
+        nodeModulesPath?: string;
+        ios?: {
+            bundleIdentifier?: string,
+            buildNumber?: string,
+            config?: {
+                usesNonExemptEncryption?: boolean,
+                googleSignIn?: {
+                    reservedClientId: string
+                }
+            },
+            supportsTablet?: boolean,
+            infoPlist?: any
+        };
+        android?: {
+            package?: string,
+            versionCode?: string,
+            config?: {
+                fabric?: {
+                    apiKey: string,
+                    buildSecret: string
+                },
+                googleMaps?: {
+                    apiKey: string
+                },
+                googleSignIn?: {
+                    apiKey: string,
+                    certificateHash: string
+                }
+            }
+        };
+        facebookScheme?: any;
+        facebookAppId?: string;
+        facebookDisplayName?: string;
+        splash?: {
+            backgroundColor?: string;
+            resizeMode?: ResizeModeContain | ResizeModeCover;
+            image?: string;
+        };
+        assetBundlePatterns?: string[];
+        releaseChannel: string;
+        [propName: string]: any;
+    }
+    const manifest: Manifest;
+    const linkingUri: string;
+
+    function getWebViewUserAgentAsync(): Promise<string>;
+}
+
+/**
+ * Contacts
+ */
+export namespace Contacts {
+    type PhoneNumbers = 'phoneNumbers';
+    type Emails = 'emails';
+    type Addresses = 'addresses';
+    type Image = 'image';
+    type Thumbnail = 'thumbnail';
+    type Note = 'note';
+    type Birthday = 'birthday';
+    type NonGregorianBirthday = 'nonGregorianBirthday';
+    type NamePrefix = 'namePrefix';
+    type NameSuffix = 'nameSuffix';
+    type PhoneticFirstName = 'phoneticFirstName';
+    type PhoneticMiddleName = 'phoneticMiddleName';
+    type PhoneticLastName = 'phoneticLastName';
+    type SocialProfiles = 'socialProfiles';
+    type InstantMessageAddresses = 'instantMessageAddresses';
+    type UrlAddresses = 'urlAddresses';
+    type Dates = 'dates';
+    type Relationships = 'relationships';
+
+    const PHONE_NUMBERS: PhoneNumbers;
+    const EMAILS: Emails;
+    const ADDRESSES: Addresses;
+    const IMAGE: Image;
+    const THUMBNAIL: Thumbnail;
+    const NOTE: Note;
+    const BIRTHDAY: Birthday;
+    const NON_GREGORIAN_BIRTHDAY: NonGregorianBirthday;
+    const NAME_PREFIX: NamePrefix;
+    const NAME_SUFFIX: NameSuffix;
+    const PHONETIC_FIRST_NAME: PhoneticFirstName;
+    const PHONETIC_MIDDLE_NAME: PhoneticMiddleName;
+    const PHONETIC_LAST_NAME: PhoneticLastName;
+    const SOCIAL_PROFILES: SocialProfiles;
+    const IM_ADDRESSES: InstantMessageAddresses;
+    const URLS: UrlAddresses;
+    const DATES: Dates;
+    const RELATIONSHIPS: Relationships;
+
+    type FieldType = PhoneNumbers | Emails | Addresses | Image | Thumbnail |
+        Note | Birthday | NonGregorianBirthday | NamePrefix | NameSuffix |
+        PhoneticFirstName | PhoneticMiddleName | PhoneticLastName | SocialProfiles |
+        InstantMessageAddresses | UrlAddresses | Dates | Relationships;
+
+    interface Options {
+        pageSize?: number;
+        pageOffset?: number;
+        fields?: FieldType[];
+    }
+
+    interface Contact {
+        id: string;
+        contactType: string;
+        name: string;
+        firstName?: string;
+        middleName?: string;
+        lastName?: string;
+        previousLastName?: string;
+        namePrefix?: string;
+        nameSuffix?: string;
+        nickname?: string;
+        phoneticFirstName?: string;
+        phoneticMiddleName?: string;
+        phoneticLastName?: string;
+        emails?: Array<{
+            email?: string;
+            primary?: boolean;
+            label: string;
+            id: string;
+        }>;
+        phoneNumbers?: Array<{
+            number?: string;
+            primary?: boolean;
+            digits?: string;
+            countryCode?: string;
+            label: string;
+            id: string;
+        }>;
+        addresses?: Array<{
+            street?: string;
+            city?: string;
+            country?: string;
+            region?: string;
+            neighborhood?: string;
+            postalCode?: string;
+            poBox?: string;
+            isoCountryCode?: string;
+            label: string;
+            id: string;
+        }>;
+        socialProfiles?: Array<{
+            service?: string;
+            localizedProfile?: string;
+            url?: string;
+            username?: string;
+            userId?: string;
+            label: string;
+            id: string;
+        }>;
+        instantMessageAddresses?: Array<{
+            service?: string;
+            username?: string;
+            localizedService?: string;
+            label: string;
+            id: string;
+        }>;
+        urls?: {
+            label: string;
+            url?: string;
+            id: string;
+        };
+        company?: string;
+        jobTitle?: string;
+        department?: string;
+        imageAvailable?: boolean;
+        image?: {
+            uri?: string;
+        };
+        thumbnail?: {
+            uri?: string;
+        };
+        note?: string;
+        dates?: Array<{
+            day?: number;
+            month?: number;
+            year?: number;
+            id: string;
+            label: string;
+        }>;
+        relationships?: Array<{
+            label: string;
+            name?: string;
+            id: string;
+        }>;
+    }
+
+    interface Response {
+        data: Contact[];
+        total: number;
+        hasNextPage: boolean;
+        hasPreviousPage: boolean;
+    }
+
+    function getContactsAsync(options: Options): Promise<Response>;
+    function getContactByIdAsync(options: { id?: string; fields?: FieldType[] }): Promise<Contact>;
+}
+
+/**
+ * DocumentPicker
+ */
+export namespace DocumentPicker {
+    interface Options {
+        type?: string;
+    }
+
+    type Response = {
+        type: 'success';
+        uri: string;
+        name: string;
+        size: number;
+    } | {
+        type: 'cancel';
+    };
+
+    function getDocumentAsync(options?: Options): Promise<Response>;
+}
+
+/**
+ * ErrorRecovery
+ */
+export namespace ErrorRecovery {
+    function setRecoveryProps(props: HashMap): void;
+}
+
+/**
+ * Facebook
+ */
+export namespace Facebook {
+    interface Options {
+        permissions?: string[];
+        behavior?: 'web' | 'native' | 'browser' | 'system';
+    }
+    interface Response {
+        type: 'cancel' | 'success';
+        token?: string;
+        expires?: number;
+    }
+    function logInWithReadPermissionsAsync(appId: string, options?: Options): Promise<Response>;
+}
+
+/**
+ * Facebook Ads
+ */
+export namespace FacebookAds {
+    /**
+     * Interstitial Ads
+     */
+    namespace InterstitialAdManager {
+        function showAd(placementId: string): Promise<boolean>;
+    }
+
+    /**
+     * Native Ads
+     */
+    type MediaCachePolicy = 'none' | 'icon' | 'image' | 'all';
+    class NativeAdsManager {
+        constructor(placementId: string, numberOfAdsToRequest?: number);
+        disableAutoRefresh(): void;
+        setMediaCachePolicy(cachePolicy: MediaCachePolicy): void;
+    }
+
+    function withNativeAd(component: Component<{
+        icon?: string;
+        coverImage?: string;
+        title?: string;
+        subtitle?: string;
+        description?: string;
+        callToActionText?: string;
+        socialContext?: string;
+    }>): Component<{ adsManager: NativeAdsManager }, { ad: any, canRequestAds: boolean }>;
+
+    /**
+     * Banner View
+     */
+    type AdType = 'large' | 'rectangle' | 'standard';
+
+    interface BannerViewProps {
+        type: AdType;
+        placementId: string;
+        onPress: () => void;
+        onError: () => void;
+    }
+
+    class BannerView extends Component<BannerViewProps> { }
+
+    /**
+     * Ad Settings
+     */
+    namespace AdSettings {
+        const currentDeviceHash: string;
+        function addTestDevice(device: string): void;
+        function clearTestDevices(): void;
+        type SDKLogLevel = 'none' | 'debug' | 'verbose' | 'warning' | 'error' | 'notification';
+        function setLogLevel(logLevel: SDKLogLevel): void;
+        function setIsChildDirected(isDirected: boolean): void;
+        function setMediationService(mediationService: string): void;
+        function setUrlPrefix(urlPrefix: string): void;
+    }
+}
+
+/**
+ * FaceDetector
+ */
+export interface Point {
+    x: Axis;
+    y: Axis;
+}
+
+export interface FaceFeature {
+    bounds: {
+        size: {
+            width: number;
+            height: number;
+        },
+        origin: Point;
+    };
+    smilingProbability?: number;
+    leftEarPosition?: Point;
+    rightEarPosition?: Point;
+    leftEyePosition?: Point;
+    leftEyeOpenProbability?: number;
+    rightEyePosition?: Point;
+    rightEyeOpenProbability?: number;
+    leftCheekPosition?: Point;
+    rightCheekPosition?: Point;
+    leftMouthPosition?: Point;
+    mouthPosition?: Point;
+    rightMouthPosition?: Point;
+    bottomMouthPosition?: Point;
+    noseBasePosition?: Point;
+    yawAngle?: number;
+    rollAngle?: number;
+}
+
+export interface TrackedFaceFeature extends FaceFeature {
+    faceID?: number;
+}
+
+export namespace FaceDetector {
+    interface DetectFaceResult {
+        faces: FaceFeature[];
+        image: {
+            uri: string;
+            width: number;
+            height: number;
+            orientation: number;
+        };
+    }
+    interface Mode {
+        fast: 'fast';
+        accurate: 'accurate';
+    }
+    interface _Shared {
+        all: 'all';
+        none: 'none';
+    }
+    type Landmarks = _Shared;
+    type Classifications = _Shared;
+    interface _Constants {
+        Mode: Mode;
+        Landmarks: Landmarks;
+        Classifications: Classifications;
+    }
+
+    const Constants: _Constants;
+
+    interface DetectionOptions {
+        mode?: keyof Mode;
+        detectLandmarks?: keyof Landmarks;
+        runClassifications?: keyof Classifications;
+    }
+
+    function detectFaces(uri: string, options?: DetectionOptions): Promise<DetectFaceResult>;
+}
+/**
+ * FileSystem
+ */
+export namespace FileSystem {
+    type FileInfo = {
+        exists: true;
+        isDirectory: boolean;
+        uri: string;
+        size: number;
+        modificationTime: number;
+        md5?: Md5;
+    } | {
+        exists: false;
+        isDirectory: false;
+    };
+
+    interface DownloadResult {
+        uri: string;
+        status: number;
+        headers: { [name: string]: string };
+        md5?: Md5;
+    }
+
+    const documentDirectory: string;
+    const cacheDirectory: string;
+
+    function getInfoAsync(fileUri: string, options?: { md5?: string, size?: boolean; }): Promise<FileInfo>;
+    function readAsStringAsync(fileUri: string): Promise<string>;
+    function writeAsStringAsync(fileUri: string, contents: string): Promise<void>;
+    function deleteAsync(fileUri: string, options?: { idempotent: boolean; }): Promise<void>;
+    function moveAsync(options: { from: string, to: string; }): Promise<void>;
+    function copyAsync(options: { from: string, to: string; }): Promise<void>;
+    function makeDirectoryAsync(dirUri: string, options?: { intermediates: boolean }): Promise<void>;
+    function readDirectoryAsync(dirUri: string): Promise<string[]>;
+    function downloadAsync(uri: string, fileUri: string, options?: { md5?: boolean; }): Promise<DownloadResult>;
+    function createDownloadResumable(
+        uri: string,
+        fileUri: string,
+        options?: DownloadOptions,
+        callback?: (totalBytesWritten: number, totalBytesExpectedToWrite: number) => void,
+        resumeData?: string | null
+    ): DownloadResumable;
+
+    interface PauseResult {
+        url: string;
+        fileUri: string;
+        options: { md5: boolean; };
+        resumeData: string;
+    }
+
+    interface DownloadOptions {
+        md5?: boolean;
+        headers?: { [name: string]: string };
+    }
+
+    interface DownloadProgressData {
+        totalBytesWritten: number;
+        totalBytesExpectedToWrite: number;
+    }
+
+    type DownloadProgressCallback = (data: DownloadProgressData) => void;
+
+    class DownloadResumable {
+        constructor(
+            url: string,
+            fileUri: string,
+            options: DownloadOptions,
+            callback?: DownloadProgressCallback,
+            resumeData?: string
+        );
+
+        downloadAsync(): Promise<DownloadResult>;
+        pauseAsync(): Promise<PauseResult>;
+        resumeAsync(): Promise<DownloadResult>;
+        savable(): PauseResult;
+    }
+}
+
+/** Use TouchID/FaceID (iOS) or the Fingerprint API (Android) to authenticate the user with a fingerprint scan. */
+export namespace LocalAuthentication {
+    type LocalAuthenticationResult = {
+        success: true
+    } | {
+        success: false,
+
+        /** Error code in the case where authentication fails. */
+        error: string
+    };
+
+    /** Determine whether a face or fingerprint scanner is available on the device. */
+    function hasHardwareAsync(): Promise<boolean>;
+
+    /** Determine whether the device has saved fingerprints or facial data to use for authentication. */
+    function isEnrolledAsync(): Promise<boolean>;
+
+    /**
+     * Attempts to authenticate via Fingerprint. Android: When using the fingerprint module on Android, you need to provide a UI component to prompt the user to scan their fingerprint, as the OS has no default alert for it.
+     *
+     * @param promptMessage A message that is shown alongside the TouchID/FaceID prompt. (iOS only)
+     */
+    function authenticateAsync(promptMessageIOS?: string): Promise<LocalAuthenticationResult>;
+
+    /** Cancels the fingerprint authentication flow. (Android only) */
+    function cancelAuthenticate(): void;
+}
+
+/**
+ * Font
+ */
+export namespace Font {
+    interface FontMap {
+        [name: string]: RequireSource;
+    }
+
+    function loadAsync(name: string, url: string): Promise<void>;
+    function loadAsync(map: FontMap): Promise<void>;
+}
+
+// #region GLView
+export interface ExpoWebGLRenderingContext extends WebGLRenderingContext {
+    endFrameEXP(): void;
+}
+
+/**
+ * A View that acts as an OpenGL ES render target. On mounting, an OpenGL ES
+ * context is created. Its drawing buffer is presented as the contents of
+ * the View every frame.
+ */
+export interface GLViewProps extends ViewProps {
+    /**
+     * A function that will be called when the OpenGL ES context is created.
+     * Passes an object with a WebGLRenderingContext interface as an argument.
+     */
+    onContextCreate(gl: ExpoWebGLRenderingContext): void;
+
+    /** Number of MSAA samples to use on iOS. Defaults to 4. Ignored on Android. */
+    msaaSamples?: number;
+}
+
+export class GLView extends Component<GLViewProps, { msaaSamples: number }> { }
+// #endregion
+
+/**
+ * Google
+ */
+export namespace Google {
+    interface LogInConfig {
+        androidClientId?: string;
+        androidStandaloneAppClientId?: string;
+        iosClientId?: string;
+        iosStandaloneAppClientId?: string;
+        webClientId?: string;
+        behavior?: 'system' | 'web';
+        scopes?: string[];
+    }
+
+    type LogInResult = {
+        type: 'cancel';
+    } | {
+        type: 'success';
+        accessToken: string;
+        idToken?: string;
+        refreshToken?: string;
+        serverAuthCode?: string;
+        user: {
+            id: string;
+            name: string;
+            givenName: string;
+            familyName: string;
+            photoUrl?: string;
+            email?: string;
+        }
+    };
+
+    function logInAsync(config: LogInConfig): Promise<LogInResult>;
+}
+
+/** Access the device gyroscope sensor to respond to changes in rotation in 3d space. */
+export namespace Gyroscope {
+    interface GyroscopeObject {
+        x: Axis;
+        y: Axis;
+        z: Axis;
+    }
+
+    /** A callback that is invoked when an gyroscope update is available. */
+    function addListener(listener: (obj: GyroscopeObject) => any): EventSubscription;
+
+    /** Remove all listeners. */
+    function removeAllListeners(): void;
+
+    /** Subscribe for updates to the gyroscope. */
+    function setUpdateInterval(intervalMs: number): void;
+}
+
+/**
+ * ImageManipulator
+ */
+export namespace ImageManipulator {
+    type Action = Resize | Rotate | Flip | Crop;
+
+    interface Resize {
+        resize: { width?: number, height?: number };
+    }
+
+    interface Rotate {
+        rotate: number;
+    }
+
+    interface Flip {
+        flip?: { vertical?: boolean; horizontal?: boolean };
+    }
+
+    interface Crop {
+        originX: number;
+        originY: number;
+        width: number;
+        height: number;
+    }
+
+    interface ImageResult {
+        uri: string;
+        width: number;
+        height: number;
+        base64?: string;
+    }
+
+    interface SaveOptions {
+        base64?: boolean;
+        /** A value in range `0` - `1` specifying compression level of the result image. `1` means no compression and `0` the highest compression. */
+        compress?: number;
+        format?: 'jpeg' | 'png';
+    }
+
+    function manipulate(uri: string, actions: Action[], saveOptions?: SaveOptions): Promise<ImageResult>;
+}
+
+/**
+ * Image Picker
+ */
+export namespace ImagePicker {
+    interface ImageInfo {
+        uri: string;
+        width: number;
+        height: number;
+        type: 'video' | 'image';
+        base64?: string;
+        exif?: object;
+        duration?: number;
+    }
+
+    type ImageResult = { cancelled: true } | ({ cancelled: false } & ImageInfo);
+
+    interface _MediaTypeOptions {
+        All: 'All';
+        Videos: 'Videos';
+        Images: 'Images';
+    }
+
+    const MediaTypeOptions: _MediaTypeOptions;
+
+    interface ImageLibraryOptions {
+        allowsEditing?: boolean;
+        aspect?: [number, number];
+        quality?: number;
+        base64?: boolean;
+        exif?: boolean;
+        mediaTypes?: keyof _MediaTypeOptions;
+    }
+
+    /**
+     * require Permissions.CAMERA_ROLL
+     */
+    function launchImageLibraryAsync(options?: ImageLibraryOptions): Promise<ImageResult>;
+
+    interface CameraOptions {
+        allowsEditing?: boolean;
+        aspect?: [number, number];
+        quality?: number;
+        base64?: boolean;
+        exif?: boolean;
+    }
+
+    /**
+     * require Permissions.CAMERA_ROLL
+     */
+    function launchCameraAsync(options?: CameraOptions): Promise<ImageResult>;
+}
+
+/**
+ * IntentLauncherAndroid
+ */
+export namespace IntentLauncherAndroid {
+    const ACTION_ACCESSIBILITY_SETTINGS: 'android.settings.ACCESSIBILITY_SETTINGS';
+    const ACTION_APP_NOTIFICATION_REDACTION: 'android.settings.ACTION_APP_NOTIFICATION_REDACTION';
+    const ACTION_CONDITION_PROVIDER_SETTINGS: 'android.settings.ACTION_CONDITION_PROVIDER_SETTINGS';
+    const ACTION_NOTIFICATION_LISTENER_SETTINGS: 'android.settings.ACTION_NOTIFICATION_LISTENER_SETTINGS';
+    const ACTION_PRINT_SETTINGS: 'android.settings.ACTION_PRINT_SETTINGS';
+    const ACTION_ADD_ACCOUNT_SETTINGS: 'android.settings.ADD_ACCOUNT_SETTINGS';
+    const ACTION_AIRPLANE_MODE_SETTINGS: 'android.settings.AIRPLANE_MODE_SETTINGS';
+    const ACTION_APN_SETTINGS: 'android.settings.APN_SETTINGS';
+    const ACTION_APPLICATION_DETAILS_SETTINGS: 'android.settings.APPLICATION_DETAILS_SETTINGS';
+    const ACTION_APPLICATION_DEVELOPMENT_SETTINGS: 'android.settings.APPLICATION_DEVELOPMENT_SETTINGS';
+    const ACTION_APPLICATION_SETTINGS: 'android.settings.APPLICATION_SETTINGS';
+    const ACTION_APP_NOTIFICATION_SETTINGS: 'android.settings.APP_NOTIFICATION_SETTINGS';
+    const ACTION_APP_OPS_SETTINGS: 'android.settings.APP_OPS_SETTINGS';
+    const ACTION_BATTERY_SAVER_SETTINGS: 'android.settings.BATTERY_SAVER_SETTINGS';
+    const ACTION_BLUETOOTH_SETTINGS: 'android.settings.BLUETOOTH_SETTINGS';
+    const ACTION_CAPTIONING_SETTINGS: 'android.settings.CAPTIONING_SETTINGS';
+    const ACTION_CAST_SETTINGS: 'android.settings.CAST_SETTINGS';
+    const ACTION_DATA_ROAMING_SETTINGS: 'android.settings.DATA_ROAMING_SETTINGS';
+    const ACTION_DATE_SETTINGS: 'android.settings.DATE_SETTINGS';
+    const ACTION_DEVICE_INFO_SETTINGS: 'android.settings.DEVICE_INFO_SETTINGS';
+    const ACTION_DEVICE_NAME: 'android.settings.DEVICE_NAME';
+    const ACTION_DISPLAY_SETTINGS: 'android.settings.DISPLAY_SETTINGS';
+    const ACTION_DREAM_SETTINGS: 'android.settings.DREAM_SETTINGS';
+    const ACTION_HARD_KEYBOARD_SETTINGS: 'android.settings.HARD_KEYBOARD_SETTINGS';
+    const ACTION_HOME_SETTINGS: 'android.settings.HOME_SETTINGS';
+    const ACTION_IGNORE_BACKGROUND_DATA_RESTRICTIONS_SETTINGS: 'android.settings.IGNORE_BACKGROUND_DATA_RESTRICTIONS_SETTINGS';
+    const ACTION_IGNORE_BATTERY_OPTIMIZATION_SETTINGS: 'android.settings.IGNORE_BATTERY_OPTIMIZATION_SETTINGS';
+    const ACTION_INPUT_METHOD_SETTINGS: 'android.settings.INPUT_METHOD_SETTINGS';
+    const ACTION_INPUT_METHOD_SUBTYPE_SETTINGS: 'android.settings.INPUT_METHOD_SUBTYPE_SETTINGS';
+    const ACTION_INTERNAL_STORAGE_SETTINGS: 'android.settings.INTERNAL_STORAGE_SETTINGS';
+    const ACTION_LOCALE_SETTINGS: 'android.settings.LOCALE_SETTINGS';
+    const ACTION_LOCATION_SOURCE_SETTINGS: 'android.settings.LOCATION_SOURCE_SETTINGS';
+    const ACTION_MANAGE_ALL_APPLICATIONS_SETTINGS: 'android.settings.MANAGE_ALL_APPLICATIONS_SETTINGS';
+    const ACTION_MANAGE_APPLICATIONS_SETTINGS: 'android.settings.MANAGE_APPLICATIONS_SETTINGS';
+    const ACTION_MANAGE_DEFAULT_APPS_SETTINGS: 'android.settings.MANAGE_DEFAULT_APPS_SETTINGS';
+    const ACTION_MEMORY_CARD_SETTINGS: 'android.settings.MEMORY_CARD_SETTINGS';
+    const ACTION_MONITORING_CERT_INFO: 'android.settings.MONITORING_CERT_INFO';
+    const ACTION_NETWORK_OPERATOR_SETTINGS: 'android.settings.NETWORK_OPERATOR_SETTINGS';
+    const ACTION_NFCSHARING_SETTINGS: 'android.settings.NFCSHARING_SETTINGS';
+    const ACTION_NFC_PAYMENT_SETTINGS: 'android.settings.NFC_PAYMENT_SETTINGS';
+    const ACTION_NFC_SETTINGS: 'android.settings.NFC_SETTINGS';
+    const ACTION_NIGHT_DISPLAY_SETTINGS: 'android.settings.NIGHT_DISPLAY_SETTINGS';
+    const ACTION_NOTIFICATION_POLICY_ACCESS_SETTINGS: 'android.settings.NOTIFICATION_POLICY_ACCESS_SETTINGS';
+    const ACTION_NOTIFICATION_SETTINGS: 'android.settings.NOTIFICATION_SETTINGS';
+    const ACTION_PAIRING_SETTINGS: 'android.settings.PAIRING_SETTINGS';
+    const ACTION_PRIVACY_SETTINGS: 'android.settings.PRIVACY_SETTINGS';
+    const ACTION_QUICK_LAUNCH_SETTINGS: 'android.settings.QUICK_LAUNCH_SETTINGS';
+    const ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS: 'android.settings.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS';
+    const ACTION_SECURITY_SETTINGS: 'android.settings.SECURITY_SETTINGS';
+    const ACTION_SETTINGS: 'android.settings.SETTINGS';
+    const ACTION_SHOW_ADMIN_SUPPORT_DETAILS: 'android.settings.SHOW_ADMIN_SUPPORT_DETAILS';
+    const ACTION_SHOW_INPUT_METHOD_PICKER: 'android.settings.SHOW_INPUT_METHOD_PICKER';
+    const ACTION_SHOW_REGULATORY_INFO: 'android.settings.SHOW_REGULATORY_INFO';
+    const ACTION_SHOW_REMOTE_BUGREPORT_DIALOG: 'android.settings.SHOW_REMOTE_BUGREPORT_DIALOG';
+    const ACTION_SOUND_SETTINGS: 'android.settings.SOUND_SETTINGS';
+    const ACTION_STORAGE_MANAGER_SETTINGS: 'android.settings.STORAGE_MANAGER_SETTINGS';
+    const ACTION_SYNC_SETTINGS: 'android.settings.SYNC_SETTINGS';
+    const ACTION_SYSTEM_UPDATE_SETTINGS: 'android.settings.SYSTEM_UPDATE_SETTINGS';
+    const ACTION_TETHER_PROVISIONING_UI: 'android.settings.TETHER_PROVISIONING_UI';
+    const ACTION_TRUSTED_CREDENTIALS_USER: 'android.settings.TRUSTED_CREDENTIALS_USER';
+    const ACTION_USAGE_ACCESS_SETTINGS: 'android.settings.USAGE_ACCESS_SETTINGS';
+    const ACTION_USER_DICTIONARY_INSERT: 'android.settings.USER_DICTIONARY_INSERT';
+    const ACTION_USER_DICTIONARY_SETTINGS: 'android.settings.USER_DICTIONARY_SETTINGS';
+    const ACTION_USER_SETTINGS: 'android.settings.USER_SETTINGS';
+    const ACTION_VOICE_CONTROL_AIRPLANE_MODE: 'android.settings.VOICE_CONTROL_AIRPLANE_MODE';
+    const ACTION_VOICE_CONTROL_BATTERY_SAVER_MODE: 'android.settings.VOICE_CONTROL_BATTERY_SAVER_MODE';
+    const ACTION_VOICE_CONTROL_DO_NOT_DISTURB_MODE: 'android.settings.VOICE_CONTROL_DO_NOT_DISTURB_MODE';
+    const ACTION_VOICE_INPUT_SETTINGS: 'android.settings.VOICE_INPUT_SETTINGS';
+    const ACTION_VPN_SETTINGS: 'android.settings.VPN_SETTINGS';
+    const ACTION_VR_LISTENER_SETTINGS: 'android.settings.VR_LISTENER_SETTINGS';
+    const ACTION_WEBVIEW_SETTINGS: 'android.settings.WEBVIEW_SETTINGS';
+    const ACTION_WIFI_IP_SETTINGS: 'android.settings.WIFI_IP_SETTINGS';
+    const ACTION_WIFI_SETTINGS: 'android.settings.WIFI_SETTINGS';
+    const ACTION_WIRELESS_SETTINGS: 'android.settings.WIRELESS_SETTINGS';
+    const ACTION_ZEN_MODE_AUTOMATION_SETTINGS: 'android.settings.ZEN_MODE_AUTOMATION_SETTINGS';
+    const ACTION_ZEN_MODE_EVENT_RULE_SETTINGS: 'android.settings.ZEN_MODE_EVENT_RULE_SETTINGS';
+    const ACTION_ZEN_MODE_EXTERNAL_RULE_SETTINGS: 'android.settings.ZEN_MODE_EXTERNAL_RULE_SETTINGS';
+    const ACTION_ZEN_MODE_PRIORITY_SETTINGS: 'android.settings.ZEN_MODE_PRIORITY_SETTINGS';
+    const ACTION_ZEN_MODE_SCHEDULE_RULE_SETTINGS: 'android.settings.ZEN_MODE_SCHEDULE_RULE_SETTINGS';
+    const ACTION_ZEN_MODE_SETTINGS: 'android.settings.ZEN_MODE_SETTINGS';
+
+    function startActivityAsync(activity: string, data?: HashMap): Promise<boolean>;
+}
+
+/**
+ * KeepAwake
+ */
+export class KeepAwake extends Component {
+    static activate(): void;
+    static deactivate(): void;
+}
+
+// #region LinearGradient
+/**
+ * LinearGradient
+ */
+export interface LinearGradientProps {
+    colors: string[];
+    start?: [number, number];
+    end?: [number, number];
+    locations?: number[];
+    style?: StyleProp<ViewStyle>;
+}
+
+export class LinearGradient extends Component<LinearGradientProps> { }
+// #endregion
+
+/**
+ * Linking
+ */
+export interface LinkInfo {
+    path: string;
+    queryParams: Partial<StringHashMap>;
+}
+
+export interface LinkingStatic extends ReactNativeLinkingStatic {
+    makeUrl(path: string, queryParams?: HashMap): string;
+    parse(url: string): LinkInfo;
+    parseInitialURLAsync(): Promise<LinkInfo>;
+}
+export const Linking: LinkingStatic;
+
+/**
+ * Location
+ */
+export namespace Location {
+    interface LocationOptions {
+        enableHighAccuracy?: boolean;
+        timeInterval?: number;
+        distanceInterval?: number;
+    }
+
+    interface LocationProps {
+        latitude: number;
+        longitude: number;
+    }
+
+    interface Coords extends LocationProps {
+        altitude: number;
+        accuracy: number;
+    }
+
+    interface LocationData {
+        coords: {
+            heading: number;
+            speed: number
+        } & Coords;
+        timestamp: number;
+    }
+
+    interface ProviderStatus {
+        locationServicesEnabled: boolean;
+        gpsAvailable?: boolean;
+        networkAvailable?: boolean;
+        passiveAvailable?: boolean;
+    }
+
+    interface HeadingStatus {
+        magHeading: number;
+        trueHeading: number;
+        accuracy: number;
+    }
+
+    interface GeocodeData {
+        city: string;
+        street: string;
+        region: string;
+        postalCode: string;
+        country: string;
+        name: string;
+    }
+
+    type LocationCallback = (data: LocationData) => void;
+
+    function getCurrentPositionAsync(options: LocationOptions): Promise<LocationData>;
+    function watchPositionAsync(options: LocationOptions, callback: LocationCallback): EventSubscription;
+    function getProviderStatusAsync(): Promise<ProviderStatus>;
+    function getHeadingAsync(): Promise<HeadingStatus>;
+    function watchHeadingAsync(callback: (status: HeadingStatus) => void): EventSubscription;
+    function geocodeAsync(address: string): Promise<Coords>;
+    function reverseGeocodeAsync(location: LocationProps): Promise<GeocodeData[]>;
+    function setApiKey(key: string): void;
+}
+
+/**
+ * Magnetometer
+ */
+export namespace Magnetometer {
+    interface MagnetometerObject {
+        x: Axis;
+        y: Axis;
+        z: Axis;
+    }
+
+    function addListener(listener: (obj: MagnetometerObject) => any): EventSubscription;
+    function removeAllListeners(): void;
+    function setUpdateInterval(intervalMs: number): void;
+}
+
+/**
+ * Notifications
+ */
+export namespace Notifications {
+    interface Notification {
+        origin: 'selected' | 'received';
+        data: any;
+        remote: boolean;
+        isMultiple: boolean;
+    }
+
+    interface LocalNotification {
+        title: string;
+        body?: string;
+        data?: any;
+        ios?: {
+            sound?: boolean
+        };
+        android?: {
+            sound?: boolean;
+            icon?: string;
+            color?: string;
+            priority?: 'min' | 'low' | 'high' | 'max';
+            sticky?: boolean;
+            vibrate?: boolean | number[];
+            link?: string;
+        };
+    }
+
+    type LocalNotificationId = string | number;
+
+    function addListener(listener: (notification: Notification) => any): EventSubscription;
+    function getExpoPushTokenAsync(): Promise<string>;
+    function presentLocalNotificationAsync(localNotification: LocalNotification): Promise<LocalNotificationId>;
+    function scheduleLocalNotificationAsync(
+        localNotification: LocalNotification,
+        schedulingOptions: { time: Date | number, repeat?: 'minute' | 'hour' | 'day' | 'week' | 'month' | 'year' }
+    ): Promise<LocalNotificationId>;
+    function dismissNotificationAsync(localNotificationId: LocalNotificationId): Promise<void>;
+    function dismissAllNotificationsAsync(): Promise<void>;
+    function cancelScheduledNotificationAsync(localNotificationId: LocalNotificationId): Promise<void>;
+    function cancelAllScheduledNotificationsAsync(): Promise<void>;
+    function getBadgeNumberAsync(): Promise<number>;
+    function setBadgeNumberAsync(number: number): Promise<void>;
+}
+
+/**
+ * Pedometer
+ */
+export namespace Pedometer {
+    function isAvailableAsync(): Promise<boolean>;
+    function getStepCountAsync(start: Date, end: Date): Promise<{ steps: number; }>;
+    function watchStepCount(callback: (params: { steps: number; }) => void): EventSubscription;
+}
+
+/**
+ * Permissions
+ */
+export namespace Permissions {
+    type PermissionType = 'audioRecording' | 'calendar' |
+    'cameraRoll' | 'camera' | 'contacts' | 'location' | 'reminders' |
+    'remoteNotifications' | 'systemBrightness' | 'userFacingNotifications';
+    type PermissionStatus = 'undetermined' | 'granted' | 'denied';
+    type PermissionExpires = 'never';
+
+    interface PermissionDetailsLocationIOS {
+        scope: 'whenInUse' | 'always';
+    }
+
+    interface PermissionDetailsLocationAndroid {
+        scope: 'fine' | 'coarse' | 'none';
+    }
+
+    interface PermissionResponse {
+        status: PermissionStatus;
+        expires: PermissionExpires;
+        ios?: PermissionDetailsLocationIOS;
+        android?: PermissionDetailsLocationAndroid;
+    }
+
+    function getAsync(type: PermissionType): Promise<PermissionResponse>;
+    function askAsync(type: PermissionType): Promise<PermissionResponse>;
+
+    type RemoteNotificationPermission = 'remoteNotifications';
+
+    const AUDIO_RECORDING: 'audioRecording';
+    const CALENDAR: 'calendar';
+    const CAMERA_ROLL: 'cameraRoll';
+    const CAMERA: 'camera';
+    const CONTACTS: 'contacts';
+    const LOCATION: 'location';
+    const NOTIFICATIONS: RemoteNotificationPermission;
+    const REMINDERS = 'reminders';
+    const REMOTE_NOTIFICATIONS: RemoteNotificationPermission;
+    const SYSTEM_BRIGHTNESS: 'systemBrightness';
+    const USER_FACING_NOTIFICATIONS = 'userFacingNotifications';
+}
+
+/**
+ * Register Root Component
+ */
+export function registerRootComponent(component: ComponentType): void;
+
+/**
+ * ScreenOrientation
+ */
+export namespace ScreenOrientation {
+    interface Orientations {
+        ALL: 'ALL';
+        ALL_BUT_UPSIDE_DOWN: 'ALL_BUT_UPSIDE_DOWN';
+        PORTRAIT: 'PORTRAIT';
+        PORTRAIT_UP: 'PORTRAIT_UP';
+        PORTRAIT_DOWN: 'PORTRAIT_DOWN';
+        LANDSCAPE: 'LANDSCAPE';
+        LANDSCAPE_LEFT: 'LANDSCAPE_LEFT';
+        LANDSCAPE_RIGHT: 'LANDSCAPE_RIGHT';
+    }
+
+    const Orientation: Orientations;
+
+    function allow(orientation: keyof Orientations): void;
+}
+
+/**
+ * SecureStore
+ */
+export namespace SecureStore {
+    interface SecureStoreOptions {
+        keychainService?: string;
+        keychainAccessible?: number;
+    }
+
+    function setItemAsync(key: string, value: string, options?: SecureStoreOptions): Promise<void>;
+    function getItemAsync(key: string, options?: SecureStoreOptions): Promise<string | null>;
+    function deleteItemAsync(key: string, options?: SecureStoreOptions): Promise<void>;
+}
+
+/**
+ * Segment
+ */
+export namespace Segment {
+    function initialize(keys: {
+        androidWriteKey: string;
+        iosWriteKey: string;
+    }): void;
+    function identify(userId: string): void;
+    function identifyWithTraits(userId: string, traits: object): void;
+    function track(event: string): void;
+    function reset(): void;
+    function trackWithProperties(event: string, properties: object): void;
+    function screen(screenName: string): void;
+    function screenWithProperties(screenName: string, properties: object): void;
+    function flush(): void;
+}
+
+/**
+ * Speech
+ */
+export namespace Speech {
+    interface SpeechOptions {
+        language?: string;
+        pitch?: number;
+        rate?: number;
+        onStart?: () => void;
+        onStopped?: () => void;
+        onDone?: () => void;
+        onError?: (error: string) => void;
+    }
+
+    function speak(text: string, options?: SpeechOptions): void;
+    function stop(): void;
+    function isSpeakingAsync(): Promise<boolean>;
+
+    /** Available on iOS only */
+    function pause(): void;
+
+    /** Available on iOS only */
+    function resume(): void;
+}
+
+/**
+ * SQLite
+ */
+export namespace SQLite {
+    type Error = any;
+
+    interface Database {
+        transaction(
+            callback: (transaction: Transaction) => any,
+            error?: (error: Error) => any,     // TODO def of error
+            success?: () => any
+        ): void;
+    }
+
+    interface Transaction {
+        executeSql(
+            sqlStatement: string,
+            arguments?: string[] | number[],
+            success?: (transaction: Transaction, resultSet: ResultSet) => any,
+            error?: (transaction: Transaction, error: Error) => any
+        ): void;
+    }
+
+    interface ResultSet {
+        insertId: number;
+        rowAffected: number;
+        rows: {
+            length: number;
+            item: (index: number) => any;
+            _array: HashMap[];
+        };
+    }
+
+    function openDatabase(
+        name: string | {
+            name: string,
+            version?: string,
+            description?: string,
+            size?: number,
+            callback?: () => any
+        },
+        version?: string,
+        description?: string,
+        size?: number,
+        callback?: () => any
+    ): any;
+}
+
+// #region Svg
+/**
+ * Svg
+ */
+export interface SvgCommonProps {
+    fill?: string;
+    fillOpacity?: number | string;
+    fillRule?: 'nonzero' | 'evenodd';
+    opacity?: number | string;
+    stroke?: string;
+    strokeWidth?: number | string;
+    strokeOpacity?: number | string;
+    strokeLinecap?: string;
+    strokeLineJoin?: string;
+    strokeDasharray?: any[];
+    strokeDashoffset?: any;
+    transform?: string | object;
+    x?: number | string;
+    y?: number | string;
+    rotate?: number | string;
+    rotation?: number | string;
+    scale?: number | string;
+    origin?: number | string;
+    originX?: number | string;
+    originY?: number | string;
+    id?: string;
+    disabled?: boolean;
+    onPress?: () => any;
+    onPressIn?: () => any;
+    onPressOut?: () => any;
+    onLongPress?: () => any;
+    delayPressIn?: number;
+    delayPressOut?: number;
+    delayLongPress?: number;
+}
+
+export interface SvgRectProps extends SvgCommonProps {
+    width: number | string;
+    height: number | string;
+}
+
+export interface SvgCircleProps extends SvgCommonProps {
+    cx: number | string;
+    cy: number | string;
+    r: number | string;
+}
+
+export interface SvgEllipseProps extends SvgCommonProps {
+    cx: number | string;
+    cy: number | string;
+    rx: number | string;
+    ry: number | string;
+}
+
+export interface SvgLineProps extends SvgCommonProps {
+    x1: number | string;
+    y1: number | string;
+    x2: number | string;
+    y2: number | string;
+}
+
+export interface SvgPolyProps extends SvgCommonProps {
+    points: string;
+}
+
+export interface SvgPathProps extends SvgCommonProps {
+    d: string;
+}
+
+export interface SvgTextProps extends SvgCommonProps {
+    textAnchor?: string;
+    fontSize?: number | string;
+    fontWeight?: string;
+}
+
+export interface SvgTSpanProps extends SvgTextProps {
+    dx?: string;
+    dy?: string;
+}
+
+export interface SvgTextPathProps extends SvgCommonProps {
+    href?: string;
+    startOffset?: string;
+}
+
+export interface SvgUseProps extends SvgCommonProps {
+    href: string;
+    x: number | string;
+    y: number | string;
+    width?: number | string;
+    height?: number | string;
+}
+
+export interface SvgSymbolProps extends SvgCommonProps {
+    viewBox: string;
+    preserveAspectRatio?: string;
+    width: number | string;
+    height: number | string;
+}
+
+export interface SvgLinearGradientProps extends SvgCommonProps {
+    x1: number | string;
+    x2: number | string;
+    y1: number | string;
+    y2: number | string;
+}
+
+export interface SvgRadialGradientProps extends SvgCommonProps {
+    cx: number | string;
+    cy: number | string;
+    rx: number | string;
+    ry: number | string;
+    fx: number | string;
+    fy: number | string;
+    gradientUnits?: string;
+}
+
+export interface SvgStopProps extends SvgCommonProps {
+    offset?: string;
+    stopColor?: string;
+    stopOpacity?: string;
+}
+
+export class Svg extends Component<{ width: number, height: number, viewBox?: string, preserveAspectRatio?: string }> {
+    static Circle: ComponentClass<SvgCircleProps>;
+    static ClipPath: ComponentClass<SvgCommonProps>;
+    static Defs: ComponentClass;
+    static Ellipse: ComponentClass<SvgEllipseProps>;
+    static G: ComponentClass<SvgCommonProps>;
+    static Line: ComponentClass<SvgLineProps>;
+    static LinearGradient: ComponentClass<SvgLinearGradientProps>;
+    static Path: ComponentClass<SvgPathProps>;
+    static Polygon: ComponentClass<SvgPolyProps>;
+    static Polyline: ComponentClass<SvgPolyProps>;
+    static RadialGradient: ComponentClass<SvgRadialGradientProps>;
+    static Rect: ComponentClass<SvgRectProps>;
+    static Stop: ComponentClass<SvgStopProps>;
+    static Symbol: ComponentClass<SvgSymbolProps>;
+    static Text: ComponentClass<SvgTextProps>;
+    static TextPath: ComponentClass<SvgTextPathProps>;
+    static TSpan: ComponentClass<SvgTSpanProps>;
+    static Use: ComponentClass<SvgUseProps>;
+}
+// #endregion
+
+/**
+ * Take Snapshot
+ */
+export function takeSnapshotAsync(
+    view?: (number | React.ReactElement<any>),
+    options?: {
+        width?: number,
+        height?: number,
+        format?: 'png' | 'jpg' | 'jpeg' | 'webm',
+        quality?: number,
+        result?: 'file' | 'base64' | 'data-uri',
+    }
+): Promise<string>;
+
+/** Helpful utility functions that don’t fit anywhere else, including some localization and internationalization methods. */
+export namespace Util {
+    /** Returns the current device country code. */
+    function getCurrentDeviceCountryAsync(): Promise<string>;
+
+    /** Returns the current device locale as a string. */
+    function getCurrentLocaleAsync(): Promise<string>;
+
+    /** Returns the current device time zone name. */
+    function getCurrentTimeZoneAsync(): Promise<string>;
+
+    /** Reloads the current experience. This will fetch and load the newest available JavaScript supported by the device’s Expo environment. This is useful for triggering an update of your experience if you have published a new version. */
+    function reload(): void;
+
+    /** _Android only_. Invokes a callback when a new version of your app is successfully downloaded in the background. */
+    function addNewVersionListenerExperimental(listener: (event: {
+        manifest: object;
+    }) => void): { remove(): void; };
+}
+
+// #region Video
+/**
+ * Expo Video
+ */
+export interface NaturalSize {
+    width: number;
+    height: number;
+    orientation: Orientation;
+}
+
+export interface ReadyForDisplayEvent {
+    naturalSize: NaturalSize;
+    status: PlaybackStatus;
+}
+
+export enum FullscreenUpdateVariants {
+    IOS_FULLSCREEN_UPDATE_PLAYER_WILL_PRESENT = 0,
+    IOS_FULLSCREEN_UPDATE_PLAYER_DID_PRESENT = 1,
+    IOS_FULLSCREEN_UPDATE_PLAYER_WILL_DISMISS = 2,
+    IOS_FULLSCREEN_UPDATE_PLAYER_DID_DISMISS = 3
+}
+
+export interface FullscreenUpdateEvent {
+    fullscreenUpdate: FullscreenUpdateVariants;
+    status: PlaybackStatus;
+}
+
+export interface VideoProps {
+    source?: PlaybackSource | null;
+    posterSource?: URISource | RequireSource;
+
+    resizeMode?: ResizeModeContain | ResizeModeCover | ResizeModeStretch;
+    useNativeControls?: boolean;
+    usePoster?: boolean;
+
+    onPlaybackStatusUpdate?: (status: PlaybackStatus) => void;
+    onReadyForDisplay?: (event: ReadyForDisplayEvent) => void;
+    onIOSFullscreenUpdate?: (event: FullscreenUpdateEvent) => void;
+
+    onLoadStart?: () => void;
+    onLoad?: (status: PlaybackStatus) => void;
+    onError?: (error: string) => void;
+
+    status?: PlaybackStatusToSet;
+    progressUpdateIntervalMillis?: number;
+    positionMillis?: number;
+    shouldPlay?: boolean;
+    rate?: number;
+    shouldCorrectPitch?: boolean;
+    volume?: number;
+    isMuted?: boolean;
+    isLooping?: boolean;
+
+    scaleX?: number;
+    scaleY?: number;
+    translateX?: number;
+    translateY?: number;
+    rotation?: number;
+    ref?: Ref<PlaybackObject>;
+    style?: StyleProp<ViewStyle>;
+}
+
+export interface VideoState {
+    showPoster: boolean;
+}
+
+export class Video extends Component<VideoProps, VideoState> {
+    static RESIZE_MODE_CONTAIN: ResizeModeContain;
+    static RESIZE_MODE_COVER: ResizeModeCover;
+    static RESIZE_MODE_STRETCH: ResizeModeStretch;
+    static IOS_FULLSCREEN_UPDATE_PLAYER_WILL_PRESENT: FullscreenUpdateVariants.IOS_FULLSCREEN_UPDATE_PLAYER_WILL_PRESENT;
+    static IOS_FULLSCREEN_UPDATE_PLAYER_DID_PRESENT: FullscreenUpdateVariants.IOS_FULLSCREEN_UPDATE_PLAYER_DID_PRESENT;
+    static IOS_FULLSCREEN_UPDATE_PLAYER_WILL_DISMISS: FullscreenUpdateVariants.IOS_FULLSCREEN_UPDATE_PLAYER_WILL_DISMISS;
+    static IOS_FULLSCREEN_UPDATE_PLAYER_DID_DISMISS: FullscreenUpdateVariants.IOS_FULLSCREEN_UPDATE_PLAYER_DID_DISMISS;
+}
+// #endregion
+
+/**
+ * Web Browser
+ */
+export namespace WebBrowser {
+    function openBrowserAsync(url: string): Promise<{ type: 'cancelled' | 'dismissed' }>;
+    function openAuthSessionAsync(url: string, redirectUrl?: string): Promise<{ type: 'cancelled' | 'dismissed' }>;
+    function dismissBrowser(): Promise<{ type: 'dismissed' }>;
+}
+
+// #region Calendar
+/**
+ * Calendar
+ *
+ * Provides an API for interacting with the device’s system calendars, events, reminders, and associated records.
+ */
+export namespace Calendar {
+    interface Calendar {
+        /** Internal ID that represents this calendar on the device */
+        id?: string;
+
+        /** Visible name of the calendar */
+        title?: string;
+
+        sourceId?: string; // iOS
+
+        /** Object representing the source to be used for the calendar */
+        source?: Source;
+
+        /** Type of calendar this object represents */
+        type?: CalendarType; // iOS
+
+        /** Color used to display this calendar’s events */
+        color?: string;
+
+        /** Whether the calendar is used in the Calendar or Reminders OS app */
+        entityType?: EntityTypes; // iOS
+
+        /** Boolean value that determines whether this calendar can be modified */
+        allowsModifications?: boolean;
+
+        /** Availability types that this calendar supports */
+        allowedAvailabilities?: Availability[];
+
+        /** Boolean value indicating whether this is the device’s primary calendar */
+        isPrimary?: boolean; // Android
+
+        /** Internal system name of the calendar */
+        name?: string; // Android
+
+        /** Name for the account that owns this calendar */
+        ownerAccount?: string; // Android
+
+        /** Time zone for the calendar	 */
+        timeZone?: string; // Android
+
+        /** Alarm methods that this calendar supports */
+        allowedReminders?: AlarmMethod[]; // Android
+
+        /** Attendee types that this calendar supports */
+        allowedAttendeeTypes?: AttendeeType[]; // Android
+
+        /** Indicates whether the OS displays events on this calendar */
+        isVisible?: boolean; // Android
+
+        /** Indicates whether this calendar is synced and its events stored on the device */
+        isSynced?: boolean; // Android
+
+        /** Level of access that the user has for the calendar */
+        accessLevel?: CalendarAccessLevel; // Android
+    }
+
+    interface Source {
+        /** Internal ID that represents this source on the device */
+        id?: string; // iOS only ??
+
+        /** Type of account that owns this calendar */
+        type?: string;
+
+        /** Name for the account that owns this calendar */
+        name?: string;
+
+        /** Whether this source is the local phone account */
+        isLocalAccount?: boolean; // Android
+    }
+
+    interface Event {
+        /** Internal ID that represents this event on the device */
+        id?: string;
+
+        /** ID of the calendar that contains this event */
+        calendarId?: string;
+
+        /** Visible name of the event */
+        title?: string;
+
+        /** Location field of the event	 */
+        location?: string;
+
+        /** Date when the event record was created */
+        creationDate?: string; // iOS
+
+        /** Date when the event record was last modified */
+        lastModifiedDate?: string; // iOS
+
+        /** Time zone the event is scheduled in */
+        timeZone?: string;
+
+        /** Time zone for the event end time */
+        endTimeZone?: string; // Android
+
+        /** URL for the event */
+        url?: string; // iOS
+
+        /** Description or notes saved with the event */
+        notes?: string;
+
+        /** Array of Alarm objects which control automated reminders to the user */
+        alarms?: Alarm[];
+
+        /** Object representing rules for recurring or repeating events. Null for one-time events. */
+        recurrenceRule?: RecurrenceRule;
+
+        /** Date object or string representing the time when the event starts */
+        startDate?: string | Date;
+
+        /** Date object or string representing the time when the event ends */
+        endDate?: string | Date;
+
+        /** For recurring events, the start date for the first (original) instance of the event */
+        originalStartDate?: string; // iOS
+
+        /** Boolean value indicating whether or not the event is a detached (modified) instance of a recurring event */
+        isDetached?: boolean; // iOS
+
+        /** Whether the event is displayed as an all-day event on the calendar */
+        allDay?: boolean;
+
+        /** The availability setting for the event */
+        availability?: Availability; // Availability
+
+        /** Status of the event */
+        status?: EventStatus; // Status
+
+        /** Organizer of the event, as an Attendee object */
+        organizer?: string; // Organizer - iOS
+
+        /** Email address of the organizer of the event */
+        organizerEmail?: string; // Android
+
+        /** User’s access level for the event */
+        accessLevel?: EventAccessLevel; // Android,
+
+        /** Whether invited guests can modify the details of the event */
+        guestsCanModify?: boolean; // Android,
+
+        /** Whether invited guests can invite other guests */
+        guestsCanInviteOthers?: boolean; // Android
+
+        /** Whether invited guests can see other guests */
+        guestsCanSeeGuests?: boolean; // Android
+
+        /** For detached (modified) instances of recurring events, the ID of the original recurring event */
+        originalId?: string; // Android
+
+        /** For instances of recurring events, volatile ID representing this instance; not guaranteed to always refer to the same instance */
+        instanceId?: string; // Android
+    }
+
+    interface Attendee {
+        /** Internal ID that represents this attendee on the device */
+        id?: string; // Android
+
+        /** Indicates whether or not this attendee is the current OS user */
+        isCurrentUser?: boolean; // iOS
+
+        /** Displayed name of the attendee */
+        name?: string;
+
+        /** Role of the attendee at the event */
+        role?: AttendeeRole;
+
+        /** Status of the attendee in relation to the event */
+        status?: AttendeeStatus;
+
+        /** Type of the attendee */
+        type?: AttendeeType;
+
+        /** URL for the attendee */
+        url?: string; // iOS
+
+        /** Email address of the attendee */
+        email?: string; // Android
+    }
+
+    interface Reminder {
+        /** Internal ID that represents this reminder on the device */
+        id?: string;
+
+        /** ID of the calendar that contains this reminder */
+        calendarId?: string;
+
+        /** Visible name of the reminder */
+        title?: string;
+
+        /** Location field of the reminder */
+        location?: string;
+
+        /** Date when the reminder record was created */
+        creationDate?: string;
+
+        /** Date when the reminder record was last modified */
+        lastModifiedDate?: string;
+
+        /** Time zone the reminder is scheduled in */
+        timeZone?: string;
+
+        /** URL for the reminder */
+        url?: string;
+
+        /** Description or notes saved with the reminder */
+        notes?: string;
+
+        /** Array of Alarm objects which control automated alarms to the user about the task */
+        alarms?: Alarm[];
+
+        /** Object representing rules for recurring or repeated reminders. Null for one-time tasks. */
+        recurrenceRule?: RecurrenceRule;
+
+        /** Date object or string representing the start date of the reminder task */
+        startDate?: string;
+
+        /** Date object or string representing the time when the reminder task is due */
+        dueDate?: string;
+
+        /** Indicates whether or not the task has been completed */
+        completed?: boolean;
+
+        /** Date object or string representing the date of completion, if completed is true */
+        completionDate?: string;
+    }
+
+    interface Alarm {
+        /** Date object or string representing an absolute time the alarm should occur; overrides relativeOffset and structuredLocation if specified alongside either */
+        absoluteDate?: string; // iOS
+
+        /** Number of minutes from the startDate of the calendar item that the alarm should occur; use negative values to have the alarm occur before the startDate */
+        relativeOffset?: string;
+        structuredLocation?: {
+            // iOS
+            title?: string;
+            proximity?: string; // Proximity
+            radius?: number;
+            coords?: {
+                latitude?: number;
+                longitude?: number;
+            };
+        };
+
+        /** Method of alerting the user that this alarm should use; on iOS this is always a notification */
+        method?: AlarmMethod; // Method, Android
+    }
+
+    interface RecurrenceRule {
+        /** How often the calendar item should recur */
+        frequency: Frequency; // Frequency
+
+        /** Interval at which the calendar item should recur. For example, an interval: 2 with frequency: DAILY would yield an event that recurs every other day. Defaults to 1 . */
+        interval?: number;
+
+        /** Date on which the calendar item should stop recurring; overrides occurrence if both are specified */
+        endDate?: string;
+
+        /** Number of times the calendar item should recur before stopping */
+        occurrence?: number;
+    }
+
+    enum EntityTypes {
+        EVENT = 'event',
+        REMINDER = 'reminder',
+    }
+
+    enum CalendarType {
+        LOCAL = 'local',
+        CALDAV = 'caldav',
+        EXCHANGE = 'exchange',
+        SUBSCRIBED = 'subscribed',
+        BIRTHDAYS = 'birthdays'
+    }
+
+    enum Availability {
+        NOT_SUPPORTED = 'notSupported', // iOS
+        BUSY = 'busy',
+        FREE = 'free',
+        TENTATIVE = 'tentative',
+        UNAVAILABLE = 'unavailable' // iOS
+    }
+
+    enum AlarmMethod {
+        ALARM = 'alarm',
+        ALERT = 'alert',
+        EMAIL = 'email',
+        SMS = 'sms',
+        DEFAULT = 'default',
+    }
+
+    enum AttendeeType {
+        UNKNOWN = 'unknown', // iOS
+        PERSON = 'person', // iOS
+        ROOM = 'room', // iOS
+        GROUP = 'group', // iOS
+        RESOURCE = 'resource',
+        OPTIONAL = 'optional', // Android
+        REQUIRED = 'required', // Android
+        NONE = 'none' // Android
+    }
+
+    enum CalendarAccessLevel {
+        CONTRIBUTOR = 'contributor',
+        EDITOR = 'editor',
+        FREEBUSY = 'freebusy',
+        OVERRIDE = 'override',
+        OWNER = 'owner',
+        READ = 'read',
+        RESPOND = 'respond',
+        ROOT = 'root',
+        NONE = 'none'
+    }
+
+    enum EventAccessLevel {
+        CONFIDENTIAL = 'confidential',
+        PRIVATE = 'private',
+        PUBLIC = 'public',
+        DEFAULT = 'default'
+    }
+
+    enum EventStatus {
+        NONE = 'none',
+        CONFIRMED = 'confirmed',
+        TENTATIVE = 'tentative',
+        CANCELED = 'canceled'
+    }
+
+    enum AttendeeRole {
+        UNKNOWN = 'unknown', // iOS
+        REQUIRED = 'required', // iOS
+        OPTIONAL = 'optional', // iOS
+        CHAIR = 'chair', // iOS
+        NON_PARTICIPANT = 'nonParticipant', // iOS
+        ATTENDEE = 'attendee', // Android
+        ORGANIZER = 'organizer', // Android
+        PERFORMER = 'performer', // Android
+        SPEAKER = 'speaker', // Android
+        NONE = 'none' // Android
+    }
+
+    enum AttendeeStatus {
+        UNKNOWN = 'unknown', // iOS
+        PENDING = 'pending', // iOS
+        ACCEPTED = 'accepted',
+        DECLINED = 'declined',
+        TENTATIVE = 'tentative',
+        DELEGATED = 'delegated', // iOS
+        COMPLETED = 'completed', // iOS
+        IN_PROCESS = 'inProcess', // iOS
+        INVITED = 'invited', // Android
+        NONE = 'none' // Android
+    }
+
+    enum Frequency {
+        DAILY = 'daily',
+        WEEKLY = 'weekly',
+        MONTHLY = 'monthly',
+        YEARLY = 'yearly'
+    }
+
+    enum ReminderStatus {
+        COMPLETED = 'completed',
+        INCOMPLETE = 'incomplete'
+    }
+
+    interface RecurringEventOptions {
+        futureEvents?: boolean;
+        instanceStartDate?: string;
+    }
+
+    /** Gets an array of calendar objects with details about the different calendars stored on the device. */
+    function getCalendarsAsync(
+        /** (iOS only) Not required, but if defined, filters the returned calendars to a specific entity type.  */
+        entityType?: EntityTypes
+    ): Promise<Calendar[]>;
+
+    /** Creates a new calendar on the device, allowing events to be added later and displayed. */
+    function createCalendarAsync(details: Calendar): Promise<string>;
+
+    /** Updates the provided details of an existing calendar stored on the device. To remove a property, explicitly set it to null in details */
+    function updateCalendarAsync(id: string, details?: Calendar | null): Promise<string>;
+
+    /** Deletes an existing calendar and all associated events/reminders/attendees from the device. Use with caution. */
+    function deleteCalendarAsync(id: string): Promise<void>;
+
+    /** Returns all events in a given set of calendars over a specified time period. */
+    function getEventsAsync(
+        /** Array of IDs of calendars to search for events in. Required. */
+        calendarIds: string[],
+
+        /** Beginning of time period to search for events in. Required. */
+        startDate: Date,
+
+        /** End of time period to search for events in. Required. */
+        endDate: Date
+    ): Promise<Event[]>;
+
+    /** Returns a specific event selected by ID. If a specific instance of a recurring event is desired, the start date of this instance must also be provided, as instances of recurring events do not have their own unique and stable IDs on either iOS or Android. */
+    function getEventAsync(
+        /** ID of the event to return. Required. */
+        id: string,
+
+        /** A map of options for recurring events */
+        recurringEventOptions?: RecurringEventOptions
+    ): Promise<Event>;
+
+    /** Creates a new event on the specified calendar. */
+    function createEventAsync(
+        /** ID of the calendar to create this event in. Required. */
+        calendarId: string,
+        details?: Event
+    ): Promise<string>;
+
+    /** Updates the provided details of an existing calendar stored on the device. To remove a property, explicitly set it to null in details */
+    function updateEventAsync(
+        /** ID of the event to be updated. Required. */
+        id: string,
+
+        /** A map of properties to be updated  */
+        details?: Event | null,
+
+        /** A map of options for recurring events */
+        recurrentEventOptions?: RecurringEventOptions
+    ): Promise<string>;
+
+    /** Deletes an existing event from the device. Use with caution. */
+    function deleteEventAsync(
+        /** ID of the event to be deleted. Required. */
+        id: string,
+
+        /** A map of options for recurring events */
+        recurringEventOptions?: RecurringEventOptions
+    ): Promise<void>;
+
+    /** Gets all attendees for a given event (or instance of a recurring event). */
+    function getAttendeesForEventAsync(
+        /** ID of the event to return attendees for. Required. */
+        eventId: string,
+
+        /** A map of options for recurring events */
+        recurrentEventOptions?: RecurringEventOptions
+    ): Promise<Attendee[]>;
+
+    /** Available on Android only. Creates a new attendee record and adds it to the specified event. Note that if eventId specifies a recurring event, this will add the attendee to every instance of the event. */
+    function createAttendeeAsync(
+        /**  ID of the event to add this attendee to. Required. */
+        eventId: string,
+
+        /** A map of details for the attendee to be created  */
+        details?: Attendee
+    ): Promise<string>;
+
+    /** Available on Android only. Updates an existing attendee record. To remove a property, explicitly set it to null in details. */
+    function updateAttendeeAsync(
+        /** ID of the attendee record to be updated. Required. */
+        id: string,
+
+        /** A map of properties to be updated  */
+        details?: Attendee | null
+    ): Promise<string>;
+
+    /** Available on Android only. Deletes an existing attendee record from the device. Use with caution. */
+    function deleteAttendeeAsync(id: string): Promise<void>;
+
+    /** Available on iOS only. Returns a list of reminders matching the provided criteria. */
+    function getRemindersAsync(
+        /**  Array of IDs of calendars to search for reminders in. Required. */
+        calendarIds: string[],
+
+        status?: ReminderStatus,
+
+        /** Beginning of time period to search for reminders in. Required if status is defined. */
+        startDate?: Date,
+
+        /** End of time period to search for reminders in. Required if status is defined. */
+        endDate?: Date
+    ): Promise<Reminder[]>;
+
+    /** Available on iOS only. Returns a specific reminder selected by ID. */
+    function getReminderAsync(id: string): Promise<Reminder>;
+
+    /** Available on iOS only. Creates a new reminder on the specified calendar. */
+    function createReminderAsync(
+        /** ID of the calendar to create this reminder in. Required. */
+        calendarId: string,
+
+        /** A map of details for the reminder to be created */
+        details?: Reminder
+    ): Promise<string>;
+
+    /** Available on iOS only. Updates the provided details of an existing reminder stored on the device. To remove a property, explicitly set it to null in details. */
+    function updateReminderAsync(
+        /** ID of the reminder to be updated. Required. */
+        id: string,
+
+        /** A map of properties to be updated */
+        details?: Reminder | null
+    ): Promise<string>;
+
+    /** Available on iOS only. Deletes an existing reminder from the device. Use with caution. */
+    function deleteReminderAsync(id: string): Promise<void>;
+
+    /** Available on iOS only. */
+    function getSourcesAsync(): Promise<Source[]>;
+
+    /** Available on iOS only. Returns a specific source selected by ID. */
+    function getSourceAsync(id: string): Promise<Source>;
+
+    /** Available on Android only. Sends an intent to open the specified event in the OS Calendar app. */
+    function openEventInCalendar(
+        /** ID of the event to open. Required. */
+        id: string
+    ): void;
+}
+// #endregion
+
+// #region MailComposer
+/**
+ * An API to compose mails using OS specific UI.
+ */
+export namespace MailComposer {
+    interface ComposeOptions {
+        /** An array of e-mail addressess of the recipients. */
+        recipients?: string[];
+
+        /** An array of e-mail addressess of the CC recipients. */
+        ccRecipients?: string[];
+
+        /** An array of e-mail addressess of the BCC recipients. */
+        bccRecipients?: string[];
+
+        /** Subject of the mail. */
+        subject?: string;
+
+        /** Body of the mail. */
+        body?: string;
+
+        /** Whether the body contains HTML tags so it could be formatted properly. Not working perfectly on Android. */
+        isHtml?: boolean;
+
+        /** An array of app’s internal file uris to attach. */
+        attachments?: string[];
+    }
+
+    /** Resolves to a promise with object containing status field that could be either sent, saved or cancelled. Android does not provide such info so it always resolves to sent. */
+    function composeAsync(
+        /** A map defining the data to fill the mail */
+        options: ComposeOptions
+    ): Promise<{ status: 'sent' | 'saved' | 'cancelled' }>;
+}
+// #endregion
+
+export namespace Updates {
+    namespace EventType {
+        /** A new update is available and has started downloading. */
+        type DownloadStart = 'downloadStart';
+        /** A new update is currently being downloaded and will be stored in the device's cache. */
+        type DownloadProgress = 'downloadProgress';
+        /** A new update has finished downloading and is now stored in the device's cache. */
+        type DownloadFinished = 'downloadFinished';
+        /** No updates are available, and the most up-to-date bundle of this experience is already running. */
+        type NoUpdateAvailable = 'noUpdateAvailable';
+        /** An error occurred trying to fetch the latest update. */
+        type Error = 'error';
+
+        /** A new update is available and has started downloading. */
+        const DOWNLOAD_STARTED: DownloadStart;
+        /** A new update is currently being downloaded and will be stored in the device's cache. */
+        const DOWNLOAD_PROGRESS: DownloadProgress;
+        /** A new update has finished downloading and is now stored in the device's cache. */
+        const DOWNLOAD_FINISHED: DownloadFinished;
+        /** No updates are available, and the most up-to-date bundle of this experience is already running. */
+        const NO_UPDATE_AVAILABLE: NoUpdateAvailable;
+        /** An error occurred trying to fetch the latest update. */
+        const ERROR: Error;
+    }
+
+    interface UpdateCheck {
+        /** True if an update is available, false if you're already running the most up-to-date JS bundle. */
+        isAvailable: boolean;
+        /** If `isAvailable` is true, the manifest of the available update. Undefined otherwise. */
+        manifest?: Constants.Manifest;
+    }
+
+    interface UpdateBundle {
+        /** True if the fetched bundle is new (i.e. a different version that the what's currently running). */
+        isNew: boolean;
+        /** Manifest of the fetched update. */
+        manifest: Constants.Manifest;
+    }
+
+    /** An object that is passed into each event listener when a new version is available. */
+    interface UpdateEvent {
+        /** Type of the event */
+        type: EventType.DownloadStart
+            | EventType.DownloadProgress
+            | EventType.DownloadFinished
+            | EventType.NoUpdateAvailable
+            | EventType.Error;
+        /** If `type === Expo.Updates.EventType.DOWNLOAD_FINISHED`, the manifest of the newly downloaded update. Undefined otherwise. */
+        manifest?: Constants.Manifest;
+        /** If `type === Expo.Updates.EventType.ERROR`, the error message. Undefined otherwise. */
+        message?: string;
+    }
+
+    /** An optional params object passed to fetchUpdateAsync. */
+    interface FetchUpdateAsyncParams {
+        eventListener: UpdateEventListener;
+    }
+
+    type UpdateEventListener = (event: UpdateEvent) => any;
+
+    /**
+     * Invokes a callback when updates-related events occur,
+     * either on the initial app load or as a result of a call to `Expo.Updates.fetchUpdateAsync`.
+     */
+    function addListener(listener: UpdateEventListener): EventSubscription;
+
+    /**
+     * Check if a new published version of your project is available.
+     * Does not actually download the update.
+     * Rejects if `updates.enabled` is `false` in app.json.
+     */
+    function checkForUpdateAsync(): Promise<UpdateCheck>;
+
+    /**
+     * Downloads the most recent published version of your experience to the device's local cache.
+     * Rejects if `updates.enabled` is `false` in app.json.
+     */
+    function fetchUpdateAsync(params?: FetchUpdateAsyncParams): Promise<UpdateBundle>;
+
+    /**
+     * Immediately reloads the current experience.
+     * This will use your app.json updates configuration to fetch and load the newest available JS supported by the device's Expo environment.
+     * This is useful for triggering an update of your experience if you have published a new version.
+     */
+    function reload(): void;
+
+    /**
+     * Immediately reloads the current experience using the most recent cached version.
+     * This is useful for triggering an update of your experience if you have published and already downloaded a new version.
+     */
+    function reloadFromCache(): void;
+}
+
+// #region MediaLibrary
+/**
+ * https://docs.expo.io/versions/latest/sdk/media-library
+ * Provides access to user's media library
+ * Requires Permissions.CAMERA_ROLL permissions.
+ */
+
+export namespace MediaLibrary {
+  /**
+   * Creates an asset from existing file. The most common use case is to save a picture taken by Camera.
+   */
+  function createAssetAsync(localUri: string): Promise<Asset>;
+
+  /**
+   * Fetches a page of assets matching the provided criteria.
+   */
+  function getAssetsAsync(options: GetAssetsOptions): Promise<GetAssetsResult>;
+
+  /**
+   * Provides more informations about an asset, including GPS location, local URI and EXIF metadata.
+   */
+  function getAssetInfoAsync(asset: string | Asset): Promise<Asset>;
+
+  /**
+   * Deletes assets from the library. On iOS it deletes assets from all albums they belong to, while on Android it keeps all copies of them
+   * (album is strictly connected to the asset). Also, there is additional dialog on iOS that requires user to confirm this action.
+   */
+  function deleteAssetsAsync(asset: string[] | Asset[]): Promise<boolean>;
+
+  /**
+   * Queries for user-created albums in media gallery.
+   */
+  function getAlbumsAsync(): Promise<Album[]>;
+
+  /**
+   * Queries for an album with a specific name.
+   */
+  function getAlbumAsync(albumName: string): Promise<Album>;
+
+  /**
+   * Creates an album with given name and initial asset.
+   * The asset parameter is required on Android, since it's not possible to create empty album on this platform.
+   */
+  function createAlbumAsync(albumName: string, asset: string | Asset): Promise<Album>;
+
+  /**
+   * Adds array of assets to the album.
+   * On Android, by default it copies assets from the current album to provided one, however it's also possible to move them by passing false as copyAssets argument.
+   * In case they're copied you should keep in mind that getAssetsAsync will return duplicated assets.
+   */
+  function addAssetsToAlbumAsync(assets: Asset[], album: string | Album, copyAssets?: boolean /* default true */): Promise<boolean>;
+
+  /**
+   * Removes given assets from album.
+   * On Android, album will be automatically deleted if there are no more assets inside.
+   */
+  function removeAssetsFromAlbumAsync(assets: Asset[], album: string | Album): Promise<boolean>;
+
+  /**
+   * Available on iOS only. Fetches a list of moments, which is a group of assets taken around the same place and time.
+   */
+  function getMomentsAsync(): Promise<Album[]>;
+
+  enum MediaType {
+    audio = 'audio',
+    photo = 'photo',
+    video = 'video',
+    unknow = 'unknow'
+  }
+
+  enum SortBy {
+    default = 'default',
+    id = 'id',
+    creationTime = 'creationTime',
+    modificationTime = 'modificationTime',
+    mediaType = 'mediaType',
+    width = 'width',
+    height = 'height',
+    duration = 'duration'
+  }
+
+  // region Asset
+  interface AssetAndroid {
+    albumId?: string;
+  }
+
+  interface AssetIos {
+    mediaSubtypes?: MediaType[];
+    // *
+    orientation: number;
+    // *
+    isFavorite: boolean;
+  }
+
+  interface Asset extends AssetAndroid, AssetIos {
+    id: string;
+    filename: string;
+    uri: string;
+    mediaType: string;
+    width: number;
+    height: number;
+    creationTime: number;
+    modificationTime: number;
+    duration: number;
+    // *
+    localUri?: string;
+    // *
+    location?: Location.LocationProps;
+    // *
+    exif?: object;
+  }
+
+  /**
+   * These fields can be obtained only by calling getAssetInfoAsync method
+   */
+  //#endregion
+
+  // #region Album
+  interface AlbumIos {
+    type?: string;
+    // *
+    startTime: number;
+    // *
+    endTime: number;
+    // *
+    approximateLocation?: Location.LocationProps;
+    // *
+    locationNames?: string[];
+  }
+
+  /**
+   * These fields apply only to albums whose type is moment
+   */
+
+  interface Album extends AlbumIos {
+    id: string;
+    title: string;
+    assetCount: number;
+  }
+  // #endregion
+
+  interface GetAssetsOptions {
+    first?: number;
+    after?: string;
+    album?: string | Album;
+    sortBy?: SortBy;
+    mediaType?: MediaType;
+  }
+
+  interface GetAssetsResult {
+    assets: Asset[];
+    endCursor: string;
+    hasNextPage: boolean;
+    totalCount: number;
+  }
+}
+// #endregion
+
+// #region Haptic
+/**
+ * https://docs.expo.io/versions/latest/sdk/haptic
+ * Provides haptic feedback for iOS 10+ devices using the Taptic Engine.
+ * If this is used in Android the device will use ReactNative.Vibrate instead, it's best to just avoid this.
+ */
+export namespace Haptic {
+  /**
+   * Used to let a user know when a selection change has been registered
+   */
+  function selection(): void;
+  function notification(notificationType?: NotificationType): void;
+  function impact(impactStyles?: ImpactStyles): void;
+
+  enum ImpactStyles {
+    Light = 'light',
+    Medium = 'medium',
+    Heavy = 'heavy'
+  }
+
+  enum NotificationType {
+    Success = 'success',
+    Warning = 'warning',
+    Error = 'error'
+  }
+}
+// #endregion
diff --git a/types/expo/v30/tsconfig.json b/types/expo/v30/tsconfig.json
new file mode 100644
index 0000000000..ec6b729436
--- /dev/null
+++ b/types/expo/v30/tsconfig.json
@@ -0,0 +1,30 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": ["es6"],
+        "jsx": "react",
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../../",
+        "typeRoots": [
+            "../../"
+        ],
+        "paths": {
+            "expo": [
+                "expo/v30"
+            ],
+            "expo/*": [
+                "expo/v30/*"
+            ]
+        },
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "expo-tests.tsx"
+    ]
+}
diff --git a/types/expo/v30/tslint.json b/types/expo/v30/tslint.json
new file mode 100644
index 0000000000..8270136207
--- /dev/null
+++ b/types/expo/v30/tslint.json
@@ -0,0 +1,7 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "void-return": false,
+        "max-line-length": false
+    }
+}

From 9fa6e5174ccd21fafc9a1117ad23e9adcce4de86 Mon Sep 17 00:00:00 2001
From: Hasan Oezdemir <hasan.ozdemir@nodify.at>
Date: Wed, 21 Nov 2018 00:22:16 +0100
Subject: [PATCH 133/836] remove path version and remove the line dtheader:
 false from the tslint.json file

---
 types/redis-rate-limiter/index.d.ts  | 2 +-
 types/redis-rate-limiter/tslint.json | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/types/redis-rate-limiter/index.d.ts b/types/redis-rate-limiter/index.d.ts
index 45495ad874..ec277ae82a 100644
--- a/types/redis-rate-limiter/index.d.ts
+++ b/types/redis-rate-limiter/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for redis-rate-limiter 1.2.0
+// Type definitions for redis-rate-limiter 1.2
 // Project: https://github.com/TabDigital/redis-rate-limiter
 // Definitions by: Seth Westphal <https://github.com/westy92>
 //                 Hasan Oezdemir <https://github.com/nodify-at>
diff --git a/types/redis-rate-limiter/tslint.json b/types/redis-rate-limiter/tslint.json
index a41bf5d19a..a0357daa61 100644
--- a/types/redis-rate-limiter/tslint.json
+++ b/types/redis-rate-limiter/tslint.json
@@ -7,7 +7,6 @@
         "ban-types": false,
         "callable-types": false,
         "comment-format": false,
-        "dt-header": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,

From 9317b400aec9c70318d32bfc3848a90ce57b7486 Mon Sep 17 00:00:00 2001
From: Naveen Kumar Sangi <naveenkumarsangi@protonmail.com>
Date: Tue, 20 Nov 2018 17:17:35 +0530
Subject: [PATCH 134/836] Add type definitions for netlify-identity-widget

---
 types/netlify-identity-widget/index.d.ts      | 86 +++++++++++++++++++
 .../netlify-identity-widget-tests.ts          | 69 +++++++++++++++
 types/netlify-identity-widget/tsconfig.json   | 24 ++++++
 types/netlify-identity-widget/tslint.json     |  3 +
 4 files changed, 182 insertions(+)
 create mode 100644 types/netlify-identity-widget/index.d.ts
 create mode 100644 types/netlify-identity-widget/netlify-identity-widget-tests.ts
 create mode 100644 types/netlify-identity-widget/tsconfig.json
 create mode 100644 types/netlify-identity-widget/tslint.json

diff --git a/types/netlify-identity-widget/index.d.ts b/types/netlify-identity-widget/index.d.ts
new file mode 100644
index 0000000000..a231be53d2
--- /dev/null
+++ b/types/netlify-identity-widget/index.d.ts
@@ -0,0 +1,86 @@
+// Type definitions for netlify-identity-widget 1.4
+// Project: https://github.com/netlify/netlify-identity-widget
+// Definitions by: Naveen Kumar Sangi <https://github.com/nkprince007>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export interface InitOptions {
+    // The container to attach to. e.g.: '#some-query-selector'
+    container?: string;
+
+    // Absolute url to endpoint. ONLY USE IN SPECIAL CASES!
+    // e.g. https://www.example.com/.netlify/functions/identity
+    // Generally avoid setting the APIUrl. You should only set this when
+    // your app is served from a domain that differs from where the
+    // identity endpoint is served.This is common for Cordova or Electron
+    // apps where you host from localhost or a file.
+    APIUrl?: string;
+}
+
+export interface Token {
+    access_token: string;
+    expires_at: string | number;
+    expires_in: string | number;
+    refresh_token: string;
+    token_type: string;
+}
+
+export interface User {
+    api: {
+        _sameOrigin?: boolean;
+        apiURL: string;
+        defaultHeaders: {
+            [header: string]: string | string[] | undefined;
+        };
+    };
+    app_metadata: {
+        provider: string;
+    };
+    aud: string;
+    audience?: any;
+    confirmed_at: string;
+    created_at: string;
+    updated_at: string;
+    email: string;
+    id: string;
+    role: string;
+    token?: Token;
+    url: string;
+    user_metadata: {
+        avatar_url: string;
+        full_name: string;
+    };
+}
+
+/**
+ * Initialises the netlify identity widget.
+ */
+export function init(opts?: InitOptions): void;
+
+/**
+ * Opens the netlify login modal to the corresponding tab.
+ */
+export function open(tabName?: "signup" | "login"): void;
+
+/**
+ * Closes the netlify login modal.
+ */
+export function close(): void;
+
+/**
+ * Retrieves the current logged in user information.
+ */
+export function currentUser(): User | null;
+
+/**
+ * Registers callbacks to corresponding events on the widget.
+ */
+export function on(event: 'init', cb: (user: User | null) => void): void;
+export function on(event: 'login', cb: (user: User) => void): void;
+export function on(event: 'logout' | 'open' | 'close', cb: () => void): void;
+export function on(event: 'error', cb: (err: Error) => void): void;
+
+/**
+ * Logs out the current user. Returns a Promise<void> when a user is
+ * logged in, else returns undefined.
+ */
+export function logout(): Promise<void> | undefined;
diff --git a/types/netlify-identity-widget/netlify-identity-widget-tests.ts b/types/netlify-identity-widget/netlify-identity-widget-tests.ts
new file mode 100644
index 0000000000..f44daaec37
--- /dev/null
+++ b/types/netlify-identity-widget/netlify-identity-widget-tests.ts
@@ -0,0 +1,69 @@
+import es6styleimport from 'netlify-identity-widget';
+
+import NetlifyIdentityWidget = require('netlify-identity-widget');
+
+// Type 0: es6styleimport test
+es6styleimport.init();
+
+// Type 1: Initialize without options
+NetlifyIdentityWidget.init();
+NetlifyIdentityWidget.init({});
+
+// Type 2: Initialize with container option
+NetlifyIdentityWidget.init({ container: 'body' });
+
+// Type 3: Initialize with a specific APIUrl
+NetlifyIdentityWidget.init({ APIUrl: 'https://www.example.com/.netlify/functions/identity' });
+
+// Type 4: Initialize with both the options specified
+NetlifyIdentityWidget.init({
+    APIUrl: 'https://www.example.com/.netlify/functions/identity',
+    container: 'body',
+});
+
+// Open widget modal to let users login
+NetlifyIdentityWidget.open();
+NetlifyIdentityWidget.on('open', () => {
+    // Widget is open and ready to login
+});
+
+// Open wigdet modal with signup tab selected
+NetlifyIdentityWidget.open('signup');
+
+// Close the widget programmatically
+NetlifyIdentityWidget.close();
+NetlifyIdentityWidget.on('close', () => {
+    // Widget is closed
+});
+
+// Event handling after login
+NetlifyIdentityWidget.on('login', (user) => {
+    // You can now use User info after a successful login
+});
+
+// Event handling after logout
+NetlifyIdentityWidget.on('logout', () => {
+    // You can now notify that the logout was successful
+});
+
+// Event handling after login on page refresh
+NetlifyIdentityWidget.on('init', (user) => {
+    // Now the widget is ready to use
+    // If a user was already logged in, the value is returned else null is passed via callback
+});
+
+// Event handling on errors
+NetlifyIdentityWidget.on('error', (err) => {
+    // The error occured during operation is passed in via callback
+});
+
+// Use the current logged in user
+const user = NetlifyIdentityWidget.currentUser();
+
+// If a user is logged in, logout returns a Promise<void>
+const logoutPromise = NetlifyIdentityWidget.logout();
+if (logoutPromise) {
+    logoutPromise.then(() => {
+        // You can now do clean up after successful logout
+    });
+}
diff --git a/types/netlify-identity-widget/tsconfig.json b/types/netlify-identity-widget/tsconfig.json
new file mode 100644
index 0000000000..8ded135467
--- /dev/null
+++ b/types/netlify-identity-widget/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "allowSyntheticDefaultImports": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "netlify-identity-widget-tests.ts"
+    ]
+}
diff --git a/types/netlify-identity-widget/tslint.json b/types/netlify-identity-widget/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/netlify-identity-widget/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}

From f9358fdf2eae83002c3c26743ee30c668ec3ccf3 Mon Sep 17 00:00:00 2001
From: Elizabeth Samuel <elizs@microsoft.com>
Date: Tue, 20 Nov 2018 16:13:44 -0800
Subject: [PATCH 135/836] office-js: Refresh common APIs client support

---
 types/office-js/index.d.ts | 585 +++++++++++++++++++------------------
 1 file changed, 294 insertions(+), 291 deletions(-)

diff --git a/types/office-js/index.d.ts b/types/office-js/index.d.ts
index bbbaccf209..ceb6f2263b 100644
--- a/types/office-js/index.d.ts
+++ b/types/office-js/index.d.ts
@@ -252,7 +252,7 @@ declare namespace Office {
      * 
      * *Supported hosts, by platform*
      *  <table>
-     *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th><th> OWA for Devices </th><th> Office for Mac </th></tr>
+     *   <tr><th>                             </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th><th> OWA for Devices </th><th> Office for Mac </th></tr>
      *   <tr><td><strong> Access     </strong></td><td>                            </td><td> Y                          </td><td>                 </td><td>                 </td><td>                </td></tr>
      *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td>                 </td><td>                </td></tr>
      *   <tr><td><strong> Outlook    </strong></td><td> Y                          </td><td> Y                          </td><td>                 </td><td> Y               </td><td> Y              </td></tr>
@@ -288,7 +288,7 @@ declare namespace Office {
      * 
      * *Supported hosts, by platform*
      *  <table>
-     *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th><th> OWA for Devices </th><th> Office for Mac </th></tr>
+     *   <tr><th>                             </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th><th> OWA for Devices </th><th> Office for Mac </th></tr>
      *   <tr><td><strong> Access     </strong></td><td>                            </td><td> Y                          </td><td>                 </td><td>                 </td><td>                </td></tr>
      *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td>                 </td><td>                </td></tr>
      *   <tr><td><strong> Outlook    </strong></td><td> Y                          </td><td> Y                          </td><td>                 </td><td> Y               </td><td> Y              </td></tr>
@@ -326,7 +326,7 @@ declare namespace Office {
      * 
      * *Supported hosts, by platform*
      *  <table>
-     *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th><th> OWA for Devices </th><th> Office for Mac </th></tr>
+     *   <tr><th>                             </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th><th> OWA for Devices </th><th> Office for Mac </th></tr>
      *   <tr><td><strong> Access     </strong></td><td>                            </td><td> Y                          </td><td>                 </td><td>                 </td><td>                </td></tr>
      *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td>                 </td><td>                </td></tr>
      *   <tr><td><strong> Outlook    </strong></td><td> Y                          </td><td> Y                          </td><td>                 </td><td> Y               </td><td> Y              </td></tr>
@@ -356,7 +356,7 @@ declare namespace Office {
      * 
      * *Supported hosts, by platform*
      *  <table>
-     *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th><th> OWA for Devices </th><th> Office for Mac </th></tr>
+     *   <tr><th>                             </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th><th> OWA for Devices </th><th> Office for Mac </th></tr>
      *   <tr><td><strong> Access     </strong></td><td> Y                          </td><td>                            </td><td>                 </td><td>                 </td><td>                </td></tr>
      *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td>                 </td><td>                </td></tr>
      *   <tr><td><strong> Outlook    </strong></td><td> Y                          </td><td> Y                          </td><td>                 </td><td> Y               </td><td> Y              </td></tr>
@@ -390,7 +390,7 @@ declare namespace Office {
      * 
      * *Supported hosts, by platform*
      *  <table>
-     *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
+     *   <tr><th>                             </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
      *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
      *   <tr><td><strong> Project    </strong></td><td> Y                          </td><td>                            </td><td>                 </td></tr>
      *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td>                            </td><td> Y               </td></tr>
@@ -421,7 +421,7 @@ declare namespace Office {
      * 
      * *Supported hosts, by platform*
      *  <table>
-     *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th><th> OWA for Devices </th><th> Office for Mac </th></tr>
+     *   <tr><th>                             </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th><th> OWA for Devices </th><th> Office for Mac </th></tr>
      *   <tr><td><strong> Access     </strong></td><td> Y                          </td><td>                            </td><td>                 </td><td>                 </td><td>                </td></tr>
      *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td>                 </td><td>                </td></tr>
      *   <tr><td><strong> OneNote    </strong></td><td>                            </td><td> Y                          </td><td>                 </td><td> Y               </td><td>                </td></tr>
@@ -476,7 +476,7 @@ declare namespace Office {
      * 
      * *Supported hosts, by platform*
      *  <table>
-     *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th><th> OWA for Devices </th><th> Office for Mac </th></tr>
+     *   <tr><th>                             </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th><th> OWA for Devices </th><th> Office for Mac </th></tr>
      *   <tr><td><strong> Access     </strong></td><td> Y                          </td><td>                            </td><td>                 </td><td>                 </td><td>                </td></tr>
      *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td>                 </td><td>                </td></tr>
      *   <tr><td><strong> OneNote    </strong></td><td>                            </td><td> Y                          </td><td>                 </td><td> Y               </td><td>                </td></tr>
@@ -540,7 +540,7 @@ declare namespace Office {
         * 
         * *Supported hosts, by platform*
         *  <table>
-        *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th><th> OWA for Devices </th><th> Office for Mac </th></tr>
+        *   <tr><th>                             </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th><th> OWA for Devices </th><th> Office for Mac </th></tr>
         *   <tr><td><strong> Access     </strong></td><td> Y                          </td><td>                            </td><td>                 </td><td>                 </td><td>                </td></tr>
         *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td>                 </td><td>                </td></tr>
         *   <tr><td><strong> Outlook    </strong></td><td> Y                          </td><td> Y                          </td><td>                 </td><td> Y               </td><td> Y              </td></tr>
@@ -596,7 +596,7 @@ declare namespace Office {
         * 
         * *Supported hosts, by platform*
         *  <table>
-        *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th><th> OWA for Devices </th><th> Office for Mac </th></tr>
+        *   <tr><th>                             </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th><th> OWA for Devices </th><th> Office for Mac </th></tr>
         *   <tr><td><strong> Access     </strong></td><td>                            </td><td> Y                          </td><td>                 </td><td>                 </td><td>                </td></tr>
         *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td>                 </td><td>                </td></tr>
         *   <tr><td><strong> Outlook    </strong></td><td> Y                          </td><td> Y                          </td><td>                 </td><td> Y               </td><td> Y              </td></tr>
@@ -651,7 +651,7 @@ declare namespace Office {
         * 
         * *Supported hosts, by platform*
         *  <table>
-        *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th><th> OWA for Devices </th><th> Office for Mac </th></tr>
+        *   <tr><th>                             </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th><th> OWA for Devices </th><th> Office for Mac </th></tr>
         *   <tr><td><strong> Access     </strong></td><td>                            </td><td> Y                          </td><td>                 </td><td>                 </td><td>                </td></tr>
         *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td>                 </td><td>                </td></tr>
         *   <tr><td><strong> Outlook    </strong></td><td> Y                          </td><td> Y                          </td><td>                 </td><td> Y               </td><td> Y              </td></tr>
@@ -688,9 +688,9 @@ declare namespace Office {
         * 
         * *Supported hosts, by platform*
         *  <table>
-        *   <tr><th>                    </th><th> Office for iPad </th></tr>
-        *   <tr><td><strong> Excel      </strong></td><td> Y               </td></tr>
-        *   <tr><td><strong> Word       </strong></td><td> Y               </td></tr>
+        *   <tr><th>                        </th><th> Office for iPad </th></tr>
+        *   <tr><td><strong> Excel </strong></td><td> Y               </td></tr>
+        *   <tr><td><strong> Word  </strong></td><td> Y               </td></tr>
         *  </table>
         */
         commerceAllowed: boolean;
@@ -713,7 +713,7 @@ declare namespace Office {
         * 
         * *Supported hosts, by platform*
         *  <table>
-        *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th><th> OWA for Devices </th><th> Office for Mac </th></tr>
+        *   <tr><th>                             </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th><th> OWA for Devices </th><th> Office for Mac </th></tr>
         *   <tr><td><strong> Access     </strong></td><td>                            </td><td> Y                          </td><td>                 </td><td>                 </td><td>                </td></tr>
         *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td>                 </td><td>                </td></tr>
         *   <tr><td><strong> Outlook    </strong></td><td> Y                          </td><td> Y                          </td><td>                 </td><td> Y               </td><td> Y              </td></tr>
@@ -751,7 +751,7 @@ declare namespace Office {
         * 
         * *Supported hosts, by platform*
         *  <table>
-        *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th><th> OWA for Devices </th><th> Office for Mac </th></tr>
+        *   <tr><th>                             </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th><th> OWA for Devices </th><th> Office for Mac </th></tr>
         *   <tr><td><strong> Access     </strong></td><td> Y                          </td><td>                            </td><td>                 </td><td>                 </td><td>                </td></tr>
         *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td>                 </td><td>                </td></tr>
         *   <tr><td><strong> Outlook    </strong></td><td> Y                          </td><td> Y                          </td><td>                 </td><td> Y               </td><td> Y              </td></tr>
@@ -776,7 +776,7 @@ declare namespace Office {
         * 
         * *Supported hosts, by platform*
         *  <table>
-        *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
+        *   <tr><th>                             </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
         *   <tr><td><strong> Access     </strong></td><td>                            </td><td> Y                          </td><td>                 </td></tr>
         *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
         *   <tr><td><strong> PowerPoint </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
@@ -856,7 +856,7 @@ declare namespace Office {
         * 
         * *Supported hosts, by platform*
         *  <table>
-        *   <tr><th>                    </th><th> Office for iPad </th></tr>
+        *   <tr><th>                             </th><th> Office for iPad </th></tr>
         *   <tr><td><strong> Excel      </strong></td><td> Y               </td></tr>
         *   <tr><td><strong> PowerPoint </strong></td><td> Y               </td></tr>
         *   <tr><td><strong> Word       </strong></td><td> Y               </td></tr>
@@ -885,7 +885,7 @@ declare namespace Office {
      * 
      * *Supported hosts, by platform*
      *  <table>
-     *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th><th> OWA for Devices </th><th> Office for Mac </th></tr>
+     *   <tr><th>                             </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th><th> OWA for Devices </th><th> Office for Mac </th></tr>
      *   <tr><td><strong> Access     </strong></td><td>                            </td><td> Y                          </td><td>                 </td><td>                 </td><td>                </td></tr>
      *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td>                 </td><td>                </td></tr>
      *   <tr><td><strong> Outlook    </strong></td><td> Y                          </td><td> Y                          </td><td>                 </td><td> Y               </td><td> Y              </td></tr>
@@ -936,8 +936,8 @@ declare namespace Office {
              * 
              * *Supported hosts, by platform*
              *  <table>
-             *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
-             *   <tr><td><strong> Outlook    </strong></td><td> Y (Mailbox 1.3)            </td><td>                            </td><td>                 </td></tr>
+             *   <tr><th>                          </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
+             *   <tr><td><strong> Outlook </strong></td><td> Y (Mailbox 1.3)            </td><td>                            </td><td>                 </td></tr>
              *  </table>
              */
             source:Source;
@@ -969,7 +969,7 @@ declare namespace Office {
              * 
              * *Supported hosts, by platform*
              *  <table>
-             *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
+             *   <tr><th>                             </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
              *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
              *   <tr><td><strong> Outlook    </strong></td><td> Y (Mailbox 1.3)            </td><td>                            </td><td>                 </td></tr>
              *   <tr><td><strong> PowerPoint </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
@@ -1511,7 +1511,7 @@ declare namespace Office {
      * 
      * *Supported hosts, by platform*
      *  <table>
-     *   <tr><th>                    </th><th> Office for Windows desktop </th></tr>
+     *   <tr><th>                             </th><th> Office for Windows desktop </th></tr>
      *   <tr><td><strong> Excel      </strong></td><td> Y                          </td></tr>
      *   <tr><td><strong> Outlook    </strong></td><td> Y (in preview)             </td></tr>
      *   <tr><td><strong> PowerPoint </strong></td><td> Y                          </td></tr>
@@ -1578,10 +1578,10 @@ declare namespace Office {
      * 
      * *Supported hosts, by platform*
      *  <table>
-     *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
-     *   <tr><td><strong> Access     </strong></td><td>                            </td><td> Y                          </td><td>                 </td></tr>
-     *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
-     *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td>                            </td><td> Y               </td></tr>
+     *   <tr><th>                         </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
+     *   <tr><td><strong> Access </strong></td><td>                            </td><td> Y                          </td><td>                 </td></tr>
+     *   <tr><td><strong> Excel  </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+     *   <tr><td><strong> Word   </strong></td><td> Y                          </td><td>                            </td><td> Y               </td></tr>
      *  </table>
      */
     function select(expression: string, callback?: (result: AsyncResult<any>) => void): Binding;
@@ -1600,8 +1600,8 @@ declare namespace Office {
      * 
      * *Supported hosts, by platform*
      *  <table>
-     *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
-     *   <tr><td><strong> PowerPoint </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+     *   <tr><th>                             </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th><th> Office for Mac </th></tr>
+     *   <tr><td><strong> PowerPoint </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td></tr>
      *  </table>
      */
     enum ActiveView {
@@ -1628,10 +1628,10 @@ declare namespace Office {
      * 
      * *Supported hosts, by platform*
      *  <table>
-     *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
-     *   <tr><td><strong> Access     </strong></td><td> Y                          </td><td>                            </td><td>                 </td></tr>
-     *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
-     *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+     *   <tr><th>                         </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th><th> Office for Mac </th></tr>
+     *   <tr><td><strong> Access </strong></td><td> Y                          </td><td>                            </td><td>                 </td><td>                </td></tr>
+     *   <tr><td><strong> Excel  </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td></tr>
+     *   <tr><td><strong> Word   </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td></tr>
      *  </table>
      */
     enum BindingType {
@@ -1667,7 +1667,7 @@ declare namespace Office {
      * 
      * *Supported hosts, by platform*
      *  <table>
-     *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th><th> OWA for Devices </th><th> Office for Mac </th></tr>
+     *   <tr><th>                             </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th><th> OWA for Devices </th><th> Office for Mac </th></tr>
      *   <tr><td><strong> Access     </strong></td><td> Y                          </td><td>                            </td><td>                 </td><td>                 </td><td>                </td></tr>
      *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td>                 </td><td>                </td></tr>
      *   <tr><td><strong> Outlook    </strong></td><td> Y                          </td><td> Y                          </td><td>                 </td><td> Y               </td><td> Y              </td></tr>
@@ -1716,7 +1716,7 @@ declare namespace Office {
         SlideRange,
         /**
         * Data is returned or set as an image stream.
-        * Note: Only applies to data in Excel, Word and PowerPoint.
+        * Note: Only applies to data in Excel, Word, and PowerPoint.
         */
         Image
     }
@@ -1737,11 +1737,11 @@ declare namespace Office {
      * 
      * *Supported hosts, by platform*
      *  <table>
-     *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
-     *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
-     *   <tr><td><strong> PowerPoint </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
-     *   <tr><td><strong> Project    </strong></td><td> Y                          </td><td>                            </td><td>                 </td></tr>
-     *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td>                            </td><td> Y               </td></tr>
+     *   <tr><th>                             </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th><th> Office for Mac </th></tr>
+     *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td></tr>
+     *   <tr><td><strong> PowerPoint </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td></tr>
+     *   <tr><td><strong> Project    </strong></td><td> Y                          </td><td>                            </td><td>                 </td><td>                </td></tr>
+     *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td>                            </td><td> Y               </td><td> Y              </td></tr>
      *  </table>
      */
     enum DocumentMode {
@@ -1770,8 +1770,8 @@ declare namespace Office {
      * 
      * *Supported hosts, by platform*
      *  <table>
-     *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
-     *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+     *   <tr><th>                       </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th><th> Office for Mac </th></tr>
+     *   <tr><td><strong> Word </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td></tr>
      *  </table>
      */
     enum CustomXMLNodeType {
@@ -1824,7 +1824,7 @@ declare namespace Office {
      * 
      * *Supported hosts, by platform*
      *  <table>
-     *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
+     *   <tr><th>                             </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
      *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
      *   <tr><td><strong> Outlook    </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
      *   <tr><td><strong> PowerPoint </strong></td><td> Y                          </td><td> Y                          </td><td>                 </td></tr>
@@ -1846,7 +1846,7 @@ declare namespace Office {
          * 
          * *Supported hosts, by platform*
          *  <table>
-         *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
+         *   <tr><th>                             </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
          *   <tr><td><strong> PowerPoint </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
          *  </table>
          */
@@ -1882,10 +1882,10 @@ declare namespace Office {
          * 
          * *Supported hosts, by platform*
          *  <table>
-         *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
-         *   <tr><td><strong> Access     </strong></td><td>                            </td><td> Y                          </td><td>                 </td></tr>
-         *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
-         *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+         *   <tr><th>                         </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
+         *   <tr><td><strong> Access </strong></td><td>                            </td><td> Y                          </td><td>                 </td></tr>
+         *   <tr><td><strong> Excel  </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+         *   <tr><td><strong> Word   </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
          *  </table>
          */
         BindingDataChanged,
@@ -1905,10 +1905,10 @@ declare namespace Office {
          * 
          * *Supported hosts, by platform*
          *  <table>
-         *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
-         *   <tr><td><strong> Access     </strong></td><td>                            </td><td> Y                          </td><td>                 </td></tr>
-         *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
-         *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+         *   <tr><th>                         </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
+         *   <tr><td><strong> Access </strong></td><td>                            </td><td> Y                          </td><td>                 </td></tr>
+         *   <tr><td><strong> Excel  </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+         *   <tr><td><strong> Word   </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
          *  </table>
          */
         BindingSelectionChanged,
@@ -1933,9 +1933,9 @@ declare namespace Office {
          * 
          * *Supported hosts, by platform*
          *  <table>
-         *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
-         *   <tr><td><strong> Excel      </strong></td><td>                            </td><td> Y                          </td><td>                 </td></tr>
-         *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td> Y                          </td><td>                 </td></tr>
+         *   <tr><th>                        </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
+         *   <tr><td><strong> Excel </strong></td><td>                            </td><td> Y                          </td><td>                 </td></tr>
+         *   <tr><td><strong> Word  </strong></td><td> Y                          </td><td> Y                          </td><td>                 </td></tr>
          *  </table>
          */
         DocumentSelectionChanged,
@@ -1994,7 +1994,7 @@ declare namespace Office {
          * 
          * *Supported hosts, by platform*
          *  <table>
-         *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
+         *   <tr><th>                             </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
          *   <tr><td><strong> Access     </strong></td><td>                            </td><td> Y                          </td><td>                 </td></tr>
          *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
          *   <tr><td><strong> PowerPoint </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
@@ -2027,10 +2027,10 @@ declare namespace Office {
      * 
      * *Supported hosts, by platform*
      *  <table>
-     *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
-     *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
-     *   <tr><td><strong> PowerPoint </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
-     *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+     *   <tr><th>                             </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th><th> Office for Mac </th></tr>
+     *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td></tr>
+     *   <tr><td><strong> PowerPoint </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td></tr>
+     *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td></tr>
      *  </table>
      */
     enum FileType {
@@ -2062,10 +2062,10 @@ declare namespace Office {
      * 
      * *Supported hosts, by platform*
      *  <table>
-     *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
-     *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
-     *   <tr><td><strong> Project    </strong></td><td> Y                          </td><td>                            </td><td>                 </td></tr>
-     *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td>                            </td><td> Y               </td></tr>
+     *   <tr><th>                          </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
+     *   <tr><td><strong> Excel   </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+     *   <tr><td><strong> Project </strong></td><td> Y                          </td><td>                            </td><td>                 </td></tr>
+     *   <tr><td><strong> Word    </strong></td><td> Y                          </td><td>                            </td><td> Y               </td></tr>
      *  </table>
      */
     enum FilterType {
@@ -2093,7 +2093,7 @@ declare namespace Office {
      * 
      * *Supported hosts, by platform*
      *  <table>
-     *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
+     *   <tr><th>                             </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
      *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
      *   <tr><td><strong> PowerPoint </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
      *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td>                            </td><td> Y               </td></tr>
@@ -2141,7 +2141,7 @@ declare namespace Office {
      * 
      * *Supported hosts, by platform*
      *  <table>
-     *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
+     *   <tr><th>                             </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
      *   <tr><td><strong> PowerPoint </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
      *  </table>
      */
@@ -2178,7 +2178,7 @@ declare namespace Office {
      * 
      * *Supported hosts, by platform*
      *  <table>
-     *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
+     *   <tr><th>                             </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
      *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
      *   <tr><td><strong> PowerPoint </strong></td><td> Y                          </td><td>                            </td><td>                 </td></tr>
      *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td>                            </td><td> Y               </td></tr>
@@ -2213,10 +2213,10 @@ declare namespace Office {
      * 
      * *Supported hosts, by platform*
      *  <table>
-     *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
-     *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
-     *   <tr><td><strong> Project    </strong></td><td> Y                          </td><td>                            </td><td>                 </td></tr>
-     *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td>                            </td><td> Y               </td></tr>
+     *   <tr><th>                          </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
+     *   <tr><td><strong> Excel   </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+     *   <tr><td><strong> Project </strong></td><td> Y                          </td><td>                            </td><td>                 </td></tr>
+     *   <tr><td><strong> Word    </strong></td><td> Y                          </td><td>                            </td><td> Y               </td></tr>
      *  </table>
      */
     enum ValueFormat {
@@ -2234,7 +2234,7 @@ declare namespace Office {
     * Represents a binding to a section of the document.
     *
     * @remarks
-    * <table><tr><td>Requirement Sets</td><td>MatrixBinding, TableBinding, TextBinding</td></tr></table>
+    * <table><tr><td>Requirement Sets</td><td>MatrixBindings, TableBindings, TextBindings</td></tr></table>
     *
     * The Binding object exposes the functionality possessed by all bindings regardless of type.
     *
@@ -2254,10 +2254,10 @@ declare namespace Office {
     * 
     * *Supported hosts, by platform*
     *  <table>
-    *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
-    *   <tr><td><strong> Access     </strong></td><td>                            </td><td> Y                          </td><td>                 </td></tr>
-    *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
-    *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+    *   <tr><th>                         </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th><th> Office for Mac </th></tr>
+    *   <tr><td><strong> Access </strong></td><td>                            </td><td> Y                          </td><td>                 </td><td>                </td></tr>
+    *   <tr><td><strong> Excel  </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td></tr>
+    *   <tr><td><strong> Word   </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td></tr>
     *  </table>
     */
     interface Binding {
@@ -2541,10 +2541,10 @@ declare namespace Office {
          * 
          * *Supported hosts, by platform*
          *  <table>
-         *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
-         *   <tr><td><strong> Access     </strong></td><td>                            </td><td> Y                          </td><td>                 </td></tr>
-         *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
-         *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+         *   <tr><th>                         </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th><th> Office for Mac </th></tr>
+         *   <tr><td><strong> Access </strong></td><td>                            </td><td> Y                          </td><td>                 </td><td>                </td></tr>
+         *   <tr><td><strong> Excel  </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td></tr>
+         *   <tr><td><strong> Word   </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td></tr>
          *  </table>
          */
         document: Document;
@@ -2582,10 +2582,10 @@ declare namespace Office {
          * 
          * *Supported hosts, by platform*
          *  <table>
-         *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
-         *   <tr><td><strong> Access     </strong></td><td>                            </td><td> Y                          </td><td>                 </td></tr>
-         *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
-         *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+         *   <tr><th>                         </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th><th> Office for Mac </th></tr>
+         *   <tr><td><strong> Access </strong></td><td>                            </td><td> Y                          </td><td>                 </td><td>                </td></tr>
+         *   <tr><td><strong> Excel  </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td></tr>
+         *   <tr><td><strong> Word   </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td></tr>
          *  </table>
          * @param itemName Name of the bindable object in the document. For Example 'MyExpenses' table in Excel."
          * @param bindingType The {@link Office.BindingType} for the data. The method returns null if the selected object cannot be coerced into the specified type.
@@ -2613,9 +2613,9 @@ declare namespace Office {
          * 
          * *Supported hosts, by platform*
          *  <table>
-         *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
-         *   <tr><td><strong> Access     </strong></td><td>                            </td><td> Y                          </td><td>                 </td></tr>
-         *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+         *   <tr><th>                         </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th><th> Office for Mac </th></tr>
+         *   <tr><td><strong> Access </strong></td><td>                            </td><td> Y                          </td><td>                 </td><td>                </td></tr>
+         *   <tr><td><strong> Excel  </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td></tr>
          *  </table>
          *
          * @param bindingType Specifies the type of the binding object to create. Required. 
@@ -2648,10 +2648,10 @@ declare namespace Office {
          * 
          * *Supported hosts, by platform*
          *  <table>
-         *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
-         *   <tr><td><strong> Access     </strong></td><td>                            </td><td> Y                          </td><td>                 </td></tr>
-         *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
-         *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+         *   <tr><th>                         </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th><th> Office for Mac </th></tr>
+         *   <tr><td><strong> Access </strong></td><td>                            </td><td> Y                          </td><td>                 </td><td>                </td></tr>
+         *   <tr><td><strong> Excel  </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td></tr>
+         *   <tr><td><strong> Word   </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td></tr>
          *  </table>
          *
          * @param bindingType Specifies the type of the binding object to create. Required. 
@@ -2677,10 +2677,10 @@ declare namespace Office {
          * 
          * *Supported hosts, by platform*
          *  <table>
-         *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
-         *   <tr><td><strong> Access     </strong></td><td>                            </td><td> Y                          </td><td>                 </td></tr>
-         *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
-         *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+         *   <tr><th>                         </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th><th> Office for Mac </th></tr>
+         *   <tr><td><strong> Access </strong></td><td>                            </td><td> Y                          </td><td>                 </td><td>                </td></tr>
+         *   <tr><td><strong> Excel  </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td></tr>
+         *   <tr><td><strong> Word   </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td></tr>
          *  </table>
          *
          * @param options Provides an option for preserving context data of any type, unchanged, for use in a callback.
@@ -2706,10 +2706,10 @@ declare namespace Office {
          * 
          * *Supported hosts, by platform*
          *  <table>
-         *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
-         *   <tr><td><strong> Access     </strong></td><td>                            </td><td> Y                          </td><td>                 </td></tr>
-         *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
-         *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+         *   <tr><th>                         </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th><th> Office for Mac </th></tr>
+         *   <tr><td><strong> Access </strong></td><td>                            </td><td> Y                          </td><td>                 </td><td>                </td></tr>
+         *   <tr><td><strong> Excel  </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td></tr>
+         *   <tr><td><strong> Word   </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td></tr>
          *  </table>
          *
          * @param id Specifies the unique name of the binding object. Required.
@@ -2736,10 +2736,10 @@ declare namespace Office {
          * 
          * *Supported hosts, by platform*
          *  <table>
-         *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
-         *   <tr><td><strong> Access     </strong></td><td>                            </td><td> Y                          </td><td>                 </td></tr>
-         *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
-         *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+         *   <tr><th>                         </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th><th> Office for Mac </th></tr>
+         *   <tr><td><strong> Access </strong></td><td>                            </td><td> Y                          </td><td>                 </td><td>                </td></tr>
+         *   <tr><td><strong> Excel  </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td></tr>
+         *   <tr><td><strong> Word   </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td></tr>
          *  </table>
          *
          * @param id Specifies the unique name to be used to identify the binding object. Required.
@@ -2764,8 +2764,8 @@ declare namespace Office {
      * 
      * *Supported hosts, by platform*
      *  <table>
-     *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
-     *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+     *   <tr><th>                       </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th><th> Office for Mac </th></tr>
+     *   <tr><td><strong> Word </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td></tr>
      *  </table>
      */
     interface CustomXmlNode {
@@ -2887,8 +2887,8 @@ declare namespace Office {
      * 
      * *Supported hosts, by platform*
      *  <table>
-     *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
-     *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+     *   <tr><th>                       </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th><th> Office for Mac </th></tr>
+     *   <tr><td><strong> Word </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td></tr>
      *  </table>
      */
     interface CustomXmlPart {
@@ -2979,8 +2979,8 @@ declare namespace Office {
      * 
      * *Supported hosts, by platform*
      *  <table>
-     *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
-     *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td>                            </td><td> Y               </td></tr>
+     *   <tr><th>                       </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th><th> Office for Mac </th></tr>
+     *   <tr><td><strong> Word </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td></tr>
      *  </table>
      */
     interface NodeDeletedEventArgs {
@@ -3016,8 +3016,8 @@ declare namespace Office {
      * 
      * *Supported hosts, by platform*
      *  <table>
-     *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
-     *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td>                            </td><td> Y               </td></tr>
+     *   <tr><th>                       </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th><th> Office for Mac </th></tr>
+     *   <tr><td><strong> Word </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td></tr>
      *  </table>
      */
     interface NodeInsertedEventArgs  {
@@ -3047,8 +3047,8 @@ declare namespace Office {
      * 
      * *Supported hosts, by platform*
      *  <table>
-     *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
-     *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td>                            </td><td> Y               </td></tr>
+     *   <tr><th>                       </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th><th> Office for Mac </th></tr>
+     *   <tr><td><strong> Word </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td></tr>
      *  </table>
      */
     interface NodeReplacedEventArgs  {
@@ -3087,8 +3087,8 @@ declare namespace Office {
      * 
      * *Supported hosts, by platform*
      *  <table>
-     *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
-     *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td>                            </td><td> Y               </td></tr>
+     *   <tr><th>                       </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th><th> Office for Mac </th></tr>
+     *   <tr><td><strong> Word </strong></td><td> Y                          </td><td>                            </td><td> Y               </td><td> Y              </td></tr>
      *  </table>
      */
     interface CustomXmlParts {
@@ -3138,8 +3138,8 @@ declare namespace Office {
      * 
      * *Supported hosts, by platform*
      *  <table>
-     *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
-     *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td>                            </td><td> Y               </td></tr>
+     *   <tr><th>                       </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th><th> Office for Mac </th></tr>
+     *   <tr><td><strong> Word </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td></tr>
      *  </table>
      */
     interface CustomXmlPrefixMappings {
@@ -3208,10 +3208,10 @@ declare namespace Office {
          * 
          * *Supported hosts, by platform*
          *  <table>
-         *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
-         *   <tr><td><strong> Access     </strong></td><td>                            </td><td> Y                          </td><td>                 </td></tr>
-         *   <tr><td><strong> PowerPoint </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
-         *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+         *   <tr><th>                             </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th><th> Office for Mac </th></tr>
+         *   <tr><td><strong> Access     </strong></td><td>                            </td><td> Y                          </td><td>                 </td><td>                </td></tr>
+         *   <tr><td><strong> PowerPoint </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td></tr>
+         *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td></tr>
          *  </table>
          */
         bindings: Bindings;
@@ -3230,8 +3230,8 @@ declare namespace Office {
          * 
          * *Supported hosts, by platform*
          *  <table>
-         *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
-         *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td>                            </td><td> Y               </td></tr>
+         *   <tr><th>                             </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th><th> Office for Mac </th></tr>
+         *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td></tr>
          *  </table>
          */
         customXmlParts: CustomXmlParts;
@@ -3250,11 +3250,11 @@ declare namespace Office {
          * 
          * *Supported hosts, by platform*
          *  <table>
-         *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
-         *   <tr><td><strong> Access     </strong></td><td>                            </td><td> Y                          </td><td>                 </td></tr>
-         *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
-         *   <tr><td><strong> PowerPoint </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
-         *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+         *   <tr><th>                             </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th><th> Office for Mac </th></tr>
+         *   <tr><td><strong> Access     </strong></td><td>                            </td><td> Y                          </td><td>                 </td><td>                </td></tr>
+         *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td></tr>
+         *   <tr><td><strong> PowerPoint </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td></tr>
+         *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td></tr>
          *  </table>
          */
         mode: DocumentMode;
@@ -3273,11 +3273,12 @@ declare namespace Office {
          * 
          * *Supported hosts, by platform*
          *  <table>
-         *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
-         *   <tr><td><strong> Access     </strong></td><td>                            </td><td> Y                          </td><td>                 </td></tr>
-         *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
-         *   <tr><td><strong> PowerPoint </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
-         *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+         *   <tr><th>                             </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th><th> Office for Mac </th></tr>
+         *   <tr><td><strong> Access     </strong></td><td>                            </td><td> Y                          </td><td>                 </td><td>                </td></tr>
+         *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td><</tr>
+         *   <tr><td><strong> OneNote    </strong></td><td>                            </td><td> Y                          </td><td>                 </td><td>                </td><</tr>
+         *   <tr><td><strong> PowerPoint </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td><</tr>
+         *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td><</tr>
          *  </table>
          */
         settings: Settings;
@@ -3296,7 +3297,7 @@ declare namespace Office {
          * 
          * *Supported hosts, by platform*
          *  <table>
-         *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
+         *   <tr><th>                             </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
          *   <tr><td><strong> Access     </strong></td><td>                            </td><td> Y                          </td><td>                 </td></tr>
          *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
          *   <tr><td><strong> PowerPoint </strong></td><td> Y                          </td><td>                            </td><td>                 </td></tr>
@@ -3322,11 +3323,12 @@ declare namespace Office {
          * 
          * *Supported hosts, by platform*
          *  <table>
-         *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
-         *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
-         *   <tr><td><strong> PowerPoint </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
-         *   <tr><td><strong> Project    </strong></td><td> Y                          </td><td>                            </td><td>                 </td></tr>
-         *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+         *   <tr><th>                             </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th><th> Office for Mac </th></tr>
+         *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td></tr>
+         *   <tr><td><strong> OneNote    </strong></td><td>                            </td><td> Y                          </td><td>                 </td><td>                </td></tr>
+         *   <tr><td><strong> PowerPoint </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td></tr>
+         *   <tr><td><strong> Project    </strong></td><td> Y                          </td><td>                            </td><td>                 </td><td>                </td></tr>
+         *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td></tr>
          *  </table>
          *
          * @param eventType For a Document object event, the eventType parameter can be specified as `Office.EventType.Document.SelectionChanged` or 
@@ -3354,10 +3356,8 @@ declare namespace Office {
          * 
          * *Supported hosts, by platform*
          *  <table>
-         *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
-         *   <tr><td><strong> Excel      </strong></td><td>                            </td><td>                            </td><td> Y               </td></tr>
-         *   <tr><td><strong> PowerPoint </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
-         *   <tr><td><strong> Word       </strong></td><td>                            </td><td>                            </td><td> Y               </td></tr>
+         *   <tr><th>                             </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th><th> Office for Mac </th></tr>
+         *   <tr><td><strong> PowerPoint </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td></tr>
          *  </table>
          *
          * @param options Provides an option for preserving context data of any type, unchanged, for use in a callback.
@@ -3381,13 +3381,13 @@ declare namespace Office {
          * The fileType parameter can be specified by using the {@link Office.FileType} enumeration or text values. But the possible values vary with 
          * the host:
          *
-         * Excel Online, Win32, Mac, and iOS: `Office.FileType.Compressed`
+         * Excel for Windows desktop, iPad, and Excel Online: `Office.FileType.Compressed`
+         * 
+         * Excel for Mac: `Office.FileType.Compressed`, `Office.FileType.Pdf`
          *
-         * PowerPoint on Windows desktop, Mac, and iPad, and PowerPoint Online: `Office.FileType.Compressed`, `Office.FileType.Pdf`
+         * PowerPoint for Windows desktop, Mac, iPad, and PowerPoint Online: `Office.FileType.Compressed`, `Office.FileType.Pdf`
          *
-         * Word on Windows desktop, Word on Mac, and Word Online: `Office.FileType.Compressed`, `Office.FileType.Pdf`, `Office.FileType.Text`
-         *
-         * Word on iPad: `Office.FileType.Compressed`, `Office.FileType.Text`
+         * Word for Windows desktop, Mac, iPad, and Word Online: `Office.FileType.Compressed`, `Office.FileType.Pdf`, `Office.FileType.Text`
          * 
          * **Support details**
          * 
@@ -3399,10 +3399,10 @@ declare namespace Office {
          * 
          * *Supported hosts, by platform*
          *  <table>
-         *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
-         *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td>                            </td><td>                 </td></tr>
-         *   <tr><td><strong> PowerPoint </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
-         *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td>                            </td><td> Y               </td></tr>
+         *   <tr><th>                             </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th><th> Office for Mac </th></tr>
+         *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td></tr>
+         *   <tr><td><strong> PowerPoint </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td></tr>
+         *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td></tr>
          *  </table>
          *
          * @param fileType The format in which the file will be returned
@@ -3429,10 +3429,10 @@ declare namespace Office {
          * 
          * *Supported hosts, by platform*
          *  <table>
-         *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
-         *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
-         *   <tr><td><strong> PowerPoint </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
-         *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+         *   <tr><th>                             </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th><th> Office for Mac </th></tr>
+         *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td></tr>
+         *   <tr><td><strong> PowerPoint </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td></tr>
+         *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td></tr>
          *  </table>
          *
          * @param options Provides an option for preserving context data of any type, unchanged, for use in a callback.
@@ -3480,15 +3480,15 @@ declare namespace Office {
          *     <th>Supported coercionType</th>
          *   </tr>
          *   <tr>
-         *     <td>Excel, Excel Online, PowerPoint, PowerPoint Online, Word, and Word Online</td>
+         *     <td>Excel, PowerPoint, Project, and Word</td>
          *     <td>`Office.CoercionType.Text` (string)</td>
          *   </tr>
          *   <tr>
-         *     <td>Excel, Word, and Word Online</td>
+         *     <td>Excel and Word</td>
          *     <td>`Office.CoercionType.Matrix` (array of arrays)</td>
          *   </tr>
          *   <tr>
-         *     <td>Access, Excel, Word, and Word Online</td>
+         *     <td>Access, Excel, and Word</td>
          *     <td>`Office.CoercionType.Table` (TableData object)</td>
          *   </tr>
          *   <tr>
@@ -3496,7 +3496,7 @@ declare namespace Office {
          *     <td>`Office.CoercionType.Html`</td>
          *   </tr>
          *   <tr>
-         *     <td>Word and Word Online </td>
+         *     <td>Word</td>
          *     <td>`Office.CoercionType.Ooxml` (Office Open XML)</td>
          *   </tr>
          *   <tr>
@@ -3515,12 +3515,11 @@ declare namespace Office {
          * 
          * *Supported hosts, by platform*
          *  <table>
-         *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
-         *   <tr><td><strong> Access     </strong></td><td>                            </td><td> Y                          </td><td>                 </td></tr>
-         *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
-         *   <tr><td><strong> PowerPoint </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
-         *   <tr><td><strong> Project    </strong></td><td> Y                          </td><td> Y                          </td><td>                 </td></tr>
-         *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td>                            </td><td> Y               </td></tr>
+         *   <tr><th>                             </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th><th> Office for Mac </th></tr>
+         *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td></tr>
+         *   <tr><td><strong> PowerPoint </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td></tr>
+         *   <tr><td><strong> Project    </strong></td><td> Y                          </td><td>                            </td><td>                 </td><td>                </td></tr>
+         *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td></tr>
          *  </table>
          * 
          * @param coercionType The type of data structure to return. See the remarks section for each host's supported coercion types.
@@ -3562,10 +3561,10 @@ declare namespace Office {
          * 
          * *Supported hosts, by platform*
          *  <table>
-         *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
-         *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
-         *   <tr><td><strong> PowerPoint </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
-         *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td>                            </td><td> Y               </td></tr>
+         *   <tr><th>                             </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th><th> Office for Mac </th></tr>
+         *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td></tr>
+         *   <tr><td><strong> PowerPoint </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td></tr>
+         *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td>                            </td><td> Y               </td><td> Y              </td></tr>
          *  </table>
          *
          * @param id The identifier of the object or location to go to.
@@ -3591,10 +3590,12 @@ declare namespace Office {
          * 
          * *Supported hosts, by platform*
          *  <table>
-         *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
-         *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
-         *   <tr><td><strong> PowerPoint </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
-         *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+         *   <tr><th>                             </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th><th> Office for Mac </th></tr>
+         *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td></tr>
+         *   <tr><td><strong> OneNote    </strong></td><td>                            </td><td> Y                          </td><td>                 </td><td>                </td></tr>
+         *   <tr><td><strong> PowerPoint </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td></tr>
+         *   <tr><td><strong> Project    </strong></td><td> Y                          </td><td>                            </td><td>                 </td><td>                </td></tr>
+         *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td></tr>
          *  </table>
          *
          * @param eventType The event type. For document can be 'Document.SelectionChanged' or 'Document.ActiveViewChanged'.
@@ -3643,15 +3644,15 @@ declare namespace Office {
          *     <th>Supported coercionType</th>
          *   </tr>
          *   <tr>
-         *     <td>Excel, Excel Online, PowerPoint, PowerPoint Online, Word, and Word Online</td>
+         *     <td>Excel, PowerPoint, Project, and Word</td>
          *     <td>`Office.CoercionType.Text` (string)</td>
          *   </tr>
          *   <tr>
-         *     <td>Excel, Word, and Word Online</td>
+         *     <td>Excel and Word</td>
          *     <td>`Office.CoercionType.Matrix` (array of arrays)</td>
          *   </tr>
          *   <tr>
-         *     <td>Access, Excel, Word, and Word Online</td>
+         *     <td>Access, Excel, and Word</td>
          *     <td>`Office.CoercionType.Table` (TableData object)</td>
          *   </tr>
          *   <tr>
@@ -3659,7 +3660,7 @@ declare namespace Office {
          *     <td>`Office.CoercionType.Html`</td>
          *   </tr>
          *   <tr>
-         *     <td>Word and Word Online </td>
+         *     <td>Word</td>
          *     <td>`Office.CoercionType.Ooxml` (Office Open XML)</td>
          *   </tr>
          *   <tr>
@@ -3678,11 +3679,11 @@ declare namespace Office {
          * 
          * *Supported hosts, by platform*
          *  <table>
-         *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
-         *   <tr><td><strong> Access     </strong></td><td> y                          </td><td>                            </td><td>                 </td></tr>
-         *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
-         *   <tr><td><strong> PowerPoint </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
-         *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+         *   <tr><th>                             </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th><th> Office for Mac </th></tr>
+         *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td></tr>
+         *   <tr><td><strong> PowerPoint </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td></tr>
+         *   <tr><td><strong> Project    </strong></td><td> Y                          </td><td>                            </td><td>                 </td><td>                </td></tr>
+         *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td></tr>
          *  </table>
          * 
          * @param data The data to be set. Either a string or  {@link Office.CoercionType} value, 2d array or TableData object.
@@ -3734,8 +3735,8 @@ declare namespace Office {
          * 
          * *Supported hosts, by platform*
          *  <table>
-         *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser)</th></tr>
-         *   <tr><td><strong> Project    </strong></td><td> Y                          </td><td>                           </td></tr>
+         *   <tr><th>                          </th><th> Office for Windows desktop </th><th> Office Online (in browser)</th></tr>
+         *   <tr><td><strong> Project </strong></td><td> Y                          </td><td>                           </td></tr>
          *  </table>
          */
         getProjectFieldAsync(fieldId: number, options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<any>) => void): void;
@@ -3759,8 +3760,8 @@ declare namespace Office {
          * 
          * *Supported hosts, by platform*
          *  <table>
-         *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser)</th></tr>
-         *   <tr><td><strong> Project    </strong></td><td> Y                          </td><td>                           </td></tr>
+         *   <tr><th>                          </th><th> Office for Windows desktop </th><th> Office Online (in browser)</th></tr>
+         *   <tr><td><strong> Project </strong></td><td> Y                          </td><td>                           </td></tr>
          *  </table>
          */
         getResourceFieldAsync(resourceId: string, fieldId: number, options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<string>) => void): void;
@@ -3782,8 +3783,8 @@ declare namespace Office {
          * 
          * *Supported hosts, by platform*
          *  <table>
-         *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser)</th></tr>
-         *   <tr><td><strong> Project    </strong></td><td> Y                          </td><td>                           </td></tr>
+         *   <tr><th>                          </th><th> Office for Windows desktop </th><th> Office Online (in browser)</th></tr>
+         *   <tr><td><strong> Project </strong></td><td> Y                          </td><td>                           </td></tr>
          *  </table>
          */
         getSelectedResourceAsync(options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<string>) => void): void;
@@ -3805,8 +3806,8 @@ declare namespace Office {
          * 
          * *Supported hosts, by platform*
          *  <table>
-         *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser)</th></tr>
-         *   <tr><td><strong> Project    </strong></td><td> Y                          </td><td>                           </td></tr>
+         *   <tr><th>                          </th><th> Office for Windows desktop </th><th> Office Online (in browser)</th></tr>
+         *   <tr><td><strong> Project </strong></td><td> Y                          </td><td>                           </td></tr>
          *  </table>
          */
         getSelectedTaskAsync(options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<string>) => void): void;
@@ -3830,8 +3831,8 @@ declare namespace Office {
          * 
          * *Supported hosts, by platform*
          *  <table>
-         *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser)</th></tr>
-         *   <tr><td><strong> Project    </strong></td><td> Y                          </td><td>                           </td></tr>
+         *   <tr><th>                          </th><th> Office for Windows desktop </th><th> Office Online (in browser)</th></tr>
+         *   <tr><td><strong> Project </strong></td><td> Y                          </td><td>                           </td></tr>
          *  </table>
          */
         getSelectedViewAsync(options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<any>) => void): void;
@@ -3857,8 +3858,8 @@ declare namespace Office {
          * 
          * *Supported hosts, by platform*
          *  <table>
-         *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser)</th></tr>
-         *   <tr><td><strong> Project    </strong></td><td> Y                          </td><td>                           </td></tr>
+         *   <tr><th>                          </th><th> Office for Windows desktop </th><th> Office Online (in browser)</th></tr>
+         *   <tr><td><strong> Project </strong></td><td> Y                          </td><td>                           </td></tr>
          *  </table>
          */
         getTaskAsync(taskId: string, options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<any>) => void): void;
@@ -3882,8 +3883,8 @@ declare namespace Office {
          * 
          * *Supported hosts, by platform*
          *  <table>
-         *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser)</th></tr>
-         *   <tr><td><strong> Project    </strong></td><td> Y                          </td><td>                           </td></tr>
+         *   <tr><th>                          </th><th> Office for Windows desktop </th><th> Office Online (in browser)</th></tr>
+         *   <tr><td><strong> Project </strong></td><td> Y                          </td><td>                           </td></tr>
          *  </table>
          */
         getTaskFieldAsync(taskId: string, fieldId: number, options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<any>) => void): void;
@@ -3907,8 +3908,8 @@ declare namespace Office {
          * 
          * *Supported hosts, by platform*
          *  <table>
-         *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser)</th></tr>
-         *   <tr><td><strong> Project    </strong></td><td> Y                          </td><td>                           </td></tr>
+         *   <tr><th>                          </th><th> Office for Windows desktop </th><th> Office Online (in browser)</th></tr>
+         *   <tr><td><strong> Project </strong></td><td> Y                          </td><td>                           </td></tr>
          *  </table>
          */
         getWSSUrlAsync(options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<any>) => void): void;
@@ -3959,8 +3960,8 @@ declare namespace Office {
          * 
          * *Supported hosts, by platform*
          *  <table>
-         *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser)</th></tr>
-         *   <tr><td><strong> Project    </strong></td><td> Y                          </td><td>                           </td></tr>
+         *   <tr><th>                          </th><th> Office for Windows desktop </th><th> Office Online (in browser)</th></tr>
+         *   <tr><td><strong> Project </strong></td><td> Y                          </td><td>                           </td></tr>
          *  </table>
          */
         getMaxTaskIndexAsync(options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<number>) => void): void;
@@ -3986,8 +3987,8 @@ declare namespace Office {
          * 
          * *Supported hosts, by platform*
          *  <table>
-         *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser)</th></tr>
-         *   <tr><td><strong> Project    </strong></td><td> Y                          </td><td>                           </td></tr>
+         *   <tr><th>                          </th><th> Office for Windows desktop </th><th> Office Online (in browser)</th></tr>
+         *   <tr><td><strong> Project </strong></td><td> Y                          </td><td>                           </td></tr>
          *  </table>
          */
         getResourceByIndexAsync(resourceIndex: number, options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<string>) => void): void;
@@ -4013,8 +4014,8 @@ declare namespace Office {
          * 
          * *Supported hosts, by platform*
          *  <table>
-         *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser)</th></tr>
-         *   <tr><td><strong> Project    </strong></td><td> Y                          </td><td>                           </td></tr>
+         *   <tr><th>                          </th><th> Office for Windows desktop </th><th> Office Online (in browser)</th></tr>
+         *   <tr><td><strong> Project </strong></td><td> Y                          </td><td>                           </td></tr>
          *  </table>
          */
         getTaskByIndexAsync(taskIndex: number, options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<string>) => void): void;
@@ -4041,8 +4042,8 @@ declare namespace Office {
          * 
          * *Supported hosts, by platform*
          *  <table>
-         *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser)</th></tr>
-         *   <tr><td><strong> Project    </strong></td><td> Y                          </td><td>                           </td></tr>
+         *   <tr><th>                          </th><th> Office for Windows desktop </th><th> Office Online (in browser)</th></tr>
+         *   <tr><td><strong> Project </strong></td><td> Y                          </td><td>                           </td></tr>
          *  </table>
          */
         setResourceFieldAsync(resourceId: string, fieldId: number, fieldValue: string | number | boolean | object, options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<void>) => void): void;
@@ -4069,8 +4070,8 @@ declare namespace Office {
          * 
          * *Supported hosts, by platform*
          *  <table>
-         *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser)</th></tr>
-         *   <tr><td><strong> Project    </strong></td><td> Y                          </td><td>                           </td></tr>
+         *   <tr><th>                          </th><th> Office for Windows desktop </th><th> Office Online (in browser)</th></tr>
+         *   <tr><td><strong> Project </strong></td><td> Y                          </td><td>                           </td></tr>
          *  </table>
          */
         setTaskFieldAsync(taskId: string, fieldId: number, fieldValue: string | number | boolean | object, options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<void>) => void): void;
@@ -4104,9 +4105,10 @@ declare namespace Office {
      * 
      * *Supported hosts, by platform*
      *  <table>
-     *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
-     *   <tr><td><strong> PowerPoint </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
-     *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+     *   <tr><th>                             </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th><th> Office for Mac </th></tr>
+     *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td></tr>
+     *   <tr><td><strong> PowerPoint </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td></tr>
+     *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td></tr>
      *  </table>
      */
     interface File {
@@ -4222,9 +4224,9 @@ declare namespace Office {
      * 
      * *Supported hosts, by platform*
      *  <table>
-     *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
-     *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
-     *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+     *   <tr><th>                        </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th><th> Office for Mac </th></tr>
+     *   <tr><td><strong> Excel </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td></tr>
+     *   <tr><td><strong> Word  </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td></tr>
      *  </table>
      */
     interface MatrixBinding extends Binding {
@@ -4317,8 +4319,9 @@ declare namespace Office {
          * 
          * *Supported hosts, by platform*
          *  <table>
-         *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
-         *   <tr><td><strong> Excel      </strong></td><td>                            </td><td> Y                          </td><td>                 </td></tr>
+         *   <tr><th>                         </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
+         *   <tr><td><strong> Access </strong></td><td>                            </td><td> Y                          </td><td>                 </td></tr>
+         *   <tr><td><strong> Excel  </strong></td><td>                            </td><td> Y                          </td><td>                 </td></tr>
          *  </table>
          */
         addHandlerAsync(eventType: Office.EventType, handler: any, options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<void>) => void): void;
@@ -4338,11 +4341,11 @@ declare namespace Office {
          * 
          * *Supported hosts, by platform*
          *  <table>
-         *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
-         *   <tr><td><strong> Access     </strong></td><td>                            </td><td> Y                          </td><td>                 </td></tr>
-         *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
-         *   <tr><td><strong> PowerPoint </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
-         *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+         *   <tr><th>                             </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th><th> Office for Mac </th></tr>
+         *   <tr><td><strong> Access     </strong></td><td>                            </td><td> Y                          </td><td>                 </td><td>                </td></tr>
+         *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td></tr>
+         *   <tr><td><strong> PowerPoint </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td></tr>
+         *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td></tr>
          *  </table>
          *
          * @param settingName The case-sensitive name of the setting to retrieve.
@@ -4398,11 +4401,11 @@ declare namespace Office {
          * 
          * *Supported hosts, by platform*
          *  <table>
-         *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
+         *   <tr><th>                             </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
          *   <tr><td><strong> Access     </strong></td><td>                            </td><td> Y                          </td><td>                 </td></tr>
-         *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
-         *   <tr><td><strong> PowerPoint </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
-         *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+         *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td>                 </td></tr>
+         *   <tr><td><strong> PowerPoint </strong></td><td> Y                          </td><td> Y                          </td><td>                 </td></tr>
+         *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td> Y                          </td><td>                 </td></tr>
          *  </table>
          *
          * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type {@link Office.AsyncResult}.
@@ -4431,11 +4434,11 @@ declare namespace Office {
          * 
          * *Supported hosts, by platform*
          *  <table>
-         *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
-         *   <tr><td><strong> Access     </strong></td><td>                            </td><td> Y                          </td><td>                 </td></tr>
-         *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
-         *   <tr><td><strong> PowerPoint </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
-         *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td>                            </td><td> Y               </td></tr>
+         *   <tr><th>                             </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th><th> Office for Mac </th></tr>
+         *   <tr><td><strong> Access     </strong></td><td>                            </td><td> Y                          </td><td>                 </td><td>                </td></tr>
+         *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td></tr>
+         *   <tr><td><strong> PowerPoint </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td></tr>
+         *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td></tr>
          *  </table>
          *
          * @param settingName The case-sensitive name of the setting to remove.
@@ -4467,10 +4470,9 @@ declare namespace Office {
          * 
          * *Supported hosts, by platform*
          *  <table>
-         *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
-         *   <tr><td><strong> Access     </strong></td><td>                            </td><td> Y                          </td><td>                 </td></tr>
-         *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
-         *   <tr><td><strong> PowerPoint </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+         *   <tr><th>                         </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
+         *   <tr><td><strong> Access </strong></td><td>                            </td><td> Y                          </td><td>                 </td></tr>
+         *   <tr><td><strong> Excel  </strong></td><td>                            </td><td> Y                          </td><td>                 </td></tr>
          *  </table>
          *
          * @param eventType Specifies the type of event to remove. Required.
@@ -4524,11 +4526,11 @@ declare namespace Office {
          * 
          * *Supported hosts, by platform*
          *  <table>
-         *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
-         *   <tr><td><strong> Access     </strong></td><td>                            </td><td> Y                          </td><td>                 </td></tr>
-         *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
-         *   <tr><td><strong> PowerPoint </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
-         *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+         *   <tr><th>                             </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th><th> Office for Mac </th></tr>
+         *   <tr><td><strong> Access     </strong></td><td>                            </td><td> Y                          </td><td>                 </td><td>                </td></tr>
+         *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td></tr>
+         *   <tr><td><strong> PowerPoint </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td></tr>
+         *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td></tr>
          *  </table>
          * 
          * @param options Provides options for saving settings.
@@ -4560,11 +4562,11 @@ declare namespace Office {
          * 
          * *Supported hosts, by platform*
          *  <table>
-         *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
-         *   <tr><td><strong> Access     </strong></td><td>                            </td><td> Y                          </td><td>                 </td></tr>
-         *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
-         *   <tr><td><strong> PowerPoint </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
-         *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+         *   <tr><th>                             </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th><th> Office for Mac </th></tr>
+         *   <tr><td><strong> Access     </strong></td><td>                            </td><td> Y                          </td><td>                 </td><td>                </td></tr>
+         *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td></tr>
+         *   <tr><td><strong> PowerPoint </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td></tr>
+         *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td></tr>
          *  </table>
          * 
          * @param settingName The case-sensitive name of the setting to set or create.
@@ -4603,9 +4605,9 @@ declare namespace Office {
      * 
      * *Supported hosts, by platform*
      *  <table>
-     *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
-     *   <tr><td><strong> Excel      </strong></td><td>                            </td><td> Y                          </td><td>                 </td></tr>
-     *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td> Y                          </td><td>                 </td></tr>
+     *   <tr><th>                        </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
+     *   <tr><td><strong> Excel </strong></td><td>                            </td><td> Y                          </td><td>                 </td></tr>
+     *   <tr><td><strong> Word  </strong></td><td> Y                          </td><td> Y                          </td><td>                 </td></tr>
      *  </table>
      */
     interface SettingsChangedEventArgs {
@@ -4636,7 +4638,7 @@ declare namespace Office {
      * 
      * *Supported hosts, by platform*
      *  <table>
-     *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
+     *   <tr><th>                             </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
      *   <tr><td><strong> PowerPoint </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
      *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
      *  </table>
@@ -4688,10 +4690,10 @@ declare namespace Office {
         * 
         * *Supported hosts, by platform*
         *  <table>
-        *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
-        *   <tr><td><strong> Access     </strong></td><td>                            </td><td> Y                          </td><td>                 </td></tr>
-        *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
-        *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+        *   <tr><th>                         </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th><th> Office for Mac </th></tr>
+        *   <tr><td><strong> Access </strong></td><td>                            </td><td> Y                          </td><td>                 </td><td>                </td></tr>
+        *   <tr><td><strong> Excel  </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td><</tr>
+        *   <tr><td><strong> Word   </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td><</tr>
         *  </table>
         */
         columnCount: number;
@@ -4710,10 +4712,10 @@ declare namespace Office {
         * 
         * *Supported hosts, by platform*
         *  <table>
-        *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
-        *   <tr><td><strong> Access     </strong></td><td>                            </td><td> Y                          </td><td>                 </td></tr>
-        *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
-        *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+        *   <tr><th>                         </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th><th> Office for Mac </th></tr>
+        *   <tr><td><strong> Access </strong></td><td>                            </td><td> Y                          </td><td>                 </td><td>                </td></tr>
+        *   <tr><td><strong> Excel  </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td><</tr>
+        *   <tr><td><strong> Word   </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td><</tr>
         *  </table>
         */
         hasHeaders: boolean;
@@ -4745,10 +4747,10 @@ declare namespace Office {
         * 
         * *Supported hosts, by platform*
         *  <table>
-        *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
-        *   <tr><td><strong> Access     </strong></td><td>                            </td><td> Y                          </td><td>                 </td></tr>
-        *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
-        *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+        *   <tr><th>                         </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th><th> Office for Mac </th></tr>
+        *   <tr><td><strong> Access </strong></td><td>                            </td><td> Y                          </td><td>                 </td><td>                </td></tr>
+        *   <tr><td><strong> Excel  </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td><</tr>
+        *   <tr><td><strong> Word   </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td><</tr>
         *  </table>
         */
         rowCount: number;
@@ -4778,15 +4780,16 @@ declare namespace Office {
          * 
          * A capital Y in the following matrix indicates that this method is supported in the corresponding Office host application. 
          * An empty cell indicates that the Office host application doesn't support this method.
-        * 
+         * 
          * For more information about Office host application and server requirements, see 
          * {@link https://docs.microsoft.com/office/dev/add-ins/concepts/requirements-for-running-office-add-ins | Requirements for running Office Add-ins}.
          * 
          * *Supported hosts, by platform*
          *  <table>
-         *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
-         *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
-         *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+         *   <tr><th>                         </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th><th> Office for Mac </th></tr>
+         *   <tr><td><strong> Access </strong></td><td>                            </td><td> Y                          </td><td>                 </td><td>                </td></tr>
+         *   <tr><td><strong> Excel  </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td><</tr>
+         *   <tr><td><strong> Word   </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td><</tr>
          *  </table>
          *
          * @param tableData An array of arrays ("matrix") or a TableData object that contains one or more columns of data to add to the table. Required.
@@ -4823,10 +4826,10 @@ declare namespace Office {
          * 
          * *Supported hosts, by platform*
          *  <table>
-         *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
-         *   <tr><td><strong> Access     </strong></td><td>                            </td><td> Y                          </td><td>                 </td></tr>
-         *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
-         *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+         *   <tr><th>                         </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th><th> Office for Mac </th></tr>
+         *   <tr><td><strong> Access </strong></td><td>                            </td><td> Y                          </td><td>                 </td><td>                </td></tr>
+         *   <tr><td><strong> Excel  </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td><</tr>
+         *   <tr><td><strong> Word   </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td><</tr>
          *  </table>
          *
          * @param rows An array of arrays ("matrix") or a TableData object that contains one or more rows of data to add to the table. Required.
@@ -4851,10 +4854,10 @@ declare namespace Office {
          * 
          * *Supported hosts, by platform*
          *  <table>
-         *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
-         *   <tr><td><strong> Access     </strong></td><td>                            </td><td> Y                          </td><td>                 </td></tr>
-         *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
-         *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+         *   <tr><th>                         </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th><th> Office for Mac </th></tr>
+         *   <tr><td><strong> Access </strong></td><td>                            </td><td> Y                          </td><td>                 </td><td>                </td></tr>
+         *   <tr><td><strong> Excel  </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td><</tr>
+         *   <tr><td><strong> Word   </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td><</tr>
          *  </table>
          *
          * @param options Provides an option for preserving context data of any type, unchanged, for use in a callback.
@@ -4877,8 +4880,8 @@ declare namespace Office {
          * 
          * *Supported hosts, by platform*
          *  <table>
-         *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
-         *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+         *   <tr><th>                        </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th><th> Office for Mac </th></tr>
+         *   <tr><td><strong> Excel </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td></tr>
          *  </table>
          *
          * @param options Provides an option for preserving context data of any type, unchanged, for use in a callback.
@@ -5043,8 +5046,8 @@ declare namespace Office {
          * 
          * *Supported hosts, by platform*
          *  <table>
-         *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
-         *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+         *   <tr><th>                        </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th><th> Office for Mac </th></tr>
+         *   <tr><td><strong> Excel </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td></tr>
          *  </table>
          *
          * @param cellFormat An array that contains one or more JavaScript objects that specify which cells to target and the formatting to apply to them.
@@ -5095,8 +5098,8 @@ declare namespace Office {
          * 
          * *Supported hosts, by platform*
          *  <table>
-         *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
-         *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+         *   <tr><th>                        </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th><th> Office for Mac </th></tr>
+         *   <tr><td><strong> Excel </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td></tr>
          *  </table>
          *
          * @param tableOptions An object literal containing a list of property name-value pairs that define the table options to apply.
@@ -5173,8 +5176,8 @@ declare namespace Office {
      * 
      * *Supported hosts, by platform*
      *  <table>
-     *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
-     *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+     *   <tr><th>                        </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th><th> Office for Mac </th></tr>
+     *   <tr><td><strong> Excel </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td></tr>
      *  </table>
      */
     enum Table {
@@ -5210,9 +5213,9 @@ declare namespace Office {
      * 
      * *Supported hosts, by platform*
      *  <table>
-     *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
-     *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
-     *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+     *   <tr><th>                        </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th><th> Office for Mac </th></tr>
+     *   <tr><td><strong> Excel </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td></tr>
+     *   <tr><td><strong> Word  </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td></tr>
      *  </table>
      */
     interface TextBinding extends Binding { }
@@ -5233,8 +5236,8 @@ declare namespace Office {
      * 
      * *Supported hosts, by platform*
      *  <table>
-     *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th></tr>
-     *   <tr><td><strong> Project    </strong></td><td> Y                          </td><td>                            </td></tr>
+     *   <tr><th>                          </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th></tr>
+     *   <tr><td><strong> Project </strong></td><td> Y                          </td><td>                            </td></tr>
      *  </table>
      */
     enum ProjectProjectFields {
@@ -5309,8 +5312,8 @@ declare namespace Office {
      * 
      * *Supported hosts, by platform*
      *  <table>
-     *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th></tr>
-     *   <tr><td><strong> Project    </strong></td><td> Y                          </td><td>                            </td></tr>
+     *   <tr><th>                          </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th></tr>
+     *   <tr><td><strong> Project </strong></td><td> Y                          </td><td>                            </td></tr>
      *  </table>
      */
     enum ProjectResourceFields {
@@ -6136,8 +6139,8 @@ declare namespace Office {
      * 
      * *Supported hosts, by platform*
      *  <table>
-     *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th></tr>
-     *   <tr><td><strong> Project    </strong></td><td> Y                          </td><td>                            </td></tr>
+     *   <tr><th>                          </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th></tr>
+     *   <tr><td><strong> Project </strong></td><td> Y                          </td><td>                            </td></tr>
      *  </table>
      */
     enum ProjectTaskFields {
@@ -7298,8 +7301,8 @@ declare namespace Office {
      * 
      * *Supported hosts, by platform*
      *  <table>
-     *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th></tr>
-     *   <tr><td><strong> Project    </strong></td><td> Y                          </td><td>                            </td></tr>
+     *   <tr><th>                          </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th></tr>
+     *   <tr><td><strong> Project </strong></td><td> Y                          </td><td>                            </td></tr>
      *  </table>
      */
     enum ProjectViewTypes {

From d2dd41340a12ebef17e104a61309611a51cf1183 Mon Sep 17 00:00:00 2001
From: Yann Normand <yann.normand@gmail.com>
Date: Wed, 21 Nov 2018 10:25:41 +1000
Subject: [PATCH 136/836] downgrade to Typescript 2.8

---
 types/react-big-calendar/index.d.ts           |   2 +-
 .../react-big-calendar-tests.tsx              | 118 +++++++++---------
 2 files changed, 60 insertions(+), 60 deletions(-)

diff --git a/types/react-big-calendar/index.d.ts b/types/react-big-calendar/index.d.ts
index 0d4da60aa4..89e6f0eead 100644
--- a/types/react-big-calendar/index.d.ts
+++ b/types/react-big-calendar/index.d.ts
@@ -7,7 +7,7 @@
 //                 Paul Potsides <https://github.com/strongpauly>
 //                 janb87 <https://github.com/janb87>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.9
+// TypeScript Version: 2.8
 import { Validator } from 'prop-types';
 import * as React from 'react';
 
diff --git a/types/react-big-calendar/react-big-calendar-tests.tsx b/types/react-big-calendar/react-big-calendar-tests.tsx
index 918c352e0c..fd1e70f929 100644
--- a/types/react-big-calendar/react-big-calendar-tests.tsx
+++ b/types/react-big-calendar/react-big-calendar-tests.tsx
@@ -61,70 +61,70 @@ class CalendarResource {
 }
 
 {
+    class MyCalendar extends BigCalendar<CalendarEvent, CalendarResource> {}
+
     // Full API Example Test - based on API Documentation
     // http://intljusticemission.github.io/react-big-calendar/examples/index.html#api
     class FullAPIExample extends React.Component<BigCalendarProps<CalendarEvent, CalendarResource>> {
         render() {
             return (
-                <BigCalendar<CalendarEvent, CalendarResource>
-                    {...this.props}
-                    date={new Date()}
-                    view={'day'}
-                    events={getEvents()}
-                    onNavigate={(newDate: Date, view: View, action: Navigate) => { }}
-                    onView={(view: View) => { }}
-                    onSelectSlot={(slotInfo) => {
-                        const start = slotInfo.start;
-                        const end = slotInfo.end;
-                        const slots = slotInfo.slots;
-                    }}
-                    onSelectEvent={(event) => { }}
-                    onSelecting={(slotInfo) => {
-                        const start = slotInfo.start;
-                        const end = slotInfo.end;
-                        return true;
-                    }}
-                    views={['day']}
-                    toolbar={true}
-                    popup={true}
-                    popupOffset={20}
-                    selectable={true}
-                    step={20}
-                    rtl={true}
-                    eventPropGetter={(event, start, end, isSelected) => ({ className: 'some-class' })}
-                    titleAccessor={'title'}
-                    allDayAccessor={(event: CalendarEvent) => !!event.allDay}
-                    startAccessor={'start'}
-                    endAccessor={(event: CalendarEvent) => event.end || event.start}
-                    min={new Date()}
-                    max={new Date()}
-                    scrollToTime={new Date()}
-                    formats={{
-                        dateFormat: "h a",
-                        agendaDateFormat: (date: Date, culture?: string, localizer?: object) => "some-format",
-                        dayRangeHeaderFormat: (range: DateRange, culture?: string, localizer?: object) => "some-format"
-                    }}
-                    messages={{}}
-                    timeslots={24}
-                    defaultView={'month'}
-                    className={'my-calendar'}
-                    elementProps={{ id: 'myCalendar' }}
-                    components={{
-                        event: Event,
-                        agenda: {
-                            event: EventAgenda
-                        },
-                        toolbar: Toolbar,
-                        eventWrapper: EventWrapper,
-                    }}
-                    dayPropGetter={customDayPropGetter}
-                    slotPropGetter={customSlotPropGetter}
-                    defaultDate={new Date()}
-                    resources={getResources()}
-                    resourceAccessor={event => event.resourceId}
-                    resourceIdAccessor={resource => resource.id}
-                    resourceTitleAccessor={resource => resource.title}
-                />
+              <MyCalendar  {...this.props}
+              date={new Date()}
+              view={'day'}
+              events={getEvents()}
+              onNavigate={(newDate: Date, view: View, action: Navigate) => { }}
+              onView={(view: View) => { }}
+              onSelectSlot={(slotInfo) => {
+                  const start = slotInfo.start;
+                  const end = slotInfo.end;
+                  const slots = slotInfo.slots;
+              }}
+              onSelectEvent={(event) => { }}
+              onSelecting={(slotInfo) => {
+                  const start = slotInfo.start;
+                  const end = slotInfo.end;
+                  return true;
+              }}
+              views={['day']}
+              toolbar={true}
+              popup={true}
+              popupOffset={20}
+              selectable={true}
+              step={20}
+              rtl={true}
+              eventPropGetter={(event, start, end, isSelected) => ({ className: 'some-class' })}
+              titleAccessor={'title'}
+              allDayAccessor={(event: CalendarEvent) => !!event.allDay}
+              startAccessor={'start'}
+              endAccessor={(event: CalendarEvent) => event.end || event.start}
+              min={new Date()}
+              max={new Date()}
+              scrollToTime={new Date()}
+              formats={{
+                  dateFormat: "h a",
+                  agendaDateFormat: (date: Date, culture?: string, localizer?: object) => "some-format",
+                  dayRangeHeaderFormat: (range: DateRange, culture?: string, localizer?: object) => "some-format"
+              }}
+              messages={{}}
+              timeslots={24}
+              defaultView={'month'}
+              className={'my-calendar'}
+              elementProps={{ id: 'myCalendar' }}
+              components={{
+                  event: Event,
+                  agenda: {
+                      event: EventAgenda
+                  },
+                  toolbar: Toolbar,
+                  eventWrapper: EventWrapper,
+              }}
+              dayPropGetter={customDayPropGetter}
+              slotPropGetter={customSlotPropGetter}
+              defaultDate={new Date()}
+              resources={getResources()}
+              resourceAccessor={event => event.resourceId}
+              resourceIdAccessor={resource => resource.id}
+              resourceTitleAccessor={resource => resource.title} />
             );
         }
     }

From 6187a17f6d944d1c7b57bb8c3b2ee472fe3cc9ee Mon Sep 17 00:00:00 2001
From: Alexandre Parent <alex-dev@users.noreply.github.com>
Date: Tue, 20 Nov 2018 19:25:52 -0500
Subject: [PATCH 137/836] Added a use for expect 'checker' with a callback

I often use expect(Object, CallbackHandler) because expect((Response) => any, CallbackHandler) doesn't exist. On the other hand, making callback nullable will allow those using it without callback to keep doing it.
---
 types/supertest/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/supertest/index.d.ts b/types/supertest/index.d.ts
index 77418352f9..5ac03df42d 100644
--- a/types/supertest/index.d.ts
+++ b/types/supertest/index.d.ts
@@ -24,7 +24,7 @@ declare namespace supertest {
       serverAddress(app: any, path: string): string;
       expect(status: number, callback?: CallbackHandler): this;
       expect(status: number, body: any, callback?: CallbackHandler): this;
-      expect(checker: (res: Response) => any): this;
+      expect(checker: (res: Response) => any, callback?: CallbackHandler): this;
       expect(body: string, callback?: CallbackHandler): this;
       expect(body: RegExp, callback?: CallbackHandler): this;
       expect(body: Object, callback?: CallbackHandler): this;

From 6ccbcd2c4ded5f73753b42b638e60bb9352046ba Mon Sep 17 00:00:00 2001
From: Ulrich Buchgraber <ulrich.b@gmx.at>
Date: Tue, 20 Nov 2018 23:22:52 +0100
Subject: [PATCH 138/836] Fix all the (unrelated)
 'no-angle-bracket-type-assertion' linter errors in packages which depend on
 @types/node

---
 types/ansi/ansi-tests.ts                      |  2 +-
 types/async/test/index.ts                     | 18 ++++++------
 types/atom/atom-tests.ts                      |  4 +--
 types/baconjs/baconjs-tests.ts                |  6 ++--
 types/bell/bell-tests.ts                      |  2 +-
 types/d3kit/d3kit-tests.ts                    |  4 +--
 types/d3kit/v1/d3kit-tests.ts                 | 26 ++++++++---------
 .../db-migrate-base/db-migrate-base-tests.ts  |  2 +-
 types/db-migrate-pg/db-migrate-pg-tests.ts    |  2 +-
 types/dot-prop/dot-prop-tests.ts              |  2 +-
 types/duplexer3/duplexer3-tests.ts            |  2 +-
 .../easy-api-request-tests.ts                 |  4 +--
 .../express-fileupload-tests.ts               |  2 +-
 types/hapi/v12/hapi-tests.ts                  |  2 +-
 types/hapi/v16/test/continuation/errors.ts    |  2 +-
 .../hapi/v16/test/route/additional-options.ts | 16 +++++------
 types/hapi/v16/test/route/public-interface.ts |  4 +--
 types/hapi/v16/test/route/validate.ts         |  4 +--
 types/hapi/v16/test/server/listener.ts        |  2 +-
 .../html-webpack-plugin-tests.ts              |  2 +-
 types/http-assert/http-assert-tests.ts        |  6 ++--
 types/irc/irc-tests.ts                        | 28 +++++++++----------
 types/jsdom/jsdom-tests.ts                    |  2 +-
 types/maker.js/maker.js-tests.ts              |  6 ++--
 types/meteor/test/globals/meteor-tests.ts     |  6 ++--
 types/meteor/test/meteor-tests.ts             |  6 ++--
 .../mongoose-paginate-tests.ts                |  2 +-
 types/mz/mz-tests.ts                          |  8 +++---
 types/nightmare/nightmare-tests.ts            |  8 +++---
 types/node-ral/node-ral-tests.ts              |  2 +-
 types/nw.js/nw.js-tests.ts                    |  2 +-
 types/pouchdb-core/pouchdb-core-tests.ts      |  2 +-
 types/pouchdb-upsert/pouchdb-upsert-tests.ts  |  8 +++---
 types/project-oxford/project-oxford-tests.ts  |  4 +--
 types/react/test/index.ts                     |  2 +-
 types/restify/restify-tests.ts                |  2 +-
 types/restify/v4/restify-tests.ts             |  4 +--
 types/restify/v5/restify-tests.ts             |  2 +-
 types/rx.wamp/rx.wamp-tests.ts                |  4 +--
 .../set-cookie-parser-tests.ts                |  2 +-
 types/shelljs/shelljs-tests.ts                |  4 +--
 types/socketio-jwt/socketio-jwt-tests.ts      |  2 +-
 types/spdy/spdy-tests.ts                      |  2 +-
 .../swaggerize-express-tests.ts               | 14 +++++-----
 types/terminal-menu/terminal-menu-tests.ts    |  2 +-
 types/twilio/twilio-tests.ts                  |  2 +-
 types/vinyl-fs/vinyl-fs-tests.ts              | 28 +++++++++----------
 types/vinyl/v0/vinyl-tests.ts                 |  8 +++---
 types/whatwg-streams/whatwg-streams-tests.ts  |  4 +--
 types/yog-log/yog-log-tests.ts                |  2 +-
 types/yog2-kernel/yog2-kernel-tests.ts        |  4 +--
 51 files changed, 143 insertions(+), 143 deletions(-)

diff --git a/types/ansi/ansi-tests.ts b/types/ansi/ansi-tests.ts
index b2625defa5..0c033c6839 100644
--- a/types/ansi/ansi-tests.ts
+++ b/types/ansi/ansi-tests.ts
@@ -22,7 +22,7 @@ Object.keys({
 }).forEach((color) => {
     const cname = color.replace(/([a-z])([A-Z])/g, (_: string, l: string, u: string): string => `${l} ${u.toLowerCase()}`);
 
-    ((<(...anything: any[]) => ansi.Cursor> cursor[color])()
+    ((cursor[color] as (...anything: any[]) => ansi.Cursor)()
         .bold()
         .bg)[color === 'blue' || color === 'brightBlue' ? 'black' : 'blue']()
         .write(
diff --git a/types/async/test/index.ts b/types/async/test/index.ts
index 0081dd3dcd..574a5ed8b9 100644
--- a/types/async/test/index.ts
+++ b/types/async/test/index.ts
@@ -390,22 +390,22 @@ async.auto({
     get_data: function (callback: AsyncResultCallback<any>) { },
     make_folder: function (callback: AsyncResultCallback<any>) { },
     //arrays with different types are not accepted by TypeScript.
-    write_file: ['get_data', 'make_folder', <any>function (callback: AsyncResultCallback<any>) {
+    write_file: ['get_data', 'make_folder', function (callback: AsyncResultCallback<any>) {
         callback(null, filename);
-    }],
+    } as any],
     //arrays with different types are not accepted by TypeScript.
-    email_link: ['write_file', <any>function (callback: AsyncResultCallback<any>, results: any) { }]
+    email_link: ['write_file', function (callback: AsyncResultCallback<any>, results: any) { } as any]
 });
 
 async.auto({
     get_data: function (callback: AsyncResultCallback<any>) { },
     make_folder: function (callback: AsyncResultCallback<any>) { },
     //arrays with different types are not accepted by TypeScript.
-    write_file: ['get_data', 'make_folder', <any>function (callback: AsyncResultCallback<any>) {
+    write_file: ['get_data', 'make_folder', function (callback: AsyncResultCallback<any>) {
         callback(null, filename);
-    }],
+    } as any],
     //arrays with different types are not accepted by TypeScript.
-    email_link: ['write_file', <any>function (callback: AsyncResultCallback<any>, results: any) { }]
+    email_link: ['write_file', function (callback: AsyncResultCallback<any>, results: any) { } as any]
 }, function (err, results) {
     console.log('finished auto');
 });
@@ -421,11 +421,11 @@ async.auto<A>({
     get_data: function (callback: AsyncResultCallback<any>) { },
     make_folder: function (callback: AsyncResultCallback<any>) { },
     //arrays with different types are not accepted by TypeScript.
-    write_file: ['get_data', 'make_folder', <any>function (callback: AsyncResultCallback<any>) {
+    write_file: ['get_data', 'make_folder', function (callback: AsyncResultCallback<any>) {
         callback(null, filename);
-    }],
+    } as any],
     //arrays with different types are not accepted by TypeScript.
-    email_link: ['write_file', <any>function (callback: AsyncResultCallback<any>, results: any) { }]
+    email_link: ['write_file', function (callback: AsyncResultCallback<any>, results: any) { } as any]
 }, 1, function (err, results) {
     console.log('finished auto');
 });
diff --git a/types/atom/atom-tests.ts b/types/atom/atom-tests.ts
index 6acca94fc5..9a04b9c7b6 100644
--- a/types/atom/atom-tests.ts
+++ b/types/atom/atom-tests.ts
@@ -557,8 +557,8 @@ function testDesializerManager() {
     }
 
     function isStorableClass(o: object): o is StorableClass {
-        if (typeof o === "object" && (<StorableClass> o).name &&
-            (<StorableClass> o).name === "test") {
+        if (typeof o === "object" && (o as StorableClass).name &&
+            (o as StorableClass).name === "test") {
             return true;
         } else {
             return false;
diff --git a/types/baconjs/baconjs-tests.ts b/types/baconjs/baconjs-tests.ts
index 2755bec595..b7d6db4c0f 100644
--- a/types/baconjs/baconjs-tests.ts
+++ b/types/baconjs/baconjs-tests.ts
@@ -120,7 +120,7 @@ function CommonMethodsInEventStreamsAndProperties() {
     Bacon.fromArray([1, 2, 3]).withStateMachine(0, (sum, event) => {
         if (event.hasValue()) {
             // had to cast to `number` because event:Bacon.Next<number>|Bacon.Error<{}>
-            return [sum + <number>event.value(), []];
+            return [sum + (event.value() as number), []];
         }
         else if (event.isEnd()) {
             return [undefined, [new Bacon.Next(sum), event]];
@@ -140,8 +140,8 @@ function CommonMethodsInEventStreamsAndProperties() {
 
     {
         // This is handy for keeping track whether we are currently awaiting an AJAX response:
-        var ajaxRequest = <Bacon.Observable<Error, JQueryXHR>>{},
-            ajaxResponse = <Bacon.Observable<Error, JQueryXHR>>{},
+        var ajaxRequest = {} as Bacon.Observable<Error, JQueryXHR>,
+            ajaxResponse = {} as Bacon.Observable<Error, JQueryXHR>,
             showAjaxIndicator = ajaxRequest.awaiting(ajaxResponse);
     }
 
diff --git a/types/bell/bell-tests.ts b/types/bell/bell-tests.ts
index 5eaeac4f35..26a29670a0 100644
--- a/types/bell/bell-tests.ts
+++ b/types/bell/bell-tests.ts
@@ -16,7 +16,7 @@ async function run() {
         clientSecret: '',
         scope(request) {
             const scopes = ['public_profile', 'email'];
-            if ((<RequestQuery> request.query).wantsSharePermission) {
+            if ((request.query as RequestQuery).wantsSharePermission) {
               scopes.push('publish_actions');
             }
             return scopes;
diff --git a/types/d3kit/d3kit-tests.ts b/types/d3kit/d3kit-tests.ts
index ec3b2de1ce..705b9fcc59 100644
--- a/types/d3kit/d3kit-tests.ts
+++ b/types/d3kit/d3kit-tests.ts
@@ -304,7 +304,7 @@ function test_svg_chart() {
      * Test plate functions
      */
     plate = new d3kit.SvgPlate();
-    plate = <d3kit.SvgPlate> chart.addPlate('a-plate', plate, true); // with doNotAppend
+    plate = chart.addPlate('a-plate', plate, true) as d3kit.SvgPlate; // with doNotAppend
     chart = chart.addPlate('a-plate', plate);       // without doNotAppend
     chart = chart.removePlate('a-plate');
 
@@ -381,7 +381,7 @@ function test_hybrid_chart() {
      * Test plate functions
      */
     plate = new d3kit.SvgPlate();
-    plate = <d3kit.SvgPlate> chart.addPlate('a-plate', plate, true); // with doNotAppend
+    plate = chart.addPlate('a-plate', plate, true) as d3kit.SvgPlate; // with doNotAppend
     chart = chart.addPlate('a-plate', plate);       // without doNotAppend
     chart = chart.removePlate('a-plate');
 
diff --git a/types/d3kit/v1/d3kit-tests.ts b/types/d3kit/v1/d3kit-tests.ts
index 18f1f144f9..92c20fa35d 100644
--- a/types/d3kit/v1/d3kit-tests.ts
+++ b/types/d3kit/v1/d3kit-tests.ts
@@ -380,8 +380,8 @@ describe('Skeleton', function(){
           b: 2
         });
         expect(skeleton).to.include.keys(['a', 'b']);
-        expect((<any>skeleton).a).to.equal(1);
-        expect((<any>skeleton).b).to.equal(2);
+        expect((skeleton as any).a).to.equal(1);
+        expect((skeleton as any).b).to.equal(2);
       });
       it('should overwrite existing fields', function(){
         skeleton.mixin({
@@ -391,7 +391,7 @@ describe('Skeleton', function(){
           b: 3
         });
         expect(skeleton).to.include.keys(['b']);
-        expect((<any>skeleton).b).to.equal(3);
+        expect((skeleton as any).b).to.equal(3);
       });
       it('should keep original fields if not overwritten', function(){
         skeleton.mixin({
@@ -403,9 +403,9 @@ describe('Skeleton', function(){
           b: 3
         });
         expect(skeleton).to.include.keys(['a', 'b', 'c']);
-        expect((<any>skeleton).a).to.equal(1);
-        expect((<any>skeleton).b).to.equal(3);
-        expect((<any>skeleton).c).to.equal(20);
+        expect((skeleton as any).a).to.equal(1);
+        expect((skeleton as any).b).to.equal(3);
+        expect((skeleton as any).c).to.equal(20);
       });
     });
 
@@ -720,7 +720,7 @@ describe('Chartlet', function(){
   beforeEach(function(done){
     ChildChartlet = function() {
       var chartlet = new d3kit.Chartlet(callback, callback, callback);
-      (<any>chartlet).runTest = function (testFunction: any) {
+      (chartlet as any).runTest = function (testFunction: any) {
         testFunction(chartlet);
       };
       return chartlet;
@@ -730,7 +730,7 @@ describe('Chartlet', function(){
       var chartlet = new d3kit.Chartlet(callback, callback, callback);
       var child = ChildChartlet();
       configureFunction(chartlet, child);
-      (<any>chartlet).runTest = (<any>child).runTest;
+      (chartlet as any).runTest = (child as any).runTest;
       return chartlet;
     };
 
@@ -850,7 +850,7 @@ describe('Chartlet', function(){
         })
         .property('foo', function(d:number) {return 2 * d;});
 
-      (<any>parent).runTest(function(child: d3kit.Chartlet) {
+      (parent as any).runTest(function(child: d3kit.Chartlet) {
         expect(child.getPropertyValue('bar', 4, 0)).to.be.equal(8);
       });
     });
@@ -862,7 +862,7 @@ describe('Chartlet', function(){
         })
         .property('foo', function(d:number) {return 2 * d;});
 
-      (<any>parent).runTest(function(child: d3kit.Chartlet) {
+      (parent as any).runTest(function(child: d3kit.Chartlet) {
         expect(child.getPropertyValue('foo', 4, 0)).to.be.equal(8);
       });
     });
@@ -878,7 +878,7 @@ describe('Chartlet', function(){
         .property('bar', function(d:number) {return 3 * d;})
         .property('baz', function(d:number) {return 4 * d;});
 
-      (<any>parent).runTest(function(child: d3kit.Chartlet) {
+      (parent as any).runTest(function(child: d3kit.Chartlet) {
         expect(child.getPropertyValue('foo-x', 1, 0)).to.be.equal(2);
         expect(child.getPropertyValue('bar-x', 1, 0)).to.be.equal(3);
         expect(child.getPropertyValue('baz-x', 1, 0)).to.be.equal(4);
@@ -894,7 +894,7 @@ describe('Chartlet', function(){
         .property('bar', function(d:number) {return 3 * d;})
         .property('baz', function(d:number) {return 4 * d;});
 
-      (<any>parent).runTest(function(child: d3kit.Chartlet) {
+      (parent as any).runTest(function(child: d3kit.Chartlet) {
         expect(child.getPropertyValue('foo', 1, 0)).to.be.equal(2);
         expect(child.getPropertyValue('bar', 1, 0)).to.be.equal(3);
         expect(child.getPropertyValue('baz', 1, 0)).to.be.equal(4);
@@ -914,7 +914,7 @@ describe('Chartlet', function(){
       var child = new d3kit.Chartlet(callback, callback, callback, ['foo'])
         .publishEventsTo(parent.getDispatcher());
 
-      (<any>child.getDispatcher()).foo(99);
+      (child.getDispatcher() as any).foo(99);
     });
   });
 });
diff --git a/types/db-migrate-base/db-migrate-base-tests.ts b/types/db-migrate-base/db-migrate-base-tests.ts
index 79d81a75f9..e9c46f4873 100644
--- a/types/db-migrate-base/db-migrate-base-tests.ts
+++ b/types/db-migrate-base/db-migrate-base-tests.ts
@@ -3,7 +3,7 @@
 import * as DbMigrateBase from "db-migrate-base";
 
 // Throw together a dummy driver
-let db = <DbMigrateBase.Base>{};
+let db = {} as DbMigrateBase.Base;
 
 let callback = (err: any, response: any) => {
   // Do nothing.
diff --git a/types/db-migrate-pg/db-migrate-pg-tests.ts b/types/db-migrate-pg/db-migrate-pg-tests.ts
index adf2716074..b31d88e37d 100644
--- a/types/db-migrate-pg/db-migrate-pg-tests.ts
+++ b/types/db-migrate-pg/db-migrate-pg-tests.ts
@@ -3,7 +3,7 @@
 import * as DbMigratePg from "db-migrate-pg";
 
 // Throw together a dummy driver
-let db = <DbMigratePg.PgDriver>{};
+let db = {} as DbMigratePg.PgDriver;
 
 let callback = (err: any, response: any) => {
   // Do nothing.
diff --git a/types/dot-prop/dot-prop-tests.ts b/types/dot-prop/dot-prop-tests.ts
index 420fe2d320..7b21eb76c9 100644
--- a/types/dot-prop/dot-prop-tests.ts
+++ b/types/dot-prop/dot-prop-tests.ts
@@ -18,6 +18,6 @@ dotProp.has({foo: {bar: 'unicorn'}}, 'foo.bar');
 
 dotProp.delete(obj, 'foo.bar');
 console.log(obj);
-(<any> obj).foo.bar = {x: 'y', y: 'x'};
+(obj as any).foo.bar = {x: 'y', y: 'x'};
 dotProp.delete(obj, 'foo.bar.x');
 console.log(obj);
diff --git a/types/duplexer3/duplexer3-tests.ts b/types/duplexer3/duplexer3-tests.ts
index c540828d5d..03c5107e94 100644
--- a/types/duplexer3/duplexer3-tests.ts
+++ b/types/duplexer3/duplexer3-tests.ts
@@ -8,7 +8,7 @@ writable._write = (input, encoding, done) => {
     if (readable.push(input)) {
         done();
     } else {
-        readable.once('drain', <(...args: any[]) => void> done);
+        readable.once('drain', done as (...args: any[]) => void);
     }
 };
 
diff --git a/types/easy-api-request/easy-api-request-tests.ts b/types/easy-api-request/easy-api-request-tests.ts
index 02b2bc92bf..e1999170fe 100644
--- a/types/easy-api-request/easy-api-request-tests.ts
+++ b/types/easy-api-request/easy-api-request-tests.ts
@@ -17,7 +17,7 @@ APIRequest.create({
 var app = express();
 
 app.get('/', function (req:any, res:express.Response) {
-    var rMaker = <APIRequest.RequestMaker>req.testAPI;
+    var rMaker = req.testAPI as APIRequest.RequestMaker;
     var r = rMaker();
     r.get('/', function (err, resp) {
         if(err) {
@@ -28,7 +28,7 @@ app.get('/', function (req:any, res:express.Response) {
 });
 
 app.get('/', function (req:any, res:express.Response) {
-    var rMaker = <APIRequest.RequestMaker>req.testAPI;
+    var rMaker = req.testAPI as APIRequest.RequestMaker;
     var r = rMaker();
     r.get('/')
         .then(function (resp) {
diff --git a/types/express-fileupload/express-fileupload-tests.ts b/types/express-fileupload/express-fileupload-tests.ts
index 2a268fb64e..f423e5035a 100644
--- a/types/express-fileupload/express-fileupload-tests.ts
+++ b/types/express-fileupload/express-fileupload-tests.ts
@@ -9,7 +9,7 @@ const app: express.Express = express();
 app.use(fileUpload({debug: true}));
 
 function isUploadedFile(file: UploadedFile | UploadedFile[]): file is UploadedFile {
-    return typeof file === 'object' && (<UploadedFile> file).name !== undefined;
+    return typeof file === 'object' && (file as UploadedFile).name !== undefined;
 }
 
 const uploadHandler: RequestHandler = (req: Request, res: Response, next: NextFunction) => {
diff --git a/types/hapi/v12/hapi-tests.ts b/types/hapi/v12/hapi-tests.ts
index 32d1aff704..287a071d38 100644
--- a/types/hapi/v12/hapi-tests.ts
+++ b/types/hapi/v12/hapi-tests.ts
@@ -6,7 +6,7 @@ import * as Hapi from 'hapi';
 
 // Create a server with a host and port
 var server = new Hapi.Server();
-server.connection(<Hapi.IServerConnectionOptions>{
+server.connection({
     host: "localhost",
     port: 8000
 });
diff --git a/types/hapi/v16/test/continuation/errors.ts b/types/hapi/v16/test/continuation/errors.ts
index 165e5214df..2f9fedaaf5 100644
--- a/types/hapi/v16/test/continuation/errors.ts
+++ b/types/hapi/v16/test/continuation/errors.ts
@@ -26,7 +26,7 @@ const handleError: Hapi.ContinuationValueFunction = (err?: Boom.BoomError | null
 handleError(Boom.badData());
 
 // Accepts an error with custom data
-const errorWithData = Boom.badImplementation('', { custom1: 'test', customType: <'Custom1'>'Custom1', isCustom: <true>true });
+const errorWithData = Boom.badImplementation('', { custom1: 'test', customType: 'Custom1' as 'Custom1', isCustom: true as true });
 handleError(errorWithData);
 
 // Accepts an error with a more explicit type
diff --git a/types/hapi/v16/test/route/additional-options.ts b/types/hapi/v16/test/route/additional-options.ts
index ccbb36af15..7ab2171776 100644
--- a/types/hapi/v16/test/route/additional-options.ts
+++ b/types/hapi/v16/test/route/additional-options.ts
@@ -10,28 +10,28 @@ var authConfig: Hapi.RouteAdditionalConfigurationOptions = {
 var extConfigSingle: Hapi.RouteAdditionalConfigurationOptions = {
     ext: {
         type: 'onPreAuth',
-        method: <Hapi.ServerExtRequestHandler> function (request, reply) {
+        method: function (request, reply) {
             reply('ok');
-        }
+        } as Hapi.ServerExtRequestHandler
     }
 }
 
 var extConfigMulti: Hapi.RouteAdditionalConfigurationOptions = {
     ext: [{
         type: 'onPreAuth',
-        method: <Hapi.ServerExtRequestHandler> function (request, reply) {
+        method: function (request, reply) {
             reply('ok');
-        }
+        } as Hapi.ServerExtRequestHandler
     }, {
         type: 'onPostAuth',
-        method: <Hapi.ServerExtRequestHandler> function (request, reply) {
+        method: function (request, reply) {
             reply('ok');
-        }
+        } as Hapi.ServerExtRequestHandler
     }, {
         type: 'onPostStart',
-        method: <Hapi.ServerExtFunction> function (server, next) {
+        method: function (server, next) {
             next();
-        }
+        } as Hapi.ServerExtFunction
   }]
 }
 
diff --git a/types/hapi/v16/test/route/public-interface.ts b/types/hapi/v16/test/route/public-interface.ts
index f3878cea48..dad79e7306 100644
--- a/types/hapi/v16/test/route/public-interface.ts
+++ b/types/hapi/v16/test/route/public-interface.ts
@@ -2,7 +2,7 @@
 
 import * as Hapi from '../../';
 
-var route = <Hapi.RoutePublicInterface> {};
+var route = {} as Hapi.RoutePublicInterface;
 
 var a: string = route.method;
 var a: string = route.path;
@@ -14,4 +14,4 @@ if (typeof(route.vhost) == 'string') {
 var c: Hapi.ServerRealm = route.realm;
 var d: Hapi.RouteAdditionalConfigurationOptions = route.settings;
 var a: string = route.fingerprint;
-var e: boolean = route.auth.access(<Hapi.Request> {});
+var e: boolean = route.auth.access({} as Hapi.Request);
diff --git a/types/hapi/v16/test/route/validate.ts b/types/hapi/v16/test/route/validate.ts
index 06fefcc62e..42d6872570 100644
--- a/types/hapi/v16/test/route/validate.ts
+++ b/types/hapi/v16/test/route/validate.ts
@@ -55,10 +55,10 @@ const responseValidationFunction: Hapi.ValidationFunctionForRouteResponse<Custom
 
 config = {
     validate: validateWithFunctions,
-    response: <Hapi.RouteResponseConfigurationObject<CustomValidationOptions>>{
+    response: {
         schema: responseValidationFunction,
         options: {
             myOption: 18
         }
-    }
+    } as Hapi.RouteResponseConfigurationObject<CustomValidationOptions>
 };
diff --git a/types/hapi/v16/test/server/listener.ts b/types/hapi/v16/test/server/listener.ts
index 85ddb18bc6..84eda35ed5 100644
--- a/types/hapi/v16/test/server/listener.ts
+++ b/types/hapi/v16/test/server/listener.ts
@@ -15,5 +15,5 @@ io.sockets.on('connection', (socket) => {
     // a wrapper around socket.io.  Much less likely is either
     // a type error in the TypeScript definitions of socket.io or
     // an error in the Hapi docs.
-    socket.emit(<any> { msg: 'welcome' });
+    socket.emit({ msg: 'welcome' } as any);
 });
diff --git a/types/html-webpack-plugin/html-webpack-plugin-tests.ts b/types/html-webpack-plugin/html-webpack-plugin-tests.ts
index 461e43c2af..7abb6a4ed6 100644
--- a/types/html-webpack-plugin/html-webpack-plugin-tests.ts
+++ b/types/html-webpack-plugin/html-webpack-plugin-tests.ts
@@ -103,7 +103,7 @@ const plugins: HtmlWebpackPlugin[] = optionsArray.map(options => new HtmlWebpack
 // Webpack plugin `apply` function
 function apply(compiler: Compiler) {
 	compiler.hooks.compilation.tap('SomeWebpackPlugin', (compilation: compilation.Compilation) => {
-		(<HtmlWebpackPlugin.Hooks> compilation.hooks).htmlWebpackPluginAfterHtmlProcessing.tap(
+		(compilation.hooks as HtmlWebpackPlugin.Hooks).htmlWebpackPluginAfterHtmlProcessing.tap(
 			'MyPlugin',
 			(data) => {
 				data.html += 'The Magic Footer';
diff --git a/types/http-assert/http-assert-tests.ts b/types/http-assert/http-assert-tests.ts
index a0e159aeed..b2cc7ae301 100644
--- a/types/http-assert/http-assert-tests.ts
+++ b/types/http-assert/http-assert-tests.ts
@@ -5,7 +5,7 @@ try {
     httpAssert.equal('hello', 'hello');
     httpAssert(false, 401, 'authentication failed');
 } catch (err) {
-    console.log((<HttpError> err).status);
-    console.log((<HttpError> err).message);
-    console.log((<HttpError> err).expose);
+    console.log((err as HttpError).status);
+    console.log((err as HttpError).message);
+    console.log((err as HttpError).expose);
 }
diff --git a/types/irc/irc-tests.ts b/types/irc/irc-tests.ts
index b2603e7037..284bb190c7 100644
--- a/types/irc/irc-tests.ts
+++ b/types/irc/irc-tests.ts
@@ -13,15 +13,15 @@ function test_bot() {
         console.log("Connected");
     });
 
-    bot.addListener('error', <irc.handlers.IError> ((message: irc.IMessage) => {
+    bot.addListener('error', ((message: irc.IMessage) => {
     console.error('ERROR: %s: %s', message.command, message.args.join(' '));
-    }));
+    }) as irc.handlers.IError);
 
-    bot.addListener('message#blah', <irc.handlers.IMessageChannel> ((from: string, message: string) => {
+    bot.addListener('message#blah', ((from: string, message: string) => {
     console.log('<%s> %s', from, message);
-    }));
+    }) as irc.handlers.IMessageChannel);
 
-    bot.addListener('message', <irc.handlers.IRecievedMessage> ((from: string, to: string, message: string) => {
+    bot.addListener('message', ((from: string, to: string, message: string) => {
     console.log('%s => %s: %s', from, to, message);
 
     if (to.match(/^[#&]/)) {
@@ -40,23 +40,23 @@ function test_bot() {
         // private message
         console.log('private message');
     }
-    }));
+    }) as irc.handlers.IRecievedMessage);
 
-    bot.addListener('pm', <irc.handlers.IPm> ((nick: string, message: string) => {
+    bot.addListener('pm', ((nick: string, message: string) => {
     console.log('Got private message from %s: %s', nick, message);
-    }));
+    }) as irc.handlers.IPm);
 
-    bot.addListener('join', <irc.handlers.IJoin> ((channel: string, who: string) => {
+    bot.addListener('join', ((channel: string, who: string) => {
     console.log('%s has joined %s', who, channel);
-    }));
+    }) as irc.handlers.IJoin);
 
-    bot.addListener('part', <irc.handlers.IPart> ((channel: string, who: string, reason: string) => {
+    bot.addListener('part', ((channel: string, who: string, reason: string) => {
     console.log('%s has left %s: %s', who, channel, reason);
-    }));
+    }) as irc.handlers.IPart);
 
-    bot.addListener('kick', <irc.handlers.IKick> ((channel: string, who: string, by: string, reason: string) => {
+    bot.addListener('kick', ((channel: string, who: string, by: string, reason: string) => {
     console.log('%s was kicked from %s by %s: %s', who, channel, by, reason);
-    }));
+    }) as irc.handlers.IKick);
 }
 
 function test_secure() {
diff --git a/types/jsdom/jsdom-tests.ts b/types/jsdom/jsdom-tests.ts
index d20232e36f..1420723b8d 100644
--- a/types/jsdom/jsdom-tests.ts
+++ b/types/jsdom/jsdom-tests.ts
@@ -120,7 +120,7 @@ function test_runVMScript() {
     dom.runVMScript(s);
     dom.runVMScript(s);
 
-    (<any> dom.window).ran === 3;
+    (dom.window as any).ran === 3;
 }
 
 function test_reconfigure() {
diff --git a/types/maker.js/maker.js-tests.ts b/types/maker.js/maker.js-tests.ts
index f5f9d9db16..ba02fdef89 100644
--- a/types/maker.js/maker.js-tests.ts
+++ b/types/maker.js/maker.js-tests.ts
@@ -100,9 +100,9 @@ function test() {
 	function testKit() {
 		makerjs.kit.construct(null, null);
 		makerjs.kit.getParameterValues(null);
-		(<MakerJs.IMetaParameter>{}).max;
-		(<MakerJs.IKit>{}).metaParameters;
-		(<MakerJs.IKit>{}).notes;
+		({} as MakerJs.IMetaParameter).max;
+		({} as MakerJs.IKit).metaParameters;
+		({} as MakerJs.IKit).notes;
 	}
 
 	function testMeasure() {
diff --git a/types/meteor/test/globals/meteor-tests.ts b/types/meteor/test/globals/meteor-tests.ts
index b902019aca..782701086f 100644
--- a/types/meteor/test/globals/meteor-tests.ts
+++ b/types/meteor/test/globals/meteor-tests.ts
@@ -697,7 +697,7 @@ Accounts.onPageLoadLogin(function () {
 });
 
 // Covers this PR:  https://github.com/DefinitelyTyped/DefinitelyTyped/pull/8065
-var loginOpts = <Meteor.LoginWithExternalServiceOptions>{
+var loginOpts = {
     requestPermissions: ["a", "b"],
     requestOfflineToken: true,
     loginUrlParameters: { asdf: 1, qwer: "1234" },
@@ -705,7 +705,7 @@ var loginOpts = <Meteor.LoginWithExternalServiceOptions>{
     loginStyle: "Bold and powerful",
     redirectUrl: "popup",
     profile: "asdfasdf"
-};
+} as Meteor.LoginWithExternalServiceOptions;
 Meteor.loginWithMeteorDeveloperAccount(loginOpts, function (error: Meteor.Error) { });
 
 Accounts.emailTemplates.siteName = "AwesomeSite";
@@ -748,7 +748,7 @@ const deeperPrivateSetting = Meteor.settings['somePrivateSettings']['deeperSetti
 
 
 // Covers https://github.com/meteor-typings/meteor/issues/9
-const username = (<HTMLInputElement>Template.instance().find('#username')).value;
+const username = (Template.instance().find('#username') as HTMLInputElement).value;
 
 
 // Covers https://github.com/meteor-typings/meteor/issues/3
diff --git a/types/meteor/test/meteor-tests.ts b/types/meteor/test/meteor-tests.ts
index 4901e810c5..b45284df52 100644
--- a/types/meteor/test/meteor-tests.ts
+++ b/types/meteor/test/meteor-tests.ts
@@ -709,7 +709,7 @@ Accounts.onPageLoadLogin(function () {
 });
 
 // Covers this PR:  https://github.com/DefinitelyTyped/DefinitelyTyped/pull/8065
-var loginOpts = <Meteor.LoginWithExternalServiceOptions>{
+var loginOpts = {
     requestPermissions: ["a", "b"],
     requestOfflineToken: true,
     loginUrlParameters: { asdf: 1, qwer: "1234" },
@@ -717,7 +717,7 @@ var loginOpts = <Meteor.LoginWithExternalServiceOptions>{
     loginStyle: "Bold and powerful",
     redirectUrl: "popup",
     profile: "asdfasdf"
-};
+} as Meteor.LoginWithExternalServiceOptions;
 Meteor.loginWithMeteorDeveloperAccount(loginOpts, function (error: Meteor.Error) { });
 
 Accounts.emailTemplates.siteName = "AwesomeSite";
@@ -760,7 +760,7 @@ const deeperPrivateSetting = Meteor.settings['somePrivateSettings']['deeperSetti
 
 
 // Covers https://github.com/meteor-typings/meteor/issues/9
-const username = (<HTMLInputElement>Template.instance().find('#username')).value;
+const username = (Template.instance().find('#username') as HTMLInputElement).value;
 
 
 // Covers https://github.com/meteor-typings/meteor/issues/3
diff --git a/types/mongoose-paginate/mongoose-paginate-tests.ts b/types/mongoose-paginate/mongoose-paginate-tests.ts
index 320077bc3a..d55f8a454e 100644
--- a/types/mongoose-paginate/mongoose-paginate-tests.ts
+++ b/types/mongoose-paginate/mongoose-paginate-tests.ts
@@ -40,7 +40,7 @@ let router: Router = Router();
 
 router.get('/users.json', function(req: Request, res: Response) {
     let descending: boolean = true;
-    let options: PaginateOptions = <PaginateOptions>{};
+    let options: PaginateOptions = {} as PaginateOptions;
     options.select = 'email username';
     options.sort = { 'username': (descending ? -1 : 1) };
     options.populate = '';
diff --git a/types/mz/mz-tests.ts b/types/mz/mz-tests.ts
index b873c98bbe..a4ec4667a7 100644
--- a/types/mz/mz-tests.ts
+++ b/types/mz/mz-tests.ts
@@ -136,7 +136,7 @@ describe('readline', function () {
     var input = new stream.PassThrough()
     var output = new stream.PassThrough()
     var bufferedOutput = ''
-    var rl = readline.createInterface( input, output, <readline.Completer>completer, true )
+    var rl = readline.createInterface( input, output, completer as readline.Completer, true )
 
     rl.question('a').then(function (answer: string) {
       assert.equal(answer, 'bTESTSTRING')
@@ -174,12 +174,12 @@ describe('readline', function () {
     it('completer support sync', function (done) {
       function completer (line: string) {
         assert.equal(line, 'b')
-        return <[string[], string]>[['bTESTSTRING'], line]
+        return [['bTESTSTRING'], line] as [string[], string]
       }
 
       var input = new stream.PassThrough()
       var output = new stream.PassThrough()
-      var rl = readline.createInterface(input, output, <readline.Completer>completer, true)
+      var rl = readline.createInterface(input, output, completer as readline.Completer, true)
 
       rl.question('a').then(function (answer) {
         assert.ok(output.read().toString().match(/TESTSTRING/))
@@ -197,7 +197,7 @@ describe('readline', function () {
 
       var input = new stream.PassThrough()
       var output = new stream.PassThrough()
-      var rl = readline.createInterface(input, output, <readline.Completer>completer, true )
+      var rl = readline.createInterface(input, output, completer as readline.Completer, true )
 
       rl.question('a').then(function (answer) {
         assert.ok(output.read().toString().match(/TESTSTRING/))
diff --git a/types/nightmare/nightmare-tests.ts b/types/nightmare/nightmare-tests.ts
index d49d8b5932..5d6da26d2a 100644
--- a/types/nightmare/nightmare-tests.ts
+++ b/types/nightmare/nightmare-tests.ts
@@ -17,7 +17,7 @@ new Nightmare()
   .click('.searchsubmit')
   .wait('.url.breadcrumb')
   .evaluate(() => {
-    return (<HTMLElement>document.querySelector('.url.breadcrumb')).innerText;
+    return (document.querySelector('.url.breadcrumb') as HTMLElement).innerText;
   }, (breadcrumb: string) => {
     // expect(breadcrumb).to.equal('github.com');
   })
@@ -165,7 +165,7 @@ new Nightmare()
   .goto('http://validator.w3.org/#validate_by_upload')
   .upload('#uploaded_file', 'test/files/jquery-2.1.1.min.js')
   .evaluate(function () {
-    return (<HTMLInputElement>document.getElementById('uploaded_file')).value;
+    return (document.getElementById('uploaded_file') as HTMLInputElement).value;
   }, function (value) {
   })
   .run(done);
@@ -214,7 +214,7 @@ new Nightmare()
 
 var seconds = function () {
   var gifs = document.querySelectorAll('img');
-  var split = (<HTMLImageElement>gifs[gifs.length - 2]).src.split('.gif')[0];
+  var split = (gifs[gifs.length - 2] as HTMLImageElement).src.split('.gif')[0];
   var seconds = split.split('.com/c')[1];
   return parseInt(seconds, 10);
 };
@@ -319,7 +319,7 @@ new Nightmare()
   .headers(headers)
   .goto('http://httpbin.org/headers')
   .evaluate(function () {
-    return (<HTMLElement>document.body.children[0]).innerHTML;
+    return (document.body.children[0] as HTMLElement).innerHTML;
   }, function (data: string) {
   })
   .run(done);
diff --git a/types/node-ral/node-ral-tests.ts b/types/node-ral/node-ral-tests.ts
index a625c37da4..3c6f6cd9b1 100644
--- a/types/node-ral/node-ral-tests.ts
+++ b/types/node-ral/node-ral-tests.ts
@@ -17,7 +17,7 @@ class HashringBalance extends nodeRal.Balance {
         return 'hashring';
     }
     fetchServer(balanceContext: nodeRal.Balance.BalanceContextClass, conf: {}, prevBackend: nodeRal.Server) {
-        return <nodeRal.Server> {};
+        return {} as nodeRal.Server;
     }
 }
 
diff --git a/types/nw.js/nw.js-tests.ts b/types/nw.js/nw.js-tests.ts
index 853feed3b8..b0387f97a4 100644
--- a/types/nw.js/nw.js-tests.ts
+++ b/types/nw.js/nw.js-tests.ts
@@ -164,7 +164,7 @@ nw.Screen.chooseDesktopMedia( ["window", "screen"],
                 maxWidth: 1920,
                 maxHeight: 1080
             },
-            optional: <any[]>[]
+            optional: [] as any[]
         };
         //navigator.webkitGetUserMedia( { audio: false, video: constraint }, success_func, fallback_func );
     }
diff --git a/types/pouchdb-core/pouchdb-core-tests.ts b/types/pouchdb-core/pouchdb-core-tests.ts
index c4c1e0e408..911a21e2f7 100644
--- a/types/pouchdb-core/pouchdb-core-tests.ts
+++ b/types/pouchdb-core/pouchdb-core-tests.ts
@@ -50,7 +50,7 @@ function testBulkDocs() {
     const isError = (
         result: PouchDB.Core.Response | PouchDB.Core.Error
     ): result is PouchDB.Core.Error => {
-        return !!(<PouchDB.Core.Error> result).error;
+        return !!(result as PouchDB.Core.Error).error;
     };
 
     db.bulkDocs([model, model2]).then((result) => {
diff --git a/types/pouchdb-upsert/pouchdb-upsert-tests.ts b/types/pouchdb-upsert/pouchdb-upsert-tests.ts
index be36580bf7..0f718bb033 100644
--- a/types/pouchdb-upsert/pouchdb-upsert-tests.ts
+++ b/types/pouchdb-upsert/pouchdb-upsert-tests.ts
@@ -15,7 +15,7 @@ function testUpsert_WithPromise_AndReturnDoc() {
     // `doc` may be empty if the document didn't already exist, so we have to
     // cast it to the type containing the required fields.  If the document type
     // had all optional fields, the cast would not be necessary.
-    return <UpsertDocModel> doc;
+    return doc as UpsertDocModel;
   }).then((res: PouchDB.UpsertResponse) => {
   });
 }
@@ -25,7 +25,7 @@ function testUpsert_WithPromise_AndReturnFalsey() {
     if (doc.readonly)
       return false;
     // Make some updates....
-    return <UpsertDocModel> doc;
+    return doc as UpsertDocModel;
   }).then((res: PouchDB.UpsertResponse) => {
   });
 }
@@ -41,7 +41,7 @@ function testUpsert_WithPromise_AndReturnNewObject() {
 function testUpsert_WithCallback_AndReturnDoc() {
   db.upsert(docToUpsert._id, (doc) => {
     // Make some updates....
-    return <UpsertDocModel> doc;
+    return doc as UpsertDocModel;
   }, (error: PouchDB.Core.Error, res: PouchDB.UpsertResponse) => {});
 }
 
@@ -51,7 +51,7 @@ function testUpsert_WithCallback_AndReturnFalsey() {
     if (doc.readonly)
       return false;
     // Make some updates....
-    return <UpsertDocModel> doc;
+    return doc as UpsertDocModel;
   }, (error: PouchDB.Core.Error, res: PouchDB.UpsertResponse) => {});
 }
 
diff --git a/types/project-oxford/project-oxford-tests.ts b/types/project-oxford/project-oxford-tests.ts
index d4c59de109..8b1dbec466 100644
--- a/types/project-oxford/project-oxford-tests.ts
+++ b/types/project-oxford/project-oxford-tests.ts
@@ -12,7 +12,7 @@ const {describe, it, before, after, beforeEach, afterEach} = null as any as {
 var client = new oxford.Client(process.env.OXFORD_KEY);
 
 // Store variables, no point in calling the api too often
-var billFaces = <string[]>[];
+var billFaces = [] as string[];
 var personGroupId = "uuid.v4()";
 var personGroupId2 = "uuid.v4()";
 var billPersonId: string;
@@ -113,7 +113,7 @@ describe('Project Oxford Face API Test', function () {
 
     describe('#grouping()', function () {
         it('detects groups faces', function (done) {
-            var faceIds = <string[]>[];
+            var faceIds = [] as string[];
 
             this.timeout(10000);
 
diff --git a/types/react/test/index.ts b/types/react/test/index.ts
index 9680b8d8cd..de043082fb 100644
--- a/types/react/test/index.ts
+++ b/types/react/test/index.ts
@@ -121,7 +121,7 @@ class ModernComponent extends React.Component<Props, State, Snapshot>
         hello: PropTypes.string.isRequired,
         world: PropTypes.string,
         foo: PropTypes.number.isRequired,
-        key: <PropTypes.Validator<string | number | undefined>> PropTypes.oneOfType([PropTypes.number, PropTypes.string])
+        key: PropTypes.oneOfType([PropTypes.number, PropTypes.string]) as PropTypes.Validator<string | number | undefined>
     };
 
     static contextTypes: React.ValidationMap<Context> = {
diff --git a/types/restify/restify-tests.ts b/types/restify/restify-tests.ts
index 42bbe12524..70ce178df0 100644
--- a/types/restify/restify-tests.ts
+++ b/types/restify/restify-tests.ts
@@ -175,7 +175,7 @@ server.on('after', (req: restify.Request, res: restify.Response, route: restify.
     restify.plugins.auditLogger({ event: 'after', log: logger })(req, res, route, err);
 });
 
-(<any> restify).defaultResponseHeaders = function(this: restify.Request, data: any) {
+(restify as any).defaultResponseHeaders = function(this: restify.Request, data: any) {
     this.header('Server', 'helloworld');
 };
 
diff --git a/types/restify/v4/restify-tests.ts b/types/restify/v4/restify-tests.ts
index 01374a963c..49aead41ab 100644
--- a/types/restify/v4/restify-tests.ts
+++ b/types/restify/v4/restify-tests.ts
@@ -285,11 +285,11 @@ server.on('after', (req: restify.Request, res: restify.Response, route: restify.
     restify.auditLogger({ log: () => { } })(req, res, route, err);
 });
 
-(<any> restify).defaultResponseHeaders = function(this: restify.Request, data: any) {
+(restify as any).defaultResponseHeaders = function(this: restify.Request, data: any) {
     this.header('Server', 'helloworld');
 };
 
-(<any> restify).defaultResponseHeaders = false;
+(restify as any).defaultResponseHeaders = false;
 
 // RESTIFY Client Tests
 
diff --git a/types/restify/v5/restify-tests.ts b/types/restify/v5/restify-tests.ts
index 8601d912ac..3342183c2f 100644
--- a/types/restify/v5/restify-tests.ts
+++ b/types/restify/v5/restify-tests.ts
@@ -170,7 +170,7 @@ server.on('after', (req: restify.Request, res: restify.Response, route: restify.
     restify.plugins.auditLogger({ event: 'after', log: logger })(req, res, route, err);
 });
 
-(<any> restify).defaultResponseHeaders = function(this: restify.Request, data: any) {
+(restify as any).defaultResponseHeaders = function(this: restify.Request, data: any) {
     this.header('Server', 'helloworld');
 };
 
diff --git a/types/rx.wamp/rx.wamp-tests.ts b/types/rx.wamp/rx.wamp-tests.ts
index 6e7cb3e6ed..741b8e0de9 100644
--- a/types/rx.wamp/rx.wamp-tests.ts
+++ b/types/rx.wamp/rx.wamp-tests.ts
@@ -137,11 +137,11 @@ function weather_station_monitor(session: autobahn.Session) {
 
     //Home control settings
     var desiredTemperature = Rx.Observable.subscribeAsObservable(session, "temperature.indoors.desired")
-        .map(x => <number>x.args[0]);
+        .map(x => x.args[0] as number);
 
     var dailyForecast =
         sensorReadings
-            .map(rawValue => <IWeather>rawValue.kwargs)
+            .map(rawValue => rawValue.kwargs as IWeather)
             .throttle(1000) // At most once every second
             .bufferWithTime(1000 * 60 * 60 * 24) //Milliseconds in a day
             .tap(readings => {
diff --git a/types/set-cookie-parser/set-cookie-parser-tests.ts b/types/set-cookie-parser/set-cookie-parser-tests.ts
index 0faff0148c..ab4e88005d 100644
--- a/types/set-cookie-parser/set-cookie-parser-tests.ts
+++ b/types/set-cookie-parser/set-cookie-parser-tests.ts
@@ -39,7 +39,7 @@ assert.equal(cookies[1].name, "foo");
 assert.equal(cookies[1].value, "bar");
 
 // HTTP response message test
-var message = <http.IncomingMessage>{};
+var message = {} as http.IncomingMessage;
 message.headers = { "set-cookie": ["bam=baz", "foo=bar"] };
 cookies = setCookie(message);
 assert.equal(cookies.length, 2);
diff --git a/types/shelljs/shelljs-tests.ts b/types/shelljs/shelljs-tests.ts
index 37dccddff6..b61ddbd3ba 100644
--- a/types/shelljs/shelljs-tests.ts
+++ b/types/shelljs/shelljs-tests.ts
@@ -82,10 +82,10 @@ import child = require("child_process");
 
 const version = shell.exec("node --version").stdout;
 
-const version2 = <shell.ExecOutputReturnValue> shell.exec("node --version", { async: false });
+const version2 = shell.exec("node --version", { async: false }) as shell.ExecOutputReturnValue;
 const output = version2.stdout;
 
-const asyncVersion3 = <child.ChildProcess> shell.exec("node --version", { async: true });
+const asyncVersion3 = shell.exec("node --version", { async: true }) as child.ChildProcess;
 let pid = asyncVersion3.pid;
 
 shell.exec("node --version", { silent: true }, (code, stdout, stderr) => {
diff --git a/types/socketio-jwt/socketio-jwt-tests.ts b/types/socketio-jwt/socketio-jwt-tests.ts
index 2341de7747..2309d2c8d6 100644
--- a/types/socketio-jwt/socketio-jwt-tests.ts
+++ b/types/socketio-jwt/socketio-jwt-tests.ts
@@ -27,7 +27,7 @@ io.on('connection', authorize({
 
 io.on('authenticated', (socket: SocketIo.Socket) => {
 	console.log('authenticated!!');
-	console.log(JSON.stringify((<any> socket).anyNameYouWant));
+	console.log(JSON.stringify((socket as any).anyNameYouWant));
 });
 
 const secrets: any = {
diff --git a/types/spdy/spdy-tests.ts b/types/spdy/spdy-tests.ts
index cd9ebd034e..6dcce1d28d 100644
--- a/types/spdy/spdy-tests.ts
+++ b/types/spdy/spdy-tests.ts
@@ -58,7 +58,7 @@ describe('SPDY Client', () => {
         server.listen(fixtures.port, () => {
           agent = spdy.createAgent({
                                      rejectUnauthorized: false,
-                                     port: <number> fixtures.port,
+                                     port: fixtures.port as number,
                                      spdy: {
                                        plain,
                                        protocol: plain ? npn : null,
diff --git a/types/swaggerize-express/swaggerize-express-tests.ts b/types/swaggerize-express/swaggerize-express-tests.ts
index 46ada50a77..67f8ab49bd 100644
--- a/types/swaggerize-express/swaggerize-express-tests.ts
+++ b/types/swaggerize-express/swaggerize-express-tests.ts
@@ -15,13 +15,13 @@ const api = {
 };
 
 var app = express();
-app.use(swaggerize(<swaggerize.Options>{
+app.use(swaggerize({
     api,
     docspath: '/api-docs',
     handlers: './handlers'
-}));
+} as swaggerize.Options));
 
-app.use(swaggerize(<swaggerize.Options>{
+app.use(swaggerize({
     api,
     docspath: '/api-docs',
     handlers: {
@@ -33,9 +33,9 @@ app.use(swaggerize(<swaggerize.Options>{
             }
         }
     }
-}));
+} as swaggerize.Options));
 
-app.use(swaggerize(<swaggerize.Options>{
+app.use(swaggerize({
     api,
     docspath: '/api-docs',
     handlers: {
@@ -48,9 +48,9 @@ app.use(swaggerize(<swaggerize.Options>{
             }
         }
     }
-}));
+} as swaggerize.Options));
 
 var server = app.listen(18888, 'localhost', function () {
     const addr = server.address() as AddressInfo;
-    (<swaggerize.SwaggerizedExpress>app).swagger.api.host = addr.address + ':' + addr.port;
+    (app as swaggerize.SwaggerizedExpress).swagger.api.host = addr.address + ':' + addr.port;
 });
diff --git a/types/terminal-menu/terminal-menu-tests.ts b/types/terminal-menu/terminal-menu-tests.ts
index 441c644c96..979407be85 100644
--- a/types/terminal-menu/terminal-menu-tests.ts
+++ b/types/terminal-menu/terminal-menu-tests.ts
@@ -1,6 +1,6 @@
 import * as tty from "tty"; // For typing
 
-let stdin = (<tty.ReadStream> process.stdin);
+let stdin = (process.stdin as tty.ReadStream);
 
 if(!stdin.isTTY) {
     console.log("Terminal not supported");
diff --git a/types/twilio/twilio-tests.ts b/types/twilio/twilio-tests.ts
index 33a691eac0..2e7682d3b2 100644
--- a/types/twilio/twilio-tests.ts
+++ b/types/twilio/twilio-tests.ts
@@ -240,5 +240,5 @@ twilio.webhook("MYAUTHTOKEN", { validate: false });
 
 
 function getMockExpressRequest(): Express.Request {
-    return <Express.Request>JSON.parse("{}");
+    return JSON.parse("{}") as Express.Request;
 }
diff --git a/types/vinyl-fs/vinyl-fs-tests.ts b/types/vinyl-fs/vinyl-fs-tests.ts
index 6cecf42f47..aac3c4f49e 100644
--- a/types/vinyl-fs/vinyl-fs-tests.ts
+++ b/types/vinyl-fs/vinyl-fs-tests.ts
@@ -383,9 +383,9 @@ describe('dest stream', () => {
          cwd: __dirname,
          path: inputPath,
          contents: expectedContents,
-         stat: <fs.Stats> {
+         stat: {
             mode: expectedMode
-         }
+         } as fs.Stats
       });
 
       const onEnd = () => {
@@ -424,9 +424,9 @@ describe('dest stream', () => {
          cwd: __dirname,
          path: inputPath,
          contents: contentStream,
-         stat: <fs.Stats> {
+         stat: {
             mode: expectedMode
-         }
+         } as fs.Stats
       });
 
       const onEnd = () => {
@@ -467,10 +467,10 @@ describe('dest stream', () => {
          cwd: __dirname,
          path: inputPath,
          contents: null,
-         stat: <fs.Stats> {
+         stat: {
             isDirectory: () => true,
             mode: expectedMode
-         }
+         } as fs.Stats
       });
 
       const onEnd = () => {
@@ -711,9 +711,9 @@ describe('symlink stream', () => {
          cwd: __dirname,
          path: inputPath,
          contents: expectedContents,
-         stat: <fs.Stats> {
+         stat: {
             mode: expectedMode
-         }
+         } as fs.Stats
       });
 
       const onEnd = () => {
@@ -752,9 +752,9 @@ describe('symlink stream', () => {
          cwd: __dirname,
          path: inputPath,
          contents: contentStream,
-         stat: <fs.Stats> {
+         stat: {
             mode: expectedMode
-         }
+         } as fs.Stats
       });
 
       const onEnd = () => {
@@ -795,10 +795,10 @@ describe('symlink stream', () => {
          cwd: __dirname,
          path: inputPath,
          contents: null,
-         stat: <fs.Stats> {
+         stat: {
             isDirectory: () => true,
             mode: expectedMode
-         }
+         } as fs.Stats
       });
 
       const onEnd = () => {
@@ -870,9 +870,9 @@ describe('symlink stream', () => {
          cwd: __dirname,
          path: inputPath,
          contents: expectedContents,
-         stat: <fs.Stats> {
+         stat: {
             mode: expectedMode
-         }
+         } as fs.Stats
       });
 
       fs.mkdirSync(expectedBase);
diff --git a/types/vinyl/v0/vinyl-tests.ts b/types/vinyl/v0/vinyl-tests.ts
index 8c7de1ea52..8c4415bb35 100644
--- a/types/vinyl/v0/vinyl-tests.ts
+++ b/types/vinyl/v0/vinyl-tests.ts
@@ -167,11 +167,11 @@ describe('File', () => {
 	});
 
 	describe('isDirectory()', () => {
-		var fakeStat = <fs.Stats>{
+		var fakeStat = {
 			isDirectory() {
 				return true;
 			}
-		};
+		} as fs.Stats;
 
 		it('should return false when the contents are a Buffer', done => {
 			var val = new Buffer("test");
@@ -216,10 +216,10 @@ describe('File', () => {
 
 			let fileUtf8Contents = fileContents instanceof Buffer ?
 				fileContents.toString('utf8') :
-				(<NodeJS.ReadableStream>fileContents).toString();
+				(fileContents as NodeJS.ReadableStream).toString();
 			let file2Utf8Contents = file2Contents instanceof Buffer ?
 				file2Contents.toString('utf8') :
-				(<NodeJS.ReadableStream>file2Contents).toString();
+				(file2Contents as NodeJS.ReadableStream).toString();
 
 			file2Utf8Contents.should.equal(fileUtf8Contents);
 			done();
diff --git a/types/whatwg-streams/whatwg-streams-tests.ts b/types/whatwg-streams/whatwg-streams-tests.ts
index be749686cc..fb5c03e67c 100644
--- a/types/whatwg-streams/whatwg-streams-tests.ts
+++ b/types/whatwg-streams/whatwg-streams-tests.ts
@@ -149,7 +149,7 @@ function makeReadableFileStream(filename: string) {
         pull(controller) {
             const buffer = new ArrayBuffer(CHUNK_SIZE);
 
-            return fs.read(fd, <any>buffer, 0, CHUNK_SIZE, position).then(bytesRead => {
+            return fs.read(fd, buffer as any, 0, CHUNK_SIZE, position).then(bytesRead => {
                 if (bytesRead === 0) {
                     return fs.close(fd).then(() => controller.close());
                 } else {
@@ -189,7 +189,7 @@ function makeReadableByteFileStream(filename: string) {
             // feature allocates a buffer and passes it to us via byobRequest.
             const v = controller.byobRequest!.view;
 
-            return fs.read(fd, <any>v.buffer, v.byteOffset, v.byteLength, position).then(bytesRead => {
+            return fs.read(fd, v.buffer as any, v.byteOffset, v.byteLength, position).then(bytesRead => {
                 if (bytesRead === 0) {
                     return fs.close(fd).then(() => controller.close());
                 } else {
diff --git a/types/yog-log/yog-log-tests.ts b/types/yog-log/yog-log-tests.ts
index 90dd730cfb..7a37c648f8 100644
--- a/types/yog-log/yog-log-tests.ts
+++ b/types/yog-log/yog-log-tests.ts
@@ -16,7 +16,7 @@ const cookie_value = log.getCookie('test');
 const getLogFile = log.getLogFile(0);
 const log_format = log.getLogFormat('ACCESS');
 
-const logid = log.getLogID(<express.Request> {}, 'test');
+const logid = log.getLogID({} as express.Request, 'test');
 const intlevel = log.getLogLevelInt('ACCESS');
 const prfix = log.getLogPrefix();
 const log_str = log.getLogString('test');
diff --git a/types/yog2-kernel/yog2-kernel-tests.ts b/types/yog2-kernel/yog2-kernel-tests.ts
index a53b3c4dad..7f88134b10 100644
--- a/types/yog2-kernel/yog2-kernel-tests.ts
+++ b/types/yog2-kernel/yog2-kernel-tests.ts
@@ -17,8 +17,8 @@ const handler = async function(req: yog2Kernel.Request, resp: yog2Kernel.Respons
     resp.render("test", {});
 };
 
-const router = <yog2Kernel.Router> {};
-(<yog2Kernel.ActionObject> router.action("test")).get;
+const router = {} as yog2Kernel.Router;
+(router.action("test") as yog2Kernel.ActionObject).get;
 
 const handler1 = router.wrapAsync(function() { });
 const handler21 = router.wrapAsync(function(req: yog2Kernel.Request) { });

From 5cb38fe47278a9e284061f22f1a2c4a98f150275 Mon Sep 17 00:00:00 2001
From: "J. Joe Douglas" <jjoedouglas@gmail.com>
Date: Sat, 3 Nov 2018 14:23:04 -0400
Subject: [PATCH 139/836] Backbone.Event is an object, not class

---
 types/backbone-relational/index.d.ts | 14 +++++++++-
 types/backbone.marionette/index.d.ts | 14 +++++++++-
 types/backbone.radio/index.d.ts      | 13 ++++++++-
 types/backbone/backbone-tests.ts     |  2 +-
 types/backbone/index.d.ts            | 42 ++++++++++++++++++++++++----
 types/giraffe/index.d.ts             | 14 +++++++++-
 6 files changed, 89 insertions(+), 10 deletions(-)

diff --git a/types/backbone-relational/index.d.ts b/types/backbone-relational/index.d.ts
index a1c8c3eefb..e563f19fb1 100644
--- a/types/backbone-relational/index.d.ts
+++ b/types/backbone-relational/index.d.ts
@@ -122,7 +122,19 @@ declare module 'backbone' {
 
     }
 
-    export class Store extends Events {
+    export class Store implements Events {
+        on(eventName: string, callback?: Function, context?: any): any;
+        on(eventMap: EventsHash): any;
+        on(eventName: any, callback?: any, context?: any): any;
+        off(eventName?: string, callback?: Function, context?: any): any;
+        trigger(eventName: string, ...args: any[]): any;
+        bind(eventName: string, callback: Function, context?: any): any;
+        unbind(eventName?: string, callback?: Function, context?: any): any;
+        once(events: string, callback: Function, context?: any): any;
+        listenTo(object: any, events: string, callback: Function): any;
+        listenToOnce(object: any, events: string, callback: Function): any;
+        stopListening(object?: any, events?: string, callback?: Function): any;
+
         initializeRelation(model, relation, options);
 
         addModelScope(scope:any):void;
diff --git a/types/backbone.marionette/index.d.ts b/types/backbone.marionette/index.d.ts
index 609bf37b67..3a32afac71 100644
--- a/types/backbone.marionette/index.d.ts
+++ b/types/backbone.marionette/index.d.ts
@@ -407,9 +407,21 @@ export interface ObjectOptions extends RadioMixinOptions {
  * A base class which other classes can extend from. Object incorporates many
  * backbone conventions and utilities like initialize and Backbone.Events.
  */
-export class Object extends Backbone.Events implements CommonMixin, RadioMixin {
+export class Object implements CommonMixin, RadioMixin, Backbone.Events {
     constructor(options?: ObjectOptions);
 
+    on(eventName: string, callback?: () => void, context?: any): any;
+    on(eventMap: EventsHash): any;
+    on(eventName: any, callback?: any, context?: any): any;
+    off(eventName?: string, callback?: () => void, context?: any): any;
+    trigger(eventName: string, ...args: any[]): any;
+    bind(eventName: string, callback: () => void, context?: any): any;
+    unbind(eventName?: string, callback?: () => void, context?: any): any;
+    once(events: string, callback: () => void, context?: any): any;
+    listenTo(object: any, events: string, callback: () => void): any;
+    listenToOnce(object: any, events: string, callback: () => void): any;
+    stopListening(object?: any, events?: string, callback?: () => void): any;
+
     /**
      * Receives a hash of event names and functions and/or function names,
      * and returns the same hash with the function names replaced with the
diff --git a/types/backbone.radio/index.d.ts b/types/backbone.radio/index.d.ts
index 12fc6d384f..171c038842 100644
--- a/types/backbone.radio/index.d.ts
+++ b/types/backbone.radio/index.d.ts
@@ -71,7 +71,18 @@ declare module "backbone" {
             stopReplying(commandName?: string, callback?: (...args: any[]) => any, context?: any): Requests;
         }
 
-        class Channel extends Backbone.Events implements Commands, Requests {
+        class Channel implements Commands, Requests, Backbone.Events {
+            on(eventName: string, callback?: Function, context?: any): any;
+            on(eventMap: EventsHash): any;
+            on(eventName: any, callback?: any, context?: any): any;
+            off(eventName?: string, callback?: Function, context?: any): any;
+            trigger(eventName: string, ...args: any[]): any;
+            bind(eventName: string, callback: Function, context?: any): any;
+            unbind(eventName?: string, callback?: Function, context?: any): any;
+            once(events: string, callback: Function, context?: any): any;
+            listenTo(object: any, events: string, callback: Function): any;
+            listenToOnce(object: any, events: string, callback: Function): any;
+            stopListening(object?: any, events?: string, callback?: Function): any;
             channelName: string;
             reset(): Channel;
 
diff --git a/types/backbone/backbone-tests.ts b/types/backbone/backbone-tests.ts
index 65a1463978..563c21634c 100644
--- a/types/backbone/backbone-tests.ts
+++ b/types/backbone/backbone-tests.ts
@@ -1,6 +1,6 @@
 function test_events() {
 
-    var object = new Backbone.Events();
+    var object = Backbone.Events;
     object.on("alert", (eventName: string) => alert("Triggered " + eventName));
 
     object.trigger("alert", "an event");
diff --git a/types/backbone/index.d.ts b/types/backbone/index.d.ts
index 81bce43606..cabb6169ab 100644
--- a/types/backbone/index.d.ts
+++ b/types/backbone/index.d.ts
@@ -3,6 +3,7 @@
 // Definitions by: Boris Yankov <https://github.com/borisyankov>
 //                 Natan Vivo <https://github.com/nvivo>
 //                 kenjiru <https://github.com/kenjiru>
+//                 jjoekoullas <https://github.com/jjoekoullas>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -94,7 +95,8 @@ declare namespace Backbone {
         [selector: string]: string | {(eventObject: JQueryEventObject): void};
     }
 
-    class Events {
+    export const Events: Events;
+    interface Events {
         on(eventName: string, callback?: Function, context?: any): any;
         on(eventMap: EventsHash): any;
         off(eventName?: string, callback?: Function, context?: any): any;
@@ -108,7 +110,19 @@ declare namespace Backbone {
         stopListening(object?: any, events?: string, callback?: Function): any;
     }
 
-    class ModelBase extends Events {
+    class ModelBase implements Events {
+        on(eventName: string, callback?: Function, context?: any): any;
+        on(eventMap: EventsHash): any;
+        on(eventName: any, callback?: any, context?: any): any 
+        off(eventName?: string, callback?: Function, context?: any): any
+        trigger(eventName: string, ...args: any[]): any
+        bind(eventName: string, callback: Function, context?: any): any
+        unbind(eventName?: string, callback?: Function, context?: any): any
+        once(events: string, callback: Function, context?: any): any
+        listenTo(object: any, events: string, callback: Function):any
+        listenToOnce(object: any, events: string, callback: Function): any
+        stopListening(object?: any, events?: string, callback?: Function): any
+
         parse(response: any, options?: any): any;
         toJSON(options?: any): any;
         sync(...arg: any[]): JQueryXHR;
@@ -353,7 +367,7 @@ declare namespace Backbone {
         without(...values: TModel[]): TModel[];
     }
 
-    class Router extends Events {
+    class Router extends EventSignatures {
 
         /**
         * Do not use, prefer TypeScript's extend functionality.
@@ -382,7 +396,7 @@ declare namespace Backbone {
 
     var history: History;
 
-    class History extends Events {
+    class History extends EventSignatures {
 
         handlers: any[];
         interval: number;
@@ -419,7 +433,7 @@ declare namespace Backbone {
       attributes?: {[id: string]: any};
     }
 
-    class View<TModel extends Model> extends Events {
+    class View<TModel extends Model> extends EventSignatures {
 
         /**
         * Do not use, prefer TypeScript's extend functionality.
@@ -471,3 +485,21 @@ declare namespace Backbone {
     function noConflict(): typeof Backbone;
     var $: JQueryStatic;
 }
+
+/**
+ * This is not for external use and is only here as a convenient way to
+ * specify signatures for internal implementers of Backbone.Events
+ */
+declare abstract class EventSignatures implements Backbone.Events {
+        on(eventName: string, callback?: Function, context?: any): any;
+        on(eventMap: Backbone.EventsHash): any;
+        off(eventName?: string, callback?: Function, context?: any): any;
+        trigger(eventName: string, ...args: any[]): any;
+        bind(eventName: string, callback: Function, context?: any): any;
+        unbind(eventName?: string, callback?: Function, context?: any): any;
+
+        once(events: string, callback: Function, context?: any): any;
+        listenTo(object: any, events: string, callback: Function): any;
+        listenToOnce(object: any, events: string, callback: Function): any;
+        stopListening(object?: any, events?: string, callback?: Function): any;
+}
\ No newline at end of file
diff --git a/types/giraffe/index.d.ts b/types/giraffe/index.d.ts
index 6b88b5d4b8..3cab015ac5 100644
--- a/types/giraffe/index.d.ts
+++ b/types/giraffe/index.d.ts
@@ -145,7 +145,19 @@ declare namespace Giraffe {
 
   namespace Contrib {
 
-    class Controller extends Backbone.Events implements GiraffeObject {
+    class Controller implements GiraffeObject, Backbone.Events {
+      on(eventName: string, callback?: Function, context?: any);
+      on(eventMap: Backbone.EventsHash);
+      on(eventName: any, callback?: any, context?: any) 
+      off(eventName?: string, callback?: Function, context?: any) 
+      trigger(eventName: string, ...args: any[]) 
+      bind(eventName: string, callback: Function, context?: any) 
+      unbind(eventName?: string, callback?: Function, context?: any) 
+      once(events: string, callback: Function, context?: any): any;
+      listenTo(object: any, events: string, callback: Function): any;
+      listenToOnce(object: any, events: string, callback: Function): any;
+      stopListening(object?: any, events?: string, callback?: Function): any;
+
       app: App;
     }
 

From 5d2d49832ac9b8b4aef880b286b050babf3a9a41 Mon Sep 17 00:00:00 2001
From: "J. Joe Douglas" <jjoedouglas@gmail.com>
Date: Tue, 20 Nov 2018 20:43:08 -0500
Subject: [PATCH 140/836] no Functions

---
 .../backbone-fetch-cache-tests.ts             |  4 +--
 types/backbone-relational/index.d.ts          | 16 ++++-----
 types/backbone.marionette/index.d.ts          | 16 ++++-----
 .../backbone.paginator-tests.ts               |  4 +--
 types/backbone.radio/index.d.ts               | 16 ++++-----
 types/backbone/index.d.ts                     | 34 +++++++++----------
 types/giraffe/index.d.ts                      | 20 +++++------
 7 files changed, 55 insertions(+), 55 deletions(-)

diff --git a/types/backbone-fetch-cache/backbone-fetch-cache-tests.ts b/types/backbone-fetch-cache/backbone-fetch-cache-tests.ts
index 072e3c29ce..6c2d852961 100644
--- a/types/backbone-fetch-cache/backbone-fetch-cache-tests.ts
+++ b/types/backbone-fetch-cache/backbone-fetch-cache-tests.ts
@@ -64,7 +64,7 @@ const modelOpts: Backbone.ModelFetchWithCacheOptions = {
     context: {},
 };
 
-const hoge = <Backbone.ModelWithCache> new Backbone.Model;
+const hoge = new Backbone.Model() as Backbone.ModelWithCache;
 hoge.fetch(modelOpts);
 
 const collectionOpts: Backbone.CollectionFetchWithCacheOptions = {
@@ -76,5 +76,5 @@ const collectionOpts: Backbone.CollectionFetchWithCacheOptions = {
     prefillSuccess: (self: any) => { },
 };
 
-const fuga = <Backbone.CollectionWithCache> new Backbone.Collection;
+const fuga = new Backbone.Collection() as Backbone.CollectionWithCache;
 fuga.fetch(collectionOpts);
diff --git a/types/backbone-relational/index.d.ts b/types/backbone-relational/index.d.ts
index e563f19fb1..403759ac97 100644
--- a/types/backbone-relational/index.d.ts
+++ b/types/backbone-relational/index.d.ts
@@ -123,17 +123,17 @@ declare module 'backbone' {
     }
 
     export class Store implements Events {
-        on(eventName: string, callback?: Function, context?: any): any;
+        on(eventName: string, callback?: (...args: any[]) => void, context?: any): any;
         on(eventMap: EventsHash): any;
         on(eventName: any, callback?: any, context?: any): any;
-        off(eventName?: string, callback?: Function, context?: any): any;
+        off(eventName?: string, callback?: (...args: any[]) => void, context?: any): any;
         trigger(eventName: string, ...args: any[]): any;
-        bind(eventName: string, callback: Function, context?: any): any;
-        unbind(eventName?: string, callback?: Function, context?: any): any;
-        once(events: string, callback: Function, context?: any): any;
-        listenTo(object: any, events: string, callback: Function): any;
-        listenToOnce(object: any, events: string, callback: Function): any;
-        stopListening(object?: any, events?: string, callback?: Function): any;
+        bind(eventName: string, callback: (...args: any[]) => void, context?: any): any;
+        unbind(eventName?: string, callback?: (...args: any[]) => void, context?: any): any;
+        once(events: string, callback: (...args: any[]) => void, context?: any): any;
+        listenTo(object: any, events: string, callback: (...args: any[]) => void): any;
+        listenToOnce(object: any, events: string, callback: (...args: any[]) => void): any;
+        stopListening(object?: any, events?: string, callback?: (...args: any[]) => void): any;
 
         initializeRelation(model, relation, options);
 
diff --git a/types/backbone.marionette/index.d.ts b/types/backbone.marionette/index.d.ts
index 3a32afac71..4edaba87b7 100644
--- a/types/backbone.marionette/index.d.ts
+++ b/types/backbone.marionette/index.d.ts
@@ -410,17 +410,17 @@ export interface ObjectOptions extends RadioMixinOptions {
 export class Object implements CommonMixin, RadioMixin, Backbone.Events {
     constructor(options?: ObjectOptions);
 
-    on(eventName: string, callback?: () => void, context?: any): any;
+    on(eventName: string, callback?: (...args: any[]) => void, context?: any): any;
     on(eventMap: EventsHash): any;
     on(eventName: any, callback?: any, context?: any): any;
-    off(eventName?: string, callback?: () => void, context?: any): any;
+    off(eventName?: string, callback?: (...args: any[]) => void, context?: any): any;
     trigger(eventName: string, ...args: any[]): any;
-    bind(eventName: string, callback: () => void, context?: any): any;
-    unbind(eventName?: string, callback?: () => void, context?: any): any;
-    once(events: string, callback: () => void, context?: any): any;
-    listenTo(object: any, events: string, callback: () => void): any;
-    listenToOnce(object: any, events: string, callback: () => void): any;
-    stopListening(object?: any, events?: string, callback?: () => void): any;
+    bind(eventName: string, callback: (...args: any[]) => void, context?: any): any;
+    unbind(eventName?: string, callback?: (...args: any[]) => void, context?: any): any;
+    once(events: string, callback: (...args: any[]) => void, context?: any): any;
+    listenTo(object: any, events: string, callback: (...args: any[]) => void): any;
+    listenToOnce(object: any, events: string, callback: (...args: any[]) => void): any;
+    stopListening(object?: any, events?: string, callback?: (...args: any[]) => void): any;
 
     /**
      * Receives a hash of event names and functions and/or function names,
diff --git a/types/backbone.paginator/backbone.paginator-tests.ts b/types/backbone.paginator/backbone.paginator-tests.ts
index f24e2855f5..0c1b0cf9a8 100644
--- a/types/backbone.paginator/backbone.paginator-tests.ts
+++ b/types/backbone.paginator/backbone.paginator-tests.ts
@@ -70,8 +70,8 @@ namespace InitializingWithOptions {
   });
 
   var testCollection6 = new TestCollection([
-    <TestModel>{},
-    <TestModel>{},
+    {} as TestModel,
+    {} as TestModel,
   ]);
 }
 
diff --git a/types/backbone.radio/index.d.ts b/types/backbone.radio/index.d.ts
index 171c038842..ac953aa00b 100644
--- a/types/backbone.radio/index.d.ts
+++ b/types/backbone.radio/index.d.ts
@@ -72,17 +72,17 @@ declare module "backbone" {
         }
 
         class Channel implements Commands, Requests, Backbone.Events {
-            on(eventName: string, callback?: Function, context?: any): any;
+            on(eventName: string, callback?: (...args: any[]) => void, context?: any): any;
             on(eventMap: EventsHash): any;
             on(eventName: any, callback?: any, context?: any): any;
-            off(eventName?: string, callback?: Function, context?: any): any;
+            off(eventName?: string, callback?: (...args: any[]) => void, context?: any): any;
             trigger(eventName: string, ...args: any[]): any;
-            bind(eventName: string, callback: Function, context?: any): any;
-            unbind(eventName?: string, callback?: Function, context?: any): any;
-            once(events: string, callback: Function, context?: any): any;
-            listenTo(object: any, events: string, callback: Function): any;
-            listenToOnce(object: any, events: string, callback: Function): any;
-            stopListening(object?: any, events?: string, callback?: Function): any;
+            bind(eventName: string, callback: (...args: any[]) => void, context?: any): any;
+            unbind(eventName?: string, callback?: (...args: any[]) => void, context?: any): any;
+            once(events: string, callback: (...args: any[]) => void, context?: any): any;
+            listenTo(object: any, events: string, callback: (...args: any[]) => void): any;
+            listenToOnce(object: any, events: string, callback: (...args: any[]) => void): any;
+            stopListening(object?: any, events?: string, callback?: (...args: any[]) => void): any;
             channelName: string;
             reset(): Channel;
 
diff --git a/types/backbone/index.d.ts b/types/backbone/index.d.ts
index cabb6169ab..ca36541735 100644
--- a/types/backbone/index.d.ts
+++ b/types/backbone/index.d.ts
@@ -97,23 +97,23 @@ declare namespace Backbone {
 
     export const Events: Events;
     interface Events {
-        on(eventName: string, callback?: Function, context?: any): any;
+        on(eventName: string, callback?: (...args: any[]) => void, context?: any): any;
         on(eventMap: EventsHash): any;
-        off(eventName?: string, callback?: Function, context?: any): any;
+        off(eventName?: string, callback?: (...args: any[]) => void, context?: any): any;
         trigger(eventName: string, ...args: any[]): any;
-        bind(eventName: string, callback: Function, context?: any): any;
-        unbind(eventName?: string, callback?: Function, context?: any): any;
+        bind(eventName: string, callback: (...args: any[]) => void, context?: any): any;
+        unbind(eventName?: string, callback?: (...args: any[]) => void, context?: any): any;
 
-        once(events: string, callback: Function, context?: any): any;
-        listenTo(object: any, events: string, callback: Function): any;
-        listenToOnce(object: any, events: string, callback: Function): any;
-        stopListening(object?: any, events?: string, callback?: Function): any;
+        once(events: string, callback: (...args: any[]) => void, context?: any): any;
+        listenTo(object: any, events: string, callback: (...args: any[]) => void): any;
+        listenToOnce(object: any, events: string, callback: (...args: any[]) => void): any;
+        stopListening(object?: any, events?: string, callback?: (...args: any[]) => void): any;
     }
 
     class ModelBase implements Events {
         on(eventName: string, callback?: Function, context?: any): any;
         on(eventMap: EventsHash): any;
-        on(eventName: any, callback?: any, context?: any): any 
+        on(eventName: any, callback?: any, context?: any): any
         off(eventName?: string, callback?: Function, context?: any): any
         trigger(eventName: string, ...args: any[]): any
         bind(eventName: string, callback: Function, context?: any): any
@@ -491,15 +491,15 @@ declare namespace Backbone {
  * specify signatures for internal implementers of Backbone.Events
  */
 declare abstract class EventSignatures implements Backbone.Events {
-        on(eventName: string, callback?: Function, context?: any): any;
+        on(eventName: string, callback?: (...args: any[]) => void, context?: any): any;
         on(eventMap: Backbone.EventsHash): any;
-        off(eventName?: string, callback?: Function, context?: any): any;
+        off(eventName?: string, callback?: (...args: any[]) => void, context?: any): any;
         trigger(eventName: string, ...args: any[]): any;
-        bind(eventName: string, callback: Function, context?: any): any;
-        unbind(eventName?: string, callback?: Function, context?: any): any;
+        bind(eventName: string, callback: (...args: any[]) => void, context?: any): any;
+        unbind(eventName?: string, callback?: (...args: any[]) => void, context?: any): any;
 
-        once(events: string, callback: Function, context?: any): any;
-        listenTo(object: any, events: string, callback: Function): any;
-        listenToOnce(object: any, events: string, callback: Function): any;
-        stopListening(object?: any, events?: string, callback?: Function): any;
+        once(events: string, callback: (...args: any[]) => void, context?: any): any;
+        listenTo(object: any, events: string, callback: (...args: any[]) => void): any;
+        listenToOnce(object: any, events: string, callback: (...args: any[]) => void): any;
+        stopListening(object?: any, events?: string, callback?: (...args: any[]) => void): any;
 }
\ No newline at end of file
diff --git a/types/giraffe/index.d.ts b/types/giraffe/index.d.ts
index 3cab015ac5..abce777c20 100644
--- a/types/giraffe/index.d.ts
+++ b/types/giraffe/index.d.ts
@@ -146,17 +146,17 @@ declare namespace Giraffe {
   namespace Contrib {
 
     class Controller implements GiraffeObject, Backbone.Events {
-      on(eventName: string, callback?: Function, context?: any);
+      on(eventName: string, callback?: (...args: any[]) => void, context?: any);
       on(eventMap: Backbone.EventsHash);
-      on(eventName: any, callback?: any, context?: any) 
-      off(eventName?: string, callback?: Function, context?: any) 
-      trigger(eventName: string, ...args: any[]) 
-      bind(eventName: string, callback: Function, context?: any) 
-      unbind(eventName?: string, callback?: Function, context?: any) 
-      once(events: string, callback: Function, context?: any): any;
-      listenTo(object: any, events: string, callback: Function): any;
-      listenToOnce(object: any, events: string, callback: Function): any;
-      stopListening(object?: any, events?: string, callback?: Function): any;
+      on(eventName: any, callback?: any, context?: any)
+      off(eventName?: string, callback?: (...args: any[]) => void, context?: any)
+      trigger(eventName: string, ...args: any[])
+      bind(eventName: string, callback: (...args: any[]) => void, context?: any)
+      unbind(eventName?: string, callback?: (...args: any[]) => void, context?: any)
+      once(events: string, callback: (...args: any[]) => void, context?: any): any;
+      listenTo(object: any, events: string, callback: (...args: any[]) => void): any;
+      listenToOnce(object: any, events: string, callback: (...args: any[]) => void): any;
+      stopListening(object?: any, events?: string, callback?: (...args: any[]) => void): any;
 
       app: App;
     }

From 12c172badff5f3a05948f4002ce6ae4ec91775ef Mon Sep 17 00:00:00 2001
From: Chris Arnesen <chris.arnesen@gmail.com>
Date: Wed, 21 Nov 2018 13:11:29 +0700
Subject: [PATCH 141/836] Add types for expand-tilde closes
 jonschlinkert/expand-tilde#3

---
 types/expand-tilde/expand-tilde-tests.ts |  3 +++
 types/expand-tilde/index.d.ts            | 16 ++++++++++++++++
 types/expand-tilde/tsconfig.json         | 22 ++++++++++++++++++++++
 types/expand-tilde/tslint.json           |  1 +
 4 files changed, 42 insertions(+)
 create mode 100644 types/expand-tilde/expand-tilde-tests.ts
 create mode 100644 types/expand-tilde/index.d.ts
 create mode 100644 types/expand-tilde/tsconfig.json
 create mode 100644 types/expand-tilde/tslint.json

diff --git a/types/expand-tilde/expand-tilde-tests.ts b/types/expand-tilde/expand-tilde-tests.ts
new file mode 100644
index 0000000000..b9e89f3204
--- /dev/null
+++ b/types/expand-tilde/expand-tilde-tests.ts
@@ -0,0 +1,3 @@
+import expandTilde = require("expand-tilde");
+
+expandTilde("~") // $ExpectType string
diff --git a/types/expand-tilde/index.d.ts b/types/expand-tilde/index.d.ts
new file mode 100644
index 0000000000..3a0f660bd9
--- /dev/null
+++ b/types/expand-tilde/index.d.ts
@@ -0,0 +1,16 @@
+// Type definitions for expand-tilde 2.0
+// Project: https://github.com/jonschlinkert/expand-tilde
+// Definitions by: Chris Arnesen <https://github.com/carnesen>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+/**
+ * Bash-like tilde expansion for node.js. 
+ * Expands a leading tilde (~) in a file path to the user home directory, or ~+ to the cwd.
+ *
+ * @param {string} filePath - a file path to expand
+ * @returns {string} the expanded file path
+ */
+declare function expandTilde(filePath: string): string;
+
+export = expandTilde;
diff --git a/types/expand-tilde/tsconfig.json b/types/expand-tilde/tsconfig.json
new file mode 100644
index 0000000000..596eaef581
--- /dev/null
+++ b/types/expand-tilde/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",
+        "expand-tilde-tests.ts"
+    ]
+}
diff --git a/types/expand-tilde/tslint.json b/types/expand-tilde/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/expand-tilde/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 53f4ae7e3561104a4cd40d4f2f7e4ba73a1747e2 Mon Sep 17 00:00:00 2001
From: Chris Arnesen <chris.arnesen@gmail.com>
Date: Wed, 21 Nov 2018 13:21:33 +0700
Subject: [PATCH 142/836] Fix lint errors

---
 types/expand-tilde/expand-tilde-tests.ts | 2 +-
 types/expand-tilde/index.d.ts            | 3 +--
 types/expand-tilde/tsconfig.json         | 1 +
 types/expand-tilde/tslint.json           | 7 ++++++-
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/types/expand-tilde/expand-tilde-tests.ts b/types/expand-tilde/expand-tilde-tests.ts
index b9e89f3204..8b655f1450 100644
--- a/types/expand-tilde/expand-tilde-tests.ts
+++ b/types/expand-tilde/expand-tilde-tests.ts
@@ -1,3 +1,3 @@
 import expandTilde = require("expand-tilde");
 
-expandTilde("~") // $ExpectType string
+expandTilde("~"); // $ExpectType string
diff --git a/types/expand-tilde/index.d.ts b/types/expand-tilde/index.d.ts
index 3a0f660bd9..7eec7b60ad 100644
--- a/types/expand-tilde/index.d.ts
+++ b/types/expand-tilde/index.d.ts
@@ -3,9 +3,8 @@
 // Definitions by: Chris Arnesen <https://github.com/carnesen>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-
 /**
- * Bash-like tilde expansion for node.js. 
+ * Bash-like tilde expansion for node.js.
  * Expands a leading tilde (~) in a file path to the user home directory, or ~+ to the cwd.
  *
  * @param {string} filePath - a file path to expand
diff --git a/types/expand-tilde/tsconfig.json b/types/expand-tilde/tsconfig.json
index 596eaef581..5ead90e013 100644
--- a/types/expand-tilde/tsconfig.json
+++ b/types/expand-tilde/tsconfig.json
@@ -7,6 +7,7 @@
         "noImplicitAny": true,
         "noImplicitThis": true,
         "strictNullChecks": true,
+        "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [
             "../"
diff --git a/types/expand-tilde/tslint.json b/types/expand-tilde/tslint.json
index 3db14f85ea..76efdfe46d 100644
--- a/types/expand-tilde/tslint.json
+++ b/types/expand-tilde/tslint.json
@@ -1 +1,6 @@
-{ "extends": "dtslint/dt.json" }
+{ 
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "no-redundant-jsdoc-2": false
+    }
+}

From e095f61a51b87ad6e4361827e6310b1b6a95e851 Mon Sep 17 00:00:00 2001
From: Jussi Kinnula <jussi.kinnula@wunderdog.fi>
Date: Tue, 20 Nov 2018 14:05:39 +0200
Subject: [PATCH 143/836] Add GLView types for gl-react-dom, gl-react-expo,
 gl-react-headless and gl-react-native

---
 types/gl-react-dom/GLViewDOM.d.ts           | 32 +++++++++++++++++
 types/gl-react-dom/index.d.ts               |  9 ++---
 types/gl-react-dom/package.json             |  6 ----
 types/gl-react-expo/GLViewNative.d.ts       | 17 +++++++++
 types/gl-react-expo/index.d.ts              | 10 ++++--
 types/gl-react-headless/GLViewHeadless.d.ts | 23 ++++++++++++
 types/gl-react-headless/index.d.ts          |  9 ++---
 types/gl-react-native/GLViewNative.d.ts     | 12 +++++++
 types/gl-react-native/index.d.ts            | 10 ++++--
 types/gl-react/index.d.ts                   | 40 ++++++++++-----------
 10 files changed, 125 insertions(+), 43 deletions(-)
 create mode 100644 types/gl-react-dom/GLViewDOM.d.ts
 delete mode 100644 types/gl-react-dom/package.json
 create mode 100644 types/gl-react-expo/GLViewNative.d.ts
 create mode 100644 types/gl-react-headless/GLViewHeadless.d.ts
 create mode 100644 types/gl-react-native/GLViewNative.d.ts

diff --git a/types/gl-react-dom/GLViewDOM.d.ts b/types/gl-react-dom/GLViewDOM.d.ts
new file mode 100644
index 0000000000..8450a16a00
--- /dev/null
+++ b/types/gl-react-dom/GLViewDOM.d.ts
@@ -0,0 +1,32 @@
+import * as React from 'react';
+
+export type SupportedImage = 'image/png' | 'image/jpeg' | 'image/bmp' | 'image/webp' | 'image/ico';
+export type ValidQuality = 0.0 | 0.1 | 0.2 | 0.3 | 0.4 | 0.5 | 0.6 | 0.7 | 0.8 | 0.9 | 1.0;
+
+export interface GLViewDOMProps {
+  onContextCreate: (gl: WebGLRenderingContext) => void;
+  onContextFailure: (e: Error) => void;
+  onContextLost: () => void;
+  onContextRestored: (gl: WebGLRenderingContext) => void;
+  webglContextAttributes?: WebGLContextAttributes;
+  pixelRatio?: number;
+  width: number;
+  height: number;
+  style?: any;
+  debug?: number;
+}
+
+export interface GLViewDOMState {
+  error: Error;
+}
+
+export class GLViewDOM extends React.Component<GLViewDOMProps, GLViewDOMState> {
+  onRef: (ref: HTMLCanvasElement) => void;
+  debugError?: (error: Error) => void;
+  afterDraw?: () => void;
+  captureAsDataURL(type?: SupportedImage, quality?: ValidQuality): string;
+  captureAsBlob(callback: (data: Blob) => void, type?: SupportedImage, quality?: ValidQuality): Promise<Blob>;
+  webglContextAttributes: WebGLContextAttributes;
+  canvas?: HTMLCanvasElement;
+  gl?: WebGLRenderingContext;
+}
diff --git a/types/gl-react-dom/index.d.ts b/types/gl-react-dom/index.d.ts
index 8d25b244ee..2f10c6439a 100644
--- a/types/gl-react-dom/index.d.ts
+++ b/types/gl-react-dom/index.d.ts
@@ -4,14 +4,11 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 
-import * as React from 'react';
 import * as glReact from 'gl-react';
+import { GLViewDOM, GLViewDOMProps } from './GLViewDOM';
 
-export interface SurfaceProps extends glReact.SurfaceProps {
-  width: number;
-  height: number;
-}
+export interface SurfaceProps extends glReact.SurfaceProps, GLViewDOMProps {}
 
-export class Surface extends glReact.Surface {
+export class Surface extends glReact.Surface<GLViewDOM> {
   props: SurfaceProps;
 }
diff --git a/types/gl-react-dom/package.json b/types/gl-react-dom/package.json
deleted file mode 100644
index e6696d08e7..0000000000
--- a/types/gl-react-dom/package.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "private": true,
-  "dependencies": {
-    "csstype": "^2.2.0"
-  }
-}
diff --git a/types/gl-react-expo/GLViewNative.d.ts b/types/gl-react-expo/GLViewNative.d.ts
new file mode 100644
index 0000000000..4f0270dd68
--- /dev/null
+++ b/types/gl-react-expo/GLViewNative.d.ts
@@ -0,0 +1,17 @@
+import * as React from 'react';
+// Re-add this after fixing react-native types, and update it to ref's below
+// import { GLView as EXGLView } from 'expo';
+
+export interface GLViewNativeProps {
+  onContextCreate: (gl: WebGLRenderingContext) => void;
+  style?: any;
+  children?: any;
+}
+
+export class GLViewNative extends React.Component<GLViewNativeProps> {
+  afterDraw?: () => void;
+  ref?: any;
+  onRef: (ref: any) => void;
+  onContextCreate: (gl: WebGLRenderingContext) => void;
+  capture(opt: any): Promise<{ uri: string, localUri: string, width: number, height: number }>;
+}
diff --git a/types/gl-react-expo/index.d.ts b/types/gl-react-expo/index.d.ts
index 20a1e19928..d714aaf29e 100644
--- a/types/gl-react-expo/index.d.ts
+++ b/types/gl-react-expo/index.d.ts
@@ -4,5 +4,11 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 
-import { Surface } from 'gl-react';
-export { Surface };
+import * as glReact from 'gl-react';
+import { GLViewNative, GLViewNativeProps } from './GLViewNative';
+
+export interface SurfaceProps extends glReact.SurfaceProps, GLViewNativeProps {}
+
+export class Surface extends glReact.Surface<GLViewNative> {
+  props: SurfaceProps;
+}
diff --git a/types/gl-react-headless/GLViewHeadless.d.ts b/types/gl-react-headless/GLViewHeadless.d.ts
new file mode 100644
index 0000000000..a94c1f9769
--- /dev/null
+++ b/types/gl-react-headless/GLViewHeadless.d.ts
@@ -0,0 +1,23 @@
+import * as React from 'react';
+
+export interface GLViewHeadlessProps {
+  onContextCreate: (gl: WebGLRenderingContext) => void;
+  onContextFailure: (e: Error) => void;
+  onContextLost: () => void;
+  onContextRestored: (gl: WebGLRenderingContext) => void;
+  webglContextAttributes?: WebGLContextAttributes;
+  pixelRatio?: number;
+  width: number;
+  height: number;
+}
+
+export class GLViewHeadless extends React.Component<GLViewHeadlessProps> {
+  onRef: (ref: HTMLCanvasElement) => void;
+  captureAsDataURL(): string;
+  captureAsBlob(): Promise<Blob>;
+  simulateContextLost(): void;
+  simulateContextRestored(): void;
+  webglContextAttributes: WebGLContextAttributes;
+  canvas?: HTMLCanvasElement;
+  gl?: WebGLRenderingContext;
+}
diff --git a/types/gl-react-headless/index.d.ts b/types/gl-react-headless/index.d.ts
index a8b0ec5212..fe8b4648a1 100644
--- a/types/gl-react-headless/index.d.ts
+++ b/types/gl-react-headless/index.d.ts
@@ -4,14 +4,11 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 
-import * as React from 'react';
 import * as glReact from 'gl-react';
+import { GLViewHeadless, GLViewHeadlessProps } from './GLViewHeadless';
 
-export interface SurfaceProps extends glReact.SurfaceProps {
-  width: number;
-  height: number;
-}
+export interface SurfaceProps extends glReact.SurfaceProps, GLViewHeadlessProps {}
 
-export class Surface extends glReact.Surface {
+export class Surface extends glReact.Surface<GLViewHeadless> {
   props: SurfaceProps;
 }
diff --git a/types/gl-react-native/GLViewNative.d.ts b/types/gl-react-native/GLViewNative.d.ts
new file mode 100644
index 0000000000..0a780d3aa7
--- /dev/null
+++ b/types/gl-react-native/GLViewNative.d.ts
@@ -0,0 +1,12 @@
+import * as React from 'react';
+
+export interface GLViewNativeProps {
+  onContextCreate: (gl: WebGLRenderingContext) => void;
+  onContextFailure: (e: Error) => void;
+  style?: any;
+  children?: any;
+}
+
+export class GLViewNative extends React.Component<GLViewNativeProps> {
+  afterDraw?: () => void;
+}
diff --git a/types/gl-react-native/index.d.ts b/types/gl-react-native/index.d.ts
index b9bce2a806..8f0c38a96d 100644
--- a/types/gl-react-native/index.d.ts
+++ b/types/gl-react-native/index.d.ts
@@ -4,5 +4,11 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 
-import { Surface } from 'gl-react';
-export { Surface };
+import * as glReact from 'gl-react';
+import { GLViewNative, GLViewNativeProps } from './GLViewNative';
+
+export interface SurfaceProps extends glReact.SurfaceProps, GLViewNativeProps {}
+
+export class Surface extends glReact.Surface<GLViewNative> {
+  props: SurfaceProps;
+}
diff --git a/types/gl-react/index.d.ts b/types/gl-react/index.d.ts
index e16b0d887c..e1332fd964 100644
--- a/types/gl-react/index.d.ts
+++ b/types/gl-react/index.d.ts
@@ -17,8 +17,8 @@ export interface BusProps {
 
 export class Bus extends React.Component<BusProps> {
   id: number;
-  context: { glParent: Surface | Node, glSurface: Surface };
-  dependents: Array<Node | Surface>;
+  context: { glParent: Surface<any> | Node, glSurface: Surface<any> };
+  dependents: Array<Node | Surface<any>>;
   glNode?: Node;
   glBusRootNode: any;
 
@@ -43,11 +43,8 @@ export interface SurfaceProps {
   style?: any;
   preload?: any[];
   visitor?: Visitor;
-
   onLoad?: () => void;
   onLoadError?: (e: Error) => void;
-  onContextLost?: () => void;
-  onContextRestored?: () => void;
 }
 
 export interface SurfaceState {
@@ -56,13 +53,14 @@ export interface SurfaceState {
   debug: boolean;
 }
 
-export class Surface extends React.Component<SurfaceProps, SurfaceState> {
-  props: SurfaceProps;
-  state: SurfaceState;
+export class Surface<T> extends React.Component<SurfaceProps, SurfaceState> {
   id: number;
-  gl: WebGLRenderingContext;
-  RenderLessElement: any;
+  gl?: WebGLRenderingContext;
+  buffer: WebGLBuffer;
+  loaderResolver?: any;
+  glView: T;
   root: Node;
+  shaders: { [key: string]: any };
 
   mapRenderableContent(inst: any): any;
   getVisitors(): Visitor[];
@@ -85,9 +83,9 @@ export type createSurface = (
   mapRenderableContent: any,
   requestFrame: (callback: (time: number) => void) => number,
   cancelFrame: (id: number) => void
-) => Surface;
+) => Surface<typeof GLView>;
 
-export type listSurfaces = () => Surface[];
+export type listSurfaces = () => Array<Surface<any>>;
 
 export function GLSL(strings: TemplateStringsArray, ...values: any[]): string;
 
@@ -108,8 +106,8 @@ export class NearestCopy extends React.Component<NearestCopyProps> {
 }
 
 export interface SurfaceContext {
-  glParent: Node | Surface | Bus;
-  glSurface: Surface;
+  glParent: Node | Surface<any> | Bus;
+  glSurface: Surface<any>;
   glSizable: {
     getGLSize: () => [number, number];
   };
@@ -155,7 +153,7 @@ export class Node extends React.Component<NodeProps> {
     [key: string]: Array<Bus | undefined>;
   };
   dependencies: Array<Node | Bus>;
-  dependents: Array<Node | Surface>;
+  dependents: Array<Node | Surface<any>>;
 }
 
 export interface ShaderIdentifier {
@@ -193,13 +191,13 @@ export namespace Uniform {
 }
 
 export class Visitor {
-  onSurfaceMount(surface: Surface): void;
-  onSurfaceUnmount(surface: Surface): void;
-  onSurfaceGLContextChange(surface: Surface, gl?: WebGLRenderingContext): void;
-  onSurfaceDrawSkipped(surface: Surface): void;
-  onSurfaceDrawStart(surface: Surface): void;
+  onSurfaceMount(surface: Surface<any>): void;
+  onSurfaceUnmount(surface: Surface<any>): void;
+  onSurfaceGLContextChange(surface: Surface<any>, gl?: WebGLRenderingContext): void;
+  onSurfaceDrawSkipped(surface: Surface<any>): void;
+  onSurfaceDrawStart(surface: Surface<any>): void;
   onSurfaceDrawError(e: Error): boolean;
-  onSurfaceDrawEnd(surface: Surface): void;
+  onSurfaceDrawEnd(surface: Surface<any>): void;
   onNodeDrawSkipped(node: Node): void;
   onNodeDrawStart(node: Node): void;
   onNodeSyncDeps(node: Node, additions: Array<Node | Bus>, deletions: Array<Node | Bus>): void;

From e326ad10f34ecb6316d0650abb72d6bab7ea22fb Mon Sep 17 00:00:00 2001
From: Ville Saarinen <ville.saarinen@gmail.com>
Date: Wed, 21 Nov 2018 09:43:29 +0200
Subject: [PATCH 144/836] Fixes to header

---
 types/rc-tooltip/index.d.ts  | 6 +++---
 types/rc-tooltip/tslint.json | 1 -
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/types/rc-tooltip/index.d.ts b/types/rc-tooltip/index.d.ts
index 4e07ca484a..78a1fb63fb 100644
--- a/types/rc-tooltip/index.d.ts
+++ b/types/rc-tooltip/index.d.ts
@@ -1,7 +1,7 @@
-// Type definitions for rc-tooltip v3.7.3
+// Type definitions for rc-tooltip 3.7
 // Project: https://github.com/react-component/tooltip
-// Definitions by: rhysd <https://rhysd.github.io>
-//                 ahstro <http://ahst.ro>
+// Definitions by: rhysd <https://github.com/rhysd>
+//                 ahstro <https://github.com/ahstro>
 //                 vsaarinen <https://github.com/vsaarinen>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
diff --git a/types/rc-tooltip/tslint.json b/types/rc-tooltip/tslint.json
index a41bf5d19a..a0357daa61 100644
--- a/types/rc-tooltip/tslint.json
+++ b/types/rc-tooltip/tslint.json
@@ -7,7 +7,6 @@
         "ban-types": false,
         "callable-types": false,
         "comment-format": false,
-        "dt-header": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,

From 46d809eaa419f0bb20e4b41a7cacf9242a5c76d2 Mon Sep 17 00:00:00 2001
From: ptrdu <ptrdu@mucheng.local>
Date: Wed, 21 Nov 2018 17:55:49 +0800
Subject: [PATCH 145/836] FIX: export OSS class

---
 types/ali-oss/Cluster.d.ts     |   63 --
 types/ali-oss/ImageClient.d.ts |   71 ---
 types/ali-oss/ali-oss-tests.ts |   46 +-
 types/ali-oss/index.d.ts       | 1039 ++++++++++++++++++--------------
 types/ali-oss/tslint.json      |    5 +-
 5 files changed, 599 insertions(+), 625 deletions(-)
 delete mode 100644 types/ali-oss/Cluster.d.ts
 delete mode 100644 types/ali-oss/ImageClient.d.ts

diff --git a/types/ali-oss/Cluster.d.ts b/types/ali-oss/Cluster.d.ts
deleted file mode 100644
index 60886fca36..0000000000
--- a/types/ali-oss/Cluster.d.ts
+++ /dev/null
@@ -1,63 +0,0 @@
-import {
-    ACLType,
-    CopyAndPutMetaResult,
-    CopyObjectOptions,
-    DeleteMultiOptions,
-    DeleteMultiResult,
-    GetObjectOptions,
-    GetObjectResult,
-    GetStreamOptions,
-    GetStreamResult,
-    HeadObjectOptions,
-    HeadObjectResult,
-    ListObjectResult,
-    ListObjectsQuery,
-    NormalSuccessResponse,
-    PutObjectOptions,
-    PutObjectResult,
-    PutStreamOptions,
-    RequestOptions,
-    SignatureUrlOptions,
-    UserMeta
-} from "./index";
-
-export interface ClusterType {
-    host: string;
-    accessKeyId: string;
-    accessKeySecret: string;
-}
-
-export interface ClusterOptions {
-    clusters: ClusterType[];
-    schedule?: string;
-}
-
-export class Cluster {
-    constructor(options: ClusterOptions)
-
-    list(query: ListObjectsQuery | null, options: RequestOptions): Promise<ListObjectResult>;
-
-    put(name: string, file: any, options?: PutObjectOptions): Promise<PutObjectResult>;
-
-    putStream(name: string, stream: any, options?: PutStreamOptions): Promise<{ name: string, res: NormalSuccessResponse }>;
-
-    head(name: string, options?: HeadObjectOptions): Promise<HeadObjectResult>;
-
-    get(name: string, file?: any, options?: GetObjectOptions): Promise<GetObjectResult>;
-
-    getStream(name?: string, options?: GetStreamOptions): Promise<GetStreamResult>;
-
-    delete(name: string, options?: RequestOptions): Promise<NormalSuccessResponse>;
-
-    copy(name: string, sourceName: string, options?: CopyObjectOptions): Promise<CopyAndPutMetaResult>;
-
-    putMeta(name: string, meta: UserMeta, options: RequestOptions): Promise<CopyAndPutMetaResult>;
-
-    deleteMulti(names: string[], options?: DeleteMultiOptions): Promise<DeleteMultiResult>;
-
-    signatureUrl(name: string, options?: SignatureUrlOptions): string;
-
-    putACL(name: string, acl: ACLType, options?: RequestOptions): Promise<NormalSuccessResponse>;
-
-    restore(name: string, options?: RequestOptions): Promise<NormalSuccessResponse>;
-}
diff --git a/types/ali-oss/ImageClient.d.ts b/types/ali-oss/ImageClient.d.ts
deleted file mode 100644
index 850213083c..0000000000
--- a/types/ali-oss/ImageClient.d.ts
+++ /dev/null
@@ -1,71 +0,0 @@
-import { NormalSuccessResponse, RequestOptions } from "./index";
-
-export interface ImageClientOptions {
-    imageHost: string; // your image service domain that binding to a OSS bucket
-    accessKeyId: string; // access key you create on aliyun console website
-    accessKeySecret: string; // access secret you create
-    bucket: string; //  the default bucket you want to access If you don't have any bucket, please use putBucket() create one first.
-    region?: string; // the bucket data region location, please see Data Regions, default is oss-cn-hangzhou
-    internal?: boolean; // access OSS with aliyun internal network or not, default is false If your servers are running on aliyun too, you can set true to save lot of money.
-    timeout?: string | number; // instance level timeout for all operations, default is 60s
-}
-
-export interface ImageGetOptions {
-    timeout?: number;
-    headers?: object;
-}
-
-export interface StyleData {
-    Name: string; // style name
-    Content: string; // style content
-    CreateTime: string; // style create time
-    LastModifyTime: string; // style last modify time
-}
-export class ImageClient {
-    constructor(options: ImageClientOptions)
-
-    /**
-     * Get an image from the image channel.
-     */
-    get(name: string, file?: any, options?: ImageGetOptions): Promise<{ content: any, res: NormalSuccessResponse }>;
-
-    /**
-     * Get an image read stream.
-     */
-    getStream(name: string, options?: ImageGetOptions): Promise<{ stream: any, res: NormalSuccessResponse }>;
-
-    /**
-     * Get a image exif info by image object name from the image channel.
-     */
-    getExif(name: string, options?: RequestOptions): Promise<{ data: object, res: NormalSuccessResponse }>;
-
-    /**
-     * Get a image info and exif info by image object name from the image channel.
-     */
-    getInfo(name: string, options?: RequestOptions): Promise<{ data: object, res: NormalSuccessResponse }>;
-
-    /**
-     * todo
-     */
-    putStyle(name: string, style: string, options?: RequestOptions): Promise<{ data: object, res: NormalSuccessResponse }>;
-
-    /**
-     * Get a style by name from the image channel.
-     */
-    getStyle(name: string, options?: RequestOptions): Promise<{ data: StyleData, res: NormalSuccessResponse}>;
-
-    /**
-     * Get all styles from the image channel.
-     */
-    listStyle(options?: RequestOptions): Promise<StyleData[]>;
-
-    /**
-     * todo
-     */
-    deleteStyle(styleName: string, options?: RequestOptions): Promise<NormalSuccessResponse>;
-
-    /**
-     * Create a signature url for directly download.
-     */
-    signatureUrl(name: string, options?: { expires?: string, timeout?: string }): string;
-}
diff --git a/types/ali-oss/ali-oss-tests.ts b/types/ali-oss/ali-oss-tests.ts
index 96f817cca8..b3641eeeb0 100644
--- a/types/ali-oss/ali-oss-tests.ts
+++ b/types/ali-oss/ali-oss-tests.ts
@@ -1,34 +1,26 @@
-import OSS from "ali-oss";
+import * as OSS from 'ali-oss';
 
-const client = new OSS({
+const ossOptions: OSS.Options = {
     accessKeyId: 'your access key',
     accessKeySecret: 'your access secret',
     bucket: 'your bucket name',
     region: 'oss-cn-hangzhou'
-});
+};
 
-const ImageClient = OSS.ImageClient({
-    imageHost: 'host',
-    accessKeySecret: "secret",
-    accessKeyId: 'id',
-    bucket: "",
-    internal: false,
-    region: "",
-    timeout: 2000
-});
+const client = new OSS(ossOptions);
+
+const clusterOptions: OSS.ClusterOptions = {
+    clusters: [],
+};
+
+const clusterClient = new OSS.Cluster(clusterOptions);
+
+const imageOptions: OSS.ImageClientOptions = {
+    imageHost: 'xxxx',
+    accessKeyId: 'xxxx',
+    accessKeySecret: 'xxxx',
+    bucket: 'xxxx'
+};
+
+const imageClient = new OSS.ImageClient(imageOptions);
 
-const cluster = OSS.Cluster({
-    clusters: [
-        {
-            accessKeyId: 'id',
-            accessKeySecret: 'secret',
-            host: ""
-        },
-        {
-            accessKeyId: 'id',
-            accessKeySecret: 'secret',
-            host: ""
-        },
-    ],
-    schedule: 'masterSlave',
-});
diff --git a/types/ali-oss/index.d.ts b/types/ali-oss/index.d.ts
index c3fa0dd10b..13f7f56ff9 100644
--- a/types/ali-oss/index.d.ts
+++ b/types/ali-oss/index.d.ts
@@ -4,442 +4,555 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
-import * as ImageClientDefinition from './ImageClient';
-import * as ClusterDefinition from "./Cluster";
+export = OSS;
 
-export * from './ImageClient';
-export * from './Cluster';
+// basic OSS
+declare namespace OSS {
+    interface Options {
+        accessKeyId: string; // access secret you create
+        accessKeySecret: string; // access secret you create
+        stsToken?: string; // used by temporary authorization
+        bucket?: string; //  the default bucket you want to access If you don't have any bucket, please use putBucket() create one first.
+        endpoint?: string; // oss region domain. It takes priority over region.
+        region?: string; // the bucket data region location, please see Data Regions, default is oss-cn-hangzhou.
+        internal?: boolean; //  access OSS with aliyun internal network or not, default is false. If your servers are running on aliyun too, you can set true to save lot of money.
+        secure?: boolean; // instruct OSS client to use HTTPS (secure: true) or HTTP (secure: false) protocol.
+        timeout?: string | number; // instance level timeout for all operations, default is 60s
+    }
 
-export interface Options {
-    accessKeyId: string; // access secret you create
-    accessKeySecret: string; // access secret you create
-    stsToken?: string; // used by temporary authorization
-    bucket?: string; //  the default bucket you want to access If you don't have any bucket, please use putBucket() create one first.
-    endpoint?: string; // oss region domain. It takes priority over region.
-    region?: string; // the bucket data region location, please see Data Regions, default is oss-cn-hangzhou.
-    internal?: boolean; //  access OSS with aliyun internal network or not, default is false. If your servers are running on aliyun too, you can set true to save lot of money.
-    secure?: boolean; // instruct OSS client to use HTTPS (secure: true) or HTTP (secure: false) protocol.
-    timeout?: string | number; // instance level timeout for all operations, default is 60s
-}
+    interface Bucket {
+        name: string;
+        region: string;
+        creationDate: string;
+        StorageClass: StorageType;
+    }
 
-export interface Bucket {
-    name: string;
-    region: string;
-    creationDate: string;
-    StorageClass: StorageType;
-}
+    type StorageType = "Standard" | "IA" | "Archive";
 
-export type StorageType = "Standard" | "IA" | "Archive";
+    type ACLType = "public-read-write" | "public-read" | "and private";
 
-export type ACLType = "public-read-write" | "public-read" | "and private";
+    type HTTPMethods = "GET" | "POST" | "DELETE" | "PUT";
 
-export type HTTPMethods = "GET" | "POST" | "DELETE" | "PUT";
+    interface RequestOptions {
+        // the operation timeout
+        timeout?: number;
+    }
 
-export interface RequestOptions {
-    // the operation timeout
-    timeout?: number;
-}
+    type RuleStatusType = "Enabled" | "Disabled";
 
-export type RuleStatusType = "Enabled" | "Disabled";
+    interface LifecycleRule {
+        id?: string; // rule id, if not set, OSS will auto create it with random string.
+        prefix: string; // store prefix
+        status: RuleStatusType; // rule status, allow values: Enabled or Disabled
+        days?: number | string; // expire after the days
+        date: string; // expire date, e.g.: 2022-10-11T00:00:00.000Z date and days only set one.
+    }
 
-export interface LifecycleRule {
-    id?: string; // rule id, if not set, OSS will auto create it with random string.
-    prefix: string; // store prefix
-    status: RuleStatusType; // rule status, allow values: Enabled or Disabled
-    days?: number | string; // expire after the days
-    date: string; // expire date, e.g.: 2022-10-11T00:00:00.000Z date and days only set one.
-}
+    interface CORSRule {
+        allowedOrigin: string | string[]; // configure for Access-Control-Allow-Origin header
+        allowedMethod: string | string[]; // configure for Access-Control-Allow-Methods header
+        allowedHeader?: string | string[]; // configure for Access-Control-Allow-Headers header
+        exposeHeader?: string | string[]; // configure for Access-Control-Expose-Headers header
+        maxAgeSeconds?: string | string[]; // configure for Access-Control-Max-Age header
+    }
 
-export interface CORSRule {
-    allowedOrigin: string | string[]; // configure for Access-Control-Allow-Origin header
-    allowedMethod: string | string[]; // configure for Access-Control-Allow-Methods header
-    allowedHeader?: string | string[]; // configure for Access-Control-Allow-Headers header
-    exposeHeader?: string | string[]; // configure for Access-Control-Expose-Headers header
-    maxAgeSeconds?: string | string[]; // configure for Access-Control-Max-Age header
-}
+    interface OwnerType {
+        id: string;
+        displayName: string;
+    }
 
-export interface OwnerType {
-    id: string;
-    displayName: string;
-}
+    interface ObjectMeta  {
+        name: string; // object name on oss
+        lastModified: string; // object last modified GMT date, e.g.: 2015-02-19T08:39:44.000Z
+        etag: string; // object etag contains ", e.g.: "5B3C1A2E053D763E1B002CC607C5A0FE"
+        type: string; // object type, e.g.: Normal
+        size: number; // object size, e.g.: 344606
+        storageClass: StorageType;
+        owner: OwnerType;
+    }
 
-export interface ObjectMeta  {
-    name: string; // object name on oss
-    lastModified: string; // object last modified GMT date, e.g.: 2015-02-19T08:39:44.000Z
-    etag: string; // object etag contains ", e.g.: "5B3C1A2E053D763E1B002CC607C5A0FE"
-    type: string; // object type, e.g.: Normal
-    size: number; // object size, e.g.: 344606
-    storageClass: StorageType;
-    owner: OwnerType;
-}
+    interface NormalSuccessResponse {
+        // response status
+        status: number;
+        // response headers
+        headers: object; // todo the object in detail
+        // response size
+        size: number;
+        //  request total use time (ms)
+        rt: number;
+    }
 
-export interface NormalSuccessResponse {
-    // response status
-    status: number;
-    // response headers
-    headers: object; // todo the object in detail
-    // response size
-    size: number;
-    //  request total use time (ms)
-    rt: number;
-}
+    interface UserMeta {
+        uid: number;
+        pid: number;
+    }
 
-export interface UserMeta {
-    uid: number;
-    pid: number;
-}
+    interface ObjectCallback {
+        url: string; // After a file is uploaded successfully, the OSS sends a callback request to this URL.
+        host?: string; // The host header value for initiating callback requests.
+        body: string; // The value of the request body when a callback is initiated, for example, key=$(key)&etag=$(etag)&my_var=$(x:my_var).
+        contentType?: string; // The Content-Type of the callback requests initiatiated, It supports application/x-www-form-urlencoded and application/json, and the former is the default value.
+        customValue?: object;
+        headers?: object; //  extra headers, detail see RFC 2616
+    }
 
-export interface ObjectCallback {
-    url: string; // After a file is uploaded successfully, the OSS sends a callback request to this URL.
-    host?: string; // The host header value for initiating callback requests.
-    body: string; // The value of the request body when a callback is initiated, for example, key=$(key)&etag=$(etag)&my_var=$(x:my_var).
-    contentType?: string; // The Content-Type of the callback requests initiatiated, It supports application/x-www-form-urlencoded and application/json, and the former is the default value.
-    customValue?: object;
-    headers?: object; //  extra headers, detail see RFC 2616
-}
+    interface ModifyData {
+        lastModified: string; //  object last modified GMT string
+        etag: string; // object etag contains ", e.g.: "5B3C1A2E053D763E1B002CC607C5A0FE"
+    }
 
-export interface ModifyData {
-    lastModified: string; //  object last modified GMT string
-    etag: string; // object etag contains ", e.g.: "5B3C1A2E053D763E1B002CC607C5A0FE"
-}
+    interface Checkpoint  {
+        file: any; // The file object selected by the user, if the browser is restarted, it needs the user to manually trigger the settings
+        name: string; //  object key
+        fileSize: number;
+        partSize: number;
+        uploadId: string;
+        doneParts: Array<{ number: number, etag: string }>;
+    }
 
-export interface Checkpoint  {
-    file: any; // The file object selected by the user, if the browser is restarted, it needs the user to manually trigger the settings
-    name: string; //  object key
-    fileSize: number;
-    partSize: number;
-    uploadId: string;
-    doneParts: Array<{ number: number, etag: string }>;
-}
+    interface ObjectPart {
+        PartNumber: number;
+        LastModified: any; // {Date} Time when a part is uploaded.
+        ETag: string;
+        size: number;
+    }
 
-export interface ObjectPart {
-    PartNumber: number;
-    LastModified: any; // {Date} Time when a part is uploaded.
-    ETag: string;
-    size: number;
-}
+    interface Upload {
+        name: string;
+        uploadId: string;
+        initiated: any;
+    }
 
-export interface Upload {
-    name: string;
-    uploadId: string;
-    initiated: any;
-}
+    interface Channel {
+        Name: string;
+        Description: string;
+        Status: string;
+        LastModified: string;
+        PublishUrls: string[];
+        PlayUrls: string[];
+    }
 
-export interface Channel {
-    Name: string;
-    Description: string;
-    Status: string;
-    LastModified: string;
-    PublishUrls: string[];
-    PlayUrls: string[];
-}
-
-export interface ChannelHistory {
-    StartTime: string; //
-    EndTime: string;
-    RemoteAddr: string; //  the remote addr
-}
+    interface ChannelHistory {
+        StartTime: string; //
+        EndTime: string;
+        RemoteAddr: string; //  the remote addr
+    }
 // parameters type
-export interface ListBucketsQueryType {
-    prefix?: string; // search buckets using prefix key
-    marker?: string; // search start from marker, including marker key
-    'max-keys'?: string | number; // max buckets, default is 100, limit to 1000
+    interface ListBucketsQueryType {
+        prefix?: string; // search buckets using prefix key
+        marker?: string; // search start from marker, including marker key
+        'max-keys'?: string | number; // max buckets, default is 100, limit to 1000
+    }
+
+    interface PutBucketOptions {
+        timeout: number;
+        storageClass: StorageType;
+    }
+
+    interface PutBucketWebsiteConfig {
+        index: string; // default page, e.g.: index.html
+        error?: string; // error page, e.g.: 'error.html'
+    }
+
+    interface ListObjectsQuery {
+        prefix?: string; // search object using prefix key
+        marker?: string; // search start from marker, including marker key
+        delimiter?: string; // delimiter search scope e.g. / only search current dir, not including subdir
+        'max-keys': string | number; // max objects, default is 100, limit to 1000
+    }
+
+    interface ListObjectResult {
+        objects: ObjectMeta[];
+        prefixes: string[];
+        isTruncated: boolean;
+        nextMarker: string;
+        res: NormalSuccessResponse;
+    }
+
+    interface PutObjectOptions {
+        timeout?: number; // the operation timeout
+        mime?: string; // custom mime, will send with Content-Type entity header
+        meta?: UserMeta; // user meta, will send with x-oss-meta- prefix string e.g.: { uid: 123, pid: 110 }
+        callback: ObjectCallback;
+    }
+
+    interface PutObjectResult {
+        name: string;
+        data: object;
+        res: NormalSuccessResponse;
+    }
+
+    interface PutStreamOptions {
+        contentLength?: number; // the stream length, chunked encoding will be used if absent
+        timeout: number; // the operation timeout
+        mime: string; // custom mime, will send with Content-Type entity header
+        meta: UserMeta;
+        callback: ObjectCallback;
+    }
+
+    interface AppendObjectOptions {
+        position?: string; // specify the position which is the content length of the latest object
+        timeout?: number; // the operation timeout
+        mime?: string; // custom mime, will send with Content-Type entity header
+        meta?: UserMeta;
+        headers?: object;
+    }
+
+    interface AppendObjectResult {
+        name: string;
+        url: string; // the url of oss
+        res: NormalSuccessResponse;
+        nextAppendPosition: string; // the next position
+    }
+
+    interface HeadObjectOptions {
+        timeout?: number;
+        headers?: object;
+    }
+
+    interface HeadObjectResult {
+        status: number; // response status, maybe 200 or 304
+        meta: UserMeta;
+        res: NormalSuccessResponse;
+    }
+
+    interface GetObjectOptions {
+        timeout?: number;
+        process?: string; // image process params, will send with x-oss-process e.g.: {process: 'image/resize,w_200'}
+        headers?: object;
+    }
+
+    interface GetObjectResult {
+        content?: any; // file content buffer if file parameter is null or ignore
+        res: NormalSuccessResponse;
+    }
+
+    interface GetStreamOptions {
+        timeout?: number;
+        process?: string; // image process params, will send with x-oss-process e.g.: {process: 'image/resize,w_200'}
+        headers?: object;
+    }
+
+    interface GetStreamResult {
+        stream?: any; // readable stream instance if response status is not 200, stream will be null.
+        res: NormalSuccessResponse;
+    }
+
+    interface CopyObjectOptions {
+        timeout?: number;
+        meta?: UserMeta;
+        headers?: object;
+    }
+
+    interface CopyAndPutMetaResult {
+        data: ModifyData;
+        res: NormalSuccessResponse;
+    }
+
+    interface DeleteMultiOptions {
+        quite?: boolean; // quite mode or verbose mode, default is false
+        timeout?: number;
+    }
+
+    interface DeleteMultiResult {
+        deleted?: string[]; // deleted object names list
+        res: NormalSuccessResponse;
+    }
+
+    interface ResponseHeaderType {
+        'content-type'?: string;
+        'content-disposition'?: string;
+        'cache-control'?: string;
+    }
+
+    interface SignatureUrlOptions {
+        expires?: number; // after expires seconds, the url will become invalid, default is 1800
+        method?: HTTPMethods; // the HTTP method, default is 'GET'
+        'Content-Type'?: string; // set the request content type
+        process?: string;
+        response?: ResponseHeaderType; // set the response headers for download
+        callback?: ObjectCallback;
+    }
+
+    interface GetACLResult {
+        acl: ACLType;
+        res: NormalSuccessResponse;
+    }
+
+    interface InitMultipartUploadOptions {
+        timeout?: number;
+        mime?: string; // Mime file type
+        meta?: UserMeta;
+        headers?: object;
+    }
+
+    interface InitMultipartUploadResult {
+        res: { status: number, headers: object, size: number, rt: number };
+        bucket: string; // bucket name
+        name: string; // object name store on OSS
+        uploadId: string; // upload id, use for uploadPart, completeMultipart
+    }
+
+    interface UploadPartResult {
+        name: string;
+        etag: string;
+        res: NormalSuccessResponse;
+    }
+
+    interface CompleteMultipartUploadOptions {
+        timeout?: number;
+        callback?: ObjectCallback;
+        headers?: object;
+    }
+
+    interface CompleteMultipartUploadResult {
+        bucket: string;
+        name: string;
+        etag: string;
+        data: object;
+        res: NormalSuccessResponse;
+    }
+
+    interface MultipartUploadOptions {
+        parallel?: number; // the number of parts to be uploaded in parallel
+        partSize?: number; // the suggested size for each part
+        progress?: (...args: any[]) => any; // the progress callback called after each successful upload of one part
+        checkpoint?: Checkpoint; // the checkpoint to resume upload, if this is provided, it will continue the upload from where interrupted, otherwise a new multipart upload will be created.
+        meta?: UserMeta;
+        mime?: string;
+        callback?: ObjectCallback;
+        headers?: object;
+        timeout?: number;
+        copyheaders?: object; //  {Object} only uploadPartCopy api used, detail
+    }
+
+    interface MultipartUploadResult {
+        bucket: string;
+        name: string;
+        etag: string;
+        data: object;
+        res: NormalSuccessResponse;
+    }
+
+    interface MultipartUploadCopyResult {
+        bucket: string;
+        name: string;
+        etag: string;
+        res: NormalSuccessResponse;
+    }
+
+    interface MultipartUploadCopySourceData {
+        sourceKey: string; // the source object name
+        sourceBucketName: string; // sourceData.  the source bucket name
+        startOffset: number; // data copy start byte offset, e.g: 0
+        endOffset: number; // data copy end byte offset, e.g: 102400
+    }
+
+    interface ListPartsQuery {
+        'max-parts': number; // The maximum part number in the response of the OSS. default value: 1000.
+        'part-number-marker': number; // Starting position of a specific list. A part is listed only when the part number is greater than the value of this parameter.
+        'encoding-type': string; // Specify the encoding of the returned content and the encoding type. Optional value: url
+    }
+
+    interface ListPartsResult {
+        uploadId: string;
+        bucket: string;
+        name: string;
+        PartNumberMarker: number;
+        nextPartNumberMarker: number;
+        maxParts: number;
+        isTruncated: boolean;
+        parts: ObjectPart[];
+        res: NormalSuccessResponse;
+    }
+
+    interface ListUploadsQuery {
+        prefix?: string;
+        'max-uploads'?: number;
+        'key-marker'?: string;
+        'upload-id-marker'?: string;
+    }
+
+    interface ListUploadsResult {
+        res: NormalSuccessResponse;
+        bucket: string;
+        nextKeyMarker: any;
+        nextUploadIdMarker: any;
+        isTruncated: boolean;
+        uploads: Upload[];
+    }
+
+    interface PutChannelConf {
+        Description?: string;
+        Status?: string;
+        Target?: {
+            Type: string,
+            FragDuration: number,
+            FragCount: number,
+            PlaylistName: string
+        };
+    }
+
+    interface PutChannelResult {
+        publishUrls: string[];
+        playUrls: string[];
+        res: NormalSuccessResponse;
+    }
+
+    interface GetChannelResult {
+        Status: string;
+        ConnectedTime?: string;
+        RemoteAddr?: string;
+        Video?: object;
+        Audio?: object;
+        res: NormalSuccessResponse;
+    }
+
+    interface ListChannelsQuery {
+        prefix: string; // the channel id prefix (returns channels with this prefix)
+        marker: string; // the channel id marker (returns channels after this id)
+        'max-keys ': number; // max number of channels to return
+    }
+
+    interface ListChannelsResult {
+        channels: Channel[];
+        nextMarker: string | null;
+        isTruncated: boolean;
+        res: NormalSuccessResponse;
+    }
+
+    interface ChannelHistoryResult {
+        records: ChannelHistory;
+        res: NormalSuccessResponse;
+    }
+
+    interface GetRtmpUrlOptions {
+        expires?: number; // the expire time in seconds of the url
+        params?: object; // the additional parameters for url, e.g.: {playlistName: 'play.m3u8'}
+        timeout?: number; // the operation timeout
+    }
 }
 
-export interface PutBucketOptions {
-    timeout: number;
-    storageClass: StorageType;
+/// cluster
+declare namespace OSS {
+    interface ClusterType {
+        host: string;
+        accessKeyId: string;
+        accessKeySecret: string;
+    }
+
+    interface ClusterOptions {
+        clusters: ClusterType[];
+        schedule?: string;
+    }
+
+    class Cluster {
+        constructor(options: ClusterOptions)
+
+        list(query: ListObjectsQuery | null, options: RequestOptions): Promise<ListObjectResult>;
+
+        put(name: string, file: any, options?: PutObjectOptions): Promise<PutObjectResult>;
+
+        putStream(name: string, stream: any, options?: PutStreamOptions): Promise<{ name: string, res: NormalSuccessResponse }>;
+
+        head(name: string, options?: HeadObjectOptions): Promise<HeadObjectResult>;
+
+        get(name: string, file?: any, options?: GetObjectOptions): Promise<GetObjectResult>;
+
+        getStream(name?: string, options?: GetStreamOptions): Promise<GetStreamResult>;
+
+        delete(name: string, options?: RequestOptions): Promise<NormalSuccessResponse>;
+
+        copy(name: string, sourceName: string, options?: CopyObjectOptions): Promise<CopyAndPutMetaResult>;
+
+        putMeta(name: string, meta: UserMeta, options: RequestOptions): Promise<CopyAndPutMetaResult>;
+
+        deleteMulti(names: string[], options?: DeleteMultiOptions): Promise<DeleteMultiResult>;
+
+        signatureUrl(name: string, options?: SignatureUrlOptions): string;
+
+        putACL(name: string, acl: ACLType, options?: RequestOptions): Promise<NormalSuccessResponse>;
+
+        restore(name: string, options?: RequestOptions): Promise<NormalSuccessResponse>;
+    }
 }
 
-export interface PutBucketWebsiteConfig {
-    index: string; // default page, e.g.: index.html
-    error?: string; // error page, e.g.: 'error.html'
+// image
+declare namespace OSS {
+    interface ImageClientOptions {
+        imageHost: string; // your image service domain that binding to a OSS bucket
+        accessKeyId: string; // access key you create on aliyun console website
+        accessKeySecret: string; // access secret you create
+        bucket: string; //  the default bucket you want to access If you don't have any bucket, please use putBucket() create one first.
+        region?: string; // the bucket data region location, please see Data Regions, default is oss-cn-hangzhou
+        internal?: boolean; // access OSS with aliyun internal network or not, default is false If your servers are running on aliyun too, you can set true to save lot of money.
+        timeout?: string | number; // instance level timeout for all operations, default is 60s
+    }
+
+    interface ImageGetOptions {
+        timeout?: number;
+        headers?: object;
+    }
+
+    interface StyleData {
+        Name: string; // style name
+        Content: string; // style content
+        CreateTime: string; // style create time
+        LastModifyTime: string; // style last modify time
+    }
+
+    class ImageClient {
+        constructor(options: ImageClientOptions)
+
+        /**
+         * Get an image from the image channel.
+         */
+        get(name: string, file?: any, options?: ImageGetOptions): Promise<{ content: any, res: NormalSuccessResponse }>;
+
+        /**
+         * Get an image read stream.
+         */
+        getStream(name: string, options?: ImageGetOptions): Promise<{ stream: any, res: NormalSuccessResponse }>;
+
+        /**
+         * Get a image exif info by image object name from the image channel.
+         */
+        getExif(name: string, options?: RequestOptions): Promise<{ data: object, res: NormalSuccessResponse }>;
+
+        /**
+         * Get a image info and exif info by image object name from the image channel.
+         */
+        getInfo(name: string, options?: RequestOptions): Promise<{ data: object, res: NormalSuccessResponse }>;
+
+        /**
+         * todo
+         */
+        putStyle(name: string, style: string, options?: RequestOptions): Promise<{ data: object, res: NormalSuccessResponse }>;
+
+        /**
+         * Get a style by name from the image channel.
+         */
+        getStyle(name: string, options?: RequestOptions): Promise<{ data: StyleData, res: NormalSuccessResponse}>;
+
+        /**
+         * Get all styles from the image channel.
+         */
+        listStyle(options?: RequestOptions): Promise<StyleData[]>;
+
+        /**
+         * todo
+         */
+        deleteStyle(styleName: string, options?: RequestOptions): Promise<NormalSuccessResponse>;
+
+        /**
+         * Create a signature url for directly download.
+         */
+        signatureUrl(name: string, options?: { expires?: string, timeout?: string }): string;
+    }
 }
 
-export interface ListObjectsQuery {
-    prefix?: string; // search object using prefix key
-    marker?: string; // search start from marker, including marker key
-    delimiter?: string; // delimiter search scope e.g. / only search current dir, not including subdir
-    'max-keys': string | number; // max objects, default is 100, limit to 1000
-}
-
-export interface ListObjectResult {
-    objects: ObjectMeta[];
-    prefixes: string[];
-    isTruncated: boolean;
-    nextMarker: string;
-    res: NormalSuccessResponse;
-}
-
-export interface PutObjectOptions {
-    timeout?: number; // the operation timeout
-    mime?: string; // custom mime, will send with Content-Type entity header
-    meta?: UserMeta; // user meta, will send with x-oss-meta- prefix string e.g.: { uid: 123, pid: 110 }
-    callback: ObjectCallback;
-}
-
-export interface PutObjectResult {
-    name: string;
-    data: object;
-    res: NormalSuccessResponse;
-}
-
-export interface PutStreamOptions {
-    contentLength?: number; // the stream length, chunked encoding will be used if absent
-    timeout: number; // the operation timeout
-    mime: string; // custom mime, will send with Content-Type entity header
-    meta: UserMeta;
-    callback: ObjectCallback;
-}
-
-export interface AppendObjectOptions {
-    position?: string; // specify the position which is the content length of the latest object
-    timeout?: number; // the operation timeout
-    mime?: string; // custom mime, will send with Content-Type entity header
-    meta?: UserMeta;
-    headers?: object;
-}
-
-export interface AppendObjectResult {
-    name: string;
-    url: string; // the url of oss
-    res: NormalSuccessResponse;
-    nextAppendPosition: string; // the next position
-}
-
-export interface HeadObjectOptions {
-    timeout?: number;
-    headers?: object;
-}
-
-export interface HeadObjectResult {
-    status: number; // response status, maybe 200 or 304
-    meta: UserMeta;
-    res: NormalSuccessResponse;
-}
-
-export interface GetObjectOptions {
-    timeout?: number;
-    process?: string; // image process params, will send with x-oss-process e.g.: {process: 'image/resize,w_200'}
-    headers?: object;
-}
-
-export interface GetObjectResult {
-    content?: any; // file content buffer if file parameter is null or ignore
-    res: NormalSuccessResponse;
-}
-
-export interface GetStreamOptions {
-    timeout?: number;
-    process?: string; // image process params, will send with x-oss-process e.g.: {process: 'image/resize,w_200'}
-    headers?: object;
-}
-
-export interface GetStreamResult {
-    stream?: any; // readable stream instance if response status is not 200, stream will be null.
-    res: NormalSuccessResponse;
-}
-
-export interface CopyObjectOptions {
-    timeout?: number;
-    meta?: UserMeta;
-    headers?: object;
-}
-
-export interface CopyAndPutMetaResult {
-    data: ModifyData;
-    res: NormalSuccessResponse;
-}
-
-export interface DeleteMultiOptions {
-    quite?: boolean; // quiet mode or verbose mode, default is false
-    timeout?: number;
-}
-
-export interface DeleteMultiResult {
-    deleted?: string[]; // deleted object names list
-    res: NormalSuccessResponse;
-}
-
-export interface ResponseHeaderType {
-    'content-type'?: string;
-    'content-disposition'?: string;
-    'cache-control'?: string;
-}
-
-export interface SignatureUrlOptions {
-    expires?: number; // after expires seconds, the url will become invalid, default is 1800
-    method?: HTTPMethods; // the HTTP method, default is 'GET'
-    'Content-Type'?: string; // set the request content type
-    process?: string;
-    response?: ResponseHeaderType; // set the response headers for download
-    callback?: ObjectCallback;
-}
-
-export interface GetACLResult {
-    acl: ACLType;
-    res: NormalSuccessResponse;
-}
-
-export interface InitMultipartUploadOptions {
-    timeout?: number;
-    mime?: string; // Mime file type
-    meta?: UserMeta;
-    headers?: object;
-}
-
-export interface InitMultipartUploadResult {
-    res: { status: number, headers: object, size: number, rt: number };
-    bucket: string; // bucket name
-    name: string; // object name store on OSS
-    uploadId: string; // upload id, use for uploadPart, completeMultipart
-}
-
-export interface UploadPartResult {
-    name: string;
-    etag: string;
-    res: NormalSuccessResponse;
-}
-
-export interface CompleteMultipartUploadOptions {
-    timeout?: number;
-    callback?: ObjectCallback;
-    headers?: object;
-}
-
-export interface CompleteMultipartUploadResult {
-    bucket: string;
-    name: string;
-    etag: string;
-    data: object;
-    res: NormalSuccessResponse;
-}
-
-export interface MultipartUploadOptions {
-    parallel?: number; // the number of parts to be uploaded in parallel
-    partSize?: number; // the suggested size for each part
-    progress?: (...args: any[]) => any; // the progress callback called after each successful upload of one part
-    checkpoint?: Checkpoint; // the checkpoint to resume upload, if this is provided, it will continue the upload from where interrupted, otherwise a new multipart upload will be created.
-    meta?: UserMeta;
-    mime?: string;
-    callback?: ObjectCallback;
-    headers?: object;
-    timeout?: number;
-    copyheaders?: object; //  {Object} only uploadPartCopy api used, detail
-}
-
-export interface MultipartUploadResult {
-    bucket: string;
-    name: string;
-    etag: string;
-    data: object;
-    res: NormalSuccessResponse;
-}
-
-export interface MultipartUploadCopyResult {
-    bucket: string;
-    name: string;
-    etag: string;
-    res: NormalSuccessResponse;
-}
-
-export interface MultipartUploadCopySourceData {
-    sourceKey: string; // the source object name
-    sourceBucketName: string; // sourceData.  the source bucket name
-    startOffset: number; // data copy start byte offset, e.g: 0
-    endOffset: number; // data copy end byte offset, e.g: 102400
-}
-
-export interface ListPartsQuery {
-    'max-parts': number; // The maximum part number in the response of the OSS. default value: 1000.
-    'part-number-marker': number; // Starting position of a specific list. A part is listed only when the part number is greater than the value of this parameter.
-    'encoding-type': string; // Specify the encoding of the returned content and the encoding type. Optional value: url
-}
-
-export interface ListPartsResult {
-    uploadId: string;
-    bucket: string;
-    name: string;
-    PartNumberMarker: number;
-    nextPartNumberMarker: number;
-    maxParts: number;
-    isTruncated: boolean;
-    parts: ObjectPart[];
-    res: NormalSuccessResponse;
-}
-
-export interface ListUploadsQuery {
-    prefix?: string;
-    'max-uploads'?: number;
-    'key-marker'?: string;
-    'upload-id-marker'?: string;
-}
-
-export interface ListUploadsResult {
-    res: NormalSuccessResponse;
-    bucket: string;
-    nextKeyMarker: any;
-    nextUploadIdMarker: any;
-    isTruncated: boolean;
-    uploads: Upload[];
-}
-
-export interface PutChannelConf {
-    Description?: string;
-    Status?: string;
-    Target?: {
-        Type: string,
-        FragDuration: number,
-        FragCount: number,
-        PlaylistName: string
-    };
-}
-
-export interface PutChannelResult {
-    publishUrls: string[];
-    playUrls: string[];
-    res: NormalSuccessResponse;
-}
-
-export interface GetChannelResult {
-    Status: string;
-    ConnectedTime?: string;
-    RemoteAddr?: string;
-    Video?: object;
-    Audio?: object;
-    res: NormalSuccessResponse;
-}
-
-export interface ListChannelsQuery {
-    prefix: string; // the channel id prefix (returns channels with this prefix)
-    marker: string; // the channel id marker (returns channels after this id)
-    'max-keys ': number; // max number of channels to return
-}
-
-export interface ListChannelsResult {
-    channels: Channel[];
-    nextMarker: string | null;
-    isTruncated: boolean;
-    res: NormalSuccessResponse;
-}
-
-export interface ChannelHistoryResult {
-    records: ChannelHistory;
-    res: NormalSuccessResponse;
-}
-
-export interface GetRtmpUrlOptions {
-    expires?: number; // the expire time in seconds of the url
-    params?: object; // the additional parameters for url, e.g.: {playlistName: 'play.m3u8'}
-    timeout?: number; // the operation timeout
-}
-
-export default class OSS {
-    // the image client
-    static ImageClient: (options: ImageClientDefinition.ImageClientOptions) => ImageClientDefinition.ImageClient;
-    static Cluster: (options: ClusterDefinition.ClusterOptions) => ClusterDefinition.Cluster;
-
-    constructor(options: Options)
+declare class OSS {
+    constructor(options: OSS.Options)
 
     /******************************************* the bucket operations *************************************************/
 
@@ -447,12 +560,12 @@ export default class OSS {
     /**
      * List buckets in this account.
      */
-    listBuckets(query: ListBucketsQueryType | null, options?: RequestOptions): Promise<Bucket[]>;
+    listBuckets(query: OSS.ListBucketsQueryType | null, options?: OSS.RequestOptions): Promise<OSS.Bucket[]>;
 
     /**
      * Create a new bucket.
      */
-    putBucket(name: string, options?: PutBucketOptions): Promise<{ bucket: string, res: NormalSuccessResponse }>;
+    putBucket(name: string, options?: OSS.PutBucketOptions): Promise<{ bucket: string, res: OSS.NormalSuccessResponse }>;
 
     /**
      * Use the bucket.
@@ -462,7 +575,7 @@ export default class OSS {
     /**
      * Delete an empty bucket.
      */
-    deleteBucket(name: string, options?: RequestOptions): Promise<NormalSuccessResponse>;
+    deleteBucket(name: string, options?: OSS.RequestOptions): Promise<OSS.NormalSuccessResponse>;
 
     /**
      * Get bucket information,include CreationDate、ExtranetEndpoint、IntranetEndpoint、Location、Name、StorageClass、 Owner、AccessControlList
@@ -478,114 +591,114 @@ export default class OSS {
     /**
      * Update the bucket ACL.
      */
-    putBucketACL(name: string, acl: ACLType, options?: RequestOptions): Promise<NormalSuccessResponse>;
+    putBucketACL(name: string, acl: OSS.ACLType, options?: OSS.RequestOptions): Promise<OSS.NormalSuccessResponse>;
 
     /**
      * Get the bucket ACL.
      *   acl - acl settings string
      */
-    getBucketACL(name: string, options?: RequestOptions): Promise<{ acl: string, res: NormalSuccessResponse }>;
+    getBucketACL(name: string, options?: OSS.RequestOptions): Promise<{ acl: string, res: OSS.NormalSuccessResponse }>;
 
     // logging operations
     /**
      * Update the bucket logging settings. Log file will create every one hour and name format: <prefix><bucket>-YYYY-mm-DD-HH-MM-SS-UniqueString.
      */
-    putBucketLogging(name: string, prefix?: string, options?: RequestOptions): Promise<NormalSuccessResponse>;
+    putBucketLogging(name: string, prefix?: string, options?: OSS.RequestOptions): Promise<OSS.NormalSuccessResponse>;
 
     /**
      * Get the bucket logging settings.
      */
-    getBucketLogging(name: string, options?: RequestOptions): Promise<{ enable: boolean, prefix: string | null, res: NormalSuccessResponse }>;
+    getBucketLogging(name: string, options?: OSS.RequestOptions): Promise<{ enable: boolean, prefix: string | null, res: OSS.NormalSuccessResponse }>;
 
     /**
      * Delete the bucket logging settings.
      */
-    deleteBucketLogging(name: string, options?: RequestOptions): Promise<NormalSuccessResponse>;
+    deleteBucketLogging(name: string, options?: OSS.RequestOptions): Promise<OSS.NormalSuccessResponse>;
 
     // Website operations
     /**
      * Set the bucket as a static website.
      */
-    putBucketWebsite(name: string, config: PutBucketWebsiteConfig): Promise<NormalSuccessResponse>;
+    putBucketWebsite(name: string, config: OSS.PutBucketWebsiteConfig): Promise<OSS.NormalSuccessResponse>;
 
     /**
      * Get the bucket website config.
      */
-    getBucketWebsite(name: string, options?: RequestOptions): Promise<{ index: string, error: string, res: NormalSuccessResponse }>;
+    getBucketWebsite(name: string, options?: OSS.RequestOptions): Promise<{ index: string, error: string, res: OSS.NormalSuccessResponse }>;
 
     /**
      * Delete the bucket website config.
      */
-    deleteBucketWebsite(name: string, options?: RequestOptions): Promise<NormalSuccessResponse>;
+    deleteBucketWebsite(name: string, options?: OSS.RequestOptions): Promise<OSS.NormalSuccessResponse>;
 
     // referer operations
     /**
      * Set the bucket request Referer white list.
      */
-    putBucketReferer(name: string, allowEmpty: boolean, referers: string[], options?: RequestOptions): Promise<NormalSuccessResponse>;
+    putBucketReferer(name: string, allowEmpty: boolean, referers: string[], options?: OSS.RequestOptions): Promise<OSS.NormalSuccessResponse>;
 
     /**
      * Get the bucket request Referer white list.
      */
-    getBucketReferer(name: string, options?: RequestOptions): Promise<{ allowEmpty: boolean, referers: string[], res: NormalSuccessResponse }>;
+    getBucketReferer(name: string, options?: OSS.RequestOptions): Promise<{ allowEmpty: boolean, referers: string[], res: OSS.NormalSuccessResponse }>;
 
     /**
      * Delete the bucket request Referer white list.
      */
-    deleteBucketReferer(name: string, options?: RequestOptions): Promise<NormalSuccessResponse>;
+    deleteBucketReferer(name: string, options?: OSS.RequestOptions): Promise<OSS.NormalSuccessResponse>;
 
     // lifecycle operations
     /**
      * Set the bucket object lifecycle.
      */
-    putBucketLifecycle(name: string, rules: LifecycleRule[], options?: RequestOptions): Promise<NormalSuccessResponse>;
+    putBucketLifecycle(name: string, rules: OSS.LifecycleRule[], options?: OSS.RequestOptions): Promise<OSS.NormalSuccessResponse>;
 
     /**
      * Get the bucket object lifecycle.
      */
-    getBucketLifecycle(name: string, options?: RequestOptions): Promise<{ rules: LifecycleRule[], res: NormalSuccessResponse }>;
+    getBucketLifecycle(name: string, options?: OSS.RequestOptions): Promise<{ rules: OSS.LifecycleRule[], res: OSS.NormalSuccessResponse }>;
 
     /**
      * Delete the bucket object lifecycle.
      */
-    deleteBucketLifecycle(name: string, options?: RequestOptions): Promise<NormalSuccessResponse>;
+    deleteBucketLifecycle(name: string, options?: OSS.RequestOptions): Promise<OSS.NormalSuccessResponse>;
 
     // CORS operations
     /**
      * Set CORS rules of the bucket object
      */
-    putBucketCORS(name: string, rules: CORSRule[], options?: RequestOptions): Promise<NormalSuccessResponse>;
+    putBucketCORS(name: string, rules: OSS.CORSRule[], options?: OSS.RequestOptions): Promise<OSS.NormalSuccessResponse>;
 
     /**
      * Get CORS rules of the bucket object.
      */
-    getBucketCORS(name: string): Promise<{ rules: CORSRule[], res: NormalSuccessResponse }>;
+    getBucketCORS(name: string): Promise<{ rules: OSS.CORSRule[], res: OSS.NormalSuccessResponse }>;
 
     /**
      * Delete CORS rules of the bucket object.
      */
-    deleteBucketCORS(name: string): Promise<NormalSuccessResponse>;
+    deleteBucketCORS(name: string): Promise<OSS.NormalSuccessResponse>;
 
     /********************************************************** Object operations ********************************************/
     /**
      * List objects in the bucket.
      */
-    list(query: ListObjectsQuery | null, options: RequestOptions): Promise<ListObjectResult>;
+    list(query: OSS.ListObjectsQuery | null, options: OSS.RequestOptions): Promise<OSS.ListObjectResult>;
 
     /**
      * Add an object to the bucket.
      */
-    put(name: string, file: any, options?: PutObjectOptions): Promise<PutObjectResult>;
+    put(name: string, file: any, options?: OSS.PutObjectOptions): Promise<OSS.PutObjectResult>;
 
     /**
      * Add a stream object to the bucket.
      */
-    putStream(name: string, stream: any, options?: PutStreamOptions): Promise<{ name: string, res: NormalSuccessResponse }>;
+    putStream(name: string, stream: any, options?: OSS.PutStreamOptions): Promise<{ name: string, res: OSS.NormalSuccessResponse }>;
 
     /**
      * Append an object to the bucket, it's almost same as put, but it can add content to existing object rather than override it.
      */
-    append(name: string, file: any, options?: AppendObjectOptions): Promise<AppendObjectResult>;
+    append(name: string, file: any, options?: OSS.AppendObjectOptions): Promise<OSS.AppendObjectResult>;
 
     /**
      * Get the Object url. If provide baseUrl, will use baseUrl instead the default endpoint.
@@ -600,67 +713,67 @@ export default class OSS {
     /**
      * Head an object and get the meta info.
      */
-    head(name: string, options?: HeadObjectOptions): Promise<HeadObjectResult>;
+    head(name: string, options?: OSS.HeadObjectOptions): Promise<OSS.HeadObjectResult>;
 
     /**
      * Get an object from the bucket.
      */
-    get(name: string, file?: any, options?: GetObjectOptions): Promise<GetObjectResult>;
+    get(name: string, file?: any, options?: OSS.GetObjectOptions): Promise<OSS.GetObjectResult>;
 
     /**
      * Get an object read stream.
      */
-    getStream(name?: string, options?: GetStreamOptions): Promise<GetStreamResult>;
+    getStream(name?: string, options?: OSS.GetStreamOptions): Promise<OSS.GetStreamResult>;
 
     /**
      * Delete an object from the bucket.
      */
-    delete(name: string, options?: RequestOptions): Promise<NormalSuccessResponse>;
+    delete(name: string, options?: OSS.RequestOptions): Promise<OSS.NormalSuccessResponse>;
 
     /**
      * Copy an object from sourceName to name.
      */
-    copy(name: string, sourceName: string, options?: CopyObjectOptions): Promise<CopyAndPutMetaResult>;
+    copy(name: string, sourceName: string, options?: OSS.CopyObjectOptions): Promise<OSS.CopyAndPutMetaResult>;
 
     /**
      * Set an exists object meta.
      */
-    putMeta(name: string, meta: UserMeta, options: RequestOptions): Promise<CopyAndPutMetaResult>;
+    putMeta(name: string, meta: OSS.UserMeta, options: OSS.RequestOptions): Promise<OSS.CopyAndPutMetaResult>;
 
     /**
      * Delete multi objects in one request.
      */
-    deleteMulti(names: string[], options?: DeleteMultiOptions): Promise<DeleteMultiResult>;
+    deleteMulti(names: string[], options?: OSS.DeleteMultiOptions): Promise<OSS.DeleteMultiResult>;
 
     /**
      * Create a signature url for download or upload object. When you put object with signatureUrl ,you need to pass Content-Type.Please look at the example.
      */
-    signatureUrl(name: string, options?: SignatureUrlOptions): string;
+    signatureUrl(name: string, options?: OSS.SignatureUrlOptions): string;
 
     /**
      * Set object's ACL.
      */
-    putACL(name: string, acl: ACLType, options?: RequestOptions): Promise<NormalSuccessResponse>;
+    putACL(name: string, acl: OSS.ACLType, options?: OSS.RequestOptions): Promise<OSS.NormalSuccessResponse>;
 
     /**
      * Get object's ACL.
      */
-    getACL(name: string, options?: RequestOptions): Promise<GetACLResult>;
+    getACL(name: string, options?: OSS.RequestOptions): Promise<OSS.GetACLResult>;
 
     /**
      * Restore Object.
      */
-    restore(name: string, options?: RequestOptions): Promise<NormalSuccessResponse>;
+    restore(name: string, options?: OSS.RequestOptions): Promise<OSS.NormalSuccessResponse>;
 
     /**
      * multi upload
      */
-    initMultipartUpload(name: string, options?: InitMultipartUploadOptions): Promise<InitMultipartUploadResult>;
+    initMultipartUpload(name: string, options?: OSS.InitMultipartUploadOptions): Promise<OSS.InitMultipartUploadResult>;
 
     /**
      * After initiating a Multipart Upload event, you can upload data in parts based on the specified object name and Upload ID.
      */
-    uploadPart(name: string, uploadId: string, partNo: number, file: any, start: number, end: number, options?: RequestOptions): Promise<UploadPartResult>;
+    uploadPart(name: string, uploadId: string, partNo: number, file: any, start: number, end: number, options?: OSS.RequestOptions): Promise<OSS.UploadPartResult>;
 
     /**
      * Using Upload Part Copy, you can copy data from an existing object and upload a part of the data.
@@ -673,7 +786,7 @@ export default class OSS {
         range: string,
         sourceData: { sourceKey: string, sourceBucketName: string },
         options: { timeout?: number, headers?: object }
-    ): Promise<UploadPartResult>;
+    ): Promise<OSS.UploadPartResult>;
 
     /**
      * After uploading all data parts, you must call the Complete Multipart Upload API to complete Multipart Upload for the entire file.
@@ -682,79 +795,79 @@ export default class OSS {
         name: string,
         uploadId: string,
         parts: Array<{ number: number, etag: string }>,
-        options?: CompleteMultipartUploadOptions
-    ): Promise<CompleteMultipartUploadResult>;
+        options?: OSS.CompleteMultipartUploadOptions
+    ): Promise<OSS.CompleteMultipartUploadResult>;
 
     /**
      * Upload file with OSS multipart.
      */
-    multipartUpload(name: string, file: any, options: MultipartUploadOptions): Promise<MultipartUploadResult>;
+    multipartUpload(name: string, file: any, options: OSS.MultipartUploadOptions): Promise<OSS.MultipartUploadResult>;
 
     /**
      * Copy file with OSS multipart.
      * this function contains head, initMultipartUpload, uploadPartCopy, completeMultipartUpload.
      * When copying a file larger than 1 GB, you should use the Upload Part Copy method. If you want to copy a file smaller than 1 GB, see Copy Object.
      */
-    multipartUploadCopy(name: string, sourceData: MultipartUploadCopySourceData, options?: MultipartUploadOptions): Promise<MultipartUploadCopyResult>;
+    multipartUploadCopy(name: string, sourceData: OSS.MultipartUploadCopySourceData, options?: OSS.MultipartUploadOptions): Promise<OSS.MultipartUploadCopyResult>;
 
     /**
      * The ListParts command can be used to list all successfully uploaded parts mapped to a specific upload ID, i.e.: those not completed and not aborted.
      */
-    listParts(name: string, uploadId: string, query?: ListPartsQuery, options?: RequestOptions): Promise<ListPartsResult>;
+    listParts(name: string, uploadId: string, query?: OSS.ListPartsQuery, options?: OSS.RequestOptions): Promise<OSS.ListPartsResult>;
 
     /**
      * List on-going multipart uploads, i.e.: those not completed and not aborted.
      */
-    listUploads(query: ListUploadsQuery, options?: RequestOptions): Promise<ListUploadsResult>;
+    listUploads(query: OSS.ListUploadsQuery, options?: OSS.RequestOptions): Promise<OSS.ListUploadsResult>;
 
     /**
      * Abort a multipart upload for object.
      */
-    abortMultipartUpload(name: string, uploadId: string, options?: RequestOptions): Promise<NormalSuccessResponse>;
+    abortMultipartUpload(name: string, uploadId: string, options?: OSS.RequestOptions): Promise<OSS.NormalSuccessResponse>;
 
     /************************************************ RTMP Operations *************************************************************/
     /**
      * Create a live channel.
      */
-    putChannel(id: string, conf: PutChannelConf, options?: RequestOptions): Promise<PutChannelResult>;
+    putChannel(id: string, conf: OSS.PutChannelConf, options?: OSS.RequestOptions): Promise<OSS.PutChannelResult>;
 
     /**
      * Get live channel info.
      */
-    getChannel(id: string, options?: RequestOptions): Promise<{ data: PutChannelConf, res: NormalSuccessResponse }>;
+    getChannel(id: string, options?: OSS.RequestOptions): Promise<{ data: OSS.PutChannelConf, res: OSS.NormalSuccessResponse }>;
 
     /**
      * Delete a live channel.
      */
-    deleteChannel(id: string, options?: RequestOptions): Promise<NormalSuccessResponse>;
+    deleteChannel(id: string, options?: OSS.RequestOptions): Promise<OSS.NormalSuccessResponse>;
 
     /**
      * Change the live channel status.
      */
-    putChannelStatus(id: string, status?: string, options?: RequestOptions): Promise<NormalSuccessResponse>;
+    putChannelStatus(id: string, status?: string, options?: OSS.RequestOptions): Promise<OSS.NormalSuccessResponse>;
 
     /**
      * Get the live channel status.
      */
-    getChannelStatus(id: string, options?: RequestOptions): Promise<GetChannelResult>;
+    getChannelStatus(id: string, options?: OSS.RequestOptions): Promise<OSS.GetChannelResult>;
 
     /**
      * List channels.
      */
-    listChannels(query: ListChannelsQuery, options?: RequestOptions): Promise<ListChannelsResult>;
+    listChannels(query: OSS.ListChannelsQuery, options?: OSS.RequestOptions): Promise<OSS.ListChannelsResult>;
 
     /**
      * Get the live channel history.
      */
-    getChannelHistory(id: string, options?: RequestOptions): Promise<ChannelHistoryResult>;
+    getChannelHistory(id: string, options?: OSS.RequestOptions): Promise<OSS.ChannelHistoryResult>;
 
     /**
      * Create a VOD playlist for the channel.
      */
-    createVod(id: string, name: string, time: { startTime: number, endTime: number }, options?: RequestOptions): Promise<NormalSuccessResponse>;
+    createVod(id: string, name: string, time: { startTime: number, endTime: number }, options?: OSS.RequestOptions): Promise<OSS.NormalSuccessResponse>;
 
     /**
      * Get signatured rtmp url for publishing.
      */
-    getRtmpUrl(channelId?: string, options?: GetRtmpUrlOptions): string;
+    getRtmpUrl(channelId?: string, options?: OSS.GetRtmpUrlOptions): string;
 }
diff --git a/types/ali-oss/tslint.json b/types/ali-oss/tslint.json
index f93cf8562a..8192d88dd1 100644
--- a/types/ali-oss/tslint.json
+++ b/types/ali-oss/tslint.json
@@ -1,3 +1,6 @@
 {
-    "extends": "dtslint/dt.json"
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "no-mergeable-namespace": false
+    }
 }

From 33ed523f3b6162552d94de92fd2158e2cb2119b7 Mon Sep 17 00:00:00 2001
From: ptrdu <ptrdu@mucheng.local>
Date: Wed, 21 Nov 2018 18:01:29 +0800
Subject: [PATCH 146/836] fix: fix tsconfig.json

---
 types/ali-oss/ali-oss-tests.ts | 1 -
 types/ali-oss/tsconfig.json    | 2 --
 2 files changed, 3 deletions(-)

diff --git a/types/ali-oss/ali-oss-tests.ts b/types/ali-oss/ali-oss-tests.ts
index b3641eeeb0..dc751b8d44 100644
--- a/types/ali-oss/ali-oss-tests.ts
+++ b/types/ali-oss/ali-oss-tests.ts
@@ -23,4 +23,3 @@ const imageOptions: OSS.ImageClientOptions = {
 };
 
 const imageClient = new OSS.ImageClient(imageOptions);
-
diff --git a/types/ali-oss/tsconfig.json b/types/ali-oss/tsconfig.json
index 62f030a4fd..6a0fb7441b 100644
--- a/types/ali-oss/tsconfig.json
+++ b/types/ali-oss/tsconfig.json
@@ -18,8 +18,6 @@
     },
     "files": [
         "index.d.ts",
-        "ImageClient.d.ts",
-        "Cluster.d.ts",
         "ali-oss-tests.ts"
     ]
 }

From d92f3cdad08c4a315a726483e6885ea8102115c3 Mon Sep 17 00:00:00 2001
From: Pavlos Vinieratos <pvinis@gmail.com>
Date: Mon, 5 Nov 2018 14:34:57 +0100
Subject: [PATCH 147/836] Add typings for react-native-safe-area

---
 types/react-native-safe-area/index.d.ts       | 35 +++++++++++++++++++
 .../react-native-safe-area-tests.ts           |  4 +++
 types/react-native-safe-area/tsconfig.json    | 22 ++++++++++++
 types/react-native-safe-area/tslint.json      |  1 +
 4 files changed, 62 insertions(+)
 create mode 100644 types/react-native-safe-area/index.d.ts
 create mode 100644 types/react-native-safe-area/react-native-safe-area-tests.ts
 create mode 100644 types/react-native-safe-area/tsconfig.json
 create mode 100644 types/react-native-safe-area/tslint.json

diff --git a/types/react-native-safe-area/index.d.ts b/types/react-native-safe-area/index.d.ts
new file mode 100644
index 0000000000..dcb65e346c
--- /dev/null
+++ b/types/react-native-safe-area/index.d.ts
@@ -0,0 +1,35 @@
+// Type definitions for react-native-safe-area 0.5
+// Project: https://github.com/miyabi/react-native-safe-area#readme
+// Definitions by: Pavlos Vinieratos <https://github.com/pvinis>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="react" />
+
+declare module 'react-native-safe-area' {
+    type Direction =
+        | 'top'
+        | 'bottom'
+        | 'left'
+        | 'right'
+        | 'topLeft' // DEPRECATED
+        | 'topAndLeft'
+        | 'topRight' // DEPRECATED
+        | 'topAndRight'
+        | 'bottomLeft' // DEPRECATED
+        | 'bottomAndLeft'
+        | 'bottomRight' // DEPRECATED
+        | 'bottomAndRight'
+        | 'vertical'
+        | 'horizontal'
+        | 'verticalAndLeft'
+        | 'verticalAndRight'
+        | 'horizontalAndTop'
+        | 'horizontalAndBottom'
+        | 'all';
+
+    export function withSafeArea(
+        WrappedComponent: React.ComponentType<any>,
+        applyTo: 'margin' | 'padding' | 'absolutePosition' | 'contentInset' = 'margin',
+        direction: Direction = 'all',
+    ): React.ComponentType<any>;
+}
diff --git a/types/react-native-safe-area/react-native-safe-area-tests.ts b/types/react-native-safe-area/react-native-safe-area-tests.ts
new file mode 100644
index 0000000000..bcdbddc5f3
--- /dev/null
+++ b/types/react-native-safe-area/react-native-safe-area-tests.ts
@@ -0,0 +1,4 @@
+import { View } from 'react-native'
+import { withSafeArea } from 'react-native-safe-area';
+
+const SafeAreaView = withSafeArea(View)
diff --git a/types/react-native-safe-area/tsconfig.json b/types/react-native-safe-area/tsconfig.json
new file mode 100644
index 0000000000..9e2cfb5b7c
--- /dev/null
+++ b/types/react-native-safe-area/tsconfig.json
@@ -0,0 +1,22 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "react-native-safe-area-tests.ts"
+    ]
+}
diff --git a/types/react-native-safe-area/tslint.json b/types/react-native-safe-area/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-native-safe-area/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From eb33d259b6b5792db40e46ed2bfc2046ad9950d4 Mon Sep 17 00:00:00 2001
From: Pavlos Vinieratos <pvinis@gmail.com>
Date: Wed, 21 Nov 2018 11:16:22 +0100
Subject: [PATCH 148/836] newer version of typescript

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

diff --git a/types/react-native-safe-area/index.d.ts b/types/react-native-safe-area/index.d.ts
index dcb65e346c..7eaaf3b15e 100644
--- a/types/react-native-safe-area/index.d.ts
+++ b/types/react-native-safe-area/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/miyabi/react-native-safe-area#readme
 // Definitions by: Pavlos Vinieratos <https://github.com/pvinis>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 3.0
 
 /// <reference types="react" />
 

From 572eae2e09138880bddde21b40c1aa836f5bff98 Mon Sep 17 00:00:00 2001
From: Pavlos Vinieratos <pvinis@gmail.com>
Date: Wed, 21 Nov 2018 11:31:32 +0100
Subject: [PATCH 149/836] add `strictFunctionTypes`

---
 types/react-native-safe-area/tsconfig.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/types/react-native-safe-area/tsconfig.json b/types/react-native-safe-area/tsconfig.json
index 9e2cfb5b7c..6a88cd1448 100644
--- a/types/react-native-safe-area/tsconfig.json
+++ b/types/react-native-safe-area/tsconfig.json
@@ -7,6 +7,7 @@
         "noImplicitAny": true,
         "noImplicitThis": true,
         "strictNullChecks": true,
+        "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [
             "../"

From 3daac759f4ce410664691073d7a16f735e5fe66a Mon Sep 17 00:00:00 2001
From: Benjamin Lupton <b@lupton.cc>
Date: Wed, 21 Nov 2018 21:46:45 +1100
Subject: [PATCH 150/836] ansicolors: accurate types with recursion support

---
 types/ansicolors/index.d.ts | 44 +++++++++++++++++++++++++++++++++----
 1 file changed, 40 insertions(+), 4 deletions(-)

diff --git a/types/ansicolors/index.d.ts b/types/ansicolors/index.d.ts
index 6750283895..e82fb47dd7 100644
--- a/types/ansicolors/index.d.ts
+++ b/types/ansicolors/index.d.ts
@@ -1,8 +1,44 @@
 // Type definitions for ansicolors
 // Project: https://github.com/thlorenz/ansicolors
-// Definitions by: rogierschouten <https://github.com/rogierschouten>
+// Definitions by: Benjamin Arthur Lupton <https://github.com/balupton>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-
-declare var colors: { [index: string]: (s: string) => string; };
-export = colors;
+interface Colors extends String {
+	white: Colors
+	black: Colors
+	blue: Colors
+	cyan: Colors
+	green: Colors
+	magenta: Colors
+	red: Colors
+	yellow: Colors
+	brightBlack: Colors
+	brightRed: Colors
+	brightGreen: Colors
+	brightYellow: Colors
+	brightBlue: Colors
+	brightMagenta: Colors
+	brightCyan: Colors
+	brightWhite: Colors
+	bgBlack: Colors
+	bgRed: Colors
+	bgGreen: Colors
+	bgYellow: Colors
+	bgBlue: Colors
+	bgMagenta: Colors
+	bgCyan: Colors
+	bgWhite: Colors
+	bgBrightBlack: Colors
+	bgBrightRed: Colors
+	bgBrightGreen: Colors
+	bgBrightYellow: Colors
+	bgBrightBlue: Colors
+	bgBrightMagenta: Colors
+	bgBrightCyan: Colors
+	bgBrightWhite: Colors
+	open: Colors
+	close: Colors
+	colors: Colors
+}
+declare var colors: Colors
+export default colors

From 7a449c042ee9923551d0857ebd266a6eb7accd2b Mon Sep 17 00:00:00 2001
From: Pavlos Vinieratos <pvinis@gmail.com>
Date: Wed, 21 Nov 2018 11:55:28 +0100
Subject: [PATCH 151/836] bunch of lint fixes

---
 types/react-native-safe-area/index.d.ts       | 66 +++++++++++--------
 .../react-native-safe-area-tests.ts           |  4 +-
 2 files changed, 41 insertions(+), 29 deletions(-)

diff --git a/types/react-native-safe-area/index.d.ts b/types/react-native-safe-area/index.d.ts
index 7eaaf3b15e..923c5ae1bf 100644
--- a/types/react-native-safe-area/index.d.ts
+++ b/types/react-native-safe-area/index.d.ts
@@ -2,35 +2,47 @@
 // Project: https://github.com/miyabi/react-native-safe-area#readme
 // Definitions by: Pavlos Vinieratos <https://github.com/pvinis>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 3.0
+// TypeScript Version: 2.8
 
 /// <reference types="react" />
 
-declare module 'react-native-safe-area' {
-    type Direction =
-        | 'top'
-        | 'bottom'
-        | 'left'
-        | 'right'
-        | 'topLeft' // DEPRECATED
-        | 'topAndLeft'
-        | 'topRight' // DEPRECATED
-        | 'topAndRight'
-        | 'bottomLeft' // DEPRECATED
-        | 'bottomAndLeft'
-        | 'bottomRight' // DEPRECATED
-        | 'bottomAndRight'
-        | 'vertical'
-        | 'horizontal'
-        | 'verticalAndLeft'
-        | 'verticalAndRight'
-        | 'horizontalAndTop'
-        | 'horizontalAndBottom'
-        | 'all';
+import { EmitterSubscription } from 'react-native';
 
-    export function withSafeArea(
-        WrappedComponent: React.ComponentType<any>,
-        applyTo: 'margin' | 'padding' | 'absolutePosition' | 'contentInset' = 'margin',
-        direction: Direction = 'all',
-    ): React.ComponentType<any>;
+// from `TypeDefinition.js`
+export interface SafeAreaInsets { top: number; left: number; bottom: number; right: number; }
+
+// from `SafeArea.[ios|android].js`
+declare namespace SafeArea {
+    function getSafeAreaInsetsForRootView(): Promise<{ safeAreaInsets: SafeAreaInsets }>;
+    function addEventListener(eventType: string, listener: (...args: any[]) => any, context?: any): EmitterSubscription;
+    function removeEventListener(eventType: string, listener: (...args: any[]) => any): void;
 }
+export default SafeArea;
+
+// from `withSafeArea.js`
+export type Direction =
+    | 'top'
+    | 'bottom'
+    | 'left'
+    | 'right'
+    | 'topLeft' // DEPRECATED
+    | 'topAndLeft'
+    | 'topRight' // DEPRECATED
+    | 'topAndRight'
+    | 'bottomLeft' // DEPRECATED
+    | 'bottomAndLeft'
+    | 'bottomRight' // DEPRECATED
+    | 'bottomAndRight'
+    | 'vertical'
+    | 'horizontal'
+    | 'verticalAndLeft'
+    | 'verticalAndRight'
+    | 'horizontalAndTop'
+    | 'horizontalAndBottom'
+    | 'all';
+
+export function withSafeArea(
+    WrappedComponent: React.ComponentType<any>,
+    applyTo: 'margin' | 'padding' | 'absolutePosition' | 'contentInset' = 'margin',
+    direction: Direction = 'all',
+): React.ComponentType<any>;
diff --git a/types/react-native-safe-area/react-native-safe-area-tests.ts b/types/react-native-safe-area/react-native-safe-area-tests.ts
index bcdbddc5f3..0dc931d026 100644
--- a/types/react-native-safe-area/react-native-safe-area-tests.ts
+++ b/types/react-native-safe-area/react-native-safe-area-tests.ts
@@ -1,4 +1,4 @@
-import { View } from 'react-native'
+import { View } from 'react-native';
 import { withSafeArea } from 'react-native-safe-area';
 
-const SafeAreaView = withSafeArea(View)
+const SafeAreaView = withSafeArea(View);

From 46d57157d930db60e0176eb8be78fa9a83b6669a Mon Sep 17 00:00:00 2001
From: Sergey Rubanov <chi187@gmail.com>
Date: Mon, 19 Nov 2018 05:50:55 +0300
Subject: [PATCH 152/836] [WebAssembly] Align bufferSource value type to
 WebAssembly JS API Specification

According to [WebAssembly JS API specification](https://webassembly.github.io/spec/js-api/#webassembly-namespace) `bufferSource` is of type `BufferSources` which is union of [these types](https://heycam.github.io/webidl/#BufferSource)

importObject is always an object
---
 types/webassembly-js-api/index.d.ts  | 14 +++++++++-----
 types/webassembly-web-api/index.d.ts |  2 +-
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/types/webassembly-js-api/index.d.ts b/types/webassembly-js-api/index.d.ts
index 0c8c9d19e8..959e7c9ab5 100644
--- a/types/webassembly-js-api/index.d.ts
+++ b/types/webassembly-js-api/index.d.ts
@@ -3,7 +3,9 @@
 // Definitions by: 01alchemist <https://twitter.com/01alchemist>
 //                 Wink Saville <wink@saville.com>
 //                 Periklis Tsirakidis <https://github.com/periklis>
+//                 Sergey Rubanov <https://github.com/chicoxyzzy>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
 /**
  * The WebAssembly namespace, see [WebAssembly](https://github.com/webassembly)
@@ -22,11 +24,13 @@ declare namespace WebAssembly {
         kind: string;
     }>;
 
+    type BufferSource = ArrayBufferView | ArrayBuffer;
+
     /**
      * WebAssembly.Module
      */
     class Module {
-        constructor(bufferSource: ArrayBuffer | Uint8Array);
+        constructor(bufferSource: BufferSource);
         static customSections(module: Module, sectionName: string): ArrayBuffer[];
         static exports(module: Module): Imports;
         static imports(module: Module): Exports;
@@ -99,15 +103,15 @@ declare namespace WebAssembly {
         toString(): string;
     }
 
-    function compile(bufferSource: ArrayBuffer | Uint8Array): Promise<Module>;
+    function compile(bufferSource: BufferSource): Promise<Module>;
 
     interface ResultObject {
         module: Module;
         instance: Instance;
     }
 
-    function instantiate(bufferSource: ArrayBuffer | Uint8Array, importObject?: any): Promise<ResultObject>;
-    function instantiate(module: Module, importObject?: any): Promise<Instance>;
+    function instantiate(bufferSource: BufferSource, importObject?: object): Promise<ResultObject>;
+    function instantiate(module: Module, importObject?: object): Promise<Instance>;
 
-    function validate(bufferSource: ArrayBuffer | Uint8Array): boolean;
+    function validate(bufferSource: BufferSource): boolean;
 }
diff --git a/types/webassembly-web-api/index.d.ts b/types/webassembly-web-api/index.d.ts
index fd53e094b2..974dd3ce21 100644
--- a/types/webassembly-web-api/index.d.ts
+++ b/types/webassembly-web-api/index.d.ts
@@ -13,5 +13,5 @@
  */
 declare namespace WebAssembly {
     function compileStreaming(source: Response | Promise<Response>): Promise<Module>;
-    function instantiateStreaming(source: Response | Promise<Response>, importObject?: any): Promise<ResultObject>;
+    function instantiateStreaming(source: Response | Promise<Response>, importObject?: object): Promise<ResultObject>;
 }

From 8809b6a41bb6b2c95ecdbd13b41c2b09c8bc7a8a Mon Sep 17 00:00:00 2001
From: Chris Arnesen <chris.arnesen@gmail.com>
Date: Wed, 21 Nov 2018 21:34:30 +0700
Subject: [PATCH 153/836] Update types for npm package "ini"

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

diff --git a/types/ini/index.d.ts b/types/ini/index.d.ts
index f534ff1b8d..4efacfe182 100644
--- a/types/ini/index.d.ts
+++ b/types/ini/index.d.ts
@@ -1,6 +1,7 @@
 // Type definitions for ini v1.3.3
 // Project: https://github.com/isaacs/ini
 // Definitions by: Marcin Porębski <https://github.com/marcinporebski>
+//                 Chris Arnesen <https://github.com/carnesen>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 interface EncodeOptions {
@@ -8,9 +9,13 @@ interface EncodeOptions {
     whitespace: boolean
 }
 
-export function decode(inistring: string): any;
-export function parse(initstring: string): any;
-export function encode(object: any, options?: EncodeOptions): string;
-export function stringify(object: any, options?: EncodeOptions): string;
+export function decode(str: string): {
+  [key: string]: any;
+};
+export function parse(str: string): {
+  [key: string]: any;
+};
+export function encode(object: any, options?: EncodeOptions | string): string;
+export function stringify(object: any, options?: EncodeOptions | string): string;
 export function safe(val: string): string;
 export function unsafe(val: string): string;

From 53563af88d1854b96c617f2b7777a8bc1812afbf Mon Sep 17 00:00:00 2001
From: BlondeLlama <blondelama@live.nl>
Date: Wed, 21 Nov 2018 16:00:10 +0100
Subject: [PATCH 154/836] added moveTolerance to mapOptions

added moveTolerance to mapOptions
---
 types/openlayers/index.d.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/types/openlayers/index.d.ts b/types/openlayers/index.d.ts
index 3214bad15c..b0356122e4 100644
--- a/types/openlayers/index.d.ts
+++ b/types/openlayers/index.d.ts
@@ -12494,6 +12494,7 @@ export namespace olx {
         renderer?: (ol.RendererType | Array<(ol.RendererType | string)> | string);
         target?: (Element | string);
         view?: ol.View;
+        moveTolerance?: number;
     }
 
     /**

From a7409f00a6c2b558d1f4fdd4d27b9b78609dbebc Mon Sep 17 00:00:00 2001
From: BlondeLlama <blondelama@live.nl>
Date: Wed, 21 Nov 2018 16:33:09 +0100
Subject: [PATCH 155/836] DefinitelyTyped/types/ol/ol-tests.ts: changed cast
 <any> to as any

changed due no-angle-bracket-type-assertion rule
---
 types/ol/ol-tests.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/types/ol/ol-tests.ts b/types/ol/ol-tests.ts
index ca099420cd..be19e61a2b 100644
--- a/types/ol/ol-tests.ts
+++ b/types/ol/ol-tests.ts
@@ -303,7 +303,7 @@ import VectorTile from 'ol/vectortile';
 import View from 'ol/view';
 
 // Map
-const map: ol.Map = new Map(<any> {});
+const map: ol.Map = new Map({} as any);
 declare const mapView: View;
 declare const layerBase: LayerBase;
 declare const control: ControlControl;
@@ -320,6 +320,6 @@ declare const size: ol.Size;
 declare const position: ol.Pixel;
 view = map.getView();
 view.getProjection();
-view.animate(<any> {});
-view.calculateExtent(<any> 'size');
+view.animate({} as any);
+view.calculateExtent('size' as any);
 view.centerOn(coordinate, size, position);

From bcffa191b1a4d6edd6cbde017b767ecc6cbbd556 Mon Sep 17 00:00:00 2001
From: BlondeLlama <blondelama@live.nl>
Date: Wed, 21 Nov 2018 16:35:05 +0100
Subject: [PATCH 156/836] 
 DefinitelyTyped/edit/master/types/openlayers/openlayers-tests.ts: Changed
 cast <ol.geom.Circle> to as ol.geom.Circle

Due no-angle-bracket-type-assertion rule.
---
 types/openlayers/openlayers-tests.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/openlayers/openlayers-tests.ts b/types/openlayers/openlayers-tests.ts
index d631a9e9bb..9fb6f0bb3b 100644
--- a/types/openlayers/openlayers-tests.ts
+++ b/types/openlayers/openlayers-tests.ts
@@ -175,7 +175,7 @@ loadingStrategy = ol.loadingstrategy.tile(tilegrid);
 // ol.geom.Circle
 //
 booleanValue = circle.intersectsExtent(extent);
-circle = <ol.geom.Circle> circle.transform(projectionLike, projectionLike);
+circle = circle.transform(projectionLike, projectionLike) as ol.geom.Circle;
 
 //
 //

From c24ef742cd0a5db698bbbedd5c3a986dbef5e509 Mon Sep 17 00:00:00 2001
From: Pavlos Vinieratos <pvinis@gmail.com>
Date: Wed, 21 Nov 2018 17:34:59 +0100
Subject: [PATCH 157/836] Update index.d.ts

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

diff --git a/types/react-native-safe-area/index.d.ts b/types/react-native-safe-area/index.d.ts
index 923c5ae1bf..a6e922e083 100644
--- a/types/react-native-safe-area/index.d.ts
+++ b/types/react-native-safe-area/index.d.ts
@@ -43,6 +43,6 @@ export type Direction =
 
 export function withSafeArea(
     WrappedComponent: React.ComponentType<any>,
-    applyTo: 'margin' | 'padding' | 'absolutePosition' | 'contentInset' = 'margin',
-    direction: Direction = 'all',
+    applyTo: 'margin' | 'padding' | 'absolutePosition' | 'contentInset',
+    direction: Direction,
 ): React.ComponentType<any>;

From 834369c52b0bbc286acc7729992694d0d9d2133a Mon Sep 17 00:00:00 2001
From: Bradley Hill <brad.hill@jostens.com>
Date: Wed, 21 Nov 2018 10:49:49 -0600
Subject: [PATCH 158/836] Add optional `transform` property to the `IEvent`
 interface.

---
 types/fabric/fabric-impl.d.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/types/fabric/fabric-impl.d.ts b/types/fabric/fabric-impl.d.ts
index 6b04bf8f11..485a603966 100644
--- a/types/fabric/fabric-impl.d.ts
+++ b/types/fabric/fabric-impl.d.ts
@@ -140,6 +140,7 @@ interface IDataURLOptions {
 interface IEvent {
 	e: Event;
 	target?: Object;
+    transform?: { corner: string };
 }
 
 interface IFillOptions {

From 3564a9defa54d717e5ad7bc5185d7a399000f05d Mon Sep 17 00:00:00 2001
From: Joel Spriggs <joel.spriggs@gmail.com>
Date: Wed, 21 Nov 2018 12:05:52 -0500
Subject: [PATCH 159/836] Adding Transaction constructor for PreparedStatement
 Object Type

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

diff --git a/types/mssql/index.d.ts b/types/mssql/index.d.ts
index d4558737ba..891186f7ee 100644
--- a/types/mssql/index.d.ts
+++ b/types/mssql/index.d.ts
@@ -316,6 +316,7 @@ export declare class PreparedStatement extends events.EventEmitter {
     public parameters: IRequestParameters;
     public stream: any;
     public constructor(connection?: ConnectionPool);
+    public constructor(transaction: Transaction);
     public input(name: string, type: (() => ISqlType) | ISqlType): PreparedStatement;
     public output(name: string, type: (() => ISqlType) | ISqlType): PreparedStatement;
     public prepare(statement?: string): Promise<void>;

From befddb5226914f270ed8528e025250618b65dd7d Mon Sep 17 00:00:00 2001
From: Tom Milligan <tom@reinfer.io>
Date: Wed, 21 Nov 2018 17:10:14 +0000
Subject: [PATCH 160/836] recharts: added tooltip.payload.payload

---
 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 a9301374f1..34e3cbcb88 100644
--- a/types/recharts/index.d.ts
+++ b/types/recharts/index.d.ts
@@ -796,6 +796,7 @@ export interface TooltipPayload {
     fill?: string;
     dataKey?: DataKey;
     formatter?: TooltipFormatter;
+    payload?: any;
 }
 
 export interface TooltipProps extends Animatable {

From 9203ef2f42de2362024c1257771cf60c5b8224ef Mon Sep 17 00:00:00 2001
From: Joel Spriggs <joel.spriggs@gmail.com>
Date: Wed, 21 Nov 2018 12:20:25 -0500
Subject: [PATCH 161/836] adding test for new constructor

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

diff --git a/types/mssql/mssql-tests.ts b/types/mssql/mssql-tests.ts
index 72bbc15126..18ad4b3ad9 100644
--- a/types/mssql/mssql-tests.ts
+++ b/types/mssql/mssql-tests.ts
@@ -189,6 +189,16 @@ function test_request_constructor() {
     var request4 = new sql.Request();
 }
 
+function test_prepared_statement_constructor() {
+    // Request can be constructed with a connection, preparedStatment, transaction or no arguments
+    var connection: sql.ConnectionPool = new sql.ConnectionPool(config);
+    var preparedStatment = new sql.PreparedStatement(connection);
+    var transaction = new sql.Transaction(connection);
+
+    var preparedSatement1 = new sql.PreparedStatement(connection);
+    var preparedSatement2 = new sql.PreparedStatement(transaction);
+}
+
 function test_classes_extend_eventemitter() {
     var connection: sql.ConnectionPool = new sql.ConnectionPool(config);
     var transaction = new sql.Transaction();

From d721ef55ed58a3feb80173389d6b16ed0ddea824 Mon Sep 17 00:00:00 2001
From: Wylie Conlon <wylieconlon@gmail.com>
Date: Wed, 21 Nov 2018 12:41:41 -0500
Subject: [PATCH 162/836] Remove error-causing module declarations from
 CodeMirror

---
 types/codemirror/codemirror-comment.d.ts  | 4 ----
 types/codemirror/codemirror-panel.d.ts    | 4 ----
 types/codemirror/codemirror-showhint.d.ts | 4 ----
 3 files changed, 12 deletions(-)

diff --git a/types/codemirror/codemirror-comment.d.ts b/types/codemirror/codemirror-comment.d.ts
index 47b99fd989..706e42e807 100644
--- a/types/codemirror/codemirror-comment.d.ts
+++ b/types/codemirror/codemirror-comment.d.ts
@@ -41,7 +41,3 @@ declare module "codemirror" {
         fullLines?: boolean;
     }
 }
-
-declare module "codemirror/addon/comment/comment" {
-    export = CodeMirror;
-}
diff --git a/types/codemirror/codemirror-panel.d.ts b/types/codemirror/codemirror-panel.d.ts
index 2059c8ff72..a361992641 100644
--- a/types/codemirror/codemirror-panel.d.ts
+++ b/types/codemirror/codemirror-panel.d.ts
@@ -45,7 +45,3 @@ declare module "codemirror" {
 
     }
 }
-
-declare module "codemirror/addon/display/panel" {
-    export = CodeMirror;
-}
diff --git a/types/codemirror/codemirror-showhint.d.ts b/types/codemirror/codemirror-showhint.d.ts
index c6f367d0d2..dfbbcdc4e1 100644
--- a/types/codemirror/codemirror-showhint.d.ts
+++ b/types/codemirror/codemirror-showhint.d.ts
@@ -76,7 +76,3 @@ declare module "codemirror" {
         hintOptions?: ShowHintOptions;
     }
 }
-
-declare module "codemirror/addon/hint/show-hint" {
-    export = CodeMirror;
-}

From 292d857e3d18ec95303cd821904ab161e13c8830 Mon Sep 17 00:00:00 2001
From: Dimitri Benin <dimitri.benin@gmail.com>
Date: Wed, 21 Nov 2018 18:48:20 +0100
Subject: [PATCH 163/836] fix review issues

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

diff --git a/types/dicer/index.d.ts b/types/dicer/index.d.ts
index 319768a2cd..55d2c76411 100644
--- a/types/dicer/index.d.ts
+++ b/types/dicer/index.d.ts
@@ -36,7 +36,6 @@ declare class Dicer extends stream.Writable {
      * @param boundary The boundary to use
      */
     setBoundary(boundary: string): void;
-    addListener(event: string, listener: (...args: any[]) => void): this;
     addListener(event: "finish", listener: () => void): this;
     addListener(event: "part", listener: (stream: Dicer.PartStream) => void): this;
     addListener(event: "preamble", listener: (stream: Dicer.PartStream) => void): this;
@@ -46,7 +45,7 @@ declare class Dicer extends stream.Writable {
     addListener(event: "error", listener: (err: Error) => void): this;
     addListener(event: "pipe", listener: (src: stream.Readable) => void): this;
     addListener(event: "unpipe", listener: (src: stream.Readable) => void): this;
-    on(event: string, listener: (...args: any[]) => void): this;
+    addListener(event: string, listener: (...args: any[]) => void): this;
     on(event: "finish", listener: () => void): this;
     on(event: "part", listener: (stream: Dicer.PartStream) => void): this;
     on(event: "preamble", listener: (stream: Dicer.PartStream) => void): this;
@@ -56,7 +55,7 @@ declare class Dicer extends stream.Writable {
     on(event: "error", listener: (err: Error) => void): this;
     on(event: "pipe", listener: (src: stream.Readable) => void): this;
     on(event: "unpipe", listener: (src: stream.Readable) => void): this;
-    once(event: string, listener: (...args: any[]) => void): this;
+    on(event: string, listener: (...args: any[]) => void): this;
     once(event: "finish", listener: () => void): this;
     once(event: "part", listener: (stream: Dicer.PartStream) => void): this;
     once(event: "preamble", listener: (stream: Dicer.PartStream) => void): this;
@@ -66,7 +65,7 @@ declare class Dicer extends stream.Writable {
     once(event: "error", listener: (err: Error) => void): this;
     once(event: "pipe", listener: (src: stream.Readable) => void): this;
     once(event: "unpipe", listener: (src: stream.Readable) => void): this;
-    prependListener(event: string, listener: (...args: any[]) => void): this;
+    once(event: string, listener: (...args: any[]) => void): this;
     prependListener(event: "finish", listener: () => void): this;
     prependListener(event: "part", listener: (stream: Dicer.PartStream) => void): this;
     prependListener(event: "preamble", listener: (stream: Dicer.PartStream) => void): this;
@@ -76,7 +75,7 @@ declare class Dicer extends stream.Writable {
     prependListener(event: "error", listener: (err: Error) => void): this;
     prependListener(event: "pipe", listener: (src: stream.Readable) => void): this;
     prependListener(event: "unpipe", listener: (src: stream.Readable) => void): this;
-    prependOnceListener(event: string, listener: (...args: any[]) => void): this;
+    prependListener(event: string, listener: (...args: any[]) => void): this;
     prependOnceListener(event: "finish", listener: () => void): this;
     prependOnceListener(event: "part", listener: (stream: Dicer.PartStream) => void): this;
     prependOnceListener(event: "preamble", listener: (stream: Dicer.PartStream) => void): this;
@@ -86,7 +85,7 @@ declare class Dicer extends stream.Writable {
     prependOnceListener(event: "error", listener: (err: Error) => void): this;
     prependOnceListener(event: "pipe", listener: (src: stream.Readable) => void): this;
     prependOnceListener(event: "unpipe", listener: (src: stream.Readable) => void): this;
-    removeListener(event: string, listener: (...args: any[]) => void): this;
+    prependOnceListener(event: string, listener: (...args: any[]) => void): this;
     removeListener(event: "finish", listener: () => void): this;
     removeListener(event: "part", listener: (stream: Dicer.PartStream) => void): this;
     removeListener(event: "preamble", listener: (stream: Dicer.PartStream) => void): this;
@@ -96,6 +95,7 @@ declare class Dicer extends stream.Writable {
     removeListener(event: "error", listener: (err: Error) => void): this;
     removeListener(event: "pipe", listener: (src: stream.Readable) => void): this;
     removeListener(event: "unpipe", listener: (src: stream.Readable) => void): this;
+    removeListener(event: string, listener: (...args: any[]) => void): this;
 }
 
 declare namespace Dicer {
@@ -121,47 +121,47 @@ declare namespace Dicer {
      * - on('header', (header: object)) - An object containing the header for this particular part. Each property value is an array of one or more string values.
      */
     interface PartStream extends stream.Readable {
-        addListener(event: string, listener: (...args: any[]) => void): this;
         addListener(event: "header", listener: (header: object) => void): this;
         addListener(event: "close", listener: () => void): this;
         addListener(event: "data", listener: (chunk: Buffer | string) => void): this;
         addListener(event: "end", listener: () => void): this;
         addListener(event: "readable", listener: () => void): this;
         addListener(event: "error", listener: (err: Error) => void): this;
-        on(event: string, listener: (...args: any[]) => void): this;
+        addListener(event: string, listener: (...args: any[]) => void): this;
         on(event: "header", listener: (header: object) => void): this;
         on(event: "close", listener: () => void): this;
         on(event: "data", listener: (chunk: Buffer | string) => void): this;
         on(event: "end", listener: () => void): this;
         on(event: "readable", listener: () => void): this;
         on(event: "error", listener: (err: Error) => void): this;
-        once(event: string, listener: (...args: any[]) => void): this;
+        on(event: string, listener: (...args: any[]) => void): this;
         once(event: "header", listener: (header: object) => void): this;
         once(event: "close", listener: () => void): this;
         once(event: "data", listener: (chunk: Buffer | string) => void): this;
         once(event: "end", listener: () => void): this;
         once(event: "readable", listener: () => void): this;
         once(event: "error", listener: (err: Error) => void): this;
-        prependListener(event: string, listener: (...args: any[]) => void): this;
+        once(event: string, listener: (...args: any[]) => void): this;
         prependListener(event: "header", listener: (header: object) => void): this;
         prependListener(event: "close", listener: () => void): this;
         prependListener(event: "data", listener: (chunk: Buffer | string) => void): this;
         prependListener(event: "end", listener: () => void): this;
         prependListener(event: "readable", listener: () => void): this;
         prependListener(event: "error", listener: (err: Error) => void): this;
-        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
+        prependListener(event: string, listener: (...args: any[]) => void): this;
         prependOnceListener(event: "header", listener: (header: object) => void): this;
         prependOnceListener(event: "close", listener: () => void): this;
         prependOnceListener(event: "data", listener: (chunk: Buffer | string) => void): this;
         prependOnceListener(event: "end", listener: () => void): this;
         prependOnceListener(event: "readable", listener: () => void): this;
         prependOnceListener(event: "error", listener: (err: Error) => void): this;
-        removeListener(event: string, listener: (...args: any[]) => void): this;
+        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
         removeListener(event: "header", listener: (header: object) => void): this;
         removeListener(event: "close", listener: () => void): this;
         removeListener(event: "data", listener: (chunk: Buffer | string) => void): this;
         removeListener(event: "end", listener: () => void): this;
         removeListener(event: "readable", listener: () => void): this;
         removeListener(event: "error", listener: (err: Error) => void): this;
+        removeListener(event: string, listener: (...args: any[]) => void): this;
     }
 }

From f47bf09aa0ea90302508c7a33290091402d87d25 Mon Sep 17 00:00:00 2001
From: Dimitri Benin <dimitri.benin@gmail.com>
Date: Wed, 21 Nov 2018 18:54:35 +0100
Subject: [PATCH 164/836] fix review issues

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

diff --git a/types/stream-to-string/index.d.ts b/types/stream-to-string/index.d.ts
index 89df48b3ff..7bb071b663 100644
--- a/types/stream-to-string/index.d.ts
+++ b/types/stream-to-string/index.d.ts
@@ -7,10 +7,7 @@
 
 export = streamToString;
 
-// tslint:disable:unified-signatures
-
-declare function streamToString(stream: NodeJS.ReadableStream): Promise<string>;
-declare function streamToString(stream: NodeJS.ReadableStream, cb: Callback): Promise<string>;
+declare function streamToString(stream: NodeJS.ReadableStream, cb?: Callback): Promise<string>;
 declare function streamToString(
     stream: NodeJS.ReadableStream,
     enc: string,

From 41fabf6ad3b9fdea68a8510b318bedd27032d218 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Linus=20Unneb=C3=A4ck?= <linus@folkdatorn.se>
Date: Wed, 21 Nov 2018 17:40:34 +0000
Subject: [PATCH 165/836] [simple-oauth2] Fix typing of authorizeURL params

---
 types/simple-oauth2/index.d.ts             | 13 +++++++------
 types/simple-oauth2/simple-oauth2-tests.ts | 12 ++++++++++++
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/types/simple-oauth2/index.d.ts b/types/simple-oauth2/index.d.ts
index 19a1ff2698..8091a56f2d 100644
--- a/types/simple-oauth2/index.d.ts
+++ b/types/simple-oauth2/index.d.ts
@@ -3,13 +3,14 @@
 // Definitions by: Michael Müller <https://github.com/mad-mike>,
 //                 Troy Lamerton <https://github.com/troy-lamerton>
 //                 Martín Rodriguez <https://github.com/netux>
+//                 Linus Unnebäck <https://github.com/LinusU>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.9
 
 /** Creates a new simple-oauth2 client with the passed configuration */
-export function create(options: ModuleOptions): OAuthClient;
+export function create<ClientIdName extends string = 'client_id'>(options: ModuleOptions<ClientIdName>): OAuthClient<ClientIdName>;
 
-export interface ModuleOptions {
+export interface ModuleOptions<ClientIdName extends string = 'client_id'> {
     client: {
         /** Service registered client id. Required. */
         id: string,
@@ -18,7 +19,7 @@ export interface ModuleOptions {
         /** Parameter name used to send the client secret. Default to client_secret. */
         secretParamName?: string,
         /** Parameter name used to send the client id. Default to client_id. */
-        idParamName?: string
+        idParamName?: ClientIdName
     };
     auth: {
         /** String used to set the host to request the tokens to. Required. */
@@ -91,7 +92,7 @@ export interface ClientCredentialTokenConfig {
     scope?: string | string[];
 }
 
-export interface OAuthClient {
+export interface OAuthClient<ClientIdName extends string = 'client_id'> {
     authorizationCode: {
         /**
          * Redirect the user to the autorization page
@@ -99,8 +100,8 @@ export interface OAuthClient {
          */
         authorizeURL(
             params?: {
-                /** A key-value pair where key is ModuleOptions#client.idParamName and the value represents the Client-ID */
-                [ idParamName: string ]: string | undefined
+                /** A string that represents the Client-ID */
+                [key in ClientIdName]?: string
             } & {
                 /** A string that represents the registered application URI where the user is redirected after authentication */
                 redirect_uri?: string,
diff --git a/types/simple-oauth2/simple-oauth2-tests.ts b/types/simple-oauth2/simple-oauth2-tests.ts
index e066ad41c0..c33564b7cd 100644
--- a/types/simple-oauth2/simple-oauth2-tests.ts
+++ b/types/simple-oauth2/simple-oauth2-tests.ts
@@ -17,6 +17,12 @@ const credentials: oauth2lib.ModuleOptions = {
 
 const oauth2 = oauth2lib.create(credentials);
 
+// Test custom `idParamName`
+{
+    const oauth2 = oauth2lib.create({ client: { id: 'x', secret: 'x', idParamName: 'foobar' }, auth: { tokenHost: 'x' } });
+    oauth2.authorizationCode.authorizeURL({ foobar: 'x' });
+}
+
 // #Authorization Code flow
 (async () => {
     // Authorization oauth2 URI
@@ -26,6 +32,12 @@ const oauth2 = oauth2lib.create(credentials);
         state: '<state>'
     });
 
+    oauth2.authorizationCode.authorizeURL({
+        redirect_uri: 'http://localhost:3000/callback',
+        scope: ['<scope1>', '<scope2>'],
+        state: '<state>'
+    });
+
     // Redirect example using Express (see http://expressjs.com/api.html#res.redirect)
     // res.redirect(authorizationUri);
 

From cb3647d767af0964db8616dda47adc4ac0a90f5c Mon Sep 17 00:00:00 2001
From: Erik Christensen <erikchristensen@comcast.net>
Date: Wed, 21 Nov 2018 14:30:25 -0500
Subject: [PATCH 166/836] Added missing methods and properties along with
 result type for CommandCursor

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

diff --git a/types/mongodb/index.d.ts b/types/mongodb/index.d.ts
index ab4d2f4c02..458aef1fc5 100644
--- a/types/mongodb/index.d.ts
+++ b/types/mongodb/index.d.ts
@@ -19,6 +19,7 @@
 //                 Mikael Lirbank <https://github.com/lirbank>
 //                 Hector Ribes <https://github.com/hector7>
 //                 Florian Richter <https://github.com/floric>
+//                 Erik Christensen <https://github.com/erikc5000>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -450,7 +451,7 @@ export class Db extends EventEmitter {
     indexInformation(name: string, options?: { full?: boolean, readPreference?: ReadPreference | string }): Promise<any>;
     indexInformation(name: string, options: { full?: boolean, readPreference?: ReadPreference | string }, callback: MongoCallback<any>): void;
     /** http://mongodb.github.io/node-mongodb-native/3.1/api/Db.html#listCollections */
-    listCollections(filter?: Object, options?: { batchSize?: number, readPreference?: ReadPreference | string }): CommandCursor;
+    listCollections(filter?: Object, options?: { nameOnly?: boolean, batchSize?: number, readPreference?: ReadPreference | string, session?: ClientSession }): CommandCursor;
     /** http://mongodb.github.io/node-mongodb-native/3.1/api/Db.html#profilingInfo */
     /** @deprecated Query the system.profile collection directly. */
     profilingInfo(callback: MongoCallback<any>): void;
@@ -1578,24 +1579,30 @@ export class AggregationCursor<T = Default> extends Readable {
     unwind(field: string): AggregationCursor<T>;
 }
 
+/** http://mongodb.github.io/node-mongodb-native/3.1/api/CommandCursor.html#~resultCallback */
+export type CommandCursorResult = any | void;
 /** http://mongodb.github.io/node-mongodb-native/3.1/api/CommandCursor.html */
 export class CommandCursor extends Readable {
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/CommandCursor.html#hasNext */
+    hasNext(): Promise<CommandCursorResult>;
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/CommandCursor.html#hasNext */
+    hasNext(callback: MongoCallback<CommandCursorResult>): void;
     /** http://mongodb.github.io/node-mongodb-native/3.1/api/CommandCursor.html#batchSize */
     batchSize(value: number): CommandCursor;
     /** http://mongodb.github.io/node-mongodb-native/3.1/api/CommandCursor.html#clone */
     clone(): CommandCursor;
     /** http://mongodb.github.io/node-mongodb-native/3.1/api/CommandCursor.html#close */
-    close(): Promise<AggregationCursorResult>;
-    close(callback: MongoCallback<AggregationCursorResult>): void;
+    close(): Promise<CommandCursorResult>;
+    close(callback: MongoCallback<CommandCursorResult>): void;
     /** http://mongodb.github.io/node-mongodb-native/3.1/api/CommandCursor.html#each */
-    each(callback: MongoCallback<AggregationCursorResult>): void;
+    each(callback: MongoCallback<CommandCursorResult>): void;
     /** http://mongodb.github.io/node-mongodb-native/3.1/api/CommandCursor.html#isClosed */
     isClosed(): boolean;
     /** http://mongodb.github.io/node-mongodb-native/3.1/api/CommandCursor.html#maxTimeMS */
     maxTimeMS(value: number): CommandCursor;
     /** http://mongodb.github.io/node-mongodb-native/3.1/api/CommandCursor.html#next */
-    next(): Promise<AggregationCursorResult>;
-    next(callback: MongoCallback<AggregationCursorResult>): void;
+    next(): Promise<CommandCursorResult>;
+    next(callback: MongoCallback<CommandCursorResult>): void;
     /** http://mongodb.github.io/node-mongodb-native/3.1/api/CommandCursor.html#read */
     read(size: number): string | Buffer | void;
     /** http://mongodb.github.io/node-mongodb-native/3.1/api/CommandCursor.html#rewind */

From 398bd65886d481fdc91a49591a5b18ceab699569 Mon Sep 17 00:00:00 2001
From: Erik Christensen <erikchristensen@comcast.net>
Date: Wed, 21 Nov 2018 14:43:15 -0500
Subject: [PATCH 167/836] Remove inaccurate deprecation warning

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

diff --git a/types/mongodb/index.d.ts b/types/mongodb/index.d.ts
index 458aef1fc5..ca7b331f5b 100644
--- a/types/mongodb/index.d.ts
+++ b/types/mongodb/index.d.ts
@@ -45,10 +45,7 @@ export class MongoClient extends EventEmitter {
     static connect(uri: string, callback: MongoCallback<MongoClient>): void;
     static connect(uri: string, options?: MongoClientOptions): Promise<MongoClient>;
     static connect(uri: string, options: MongoClientOptions, callback: MongoCallback<MongoClient>): void;
-    /**
-     * @deprecated
-     * http://mongodb.github.io/node-mongodb-native/3.1/api/MongoClient.html#connect
-     */
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/MongoClient.html#connect */
     connect(): Promise<MongoClient>;
     connect(callback: MongoCallback<MongoClient>): void;
     /** http://mongodb.github.io/node-mongodb-native/3.1/api/MongoClient.html#close */

From 77435f54949eb4ce6131baf2fb97b9721cc834f4 Mon Sep 17 00:00:00 2001
From: Marc LaFleur <marcla@microsoft.com>
Date: Wed, 21 Nov 2018 15:19:54 -0500
Subject: [PATCH 168/836] Fleshed out NewmanRunExecutionAssertionError

Added several missing properties to the NewmanRunExecutionAssertionError interface
---
 types/newman/index.d.ts | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/types/newman/index.d.ts b/types/newman/index.d.ts
index cd2801c375..440e89284c 100644
--- a/types/newman/index.d.ts
+++ b/types/newman/index.d.ts
@@ -168,9 +168,12 @@ export interface NewmanRunExecutionAssertion {
     error: NewmanRunExecutionAssertionError;
 }
 export interface NewmanRunExecutionAssertionError {
+    name: string;
+    index: number;
+    test: string;
     message: string;
-}
-export interface NewmanRunFailure {
+    stack: string;
+}export interface NewmanRunFailure {
     error: NewmanRunExecutionAssertionError;
     /** The event where the failure occurred */
     at: string;

From a57ef63d3cb13e22b83b61784a7e35e0702863dd Mon Sep 17 00:00:00 2001
From: Erik Christensen <erikchristensen@comcast.net>
Date: Wed, 21 Nov 2018 15:21:03 -0500
Subject: [PATCH 169/836] Added missing index spec and collation document
 interfaces

---
 types/mongodb/index.d.ts | 50 ++++++++++++++++++++++++++++++++++------
 1 file changed, 43 insertions(+), 7 deletions(-)

diff --git a/types/mongodb/index.d.ts b/types/mongodb/index.d.ts
index ca7b331f5b..a217b0a605 100644
--- a/types/mongodb/index.d.ts
+++ b/types/mongodb/index.d.ts
@@ -655,9 +655,9 @@ export interface Collection<TSchema = Default> {
     createIndex(fieldOrSpec: string | any, options?: IndexOptions): Promise<string>;
     createIndex(fieldOrSpec: string | any, options: IndexOptions, callback: MongoCallback<string>): void;
     /** http://mongodb.github.io/node-mongodb-native/3.1/api/Collection.html#createIndexes and  http://docs.mongodb.org/manual/reference/command/createIndexes/ */
-    createIndexes(indexSpecs: Object[], callback: MongoCallback<any>): void;
-    createIndexes(indexSpecs: Object[], options?: { session?: ClientSession }): Promise<any>;
-    createIndexes(indexSpecs: Object[], options: { session?: ClientSession }, callback: MongoCallback<any>): void;
+    createIndexes(indexSpecs: IndexSpecification[], callback: MongoCallback<any>): void;
+    createIndexes(indexSpecs: IndexSpecification[], options?: { session?: ClientSession }): Promise<any>;
+    createIndexes(indexSpecs: IndexSpecification[], options: { session?: ClientSession }, callback: MongoCallback<any>): void;
     /** http://mongodb.github.io/node-mongodb-native/3.1/api/Collection.html#deleteMany */
     deleteMany(filter: FilterQuery<TSchema>, callback: MongoCallback<DeleteWriteOpResultObject>): void;
     deleteMany(filter: FilterQuery<TSchema>, options?: CommonOptions): Promise<DeleteWriteOpResultObject>;
@@ -1074,7 +1074,7 @@ export interface CollectionAggregationOptions {
     promoteLongs?: boolean;
     promoteValues?: boolean;
     promoteBuffers?: boolean;
-    collation?: Object;
+    collation?: CollationDocument;
     comment?: string
     session?: ClientSession;
 
@@ -1311,7 +1311,7 @@ export interface FindOneOptions {
     readPreference?: ReadPreference | string;
     partial?: boolean;
     maxTimeMs?: number;
-    collation?: Object;
+    collation?: CollationDocument;
     session?: ClientSession;
 }
 
@@ -1430,7 +1430,7 @@ export class Cursor<T = Default> extends Readable {
     close(): Promise<CursorResult>;
     close(callback: MongoCallback<CursorResult>): void;
     /** http://mongodb.github.io/node-mongodb-native/3.1/api/Cursor.html#collation */
-    collation(value: Object): Cursor<T>;
+    collation(value: CollationDocument): Cursor<T>;
     /** http://mongodb.github.io/node-mongodb-native/3.1/api/Cursor.html#comment */
     comment(value: string): Cursor<T>;
     /** http://mongodb.github.io/node-mongodb-native/3.1/api/Cursor.html#count */
@@ -1729,7 +1729,7 @@ export interface ChangeStreamOptions {
     maxAwaitTimeMS?: number;
     resumeAfter?: Object;
     batchSize?: number;
-    collation?: Object;
+    collation?: CollationDocument;
     readPreference?: ReadPreference;
 }
 
@@ -1780,3 +1780,39 @@ export class Logger {
     // Set the current log level
     static setLevel(level: string): void
 }
+
+/** https://docs.mongodb.com/manual/reference/collation/#collation-document-fields */
+export interface CollationDocument {
+    locale: string;
+    strength?: number;
+    caseLevel?: boolean;
+    caseFirst?: boolean;
+    numericOrdering?: boolean;
+    alternate?: string;
+    maxVariable?: string;
+    backwards?: boolean;
+    normalization?: boolean;
+
+}
+
+/** https://docs.mongodb.com/manual/reference/command/createIndexes/ */
+export interface IndexSpecification {
+    key: object;
+    name?: string;
+    background?: boolean;
+    unique?: boolean;
+    partialFilterExpression?: object;
+    sparse?: boolean;
+    expireAfterSeconds?: number;
+    storageEngine?: object;
+    weights?: object;
+    default_language?: string;
+    language_override?: string;
+    textIndexVersion?: number;
+    '2dsphereIndexVersion'?: number;
+    bits?: number;
+    min?: number;
+    max?: number;
+    bucketSize?: number;
+    collation?: CollationDocument;
+}

From 288c389f75701aab929c6cc09d01b40c855e9d28 Mon Sep 17 00:00:00 2001
From: Marc LaFleur <marcla@microsoft.com>
Date: Wed, 21 Nov 2018 15:25:57 -0500
Subject: [PATCH 170/836] Bumped version

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

diff --git a/types/newman/index.d.ts b/types/newman/index.d.ts
index 440e89284c..7bd7aef744 100644
--- a/types/newman/index.d.ts
+++ b/types/newman/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for newman 3.10
+// Type definitions for newman 3.11
 // Project: https://github.com/postmanlabs/newman
 // Definitions by: Leonid Logvinov <https://github.com/LogvinovLeon>
 //                 Graham McGregor <https://github.com/Graham42>

From f6a44f54c73a0b255e7b36a1953824e518165996 Mon Sep 17 00:00:00 2001
From: IanStorm <IanStorm28@outlook.com>
Date: Wed, 21 Nov 2018 22:04:54 +0100
Subject: [PATCH 171/836] * Added "test" for instantiating `ListStream` without
 `new` * Added "test" for using `write` on a `ListStream` instance

---
 types/list-stream/index.d.ts           | 17 +++++++++++------
 types/list-stream/list-stream-tests.ts | 17 +++++++++++++++++
 2 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/types/list-stream/index.d.ts b/types/list-stream/index.d.ts
index 226d4c09ab..b51c9bacb0 100644
--- a/types/list-stream/index.d.ts
+++ b/types/list-stream/index.d.ts
@@ -7,16 +7,21 @@
 
 import { Duplex, DuplexOptions } from "stream";
 
-declare namespace ListStream {
+interface ListStreamMethod {
+    (callback?: (err: Error, data: any[]) => void): ListStream;
+    (options?: DuplexOptions, callback?: (err: Error, data: any[]) => void): ListStream;
 }
 
-declare class ListStream extends Duplex {
-    constructor(callback?: (err: Error, data: any[]) => void);
-    constructor(options?: DuplexOptions, callback?: (err: Error, data: any[]) => void);
+interface ListStreamConstructor extends ListStreamMethod {
+    new(callback?: (err: Error, data: any[]) => void): ListStream;
+    new(options?: DuplexOptions, callback?: (err: Error, data: any[]) => void): ListStream;
 
-    static obj(callback?: (err: Error, data: any[]) => void): ListStream;
-    static obj(options?: DuplexOptions, callback?: (err: Error, data: any[]) => void): ListStream;
+    obj: ListStreamMethod;
+}
 
+declare let ListStream: ListStreamConstructor;
+
+interface ListStream extends Duplex {
     append(chunk: any): void;
     duplicate(): ListStream;
     end(): void;
diff --git a/types/list-stream/list-stream-tests.ts b/types/list-stream/list-stream-tests.ts
index 4b7fc2a6ab..5f04626b31 100644
--- a/types/list-stream/list-stream-tests.ts
+++ b/types/list-stream/list-stream-tests.ts
@@ -4,6 +4,20 @@ let chunk: any = "chunk";
 let listStream: ListStream;
 let num = 1;
 
+listStream = ListStream((err: Error, data: any[]) => {
+    if (err) { throw err; }
+    console.log(data.length);
+    for (const date of data) {
+        console.log(date);
+    }
+});
+listStream = ListStream({ objectMode: true }, (err: Error, data: any[]) => {
+    if (err) { throw err; }
+    console.log(data.length);
+    for (const date of data) {
+        console.log(date);
+    }
+});
 listStream = new ListStream((err: Error, data: any[]) => {
     if (err) { throw err; }
     console.log(data.length);
@@ -26,6 +40,9 @@ listStream = ListStream.obj((err: Error, data: any[]) => {
     }
 });
 
+listStream = ListStream.obj();
+listStream.write({ key: "value" });
+
 listStream.append(chunk);
 
 listStream = listStream.duplicate();

From a72081e2b5cdc37d2e47acec4b1526250093575a Mon Sep 17 00:00:00 2001
From: Peter Safranek <pe8ter@mac.com>
Date: Wed, 21 Nov 2018 15:07:50 -0800
Subject: [PATCH 172/836] [gulp-json-validator] Introduce typings for
 gulp-json-validator

---
 .../gulp-json-validator-tests.ts              |  6 +++++
 types/gulp-json-validator/index.d.ts          | 14 +++++++++++
 types/gulp-json-validator/tsconfig.json       | 23 +++++++++++++++++++
 types/gulp-json-validator/tslint.json         |  6 +++++
 4 files changed, 49 insertions(+)
 create mode 100644 types/gulp-json-validator/gulp-json-validator-tests.ts
 create mode 100644 types/gulp-json-validator/index.d.ts
 create mode 100644 types/gulp-json-validator/tsconfig.json
 create mode 100644 types/gulp-json-validator/tslint.json

diff --git a/types/gulp-json-validator/gulp-json-validator-tests.ts b/types/gulp-json-validator/gulp-json-validator-tests.ts
new file mode 100644
index 0000000000..74a00f03da
--- /dev/null
+++ b/types/gulp-json-validator/gulp-json-validator-tests.ts
@@ -0,0 +1,6 @@
+import gulpJsonValidator = require("gulp-json-validator");
+
+gulpJsonValidator(); // $ExpectType ReadWriteStream
+gulpJsonValidator({}); // $ExpectType ReadWriteStream
+gulpJsonValidator({ allowDuplicatedKeys: true }); // $ExpectType ReadWriteStream
+gulpJsonValidator({ allowDuplicatedKeys: false }); // $ExpectType ReadWriteStream
diff --git a/types/gulp-json-validator/index.d.ts b/types/gulp-json-validator/index.d.ts
new file mode 100644
index 0000000000..26e31d8b43
--- /dev/null
+++ b/types/gulp-json-validator/index.d.ts
@@ -0,0 +1,14 @@
+// Type definitions for gulp-json-validator 1.2
+// Project: https://github.com/jackyjieliu/gulp-json-validator
+// Definitions by: Peter Safranek <https://github.com/pe8ter>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+interface GulpJsonValidatorOptions {
+    allowDuplicatedKeys?: boolean;
+}
+
+declare function gulpJsonValidator(option?: GulpJsonValidatorOptions): NodeJS.ReadWriteStream;
+
+export = gulpJsonValidator;
diff --git a/types/gulp-json-validator/tsconfig.json b/types/gulp-json-validator/tsconfig.json
new file mode 100644
index 0000000000..76ee50c184
--- /dev/null
+++ b/types/gulp-json-validator/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "gulp-json-validator-tests.ts"
+    ]
+}
diff --git a/types/gulp-json-validator/tslint.json b/types/gulp-json-validator/tslint.json
new file mode 100644
index 0000000000..702f9354fc
--- /dev/null
+++ b/types/gulp-json-validator/tslint.json
@@ -0,0 +1,6 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "file-name-casing": false
+    }
+}

From 8734181e0caf193d3eb8bc65847d23c9b89e9ac3 Mon Sep 17 00:00:00 2001
From: Adam Binford <adam.binford@radiantsolutions.com>
Date: Wed, 21 Nov 2018 18:12:23 -0500
Subject: [PATCH 173/836] react-leaflet-markercluster: Use reference import

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

diff --git a/types/react-leaflet-markercluster/index.d.ts b/types/react-leaflet-markercluster/index.d.ts
index 989605f27c..5db583d409 100644
--- a/types/react-leaflet-markercluster/index.d.ts
+++ b/types/react-leaflet-markercluster/index.d.ts
@@ -4,7 +4,7 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 
-import 'leaflet.markercluster';
+/// <reference types="leaflet.markercluster" />
 import * as Leaflet from 'leaflet';
 import * as ReactLeaflet from 'react-leaflet';
 

From fd336a9567db83817d54ea8603aeee180d8f9d08 Mon Sep 17 00:00:00 2001
From: Adam Lavin <adam@socrates.systems>
Date: Thu, 22 Nov 2018 00:01:22 +0000
Subject: [PATCH 174/836] styled-system: Remove all type exports, and pull in
 values from csstype

---
 types/styled-system/dist/space.d.ts  |  35 +-
 types/styled-system/dist/styles.d.ts | 471 ++++++---------------------
 types/styled-system/package.json     |   6 +
 3 files changed, 127 insertions(+), 385 deletions(-)
 create mode 100644 types/styled-system/package.json

diff --git a/types/styled-system/dist/space.d.ts b/types/styled-system/dist/space.d.ts
index 9165ff39a7..9632ed7e45 100644
--- a/types/styled-system/dist/space.d.ts
+++ b/types/styled-system/dist/space.d.ts
@@ -1,7 +1,7 @@
+import * as CSS from 'csstype';
+export type TLengthStyledSystem = string | 0 | number;
 export type ResponsiveValue<T> = T | Array<T | null>;
 
-export type SpaceValue = number | string;
-
 /**
  * Converts shorthand margin and padding props to margin and padding CSS declarations
  *
@@ -11,37 +11,36 @@ export type SpaceValue = number | string;
  * - String values are passed as raw CSS values.
  * - Array values are converted into responsive values.
  */
-export type ResponsiveSpaceValue = ResponsiveValue<SpaceValue>;
 
-export interface SpaceProps {
+export interface SpaceProps<TLength = TLengthStyledSystem> {
     /** Margin on top, left, bottom and right */
-    m?: ResponsiveSpaceValue;
+    m?: ResponsiveValue<CSS.MarginProperty<TLength>>;
     /** Margin for the top */
-    mt?: ResponsiveSpaceValue;
+    mt?: ResponsiveValue<CSS.MarginTopProperty<TLength>>;
     /** Margin for the right */
-    mr?: ResponsiveSpaceValue;
+    mr?: ResponsiveValue<CSS.MarginRightProperty<TLength>>;
     /** Margin for the bottom */
-    mb?: ResponsiveSpaceValue;
+    mb?: ResponsiveValue<CSS.MarginBottomProperty<TLength>>;
     /** Margin for the left */
-    ml?: ResponsiveSpaceValue;
+    ml?: ResponsiveValue<CSS.MarginLeftProperty<TLength>>;
     /** Margin for the left and right */
-    mx?: ResponsiveSpaceValue;
+    mx?: ResponsiveValue<CSS.PaddingProperty<TLength>>;
     /** Margin for the top and bottom */
-    my?: ResponsiveSpaceValue;
+    my?: ResponsiveValue<CSS.PaddingProperty<TLength>>;
     /** Padding on top, left, bottom and right */
-    p?: ResponsiveSpaceValue;
+    p?: ResponsiveValue<CSS.PaddingProperty<TLength>>;
     /** Padding for the top */
-    pt?: ResponsiveSpaceValue;
+    pt?: ResponsiveValue<CSS.PaddingTopProperty<TLength>>;
     /** Padding for the right */
-    pr?: ResponsiveSpaceValue;
+    pr?: ResponsiveValue<CSS.PaddingRightProperty<TLength>>;
     /** Padding for the bottom */
-    pb?: ResponsiveSpaceValue;
+    pb?: ResponsiveValue<CSS.PaddingBottomProperty<TLength>>;
     /** Padding for the left */
-    pl?: ResponsiveSpaceValue;
+    pl?: ResponsiveValue<CSS.PaddingLeftProperty<TLength>>;
     /** Padding for the left and right */
-    px?: ResponsiveSpaceValue;
+    px?: ResponsiveValue<CSS.PaddingProperty<TLength>>;
     /** Padding for the top and bottom */
-    py?: ResponsiveSpaceValue;
+    py?: ResponsiveValue<CSS.PaddingProperty<TLength>>;
 }
 
 export function space(...args: any[]): any;
diff --git a/types/styled-system/dist/styles.d.ts b/types/styled-system/dist/styles.d.ts
index a06a923d11..59f8077ec9 100644
--- a/types/styled-system/dist/styles.d.ts
+++ b/types/styled-system/dist/styles.d.ts
@@ -1,9 +1,8 @@
-import { ResponsiveValue, ResponsiveSpaceValue, SpaceValue } from './space';
+import * as CSS from 'csstype';
+import { ResponsiveValue, TLengthStyledSystem } from './space';
 
 export * from './space';
 
-export type GlobalStyleValues = "inherit" | "initial" | "unset";
-
 export interface BaseTheme {
     breakpoints?: number[];
     space?: number[];
@@ -17,10 +16,7 @@ export interface BaseTheme {
  * Font Size
  */
 
-export type FontSizeValue = number | string;
-export type ResponsiveFontSizeValue = ResponsiveValue<FontSizeValue>;
-
-export interface FontSizeProps {
+export interface FontSizeProps<TLength = TLengthStyledSystem> {
     /**
      * The fontSize utility parses a component's `fontSize` prop and converts it into a CSS font-size declaration.
      *
@@ -30,7 +26,7 @@ export interface FontSizeProps {
      * - And array values are converted into responsive values.
      *
      */
-    fontSize?: ResponsiveFontSizeValue;
+    fontSize?: ResponsiveValue<CSS.FontSizeProperty<TLength>>;
 }
 
 export function fontSize(...args: any[]): any;
@@ -38,8 +34,6 @@ export function fontSize(...args: any[]): any;
 /**
  * Color
  */
-export type ColorValue = string;
-export type ResponsiveColorValue = ResponsiveValue<ColorValue>;
 
 export interface TextColorProps {
     /**
@@ -51,12 +45,12 @@ export interface TextColorProps {
      *
      * [MDN reference](https://developer.mozilla.org/en-US/docs/Web/CSS/color)
      */
-    color?: ResponsiveColorValue;
+    color?: ResponsiveValue<CSS.ColorProperty>;
 }
 
 export function textColor(...args: any[]): any;
 
-export interface BgColorProps {
+export interface BgColorProps<TLength = TLengthStyledSystem> {
     /**
      * The color utility parses a component's `color` and `bg` props and converts them into CSS declarations.
      * By default the raw value of the prop is returned.
@@ -66,7 +60,7 @@ export interface BgColorProps {
      *
      * [MDN Reference](https://developer.mozilla.org/en-US/docs/Web/CSS/background-color)
      */
-    bg?: ResponsiveColorValue;
+    bg?: ResponsiveValue<CSS.BackgroundProperty<TLength>>;
 }
 
 export function bgColor(...args: any[]): any;
@@ -78,39 +72,23 @@ export function color(...args: any[]): any;
 /**
  * Typography
  */
-export type TypographyValue = string;
-export type ResponsiveTypographyValue = ResponsiveValue<TypographyValue>;
-
 export interface FontFamilyProps {
-    fontFamily?: ResponsiveTypographyValue;
+    fontFamily?: ResponsiveValue<CSS.FontFamilyProperty>;
 }
 export function fontFamily(...args: any[]): any;
 
-export type TextAlignValue =
-    | "left"
-    | "right"
-    | "center"
-    | "justify"
-    | "justify-all"
-    | "start"
-    | "end"
-    | "match-parent";
-export type ResponsiveTextAlignValue = ResponsiveValue<TextAlignValue>;
-
 export interface TextAlignProps {
     /**
      * The text-align CSS property specifies the horizontal alignment of an inline or table-cell box.
      *
      * [MDN reference](https://developer.mozilla.org/en-US/docs/Web/CSS/text-align)
      */
-    textAlign?: ResponsiveTextAlignValue;
+    textAlign?: ResponsiveValue<CSS.TextAlignProperty>;
 }
 
 export function textAlign(...args: any[]): any;
 
-export type LineHeightValue = number | string;
-export type ResponsiveLineHeightValue = ResponsiveValue<LineHeightValue>;
-export interface LineHeightProps {
+export interface LineHeightProps<TLength = TLengthStyledSystem> {
     /**
      * The line-height CSS property sets the amount of space used for lines, such as in text. On block-level elements,
      * it specifies the minimum height of line boxes within the element.
@@ -119,19 +97,10 @@ export interface LineHeightProps {
      *
      * [MDN reference](https://developer.mozilla.org/en-US/docs/Web/CSS/line-height)
      */
-    lineHeight?: ResponsiveLineHeightValue;
+    lineHeight?: ResponsiveValue<CSS.LineHeightProperty<TLength>>;
 }
 export function lineHeight(...args: any[]): any;
 
-export type FontWeightValue =
-    | GlobalStyleValues
-    | "normal"
-    | "bold"
-    | "lighter"
-    | "bolder"
-    | number;
-export type ResponsiveFontWeightValue = ResponsiveValue<FontWeightValue>;
-
 export interface FontWeightProps {
     /**
      * The font-weight CSS property specifies the weight (or boldness) of the font.
@@ -140,13 +109,11 @@ export interface FontWeightProps {
      *
      * [MDN reference](https://developer.mozilla.org/en-US/docs/Web/CSS/font-weight)
      */
-    fontWeight?: ResponsiveFontWeightValue;
+    fontWeight?: ResponsiveValue<CSS.FontWeightProperty>;
 }
 
 export function fontWeight(...args: any[]): any;
 
-export type FontStyleValue = string;
-export type ResponsiveFontStyleValue = ResponsiveValue<FontStyleValue>;
 export interface FontStyleProps {
     /**
      * The font-style CSS property specifies whether a font should be styled with a normal, italic,
@@ -154,19 +121,17 @@ export interface FontStyleProps {
      *
      * [MDN reference](https://developer.mozilla.org/en-US/docs/Web/CSS/font-style)
      */
-    fontStyle?: ResponsiveFontStyleValue;
+    fontStyle?: ResponsiveValue<CSS.FontStyleProperty>;
 }
 export function fontStyle(...args: any[]): any;
 
-export type LetterSpacingValue = number | string;
-export type ResponsiveLetterSpacingValue = ResponsiveValue<LetterSpacingValue>;
-export interface LetterSpacingProps {
+export interface LetterSpacingProps<TLength = TLengthStyledSystem> {
     /**
      * The letter-spacing CSS property sets the spacing behavior between text characters.
      *
      * [MDN reference](https://developer.mozilla.org/en-US/docs/Web/CSS/letter-spacing)
      */
-    letterSpacing?: ResponsiveLetterSpacingValue;
+    letterSpacing?: ResponsiveValue<CSS.LetterSpacingProperty<TLength>>;
 }
 export function letterSpacing(...args: any[]): any;
 
@@ -174,15 +139,6 @@ export function letterSpacing(...args: any[]): any;
  * Layout
  */
 
-export type DisplayValue =
-    | "none"
-    | "inline"
-    | "block"
-    | "contents"
-    | "flex"
-    | "grid"
-    | "inline-block";
-export type ResponsiveDisplayValue = ResponsiveValue<DisplayValue>;
 export interface DisplayProps {
     /**
      * The display CSS property defines the display type of an element, which consists of the two basic qualities
@@ -191,36 +147,36 @@ export interface DisplayProps {
      *
      * [MDN reference](https://developer.mozilla.org/en-US/docs/Web/CSS/display)
      */
-    display?: ResponsiveDisplayValue;
+    display?: ResponsiveValue<CSS.DisplayProperty>;
 }
 
 export function display(...args: any[]): any;
 
-export interface MaxWidthProps {
+export interface MaxWidthProps<TLength = TLengthStyledSystem> {
     /**
      * The max-width CSS property sets the maximum width of an element.
      * It prevents the used value of the width property from becoming larger than the value specified by max-width.
      *
      * [MDN reference](https://developer.mozilla.org/en-US/docs/Web/CSS/max-width)
      */
-    maxWidth?: ResponsiveSpaceValue;
+    maxWidth?: ResponsiveValue<CSS.MaxWidthProperty<TLength>>;
 }
 
 export function maxWidth(...args: any[]): any;
 
-export interface MinWidthProps {
+export interface MinWidthProps<TLength = TLengthStyledSystem> {
     /**
      * The min-width CSS property sets the minimum width of an element.
      * It prevents the used value of the width property from becoming smaller than the value specified for min-width.
      *
      * [MDN reference](https://developer.mozilla.org/en-US/docs/Web/CSS/min-width)
      */
-    minWidth?: ResponsiveSpaceValue;
+    minWidth?: ResponsiveValue<CSS.MinWidthProperty<TLength>>;
 }
 
 export function minWidth(...args: any[]): any;
 
-export interface WidthProps {
+export interface WidthProps<TLength = TLengthStyledSystem> {
     /**
      *   The width utility parses a component's `width` prop and converts it into a CSS width declaration.
      *
@@ -229,57 +185,57 @@ export interface WidthProps {
      *   - String values are passed as raw CSS values.
      *   - And arrays are converted to responsive width styles.
      */
-    width?: ResponsiveSpaceValue;
+    width?: ResponsiveValue<CSS.WidthProperty<TLength>>;
 }
 
 export function width(...args: any[]): any;
 
-export interface MaxHeightProps {
+export interface MaxHeightProps<TLength = TLengthStyledSystem> {
     /**
      * The max-height CSS property sets the maximum height of an element. It prevents the used value of the height
      * property from becoming larger than the value specified for max-height.
      *
      * [MDN reference](https://developer.mozilla.org/en-US/docs/Web/CSS/max-height)
      */
-    maxHeight?: ResponsiveSpaceValue;
+    maxHeight?: ResponsiveValue<CSS.MaxHeightProperty<TLength>>;
 }
 
 export function maxHeight(...args: any[]): any;
 
-export interface MinHeightProps {
+export interface MinHeightProps<TLength = TLengthStyledSystem> {
     /**
      * The min-height CSS property sets the minimum height of an element. It prevents the used value of the height
      * property from becoming smaller than the value specified for min-height.
      *
      * [MDN reference](https://developer.mozilla.org/en-US/docs/Web/CSS/display)
      */
-    minHeight?: ResponsiveSpaceValue;
+    minHeight?: ResponsiveValue<CSS.MinHeightProperty<TLength>>;
 }
 
 export function minHeight(...args: any[]): any;
 
-export interface HeightProps {
+export interface HeightProps<TLength = TLengthStyledSystem> {
     /**
      * The height CSS property specifies the height of an element. By default, the property defines the height of the
      * content area. If box-sizing is set to border-box, however, it instead determines the height of the border area.
      *
      * [MDN reference](https://developer.mozilla.org/en-US/docs/Web/CSS/height)
      */
-    height?: ResponsiveSpaceValue;
+    height?: ResponsiveValue<CSS.HeightProperty<TLength>>;
 }
 
 export function height(...args: any[]): any;
 
 // TODO: Document, I couldn't find any info on these two properties...
 
-export interface SizeWidthProps {
-    size?: ResponsiveSpaceValue;
+export interface SizeWidthProps<TLength = TLengthStyledSystem> {
+    size?: ResponsiveValue<CSS.WidthProperty<TLength>>;
 }
 
 export function sizeWidth(...args: any[]): any;
 
-export interface SizeHeightProps {
-    size?: ResponsiveSpaceValue;
+export interface SizeHeightProps<TLength = TLengthStyledSystem> {
+    size?: ResponsiveValue<CSS.HeightProperty<TLength>>;
 }
 
 export function sizeHeight(...args: any[]): any;
@@ -288,38 +244,22 @@ export interface SizeProps extends SizeHeightProps, SizeWidthProps {}
 
 export function size(...args: any[]): any;
 
-export type RatioValue = SpaceValue;
-export type ResponsiveRatioValue = ResponsiveValue<RatioValue>;
-
 export interface RatioProps {
     /**
      * The ration is height: 0 & paddingBottom
      */
-    ratio?: ResponsiveRatioValue;
+    ratio?: ResponsiveValue<number>;
 }
 
 export function ratio(...args: any[]): any;
 
-export type VerticalAlignValue =
-    | "baseline"
-    | "sub"
-    | "super"
-    | "text-top"
-    | "text-bottom"
-    | "middle"
-    | "top"
-    | "bottom"
-    | string
-    | number;
-export type ResponsiveVerticalAlignValue = ResponsiveValue<VerticalAlignValue>;
-
-export interface VerticalAlignProps {
+export interface VerticalAlignProps<TLength = TLengthStyledSystem> {
     /**
      * The vertical-align CSS property specifies sets vertical alignment of an inline or table-cell box.
      *
      * [MDN reference](https://developer.mozilla.org/en-US/docs/Web/CSS/vertical-align)
      */
-    verticalAlign?: ResponsiveVerticalAlignValue;
+    verticalAlign?: ResponsiveValue<CSS.VerticalAlignProperty<TLength>>;
 }
 
 export function verticalAlign(...args: any[]): any;
@@ -328,25 +268,6 @@ export function verticalAlign(...args: any[]): any;
  * Flexbox
  */
 
-export type AlignItemsValue =
-    | "normal"
-    | "stretch"
-    | "center"
-    | "start"
-    | "end"
-    | "flex-start"
-    | "flex-end"
-    | "self-start"
-    | "self-end"
-    | "left"
-    | "right"
-    | "baseline"
-    | "first baseline"
-    | "last baseline"
-    | "safe center"
-    | "unsafe center";
-export type ResponsiveAlignItemsValue = ResponsiveValue<AlignItemsValue>;
-
 export interface AlignItemsProps {
     /**
      * The CSS align-items property sets the align-self value on all direct children as a group. The align-self
@@ -357,30 +278,11 @@ export interface AlignItemsProps {
      *
      * [MDN reference](https://developer.mozilla.org/en-US/docs/Web/CSS/align-items)
      */
-    alignItems?: ResponsiveAlignItemsValue;
+    alignItems?: ResponsiveValue<CSS.AlignItemsProperty>;
 }
 
 export function alignItems(...args: any[]): any;
 
-export type AlignContentValue =
-    | GlobalStyleValues
-    | "center"
-    | "start"
-    | "end"
-    | "flex-start"
-    | "flex-end"
-    | "normal"
-    | "baseline"
-    | "first baseline"
-    | "last baseline"
-    | "space-between"
-    | "space-around"
-    | "space-evenly"
-    | "stretch"
-    | "safe center"
-    | "unsafe center";
-export type ResponsiveAlignContentValue = ResponsiveValue<AlignContentValue>;
-
 export interface AlignContentProps {
     /**
      * The CSS align-content property sets how the browser distributes space between and around content items
@@ -388,14 +290,11 @@ export interface AlignContentProps {
      *
      * [MDN reference](https://developer.mozilla.org/en-US/docs/Web/CSS/align-content)
      */
-    alignContent?: ResponsiveAlignContentValue;
+    alignContent?: ResponsiveValue<CSS.AlignContentProperty>;
 }
 
 export function alignContent(...args: any[]): any;
 
-export type JustifyItemsValue = string;
-export type ResponsiveJustifyItemsValue = ResponsiveValue<JustifyItemsValue>;
-
 export interface JustifyItemsProps {
     /**
      * The CSS justify-items property defines the default justify-self for all items of the box, giving them all
@@ -403,30 +302,9 @@ export interface JustifyItemsProps {
      *
      * [MDN reference](https://developer.mozilla.org/en-US/docs/Web/CSS/justify-items)
      */
-    justifyItems?: ResponsiveJustifyItemsValue;
+    justifyItems?: ResponsiveValue<CSS.JustifyItemsProperty>;
 }
 
-export type JustifyContentValue =
-    | "center"
-    | "start"
-    | "end"
-    | "flex-start"
-    | "flex-end"
-    | "left"
-    | "right"
-    | "baseline"
-    | "first baseline"
-    | "last baseline"
-    | "space-between"
-    | "space-around"
-    | "space-evenly"
-    | "stretch"
-    | "safe center"
-    | "unsafe center";
-export type ResponsiveJustifyContentValue = ResponsiveValue<
-    JustifyContentValue
->;
-
 export interface JustifyContentProps {
     /**
      * The CSS justify-content property defines how the browser distributes space between and around content items
@@ -434,14 +312,11 @@ export interface JustifyContentProps {
      *
      * [MDN reference](https://developer.mozilla.org/en-US/docs/Web/CSS/justify-content)
      */
-    justifyContent?: ResponsiveJustifyContentValue;
+    justifyContent?: ResponsiveValue<CSS.JustifyContentProperty>;
 }
 
 export function justifyContent(...args: any[]): any;
 
-export type FlexWrapValue = "nowrap" | "wrap" | "wrap-reverse";
-export type ResponsiveFlexWrapValue = ResponsiveValue<FlexWrapValue>;
-
 export interface FlexWrapProps {
     /**
      * The flex-wrap CSS property sets whether flex items are forced onto one line or can wrap onto multiple lines.
@@ -449,40 +324,21 @@ export interface FlexWrapProps {
      *
      * [MDN reference](https://developer.mozilla.org/en-US/docs/Web/CSS/flex-wrap)
      */
-    flexWrap?: ResponsiveFlexWrapValue;
+    flexWrap?: ResponsiveValue<CSS.FlexWrapProperty>;
 }
 
 export function flexWrap(...args: any[]): any;
 
-export type FlexBasisValue =
-    | GlobalStyleValues
-    | "auto"
-    | "fill"
-    | "max-content"
-    | "min-content"
-    | "fit-content"
-    | "content";
-export type ResponsiveFlexBasisValue = ResponsiveValue<FlexBasisValue>;
-
-export interface FlexBasisProps {
+export interface FlexBasisProps<TLength = TLengthStyledSystem> {
     // TODO: The FlexBasisValue currently really only exists for documentation
     //       purposes, because flex-basis also accepts `Nem` and `Npx` strings.
     //       Not sure there’s a way to still have the union values show up as
     //       auto-completion results.
-    flexBasis?: ResponsiveFlexBasisValue | string;
+    flexBasis?: ResponsiveValue<CSS.FlexBasisProperty<TLength>>;
 }
 
 export function flexBasis(...args: any[]): any;
 
-export type FlexDirectionValue =
-    | GlobalStyleValues
-    | "row"
-    | "row-reverse"
-    | "column"
-    | "column-reverse";
-
-export type ResponsiveFlexDirectionValue = ResponsiveValue<FlexDirectionValue>;
-
 export interface FlexDirectionProps {
     /**
      * The flex-direction CSS property specifies how flex items are placed in the flex container defining the main
@@ -490,48 +346,23 @@ export interface FlexDirectionProps {
      *
      * [MDN reference](https://developer.mozilla.org/en-US/docs/Web/CSS/flex-direction)
      */
-    flexDirection?: ResponsiveFlexDirectionValue;
+    flexDirection?: ResponsiveValue<CSS.FlexDirectionProperty>;
 }
 
 export function flexDirection(...args: any[]): any;
 
-export type FlexValue = number | string;
-export type ResponsiveFlexValue = ResponsiveValue<FlexValue>;
-
-export interface FlexProps {
+export interface FlexProps<TLength = TLengthStyledSystem> {
     /**
      * The flex CSS property specifies how a flex item will grow or shrink so as to fit the space available in
      * its flex container. This is a shorthand property that sets flex-grow, flex-shrink, and flex-basis.
      *
      * [MDN reference](https://developer.mozilla.org/en-US/docs/Web/CSS/flex)
      */
-    flex?: ResponsiveFlexValue;
+    flex?: ResponsiveValue<CSS.FlexProperty<TLength>>;
 }
 
 export function flex(...args: any[]): any;
 
-export type JustifySelfValue =
-    | GlobalStyleValues
-    | "auto"
-    | "normal"
-    | "stretch"
-    | "center"
-    | "start"
-    | "end"
-    | "flex-start"
-    | "flex-end"
-    | "self-start"
-    | "self-end"
-    | "left"
-    | "right"
-    | "baseline"
-    | "first baseline"
-    | "last baseline"
-    | "safe center"
-    | "unsafe center";
-
-export type ResponsiveJustifySelfValue = ResponsiveValue<JustifySelfValue>;
-
 export interface JustifySelfProps {
     /**
      * The CSS justify-self property set the way a box is justified inside its alignment container along
@@ -539,31 +370,11 @@ export interface JustifySelfProps {
      *
      * [MDN reference](https://developer.mozilla.org/en-US/docs/Web/CSS/justify-self)
      */
-    justifySelf?: ResponsiveJustifySelfValue;
+    justifySelf?: ResponsiveValue<CSS.JustifySelfProperty>;
 }
 
 export function justifySelf(...args: any[]): any;
 
-export type AlignSelfValue =
-    | "auto"
-    | "normal"
-    | "center"
-    | "start"
-    | "end"
-    | "self-start"
-    | "self-end"
-    | "flex-start"
-    | "flex-end"
-    | "left"
-    | "right"
-    | "baseline"
-    | "first baseline"
-    | "last baseline"
-    | "stretch"
-    | "safe center"
-    | "unsafe center";
-export type ResponsiveAlignSelfValue = ResponsiveValue<AlignSelfValue>;
-
 export interface AlignSelfProps {
     /**
      * The align-self CSS property aligns flex items of the current flex line overriding the align-items value.
@@ -573,14 +384,11 @@ export interface AlignSelfProps {
      *
      * [MDN reference](https://developer.mozilla.org/en-US/docs/Web/CSS/align-self)
      */
-    alignSelf?: ResponsiveAlignSelfValue;
+    alignSelf?: ResponsiveValue<CSS.AlignSelfProperty>;
 }
 
 export function alignSelf(...args: any[]): any;
 
-export type OrderValue = GlobalStyleValues | number;
-export type ResponsiveOrderValue = ResponsiveValue<OrderValue>;
-
 export interface OrderProps {
     /**
      * The order CSS property sets the order to lay out an item in a flex or grid container. Items in a container
@@ -588,7 +396,7 @@ export interface OrderProps {
      *
      * [MDN reference](https://developer.mozilla.org/en-US/docs/Web/CSS/order)
      */
-    order?: ResponsiveOrderValue;
+    order?: ResponsiveValue<CSS.GlobalsNumber>;
 }
 
 export function order(...args: any[]): any;
@@ -597,10 +405,7 @@ export function order(...args: any[]): any;
  * Grid Layout
  */
 
-export type GridGapValue = number | string;
-export type ResponsiveGridGapValue = ResponsiveValue<GridGapValue>;
-
-export interface GridGapProps {
+export interface GridGapProps<TLength = TLengthStyledSystem> {
     /**
      * The gap CSS property sets the gaps (gutters) between rows and columns. It is a shorthand for row-gap
      * and column-gap.
@@ -609,12 +414,12 @@ export interface GridGapProps {
      *
      * [MDN reference](https://developer.mozilla.org/en-US/docs/Web/CSS/gap)
      */
-    gridGap?: ResponsiveGridGapValue;
+    gridGap?: ResponsiveValue<CSS.GridGapProperty<TLength>>;
 }
 
 export function gridGap(...args: any[]): any;
 
-export interface GridColumnGapProps {
+export interface GridColumnGapProps<TLength = TLengthStyledSystem> {
     /**
      * The column-gap CSS property sets the size of the gap (gutter) between an element's columns.
      *
@@ -622,12 +427,12 @@ export interface GridColumnGapProps {
      *
      * [MDN reference](https://developer.mozilla.org/en-US/docs/Web/CSS/column-gap)
      */
-    gridColumnGap?: ResponsiveGridGapValue;
+    gridColumnGap?: ResponsiveValue<CSS.GridColumnGapProperty<TLength>>;
 }
 
 export function gridColumnGap(...args: any[]): any;
 
-export interface GridRowGapProps {
+export interface GridRowGapProps<TLength = TLengthStyledSystem> {
     /**
      * The row-gap CSS property sets the size of the gap (gutter) between an element's rows.
      *
@@ -635,14 +440,11 @@ export interface GridRowGapProps {
      *
      * [MDN reference](https://developer.mozilla.org/en-US/docs/Web/CSS/row-gap)
      */
-    gridRowGap?: ResponsiveGridGapValue;
+    gridRowGap?: ResponsiveValue<CSS.GridRowGapProperty<TLength>>;
 }
 
 export function gridRowGap(...args: any[]): any;
 
-export type GridCellValue = string;
-export type ResponsiveGridCellValue = ResponsiveValue<GridCellValue>;
-
 export interface GridColumnProps {
     /**
      * The grid-column CSS property is a shorthand property for grid-column-start and grid-column-end specifying
@@ -651,7 +453,7 @@ export interface GridColumnProps {
      *
      * [MDN reference](https://developer.mozilla.org/en-US/docs/Web/CSS/grid-column)
      */
-    gridColumn?: ResponsiveGridCellValue;
+    gridColumn?: ResponsiveValue<CSS.GridColumnProperty>;
 }
 
 export function gridColumn(...args: any[]): any;
@@ -664,14 +466,11 @@ export interface GridRowProps {
      *
      * [MDN reference](https://developer.mozilla.org/en-US/docs/Web/CSS/grid-row)
      */
-    gridRow?: ResponsiveGridCellValue;
+    gridRow?: ResponsiveValue<CSS.GridRowProperty>;
 }
 
 export function gridRow(...args: any[]): any;
 
-export type GridAutoValue = string;
-export type ResponsiveGridAutoValue = ResponsiveValue<GridAutoValue>;
-
 export interface GridAutoFlowProps {
     /**
      * The grid-auto-flow CSS property controls how the auto-placement algorithm works, specifying exactly
@@ -679,54 +478,51 @@ export interface GridAutoFlowProps {
      *
      * [MDN reference](https://developer.mozilla.org/en-US/docs/Web/CSS/grid-auto-flow)
      */
-    gridAutoFlow?: ResponsiveGridAutoValue;
+    gridAutoFlow?: ResponsiveValue<CSS.GridAutoFlowProperty>;
 }
 
 export function gridAutoFlow(...args: any[]): any;
 
-export interface GridAutoColumnsProps {
+export interface GridAutoColumnsProps<TLength = TLengthStyledSystem> {
     /**
      * The grid-auto-columns CSS property specifies the size of an implicitly-created grid column track.
      *
      * [MDN reference](https://developer.mozilla.org/en-US/docs/Web/CSS/grid-auto-columns)
      */
-    gridAutoColumns?: ResponsiveGridAutoValue;
+    gridAutoColumns?: ResponsiveValue<CSS.GridAutoColumnsProperty<TLength>>;
 }
 
 export function gridAutoColumns(...args: any[]): any;
 
-export interface GridAutoRowsProps {
+export interface GridAutoRowsProps<TLength = TLengthStyledSystem> {
     /**
      * The grid-auto-rows CSS property specifies the size of an implicitly-created grid row track.
      *
      * [MDN reference](https://developer.mozilla.org/en-US/docs/Web/CSS/grid-auto-rows)
      */
-    gridAutoRows?: ResponsiveGridAutoValue;
+    gridAutoRows?: ResponsiveValue<CSS.GridAutoRowsProperty<TLength>>;
 }
 
 export function gridAutoRows(...args: any[]): any;
 
-export type GridTemplateValue = string;
-export type ResponsiveGridTemplateValue = ResponsiveValue<GridTemplateValue>;
-
-export interface GridTemplatesColumnsProps {
+export interface GridTemplatesColumnsProps<TLength = TLengthStyledSystem> {
     /**
      * The grid-template-columns CSS property defines the line names and track sizing functions of the grid columns.
      *
      * [MDN reference](https://developer.mozilla.org/en-US/docs/Web/CSS/grid-template-columns)
      */
-    gridTemplateColumns?: ResponsiveGridTemplateValue;
+    gridTemplateColumns?: ResponsiveValue<CSS.GridTemplateColumnsProperty<TLength>>;
 }
 
 export function gridTemplateColumns(...args: any[]): any;
 
-export interface GridTemplatesRowsProps {
+export interface GridTemplatesRowsProps<TLength = TLengthStyledSystem> {
     /**
      * The grid-template-rows CSS property defines the line names and track sizing functions of the grid rows.
      *
      * [MDN reference](https://developer.mozilla.org/en-US/docs/Web/CSS/row-template-rows)
      */
-    gridTemplateRows?: ResponsiveGridTemplateValue;
+    gridTemplateRows?: ResponsiveValue<CSS.GridTemplateRowsProperty<TLength>>;
 }
 
 export function gridTemplateRows(...args: any[]): any;
@@ -737,7 +533,7 @@ export interface GridTemplatesAreasProps {
      *
      * [MDN reference](https://developer.mozilla.org/en-US/docs/Web/CSS/grid-template-areas)
      */
-    gridTemplateAreas?: ResponsiveGridTemplateValue;
+    gridTemplateAreas?: ResponsiveValue<CSS.GridTemplateAreasProperty>;
 }
 
 export function gridTemplateAreas(...args: any[]): any;
@@ -750,7 +546,7 @@ export interface GridAreaProps {
      *
      * [MDN reference](https://developer.mozilla.org/en-US/docs/Web/CSS/grid-area)
      */
-    gridArea?: ResponsiveGridTemplateValue;
+    gridArea?: ResponsiveValue<CSS.GridAreaProperty>;
 }
 
 export function gridArea(...args: any[]): any;
@@ -759,65 +555,62 @@ export function gridArea(...args: any[]): any;
  * Borders
  */
 
-export type BorderValue = string | number;
-export type ResponsiveBorderValue = ResponsiveValue<BorderValue>;
-
-export interface BorderProps {
+export interface BorderProps<TLength = TLengthStyledSystem> {
     /**
      * The border CSS property sets an element's border. It's a shorthand for border-width, border-style,
      * and border-color.
      *
      * [MDN reference](https://developer.mozilla.org/en-US/docs/Web/CSS/border)
      */
-    border?: ResponsiveBorderValue;
+    border?: ResponsiveValue<CSS.BorderProperty<TLength>>;
 }
 
 export function border(...args: any[]): any;
 
-export interface BorderTopProps {
+export interface BorderTopProps<TLength = TLengthStyledSystem> {
     /**
      * The border-top CSS property is a shorthand that sets the values of border-top-width, border-top-style,
      * and border-top-color. These properties describe an element's top border.
      *
      * [MDN reference](https://developer.mozilla.org/en-US/docs/Web/CSS/border-top)
      */
-    borderTop?: ResponsiveBorderValue;
+    borderTop?: ResponsiveValue<CSS.BorderTopProperty<TLength>>;
 }
 
 export function borderTop(...args: any[]): any;
 
-export interface BorderRightProps {
+export interface BorderRightProps<TLength = TLengthStyledSystem> {
     /**
      * The border-right CSS property is a shorthand that sets border-right-width, border-right-style,
      * and border-right-color. These properties set an element's right border.
      *
      * [MDN reference](https://developer.mozilla.org/en-US/docs/Web/CSS/border-right)
      */
-    borderRight?: ResponsiveBorderValue;
+    borderRight?: ResponsiveValue<CSS.BorderRightProperty<TLength>>;
 }
 
 export function borderRight(...args: any[]): any;
 
-export interface BorderBottomProps {
+export interface BorderBottomProps<TLength = TLengthStyledSystem> {
     /**
      * The border-bottom CSS property sets an element's bottom border. It's a shorthand for
      * border-bottom-width, border-bottom-style and border-bottom-color.
      *
      * [MDN reference](https://developer.mozilla.org/en-US/docs/Web/CSS/border-bottom)
      */
-    borderBottom?: ResponsiveBorderValue;
+    borderBottom?: ResponsiveValue<CSS.BorderBottomProperty<TLength>>;
 }
 
 export function borderBottom(...args: any[]): any;
 
-export interface BorderLeftProps {
+export interface BorderLeftProps<TLength = TLengthStyledSystem> {
     /**
      * The border-left CSS property is a shorthand that sets the values of border-left-width,
      * border-left-style, and border-left-color. These properties describe an element's left border.
      *
      * [MDN reference](https://developer.mozilla.org/en-US/docs/Web/CSS/border-left)
      */
-    borderLeft?: ResponsiveBorderValue;
+    borderLeft?: ResponsiveValue<CSS.BorderLeftProperty<TLength>>;
 }
 
 export function borderLeft(...args: any[]): any;
@@ -826,38 +619,29 @@ export interface BordersProps extends BorderTopProps, BorderRightProps, BorderBo
 
 export function borders(...args: any[]): any;
 
-export type BorderColorValue = string;
-export type ResponsiveBorderColorValue = ResponsiveValue<BorderColorValue>;
-
 export interface BorderColorProps {
     /**
      * The border-color shorthand CSS property sets the color of all sides of an element's border.
      *
      * [MDN reference](https://developer.mozilla.org/en-US/docs/Web/CSS/border-color)
      */
-    borderColor?: ResponsiveBorderColorValue;
+    borderColor?: ResponsiveValue<CSS.BorderColorProperty>;
 }
 
 export function borderColor(...args: any[]): any;
 
-export type BorderRadiusValue = string | number;
-export type ResponsiveBorderRadiusValue = ResponsiveValue<BorderRadiusValue>;
-
-export interface BorderRadiusProps {
+export interface BorderRadiusProps<TLength = TLengthStyledSystem> {
     /**
      * The border-radius CSS property rounds the corners of an element's outer border edge. You can set a single
      * radius to make circular corners, or two radii to make elliptical corners.
      *
      * [MDN reference](https://developer.mozilla.org/en-US/docs/Web/CSS/border-radius)
      */
-    borderRadius?: ResponsiveBorderRadiusValue;
+    borderRadius?: ResponsiveValue<CSS.BorderRadiusProperty<TLength>>;
 }
 
 export function borderRadius(...args: any[]): any;
 
-export type BoxShadowValue = string | number;
-export type ResponsiveBoxShadowValue = ResponsiveValue<BoxShadowValue>;
-
 export interface BoxShadowProps {
     /**
      * The box-shadow CSS property adds shadow effects around an element's frame. You can set multiple effects
@@ -866,14 +650,11 @@ export interface BoxShadowProps {
      *
      * [MDN reference](https://developer.mozilla.org/en-US/docs/Web/CSS/box-shadow)
      */
-    boxShadow?: ResponsiveBoxShadowValue;
+    boxShadow?: ResponsiveValue<CSS.BoxShadowProperty | number>;
 }
 
 export function boxShadow(...arg: any[]): any;
 
-export type OpacityValue = string | number;
-export type ResponsiveOpacityValue = ResponsiveValue<OpacityValue>;
-
 export interface OpacityProps {
     /**
      * The opacity CSS property sets the transparency of an element or the degree to which content
@@ -881,14 +662,11 @@ export interface OpacityProps {
      *
      * [MDN reference](https://developer.mozilla.org/en-US/docs/Web/CSS/opacity)
      */
-    opacity?: ResponsiveOpacityValue;
+    opacity?: ResponsiveValue<CSS.GlobalsNumber>;
 }
 
 export function opacity(...arg: any[]): any;
 
-export type OverflowValue = string | number;
-export type ResponsiveOverflowValue = ResponsiveValue<OverflowValue>;
-
 export interface OverflowProps {
     /**
      * The overflow CSS property sets what to do when an element's content is too big to fit in its block
@@ -896,7 +674,7 @@ export interface OverflowProps {
      *
      * [MDN reference](https://developer.mozilla.org/en-US/docs/Web/CSS/overflow)
      */
-    overflow?: ResponsiveOverflowValue;
+    overflow?: ResponsiveValue<CSS.OverflowProperty>;
 }
 
 export function overflow(...arg: any[]): any;
@@ -904,68 +682,53 @@ export function overflow(...arg: any[]): any;
  * Background
  */
 
-export type BackgroundValue = string;
-export type ResponsiveBackgroundValue = ResponsiveValue<BackgroundValue>;
-
-export interface BackgroundProps {
+export interface BackgroundProps<TLength = TLengthStyledSystem> {
     /**
      * The background shorthand CSS property sets all background style properties at once,
      * such as color, image, origin and size, repeat method, and others.
      *
      * [MDN reference](https://developer.mozilla.org/en-US/docs/Web/CSS/background)
      */
-    background?: ResponsiveBackgroundValue;
+    background?: ResponsiveValue<CSS.BackgroundProperty<TLength>>;
 }
 
 export function background(...args: any[]): any;
 
-export type BackgroundImageValue = string;
-export type ResponsiveBackgroundImageValue = ResponsiveValue<BackgroundImageValue>;
-
 export interface BackgroundImageProps {
     /**
      * The background-image CSS property sets one or more background images on an element.
      *
      * [MDN reference](https://developer.mozilla.org/en-US/docs/Web/CSS/background-image)
      */
-    backgroundImage?: ResponsiveBackgroundImageValue;
+    backgroundImage?: ResponsiveValue<CSS.BackgroundImageProperty>;
 }
 
 export function backgroundImage(...args: any[]): any;
 
-export type BackgroundSizeValue = string;
-export type ResponsiveBackgroundSizeValue = ResponsiveValue<BackgroundSizeValue>;
-
-export interface BackgroundSizeProps {
+export interface BackgroundSizeProps<TLength = TLengthStyledSystem> {
     /**
      * The background-size CSS property sets the size of the element's background image. The
      * image can be left to its natural size, stretched, or constrained to fit the available space.
      *
      * [MDN reference](https://developer.mozilla.org/en-US/docs/Web/CSS/background-size)
      */
-    backgroundSize?: ResponsiveBackgroundSizeValue;
+    backgroundSize?: ResponsiveValue<CSS.BackgroundSizeProperty<TLength>>;
 }
 
 export function backgroundSize(...args: any[]): any;
 
-export type BackgroundPositionValue = string;
-export type ResponsiveBackgroundPositionValue = ResponsiveValue<BackgroundPositionValue>;
-
-export interface BackgroundPositionProps {
+export interface BackgroundPositionProps<TLength = TLengthStyledSystem> {
     /**
      * The background-position CSS property sets the initial position for each background image. The
      * position is relative to the position layer set by background-origin.
      *
      * [MDN reference](https://developer.mozilla.org/en-US/docs/Web/CSS/background-position)
      */
-    backgroundPosition?: ResponsiveBackgroundPositionValue;
+    backgroundPosition?: ResponsiveValue<CSS.BackgroundPositionProperty<TLength>>;
 }
 
 export function backgroundPosition(...args: any[]): any;
 
-export type BackgroundRepeatValue = string;
-export type ResponsiveBackgroundRepeatValue = ResponsiveValue<BackgroundRepeatValue>;
-
 export interface BackgroundRepeatProps {
     /**
      * The background-repeat CSS property sets how background images are repeated. A background
@@ -973,7 +736,7 @@ export interface BackgroundRepeatProps {
      *
      * [MDN reference](https://developer.mozilla.org/en-US/docs/Web/CSS/background-repeat)
      */
-    backgroundRepeat?: ResponsiveBackgroundRepeatValue;
+    backgroundRepeat?: ResponsiveValue<CSS.BackgroundRepeatProperty>;
 }
 
 export function backgroundRepeat(...args: any[]): any;
@@ -982,14 +745,6 @@ export function backgroundRepeat(...args: any[]): any;
  * Position
  */
 
-export type PositionValue =
-    | "static"
-    | "relative"
-    | "absolute"
-    | "sticky"
-    | "fixed";
-export type ResponsivePositionValue = ResponsiveValue<PositionValue>;
-
 export interface PositionProps {
     /**
      * The position CSS property specifies how an element is positioned in a document.
@@ -997,14 +752,11 @@ export interface PositionProps {
      *
      * [MDN reference](https://developer.mozilla.org/en-US/docs/Web/CSS/position)
      */
-    position?: ResponsivePositionValue;
+    position?: ResponsiveValue<CSS.PositionProperty>;
 }
 
 export function position(...args: any[]): any;
 
-export type ZIndexValue = GlobalStyleValues | "auto" | number;
-export type ResponsiveZIndexValue = ResponsiveValue<ZIndexValue>;
-
 export interface ZIndexProps {
     /**
      * The z-index CSS property sets the z-order of a positioned element and its descendants or
@@ -1012,88 +764,73 @@ export interface ZIndexProps {
      *
      * [MDN reference](https://developer.mozilla.org/en-US/docs/Web/CSS/z-index)
      */
-    zIndex?: ZIndexValue;
+    zIndex?: ResponsiveValue<CSS.ZIndexProperty>;
 }
 
 export function zIndex(...args: any[]): any;
 
-export type TopValue = string | number;
-export type ResponsiveTopValue = ResponsiveValue<TopValue>;
-
-export interface TopProps {
+export interface TopProps<TLength = TLengthStyledSystem> {
     /**
      * The top CSS property participates in specifying the vertical position of a
      * positioned element. It has no effect on non-positioned elements.
      *
      * [MDN reference](https://developer.mozilla.org/en-US/docs/Web/CSS/top)
      */
-    top?: ResponsiveTopValue;
+    top?: ResponsiveValue<CSS.TopProperty<TLength>>;
 }
 
 export function top(...args: any[]): any;
 
-export type RightValue = string | number;
-export type ResponsiveRightValue = ResponsiveValue<RightValue>;
-
-export interface RightProps {
+export interface RightProps<TLength = TLengthStyledSystem> {
     /**
      * The right CSS property participates in specifying the horizontal position of a
      * positioned element. It has no effect on non-positioned elements.
      *
      * [MDN reference](https://developer.mozilla.org/en-US/docs/Web/CSS/right)
      */
-    right?: ResponsiveRightValue;
+    right?: ResponsiveValue<CSS.RightProperty<TLength>>;
 }
 
 export function right(...args: any[]): any;
 
-export type BottomValue = string | number;
-export type ResponsiveBottomValue = ResponsiveValue<BottomValue>;
-
-export interface BottomProps {
+export interface BottomProps<TLength = TLengthStyledSystem> {
     /**
      * The bottom CSS property participates in specifying the vertical position of a
      * positioned element. It has no effect on non-positioned elements.
      *
      * [MDN reference](https://developer.mozilla.org/en-US/docs/Web/CSS/top)
      */
-    bottom?: ResponsiveBottomValue;
+    bottom?: ResponsiveValue<CSS.BottomProperty<TLength>>;
 }
 
 export function bottom(...args: any[]): any;
 
-export type LeftValue = string | number;
-export type ResponsiveLeftValue = ResponsiveValue<LeftValue>;
-
-export interface LeftProps {
+export interface LeftProps<TLength = TLengthStyledSystem> {
     /**
      * The left CSS property participates in specifying the horizontal position
      * of a positioned element. It has no effect on non-positioned elements.
      *
      * [MDN reference](https://developer.mozilla.org/en-US/docs/Web/CSS/left)
      */
-    left?: ResponsiveLeftValue;
+    left?: ResponsiveValue<CSS.LeftProperty<TLength>>;
 }
 
 export function left(...args: any[]): any;
 
-export type Variant = string;
-export type ResponsiveVariant = ResponsiveValue<Variant>;
-
 export interface TextStyleProps {
-    textStyle?: ResponsiveVariant;
+    textStyle?: ResponsiveValue<string>;
 }
 
 export function textStyle(...args: any[]): any;
 
 export interface ColorStyleProps {
-    colors?: ResponsiveVariant;
+    colors?: ResponsiveValue<string>;
 }
 
 export function colorStyle(...args: any[]): any;
 
 export interface ButtonStyleProps {
-    variant?: ResponsiveVariant;
+    variant?: ResponsiveValue<string>;
 }
 
 export function buttonStyle(...args: any[]): any;
diff --git a/types/styled-system/package.json b/types/styled-system/package.json
new file mode 100644
index 0000000000..e6696d08e7
--- /dev/null
+++ b/types/styled-system/package.json
@@ -0,0 +1,6 @@
+{
+  "private": true,
+  "dependencies": {
+    "csstype": "^2.2.0"
+  }
+}

From 4d312320c106bc1a3af3fb1cf88bd0fd11ad3757 Mon Sep 17 00:00:00 2001
From: danford <dford@staff.compass.edu.au>
Date: Thu, 22 Nov 2018 11:13:10 +1100
Subject: [PATCH 175/836] react-css-collapse

---
 types/react-css-collapse/index.d.ts           | 18 +++++
 .../react-css-collapse-tests.tsx              | 14 ++++
 types/react-css-collapse/tsconfig.json        | 25 ++++++
 types/react-css-collapse/tslint.json          | 79 +++++++++++++++++++
 4 files changed, 136 insertions(+)
 create mode 100644 types/react-css-collapse/index.d.ts
 create mode 100644 types/react-css-collapse/react-css-collapse-tests.tsx
 create mode 100644 types/react-css-collapse/tsconfig.json
 create mode 100644 types/react-css-collapse/tslint.json

diff --git a/types/react-css-collapse/index.d.ts b/types/react-css-collapse/index.d.ts
new file mode 100644
index 0000000000..aa17200367
--- /dev/null
+++ b/types/react-css-collapse/index.d.ts
@@ -0,0 +1,18 @@
+// Type definitions for react-css-collapse 3.6.0
+// Project: https://github.com/SparebankenVest/react-css-collapse;
+// Definitions by: Daniel Ford <https://github.com/dford07>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
+
+declare module 'react-css-collapse' {
+  interface Props {
+    isOpen: boolean;
+    className?: string | null;
+    onRest?: () => void;
+    transition?: string | null;
+  }
+  class Collapse extends React.Component<Props> {
+    public render(): React.ReactElement<Props>;
+  }
+  export default Collapse;
+}
diff --git a/types/react-css-collapse/react-css-collapse-tests.tsx b/types/react-css-collapse/react-css-collapse-tests.tsx
new file mode 100644
index 0000000000..3b699b530d
--- /dev/null
+++ b/types/react-css-collapse/react-css-collapse-tests.tsx
@@ -0,0 +1,14 @@
+import * as React from "react";
+import { SFC } from "react";
+import { render } from "react-dom";
+import Collapse from "react-css-collapse";
+
+const TestOpen: SFC = () => (
+    <Collapse isOpen>
+        <div>
+            i am open
+        </div>
+    </Collapse>
+);
+
+render(<TestOpen />, document.getElementById("main"));
diff --git a/types/react-css-collapse/tsconfig.json b/types/react-css-collapse/tsconfig.json
new file mode 100644
index 0000000000..4af49b9769
--- /dev/null
+++ b/types/react-css-collapse/tsconfig.json
@@ -0,0 +1,25 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": false,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "jsx": "react"
+    },
+    "files": [
+        "index.d.ts",
+        "react-css-collapse-tests.tsx"
+    ]
+}
diff --git a/types/react-css-collapse/tslint.json b/types/react-css-collapse/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/react-css-collapse/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 4804c30a554acf49f27e96ab7e03523f2d3687c7 Mon Sep 17 00:00:00 2001
From: Yusuke Wada <wada.yusuke@classmethod.jp>
Date: Thu, 22 Nov 2018 10:57:17 +0900
Subject: [PATCH 176/836] 'encode' also accepts string.

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

diff --git a/types/ngeohash/index.d.ts b/types/ngeohash/index.d.ts
index 25c8f29e5b..af498162ce 100644
--- a/types/ngeohash/index.d.ts
+++ b/types/ngeohash/index.d.ts
@@ -12,7 +12,7 @@ declare namespace ngeohash {
   type GeographicBoundingBox = [number, number, number, number];
   type NSEW = [number, number];
 
-  function encode(latitude: number, longitude: number, precision?: number): string;
+  function encode(latitude: number|string, longitude: number|string, precision?: number): string;
   function decode(hashstring: string): GeographicPoint;
   function decode_bbox(hashstring: string): GeographicBoundingBox;
   function bboxes(minlat: number, minlon: number, maxlat: number, maxlon: number, precision?: number): Array<string>;
diff --git a/types/ngeohash/ngeohash-tests.ts b/types/ngeohash/ngeohash-tests.ts
index 34ad34d7cf..5c77ae94df 100644
--- a/types/ngeohash/ngeohash-tests.ts
+++ b/types/ngeohash/ngeohash-tests.ts
@@ -1,6 +1,7 @@
 import geohash = require('ngeohash');
 
 console.log(geohash.encode(37.8324, 112.5584));
+console.log(geohash.encode('37.8324', '112.5584'));
 // prints ww8p1r4t8
 
 var latlon = geohash.decode('ww8p1r4t8');

From f646aa114ad2afeabfca8d4e832555636fdcdd46 Mon Sep 17 00:00:00 2001
From: Yusuke Wada <wada.yusuke@classmethod.jp>
Date: Thu, 22 Nov 2018 11:11:47 +0900
Subject: [PATCH 177/836] Fix union type style.

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

diff --git a/types/ngeohash/index.d.ts b/types/ngeohash/index.d.ts
index af498162ce..7fa05a0f4e 100644
--- a/types/ngeohash/index.d.ts
+++ b/types/ngeohash/index.d.ts
@@ -12,7 +12,7 @@ declare namespace ngeohash {
   type GeographicBoundingBox = [number, number, number, number];
   type NSEW = [number, number];
 
-  function encode(latitude: number|string, longitude: number|string, precision?: number): string;
+  function encode(latitude: number | string, longitude: number | string, precision?: number): string;
   function decode(hashstring: string): GeographicPoint;
   function decode_bbox(hashstring: string): GeographicBoundingBox;
   function bboxes(minlat: number, minlon: number, maxlat: number, maxlon: number, precision?: number): Array<string>;

From 809fc1d291a42de5da96d6fa03796452bcde1c82 Mon Sep 17 00:00:00 2001
From: feinoujc <feinoujc@users.noreply.github.com>
Date: Wed, 21 Nov 2018 21:33:29 -0500
Subject: [PATCH 178/836] add graphql-fields typings

---
 types/graphql-fields/graphql-fields-tests.ts |  8 +++++++
 types/graphql-fields/index.d.ts              | 18 +++++++++++++++
 types/graphql-fields/tsconfig.json           | 24 ++++++++++++++++++++
 types/graphql-fields/tslint.json             |  1 +
 4 files changed, 51 insertions(+)
 create mode 100644 types/graphql-fields/graphql-fields-tests.ts
 create mode 100644 types/graphql-fields/index.d.ts
 create mode 100644 types/graphql-fields/tsconfig.json
 create mode 100644 types/graphql-fields/tslint.json

diff --git a/types/graphql-fields/graphql-fields-tests.ts b/types/graphql-fields/graphql-fields-tests.ts
new file mode 100644
index 0000000000..811fe25ab2
--- /dev/null
+++ b/types/graphql-fields/graphql-fields-tests.ts
@@ -0,0 +1,8 @@
+import { GraphQLResolveInfo } from 'graphql';
+import graphqlFields = require('graphql-fields');
+
+const info = ({} as any) as GraphQLResolveInfo;
+
+const fieldsWithSubFieldsArgs = graphqlFields(info, {}, { processArguments: true });
+const fieldsWithoutTypeName = graphqlFields(info, {}, { excludedFields: ['__typename'] });
+graphqlFields(info);
diff --git a/types/graphql-fields/index.d.ts b/types/graphql-fields/index.d.ts
new file mode 100644
index 0000000000..19e7f21dc4
--- /dev/null
+++ b/types/graphql-fields/index.d.ts
@@ -0,0 +1,18 @@
+// Type definitions for graphql-fields 1.3
+// Project: https://github.com/robrichard/graphql-fields#readme
+// Definitions by: feinoujc <https://github.com/feinoujc>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.6
+
+import { GraphQLResolveInfo } from 'graphql';
+
+declare function graphqlFields(info: GraphQLResolveInfo, obj?: object, opts?: graphqlFields.Options): any;
+
+declare namespace graphqlFields {
+    interface Options {
+        processArguments?: boolean;
+        excludedFields?: string[];
+    }
+}
+
+export = graphqlFields;
diff --git a/types/graphql-fields/tsconfig.json b/types/graphql-fields/tsconfig.json
new file mode 100644
index 0000000000..826e200b41
--- /dev/null
+++ b/types/graphql-fields/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "esnext.asynciterable"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "graphql-fields-tests.ts"
+    ]
+}
diff --git a/types/graphql-fields/tslint.json b/types/graphql-fields/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/graphql-fields/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 47a9cf1ac5339062c8e1320cc619b35f694d144e Mon Sep 17 00:00:00 2001
From: Malash <i@malash.me>
Date: Wed, 21 Nov 2018 14:25:14 +0800
Subject: [PATCH 179/836] [weixin-app] fix api params

---
 types/weixin-app/index.d.ts | 42 ++++++++++++++++++++++---------------
 1 file changed, 25 insertions(+), 17 deletions(-)

diff --git a/types/weixin-app/index.d.ts b/types/weixin-app/index.d.ts
index 9a41debd2a..2e2eb35481 100644
--- a/types/weixin-app/index.d.ts
+++ b/types/weixin-app/index.d.ts
@@ -936,7 +936,7 @@ declare namespace wx {
 		/** 本地缓存中的指定的 key */
 		key: string;
 		/** 接口调用的回调函数,res = {data: key对应的内容} */
-		success(res: DataResponse): void;
+		success(res: { data: Record<string, any> | string | undefined }): void;
 	}
 	/**
 	 * 从本地缓存中异步获取指定 key 对应的内容。
@@ -3058,12 +3058,33 @@ declare namespace wx {
 	 * 登录态过期后开发者可以再调用wx.login获取新的用户登录态。
 	 */
 	function checkSession(options: CheckSessionOption): void;
+
+	// scope 列表
+	type Scope =
+		| "scope.userInfo"
+		| "scope.userLocation"
+		| "scope.address"
+		| "scope.invoiceTitle"
+		| "scope.invoice"
+		| "scope.werun"
+		| "scope.record"
+		| "scope.writePhotosAlbum"
+		| "scope.camera";
+
+	// 开放接口-----设置
+	interface AuthorizeOption {
+		scope: Scope;
+		success?(res: ErrMsgResponse): void;
+		fail?(): void;
+		complete?(): void;
+	}
+
 	/**
 	 * 提前向用户发起授权请求。
 	 * 调用后会立刻弹窗询问用户是否同意授权小程序使用某项功能或获取用户的某些数据，
 	 * 但不会实际调用对应接口。如果用户之前已经同意授权，则不会出现弹窗，直接返回成功。
 	 */
-	function authorize(options: AuthSetting): void;
+	function authorize(options: AuthorizeOption): void;
 	// 开放接口-----用户信息
 	interface UserInfo {
 		nickName: string;
@@ -3283,22 +3304,9 @@ declare namespace wx {
 	 *
 	 */
 	function openCard(options: OpenCardOptions): void;
-	// 开放接口-----设置
-	interface AuthSetting {
-		scope:
-			| "scope.userInfo"
-			| "scope.userLocation"
-			| "scope.address"
-			| "scope.invoiceTitle"
-			| "scope.werun"
-			| "scope.record"
-			| "scope.writePhotosAlbum";
-		success?(res: ErrMsgResponse): void;
-		fail?(): void;
-		complete?(): void;
-	}
+
 	interface OpenSettingOptions extends BaseOptions {
-		success?(res: { authSetting: AuthSetting }): void;
+		success?(res: { authSetting: { [key in Scope]: string} }): void;
 	}
 	/**
 	 * 调起客户端小程序设置界面，返回用户设置的操作结果。

From 4af88ab850423bf48f34057d0009d0dc786e0d23 Mon Sep 17 00:00:00 2001
From: Ben Frengley <ben.frengley@gmail.com>
Date: Thu, 22 Nov 2018 16:24:15 +1300
Subject: [PATCH 180/836] [@types/mapbox-gl] Fix source type in source events +
 indentation fix

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

diff --git a/types/mapbox-gl/index.d.ts b/types/mapbox-gl/index.d.ts
index 91fb68cd96..f3389876b9 100644
--- a/types/mapbox-gl/index.d.ts
+++ b/types/mapbox-gl/index.d.ts
@@ -1071,7 +1071,7 @@ declare namespace mapboxgl {
     export interface MapSourceDataEvent extends MapboxEvent {
         dataType: 'source';
         isSourceLoaded: boolean;
-        source: Style;
+        source: Source;
         sourceId: string;
         sourceDataType: 'metadata' | 'content';
         tile: any;
diff --git a/types/mapbox-gl/mapbox-gl-tests.ts b/types/mapbox-gl/mapbox-gl-tests.ts
index 422b255900..d119c76bd5 100644
--- a/types/mapbox-gl/mapbox-gl-tests.ts
+++ b/types/mapbox-gl/mapbox-gl-tests.ts
@@ -465,10 +465,10 @@ expectType<mapboxgl.Point>(mapboxgl.Point.convert(pointlike));
 
 expectType<mapboxgl.TransformRequestFunction>((url: string) => ({ url }));
 expectType<mapboxgl.TransformRequestFunction>((url: string, resourceType: mapboxgl.ResourceType) => ({
-	 url,
-	 credentials: 'same-origin',
-	 headers: { 'Accept-Encoding': 'compress' },
-	 method: 'POST',
+	url,
+	credentials: 'same-origin',
+	headers: { 'Accept-Encoding': 'compress' },
+	method: 'POST',
 	collectResourceTiming: true,
  }));
 

From 9414e3cb3a771a2f6b6b32b9290c70dee343ec23 Mon Sep 17 00:00:00 2001
From: Matt McCutchen <matt@mattmccutchen.net>
Date: Wed, 21 Nov 2018 23:51:57 -0500
Subject: [PATCH 181/836] react, react-dom: Enable strictFunctionTypes.
 (#30748)

Fixes https://stackoverflow.com/q/53298949 .
---
 types/react-addons-test-utils/index.d.ts |  4 ++--
 types/react-dom/react-dom-tests.tsx      |  2 +-
 types/react-dom/test-utils/index.d.ts    | 14 +++++++++-----
 types/react-dom/tsconfig.json            |  2 +-
 types/react/index.d.ts                   |  3 +--
 types/react/test/index.ts                | 19 ++++++++++++++-----
 types/react/tsconfig.json                |  2 +-
 7 files changed, 29 insertions(+), 17 deletions(-)

diff --git a/types/react-addons-test-utils/index.d.ts b/types/react-addons-test-utils/index.d.ts
index 0531c5e3f6..19df32f3dc 100644
--- a/types/react-addons-test-utils/index.d.ts
+++ b/types/react-addons-test-utils/index.d.ts
@@ -160,11 +160,11 @@ declare namespace TestUtils {
         root: Component<any>,
         tagName: string): Element;
 
-    export function scryRenderedComponentsWithType<T extends Component<{}>, C extends ComponentClass<{}>>(
+    export function scryRenderedComponentsWithType<T extends Component<any>, C extends ComponentClass<any>>(
         root: Component<any>,
         type: ClassType<any, T, C>): T[];
 
-    export function findRenderedComponentWithType<T extends Component<{}>, C extends ComponentClass<{}>>(
+    export function findRenderedComponentWithType<T extends Component<any>, C extends ComponentClass<any>>(
         root: Component<any>,
         type: ClassType<any, T, C>): T;
 
diff --git a/types/react-dom/react-dom-tests.tsx b/types/react-dom/react-dom-tests.tsx
index ff5ef5850e..c7ccb0052d 100644
--- a/types/react-dom/react-dom-tests.tsx
+++ b/types/react-dom/react-dom-tests.tsx
@@ -7,7 +7,7 @@ import * as ReactTestUtils from 'react-dom/test-utils';
 declare function describe(desc: string, f: () => void): void;
 declare function it(desc: string, f: () => void): void;
 
-class TestComponent extends React.Component { }
+class TestComponent extends React.Component<{x: string}> { }
 
 describe('ReactDOM', () => {
     it('render', () => {
diff --git a/types/react-dom/test-utils/index.d.ts b/types/react-dom/test-utils/index.d.ts
index caa5605ef5..f60d088515 100644
--- a/types/react-dom/test-utils/index.d.ts
+++ b/types/react-dom/test-utils/index.d.ts
@@ -59,7 +59,7 @@ export interface SyntheticEventData extends OptionalEventProperties {
 export type EventSimulator = (element: Element | Component<any>, eventData?: SyntheticEventData) => void;
 
 export interface MockedComponentClass {
-    new (props: {}): any;
+    new (props: any): any;
 }
 
 export interface ShallowRenderer {
@@ -160,8 +160,12 @@ export function renderIntoDocument<T extends Element>(
     element: DOMElement<any, T>): T;
 export function renderIntoDocument(
     element: SFCElement<any>): void;
-export function renderIntoDocument<T extends Component<any>>(
-    element: CElement<any, T>): T;
+// If we replace `P` with `any` in this overload, then some tests fail because
+// calls to `renderIntoDocument` choose the last overload on the
+// subtype-relation pass and get an undesirably broad return type.  Using `P`
+// allows this overload to match on the subtype-relation pass.
+export function renderIntoDocument<P, T extends Component<P>>(
+    element: CElement<P, T>): T;
 export function renderIntoDocument<P>(
     element: ReactElement<P>): Component<P> | Element | void;
 
@@ -257,7 +261,7 @@ export function findRenderedDOMComponentWithTag(
 /**
  * Finds all instances of components with type equal to `componentClass`.
  */
-export function scryRenderedComponentsWithType<T extends Component, C extends ComponentClass>(
+export function scryRenderedComponentsWithType<T extends Component<any>, C extends ComponentClass<any>>(
     root: Component<any>,
     type: ClassType<any, T, C>): T[];
 
@@ -266,7 +270,7 @@ export function scryRenderedComponentsWithType<T extends Component, C extends Co
  * and returns that one result, or throws exception if there is any other
  * number of matches besides one.
  */
-export function findRenderedComponentWithType<T extends Component, C extends ComponentClass>(
+export function findRenderedComponentWithType<T extends Component<any>, C extends ComponentClass<any>>(
     root: Component<any>,
     type: ClassType<any, T, C>): T;
 
diff --git a/types/react-dom/tsconfig.json b/types/react-dom/tsconfig.json
index 0d21b07029..f63325026f 100644
--- a/types/react-dom/tsconfig.json
+++ b/types/react-dom/tsconfig.json
@@ -15,7 +15,7 @@
         "noImplicitAny": true,
         "noImplicitThis": true,
         "strictNullChecks": false,
-        "strictFunctionTypes": false,
+        "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [
             "../"
diff --git a/types/react/index.d.ts b/types/react/index.d.ts
index 938413e41b..25f3c710ae 100644
--- a/types/react/index.d.ts
+++ b/types/react/index.d.ts
@@ -492,8 +492,7 @@ declare namespace React {
      */
     type ClassType<P, T extends Component<P, ComponentState>, C extends ComponentClass<P>> =
         C &
-        (new (props: P, context?: any) => T) &
-        (new (props: P, context?: any) => { props: P });
+        (new (props: P, context?: any) => T);
 
     //
     // Component Specs and Lifecycle
diff --git a/types/react/test/index.ts b/types/react/test/index.ts
index de043082fb..97d61118b9 100644
--- a/types/react/test/index.ts
+++ b/types/react/test/index.ts
@@ -49,6 +49,10 @@ const props: Props & React.ClassAttributes<any> = {
     foo: 42
 };
 
+const scProps: SCProps = {
+    foo: 42
+};
+
 declare const container: Element;
 
 //
@@ -258,9 +262,9 @@ const domFactoryElement: React.DOMElement<React.DOMAttributes<{}>, Element> =
 const element: React.CElement<Props, ModernComponent> = React.createElement(ModernComponent, props);
 const elementNoState: React.CElement<Props, ModernComponentNoState> = React.createElement(ModernComponentNoState, props);
 const elementNullProps: React.CElement<{}, ModernComponentNoPropsAndState> = React.createElement(ModernComponentNoPropsAndState, null);
-const functionComponentElement: React.FunctionComponentElement<SCProps> = React.createElement(FunctionComponent, props);
+const functionComponentElement: React.FunctionComponentElement<SCProps> = React.createElement(FunctionComponent, scProps);
 const functionComponentElementNullProps: React.FunctionComponentElement<SCProps> = React.createElement(FunctionComponent4, null);
-const legacyStatelessComponentElement: React.SFCElement<SCProps> = React.createElement(FunctionComponent, props);
+const legacyStatelessComponentElement: React.SFCElement<SCProps> = React.createElement(FunctionComponent, scProps);
 const legacyStatelessComponentElementNullProps: React.SFCElement<SCProps> = React.createElement(FunctionComponent4, null);
 const domElement: React.DOMElement<React.HTMLAttributes<HTMLDivElement>, HTMLDivElement> = React.createElement("div");
 const domElementNullProps = React.createElement("div", null);
@@ -393,7 +397,12 @@ const ForwardingRefComponent = React.forwardRef((props: {}, ref: React.Ref<RefCo
 
 function RefCarryingComponent() {
     const ref: React.RefObject<RefComponent> = React.createRef();
-    return React.createElement(ForwardingRefComponent, { ref });
+    // Without the explicit type argument, TypeScript infers `{ref: React.RefObject<RefComponent>}`
+    // from the second argument because both of the inferences generated by the first argument
+    // (both to the `P` in the call signature and the `P` in `defaultProps`) have low priority.
+    // Then we get a type error because `ForwardingRefComponent.defaultProps` has the wrong type.
+    // Can/should this be fixed somehow?
+    return React.createElement<React.RefAttributes<RefComponent>>(ForwardingRefComponent, { ref });
 }
 
 //
@@ -633,11 +642,11 @@ const foundComponents: ModernComponent[] = TestUtils.scryRenderedComponentsWithT
 
 // ReactTestUtils custom type guards
 
-const emptyElement1: React.ReactElement<{}> = React.createElement(ModernComponent);
+const emptyElement1: React.ReactElement<Props> = React.createElement(ModernComponent);
 if (TestUtils.isElementOfType(emptyElement1, FunctionComponent)) {
     emptyElement1.props.foo;
 }
-const emptyElement2: React.ReactElement<{}> = React.createElement(FunctionComponent);
+const emptyElement2: React.ReactElement<SCProps> = React.createElement(FunctionComponent);
 if (TestUtils.isElementOfType(emptyElement2, FunctionComponent)) {
     emptyElement2.props.foo;
 }
diff --git a/types/react/tsconfig.json b/types/react/tsconfig.json
index 55d0627c78..e39916b9e4 100644
--- a/types/react/tsconfig.json
+++ b/types/react/tsconfig.json
@@ -15,7 +15,7 @@
         "noImplicitAny": true,
         "noImplicitThis": false,
         "strictNullChecks": true,
-        "strictFunctionTypes": false,
+        "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [
             "../"

From 3f00b0355d6eeb6c5f25b48511ef6450a0f2e9ca Mon Sep 17 00:00:00 2001
From: Matt Ferderer <matt@mattferderer.com>
Date: Wed, 21 Nov 2018 23:50:31 -0600
Subject: [PATCH 182/836] Added Amount and made some optional

Adjusted based off use on Stripe Element examples by Stripe on GitHub. It somewhat looks that TokenData could even be any object but not sure on this.
---
 types/stripejs/token.d.ts | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/types/stripejs/token.d.ts b/types/stripejs/token.d.ts
index e3a3a51590..dac3308393 100644
--- a/types/stripejs/token.d.ts
+++ b/types/stripejs/token.d.ts
@@ -56,11 +56,16 @@ export interface TokenData {
      */
     name: string;
 
+    /**
+     * The amount paid, not a decimal. In USD this is in cents.
+     */
+    amount: number;
+
     /**
      * Fields for billing address information.
      */
     address_line1: string;
-    address_line2: string;
+    address_line2?: string;
     address_city: string;
     address_state: string;
     address_zip: string;
@@ -69,7 +74,7 @@ export interface TokenData {
      * A two character country code identifying the country
      * @example 'US'
      */
-    address_country: string;
+    address_country?: string;
 
     /**
      * Used to add a card to an account

From 046d432fb27464ec0a707d6039b15e0b7213ab63 Mon Sep 17 00:00:00 2001
From: Matt Ferderer <matt@mattferderer.com>
Date: Wed, 21 Nov 2018 23:55:18 -0600
Subject: [PATCH 183/836] Add payment request button

See usage here - https://github.com/stripe/elements-examples/blob/master/js/example5.js
---
 types/stripejs/element.d.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/types/stripejs/element.d.ts b/types/stripejs/element.d.ts
index 4a1e7b3c46..c6cfda71e4 100644
--- a/types/stripejs/element.d.ts
+++ b/types/stripejs/element.d.ts
@@ -163,7 +163,7 @@ export interface StripeElement {
  * The type of element that can be created by the ElementCreator
  * @see ElementCreator
  */
-export type ElementType = 'card' | 'cardNumber' | 'cardExpiry' | 'cardCvc' | 'postalCode';
+export type ElementType = 'card' | 'cardNumber' | 'cardExpiry' | 'cardCvc' | 'postalCode' | 'paymentRequestButton';
 
 // --- ELEMENT EVENTS --- //
 export interface OnChange {
@@ -295,6 +295,7 @@ export interface PaymentButtonOptions {
         complete?: PaymentRequestButtonStyle;
         empty?: PaymentRequestButtonStyle;
         invalid?: PaymentRequestButtonStyle;
+        paymentRequestButton?: PaymentRequestButtonStyle;
     };
 }
 

From f9c7057c7a3a35f22bb93d8ef8b96bbbb176c515 Mon Sep 17 00:00:00 2001
From: Matt Ferderer <matt@mattferderer.com>
Date: Wed, 21 Nov 2018 23:56:29 -0600
Subject: [PATCH 184/836] Added self to get notifications on changes

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

diff --git a/types/stripejs/index.d.ts b/types/stripejs/index.d.ts
index f2a7ab21aa..0ee2016af2 100644
--- a/types/stripejs/index.d.ts
+++ b/types/stripejs/index.d.ts
@@ -1,6 +1,7 @@
 // Type definitions for stripe.js 3.0
 // Project: https://stripe.com/
 // Definitions by: Robin van Tienhoven <https://github.com/RobinvanTienhoven>
+//                 Matt Ferderer <https://github.com/mattferderer>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.1
 

From 75dc5a9ca427435bf3d0b79a4fd6910f6a1b7b80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dennis=20M=C3=BCnch?=
 <dennismuench@users.noreply.github.com>
Date: Thu, 22 Nov 2018 09:33:58 +0100
Subject: [PATCH 185/836] add parameter [decapitalize=false] to camelize

https://github.com/epeli/underscore.string#camelizestring-decapitalizefalse--string
---
 types/underscore.string/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/underscore.string/index.d.ts b/types/underscore.string/index.d.ts
index 2d067679d5..eb0774b49a 100644
--- a/types/underscore.string/index.d.ts
+++ b/types/underscore.string/index.d.ts
@@ -207,7 +207,7 @@ declare module 'underscore' {
          * ('-moz-transform') => 'MozTransform'
          * @param str
          */
-        camelize(str: string): string;
+        camelize(str: string, decapitalize?: boolean): string;
 
         /**
          * Converts a camelized or dasherized string into an underscored one.

From b4a016ba645a65f8e16dcefdfcb260d1ce2e238d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dennis=20M=C3=BCnch?=
 <dennismuench@users.noreply.github.com>
Date: Thu, 22 Nov 2018 09:44:42 +0100
Subject: [PATCH 186/836] [@types/underscore.string] reflect change within test

_.camelize('-moz-transform');
_.camelize('-moz-transform', true);
---
 types/underscore.string/underscore.string-tests.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/types/underscore.string/underscore.string-tests.ts b/types/underscore.string/underscore.string-tests.ts
index 545f6362d6..5b827cd880 100644
--- a/types/underscore.string/underscore.string-tests.ts
+++ b/types/underscore.string/underscore.string-tests.ts
@@ -52,6 +52,7 @@ _.succ('A');
 _.titleize('my name is epeli');
 
 _.camelize('-moz-transform');
+_.camelize('-moz-transform', true);
 
 _.classify('some_class_name');
 

From 6922a35f4b9905b7a75a94859ffab134565a6378 Mon Sep 17 00:00:00 2001
From: Jussi Kinnula <jussi.kinnula@wunderdog.fi>
Date: Thu, 22 Nov 2018 10:25:50 +0200
Subject: [PATCH 187/836] Change gl-react subpackages callback props & gl-react
 Node "uniforms" prop optional & add tests for subpackages

---
 types/gl-react-dom/GLViewDOM.d.ts             |  8 +++---
 types/gl-react-dom/gl-react-dom-tests.tsx     | 27 +++++++++++++++++++
 types/gl-react-dom/tsconfig.json              |  3 ++-
 types/gl-react-expo/GLViewNative.d.ts         |  2 +-
 types/gl-react-expo/gl-react-expo-tests.tsx   | 27 +++++++++++++++++++
 types/gl-react-expo/tsconfig.json             |  3 ++-
 types/gl-react-headless/GLViewHeadless.d.ts   |  8 +++---
 .../gl-react-headless-tests.tsx               | 27 +++++++++++++++++++
 types/gl-react-headless/tsconfig.json         |  3 ++-
 types/gl-react-native/GLViewNative.d.ts       |  4 +--
 .../gl-react-native/gl-react-native-tests.tsx | 27 +++++++++++++++++++
 types/gl-react-native/tsconfig.json           |  3 ++-
 types/gl-react/index.d.ts                     |  2 +-
 13 files changed, 128 insertions(+), 16 deletions(-)
 create mode 100644 types/gl-react-dom/gl-react-dom-tests.tsx
 create mode 100644 types/gl-react-expo/gl-react-expo-tests.tsx
 create mode 100644 types/gl-react-headless/gl-react-headless-tests.tsx
 create mode 100644 types/gl-react-native/gl-react-native-tests.tsx

diff --git a/types/gl-react-dom/GLViewDOM.d.ts b/types/gl-react-dom/GLViewDOM.d.ts
index 8450a16a00..5ceef51ec8 100644
--- a/types/gl-react-dom/GLViewDOM.d.ts
+++ b/types/gl-react-dom/GLViewDOM.d.ts
@@ -4,10 +4,10 @@ export type SupportedImage = 'image/png' | 'image/jpeg' | 'image/bmp' | 'image/w
 export type ValidQuality = 0.0 | 0.1 | 0.2 | 0.3 | 0.4 | 0.5 | 0.6 | 0.7 | 0.8 | 0.9 | 1.0;
 
 export interface GLViewDOMProps {
-  onContextCreate: (gl: WebGLRenderingContext) => void;
-  onContextFailure: (e: Error) => void;
-  onContextLost: () => void;
-  onContextRestored: (gl: WebGLRenderingContext) => void;
+  onContextCreate?: (gl: WebGLRenderingContext) => void;
+  onContextFailure?: (e: Error) => void;
+  onContextLost?: () => void;
+  onContextRestored?: (gl: WebGLRenderingContext) => void;
   webglContextAttributes?: WebGLContextAttributes;
   pixelRatio?: number;
   width: number;
diff --git a/types/gl-react-dom/gl-react-dom-tests.tsx b/types/gl-react-dom/gl-react-dom-tests.tsx
new file mode 100644
index 0000000000..6d3852a156
--- /dev/null
+++ b/types/gl-react-dom/gl-react-dom-tests.tsx
@@ -0,0 +1,27 @@
+import * as React from 'react';
+import * as ReactDOM from 'react-dom';
+import { Surface } from 'gl-react-dom';
+import { Shaders, GLSL, Node } from 'gl-react';
+
+const shaders = Shaders.create({
+  Test: {
+    frag: GLSL`
+      precision highp float;
+      varying vec2 uv;
+      void main() {
+        gl_FragColor = vec4(uv.x, uv.y, 0.5, 1.0);
+      }`
+  }
+});
+
+const App = () => (
+  <div>
+    <Surface width={640} height={480}>
+      <Node shader={shaders.HelloBlue} />
+    </Surface>
+  </div>
+);
+
+const element = document.createElement('div');
+document.body.appendChild(element);
+ReactDOM.render(<App />, element);
diff --git a/types/gl-react-dom/tsconfig.json b/types/gl-react-dom/tsconfig.json
index 9c4d38ca44..49a1ee91ff 100644
--- a/types/gl-react-dom/tsconfig.json
+++ b/types/gl-react-dom/tsconfig.json
@@ -1,6 +1,7 @@
 {
   "files": [
-    "index.d.ts"
+    "index.d.ts",
+    "gl-react-dom-tests.tsx"
   ],
   "compilerOptions": {
     "module": "commonjs",
diff --git a/types/gl-react-expo/GLViewNative.d.ts b/types/gl-react-expo/GLViewNative.d.ts
index 4f0270dd68..5320ccaaa2 100644
--- a/types/gl-react-expo/GLViewNative.d.ts
+++ b/types/gl-react-expo/GLViewNative.d.ts
@@ -3,7 +3,7 @@ import * as React from 'react';
 // import { GLView as EXGLView } from 'expo';
 
 export interface GLViewNativeProps {
-  onContextCreate: (gl: WebGLRenderingContext) => void;
+  onContextCreate?: (gl: WebGLRenderingContext) => void;
   style?: any;
   children?: any;
 }
diff --git a/types/gl-react-expo/gl-react-expo-tests.tsx b/types/gl-react-expo/gl-react-expo-tests.tsx
new file mode 100644
index 0000000000..2eb1fee9a9
--- /dev/null
+++ b/types/gl-react-expo/gl-react-expo-tests.tsx
@@ -0,0 +1,27 @@
+import * as React from 'react';
+import * as ReactDOM from 'react-dom';
+import { Surface } from 'gl-react-expo';
+import { Shaders, GLSL, Node } from 'gl-react';
+
+const shaders = Shaders.create({
+  Test: {
+    frag: GLSL`
+      precision highp float;
+      varying vec2 uv;
+      void main() {
+        gl_FragColor = vec4(uv.x, uv.y, 0.5, 1.0);
+      }`
+  }
+});
+
+const App = () => (
+  <div>
+    <Surface>
+      <Node shader={shaders.HelloBlue} />
+    </Surface>
+  </div>
+);
+
+const element = document.createElement('div');
+document.body.appendChild(element);
+ReactDOM.render(<App />, element);
diff --git a/types/gl-react-expo/tsconfig.json b/types/gl-react-expo/tsconfig.json
index 9c4d38ca44..95487128f4 100644
--- a/types/gl-react-expo/tsconfig.json
+++ b/types/gl-react-expo/tsconfig.json
@@ -1,6 +1,7 @@
 {
   "files": [
-    "index.d.ts"
+    "index.d.ts",
+    "gl-react-expo-tests.tsx"
   ],
   "compilerOptions": {
     "module": "commonjs",
diff --git a/types/gl-react-headless/GLViewHeadless.d.ts b/types/gl-react-headless/GLViewHeadless.d.ts
index a94c1f9769..9b90b25958 100644
--- a/types/gl-react-headless/GLViewHeadless.d.ts
+++ b/types/gl-react-headless/GLViewHeadless.d.ts
@@ -1,10 +1,10 @@
 import * as React from 'react';
 
 export interface GLViewHeadlessProps {
-  onContextCreate: (gl: WebGLRenderingContext) => void;
-  onContextFailure: (e: Error) => void;
-  onContextLost: () => void;
-  onContextRestored: (gl: WebGLRenderingContext) => void;
+  onContextCreate?: (gl: WebGLRenderingContext) => void;
+  onContextFailure?: (e: Error) => void;
+  onContextLost?: () => void;
+  onContextRestored?: (gl: WebGLRenderingContext) => void;
   webglContextAttributes?: WebGLContextAttributes;
   pixelRatio?: number;
   width: number;
diff --git a/types/gl-react-headless/gl-react-headless-tests.tsx b/types/gl-react-headless/gl-react-headless-tests.tsx
new file mode 100644
index 0000000000..58f0cbc13b
--- /dev/null
+++ b/types/gl-react-headless/gl-react-headless-tests.tsx
@@ -0,0 +1,27 @@
+import * as React from 'react';
+import * as ReactDOM from 'react-dom';
+import { Surface } from 'gl-react-headless';
+import { Shaders, GLSL, Node } from 'gl-react';
+
+const shaders = Shaders.create({
+  Test: {
+    frag: GLSL`
+      precision highp float;
+      varying vec2 uv;
+      void main() {
+        gl_FragColor = vec4(uv.x, uv.y, 0.5, 1.0);
+      }`
+  }
+});
+
+const App = () => (
+  <div>
+    <Surface width={640} height={480}>
+      <Node shader={shaders.HelloBlue} />
+    </Surface>
+  </div>
+);
+
+const element = document.createElement('div');
+document.body.appendChild(element);
+ReactDOM.render(<App />, element);
diff --git a/types/gl-react-headless/tsconfig.json b/types/gl-react-headless/tsconfig.json
index 9c4d38ca44..8a7f2a4b22 100644
--- a/types/gl-react-headless/tsconfig.json
+++ b/types/gl-react-headless/tsconfig.json
@@ -1,6 +1,7 @@
 {
   "files": [
-    "index.d.ts"
+    "index.d.ts",
+    "gl-react-headless-tests.tsx"
   ],
   "compilerOptions": {
     "module": "commonjs",
diff --git a/types/gl-react-native/GLViewNative.d.ts b/types/gl-react-native/GLViewNative.d.ts
index 0a780d3aa7..b4a4c75bc1 100644
--- a/types/gl-react-native/GLViewNative.d.ts
+++ b/types/gl-react-native/GLViewNative.d.ts
@@ -1,8 +1,8 @@
 import * as React from 'react';
 
 export interface GLViewNativeProps {
-  onContextCreate: (gl: WebGLRenderingContext) => void;
-  onContextFailure: (e: Error) => void;
+  onContextCreate?: (gl: WebGLRenderingContext) => void;
+  onContextFailure?: (e: Error) => void;
   style?: any;
   children?: any;
 }
diff --git a/types/gl-react-native/gl-react-native-tests.tsx b/types/gl-react-native/gl-react-native-tests.tsx
new file mode 100644
index 0000000000..f74c9dc926
--- /dev/null
+++ b/types/gl-react-native/gl-react-native-tests.tsx
@@ -0,0 +1,27 @@
+import * as React from 'react';
+import * as ReactDOM from 'react-dom';
+import { Surface } from 'gl-react-native';
+import { Shaders, GLSL, Node } from 'gl-react';
+
+const shaders = Shaders.create({
+  Test: {
+    frag: GLSL`
+      precision highp float;
+      varying vec2 uv;
+      void main() {
+        gl_FragColor = vec4(uv.x, uv.y, 0.5, 1.0);
+      }`
+  }
+});
+
+const App = () => (
+  <div>
+    <Surface>
+      <Node shader={shaders.HelloBlue} />
+    </Surface>
+  </div>
+);
+
+const element = document.createElement('div');
+document.body.appendChild(element);
+ReactDOM.render(<App />, element);
diff --git a/types/gl-react-native/tsconfig.json b/types/gl-react-native/tsconfig.json
index 9c4d38ca44..0ffab2bab3 100644
--- a/types/gl-react-native/tsconfig.json
+++ b/types/gl-react-native/tsconfig.json
@@ -1,6 +1,7 @@
 {
   "files": [
-    "index.d.ts"
+    "index.d.ts",
+    "gl-react-native-tests.tsx"
   ],
   "compilerOptions": {
     "module": "commonjs",
diff --git a/types/gl-react/index.d.ts b/types/gl-react/index.d.ts
index e1332fd964..84b82ddd2d 100644
--- a/types/gl-react/index.d.ts
+++ b/types/gl-react/index.d.ts
@@ -124,7 +124,7 @@ export interface Framebuffer {
 export interface NodeProps {
   shader: ShaderIdentifier | ShaderDefinition;
   uniformsOptions?: any;
-  uniforms: { [key: string]: any };
+  uniforms?: { [key: string]: any };
   ignoreUnusedUniforms?: string[] | boolean;
   sync?: boolean;
   width?: number;

From ff1e9ee2539e54035e80739b0eb9605cb6222703 Mon Sep 17 00:00:00 2001
From: Wose <Jacksonteather@hotmail.com>
Date: Thu, 22 Nov 2018 09:46:16 -0500
Subject: [PATCH 188/836] Switch Mongoose post hook overload order

Fixes incorrect selection of function overload
---
 types/mongoose/index.d.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/types/mongoose/index.d.ts b/types/mongoose/index.d.ts
index 5963be87ed..aa24ca16b1 100644
--- a/types/mongoose/index.d.ts
+++ b/types/mongoose/index.d.ts
@@ -811,11 +811,11 @@ declare module "mongoose" {
      * @param fn callback
      */
     post<T extends Document>(method: string, fn: (
-      error: mongodb.MongoError, doc: T, next: (err?: NativeError) => void
-    ) => void): this;
+        doc: T, next: (err?: NativeError) => void
+      ) => void): this;
 
     post<T extends Document>(method: string, fn: (
-      doc: T, next: (err?: NativeError) => void
+      error: mongodb.MongoError, doc: T, next: (err?: NativeError) => void
     ) => void): this;
 
     /**

From 860b409ed936cf7e1dce27a6f9e000cae751e82f Mon Sep 17 00:00:00 2001
From: Adam <23192421+shenphen@users.noreply.github.com>
Date: Thu, 22 Nov 2018 15:51:55 +0100
Subject: [PATCH 189/836] Update index.d.ts with replace function overload

Change due to the documentation of cropperjs (https://www.npmjs.com/package/cropperjs#replaceurl-hassamesize).
---
 types/cropperjs/index.d.ts | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/types/cropperjs/index.d.ts b/types/cropperjs/index.d.ts
index 30556e11fc..6e48bdae49 100644
--- a/types/cropperjs/index.d.ts
+++ b/types/cropperjs/index.d.ts
@@ -428,6 +428,13 @@ declare class cropperjs {
      * @param url A new image url
      */
     replace(url: string): void;
+    
+    /**
+     * Replace the image's src and rebuild the cropper. If the new image has the same size with the old one, then it will not rebuilt the cropper and only update the urls of all related images. This can be used for applying filters.
+     * @param url A new image url
+     * @param hasSameSize (Default: false)
+     */
+    replace(url: string, hasSameSize: boolean): void;
 
     /**
      * Enable (unfreeze) the cropper.

From 7191616daf83a72a4636724ffe998b4c21f82579 Mon Sep 17 00:00:00 2001
From: Wose <Jacksonteather@hotmail.com>
Date: Thu, 22 Nov 2018 10:16:38 -0500
Subject: [PATCH 190/836] Update types in mongoose-tests.ts for post hook
 arguments

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

diff --git a/types/mongoose/mongoose-tests.ts b/types/mongoose/mongoose-tests.ts
index c8873f85b3..f713ba8538 100644
--- a/types/mongoose/mongoose-tests.ts
+++ b/types/mongoose/mongoose-tests.ts
@@ -491,12 +491,12 @@ preHookTestSchemaArr.push(
 );
 
 schema
-.post('save', function (error, doc, next) {
+.post('save', function (error: mongoose.Error, doc: mongoose.Document, next: (err?: mongoose.NativeError) => void) {
   error.stack;
   doc.model;
   next.apply;
 })
-.post('save', function (doc: mongoose.Document, next: Function) {
+.post('save', function (doc: mongoose.Document, next: (err?: mongoose.NativeError) => void) {
   doc.model;
   next(new Error());
 })

From eb5938ec968187d0b956e9383704e94422733c4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Alvergnat?= <toilal.dev@gmail.com>
Date: Sat, 17 Nov 2018 17:09:33 +0100
Subject: [PATCH 191/836] Add types for yeoman-assert

---
 types/yeoman-assert/index.d.ts             | 156 +++++++++++++++++++++
 types/yeoman-assert/tsconfig.json          |  23 +++
 types/yeoman-assert/tslint.json            |   3 +
 types/yeoman-assert/yeoman-assert-tests.ts |  34 +++++
 4 files changed, 216 insertions(+)
 create mode 100644 types/yeoman-assert/index.d.ts
 create mode 100644 types/yeoman-assert/tsconfig.json
 create mode 100644 types/yeoman-assert/tslint.json
 create mode 100644 types/yeoman-assert/yeoman-assert-tests.ts

diff --git a/types/yeoman-assert/index.d.ts b/types/yeoman-assert/index.d.ts
new file mode 100644
index 0000000000..cff816ff39
--- /dev/null
+++ b/types/yeoman-assert/index.d.ts
@@ -0,0 +1,156 @@
+// Type definitions for yeoman-assert 3.1
+// Project: https://github.com/yeoman/yeoman-assert
+// Definitions by: Toilal <https://github.com/Toilal>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.4
+
+import assert = require('assert');
+
+declare module 'assert' {
+    /**
+     * Assert that a file exists or that each files in the array exists
+     * @param path path to a file or an array of paths to files
+     * @example
+     * assert.file('templates/user.hbs');
+     * assert.noFile(['templates/user.hbs', 'templates/user/edit.hbs']);
+     */
+    function file(path: string | string[]): void;
+
+    /**
+     * Assert that a file doesn't exist
+     * @param file path to a file
+     * @example
+     * assert.noFile('templates/user.hbs');
+     * assert.noFile(['templates/user.hbs', 'templates/user/edit.hbs']);
+     */
+    function noFile(file: string | string[]): void;
+
+    /**
+     * Assert that a file's content matches a regex or string
+     * @param file path to a file
+     * @param reg regex / string that will be used to search the file
+     * @example
+     * assert.fileContent('models/user.js', /App\.User = DS\.Model\.extend/);
+     * assert.fileContent('models/user.js', 'App.User = DS.Model.extend');
+     */
+    function fileContent(file: string | string[], reg: string | RegExp): void;
+
+    /**
+     * Assert that each file in an array of file-regex pairs matches its corresponding regex
+     * @param pairs an array of arrays, where each subarray is a [String, RegExp] pair
+     * @example
+     * var arg = [
+     *   [ 'models/user.js', /App\.User = DS\.Model\.extend/ ],
+     *   [ 'controllers/user.js', /App\.UserController = Ember\.ObjectController\.extend/ ]
+     * ]
+     * assert.fileContent(arg);
+     */
+    function fileContent(pairs: Array<[string, RegExp]>): void;
+
+    /**
+     * Assert that a file's content is the same as the given string
+     * @param file path to a file
+     * @param expectedContent the expected content of the file
+     * @example
+     * assert.equalsFileContent(
+     *   'data.js',
+     *   'const greeting = "Hello";\nexport default { greeting }'
+     * );
+     */
+    function equalsFileContent(file: string, expectedContent: string): void;
+
+    /**
+     * Assert that each file in an array of file-string pairs equals its corresponding string
+     * @param pairs an array of arrays, where each subarray is a [String, String] pair
+     * @example
+     * assert.equalsFileContent([
+     *   ['data.js', 'const greeting = "Hello";\nexport default { greeting }'],
+     *   ['user.js', 'export default {\n  name: 'Coleman',\n  age: 0\n}']
+     * ]);
+     */
+    function equalsFileContent(pairs: Array<[string, string]>): void;
+
+    /**
+     * Assert that a file's content does not match a regex / string
+     * @param file path to a file
+     * @param reg regex / string that will be used to search the file
+     * @example
+     * assert.noFileContent('models/user.js', /App\.User = DS\.Model\.extend/);
+     * assert.noFileContent('models/user.js', 'App.User = DS.Model.extend');
+     */
+    function noFileContent(file: string | string[], reg: RegExp | string): void;
+
+    /**
+     * Assert that each file in an array of file-regex pairs does not match its corresponding regex
+     * @param pairs an array of arrays, where each subarray is a [String, RegExp] pair
+     * var arg = [
+     *   [ 'models/user.js', /App\.User \ DS\.Model\.extend/ ],
+     *   [ 'controllers/user.js', /App\.UserController = Ember\.ObjectController\.extend/ ]
+     * ]
+     * assert.noFileContent(arg);
+     */
+    function noFileContent(pairs: Array<[string, RegExp]>): void;
+
+    /**
+     * Assert that two strings are equal after standardization of newlines
+     * @param value a string
+     * @param expected the expected value of the string
+     * @example
+     * assert.textEqual('I have a yellow cat', 'I have a yellow cat');
+     */
+    function textEqual(value: string, expected: string): void;
+
+    /**
+     * Assert an Object implements an interface
+     * @param subject subject implementing the façade
+     * @param methods a façace, hash or array of keys to be implemented
+     */
+    function implement(subject: object, methods: object | string[]): void;
+
+    /**
+     * Assert an Object doesn't implements any method of an interface
+     * @param subject subject not implementing the methods
+     * @param methods hash or array of method names to be implemented
+     */
+    function notImplement(subject: object, methods: object | string[]): void;
+
+    /**
+     * Assert an object contains the provided keys
+     * @param obj Object that should match the given pattern
+     * @param content An object of key/values the object should contains
+     */
+    function objectContent(obj: object, content: object): void;
+
+    /**
+     * Assert an object does not contain the provided keys
+     * @param obj Object that should not match the given pattern
+     * @param content An object of key/values the object should not contain
+     */
+    function noObjectContent(obj: object, content: object): void;
+
+    /**
+     * Assert a JSON file contains the provided keys
+     * @param filename
+     * @param content An object of key/values the file should contains
+     */
+    function JSONFileContent(filename: string, content: object): void;
+
+    /**
+     * @see JSONFileContent
+     */
+    function jsonFileContent(filename: string, content: object): void;
+
+    /**
+     * Assert a JSON file does not contain the provided keys
+     * @param filename
+     * @param content An object of key/values the file should not contain
+     */
+    function noJSONFileContent(filename: string, content: object): void;
+
+    /**
+     * @see noJSONFileContent
+     */
+    function noJsonFileContent(filename: string, content: object): void;
+}
+
+export = assert;
diff --git a/types/yeoman-assert/tsconfig.json b/types/yeoman-assert/tsconfig.json
new file mode 100644
index 0000000000..95612ba7ca
--- /dev/null
+++ b/types/yeoman-assert/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "yeoman-assert-tests.ts"
+    ]
+}
diff --git a/types/yeoman-assert/tslint.json b/types/yeoman-assert/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/yeoman-assert/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/yeoman-assert/yeoman-assert-tests.ts b/types/yeoman-assert/yeoman-assert-tests.ts
new file mode 100644
index 0000000000..87732f1f7b
--- /dev/null
+++ b/types/yeoman-assert/yeoman-assert-tests.ts
@@ -0,0 +1,34 @@
+import * as assert from 'yeoman-assert';
+
+assert.file('path');
+assert.file(['path', 'path2']);
+
+assert.noFile('path');
+assert.noFile(['path', 'path2']);
+
+assert.fileContent('file', /abc/g);
+assert.fileContent(['file', 'file2'], 'abc');
+
+assert.equalsFileContent('file', 'expectedContent');
+assert.equalsFileContent([['file', 'expectedContent'], ['file2', 'expectedContent2']]);
+
+assert.noFileContent('file', /abc/g);
+assert.noFileContent(['file', 'file2'], 'abc');
+
+assert.textEqual('value', 'expected');
+assert.implement({value: 'test'}, {other: 'test2'});
+assert.implement({value: 'test'}, ['test2', 'test3']);
+
+assert.notImplement({value: 'test'}, {other: 'test2'});
+assert.notImplement({value: 'test'}, ['test2', 'test3']);
+
+assert.objectContent({value: 'test'}, {value: 'test2'});
+assert.noObjectContent({value: 'test'}, {value: 'test2'});
+
+assert.JSONFileContent('filename', {root: 'content'});
+assert.jsonFileContent('filename', {root: 'content'});
+
+assert.noJSONFileContent('filename', {root: 'content'});
+assert.noJsonFileContent('filename', {root: 'content'});
+
+assert.equal('test', 'expected');

From 5d4421790f435864c13dde0750333c6818de7db4 Mon Sep 17 00:00:00 2001
From: Alex Deas <alex@primarybid.com>
Date: Thu, 22 Nov 2018 16:30:31 +0000
Subject: [PATCH 192/836] Allow type parameters for cond

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

diff --git a/types/ramda/index.d.ts b/types/ramda/index.d.ts
index a3bc51c8ca..77dcdb05a0 100644
--- a/types/ramda/index.d.ts
+++ b/types/ramda/index.d.ts
@@ -776,7 +776,7 @@ declare namespace R {
          * point fn returns the result of applying its arguments to the corresponding transformer. If none of the predicates
          * matches, fn returns undefined.
          */
-        cond(fns: ReadonlyArray<[Pred, (...a: any[]) => any]>): (...a: any[]) => any;
+        cond<A, B>(fns: ReadonlyArray<[SafePred<A>, (a: A) => B]>): (a: A) => B;
 
         /**
          * Wraps a constructor function inside a curried function that can be called with the same arguments and returns the same type.
diff --git a/types/ramda/ramda-tests.ts b/types/ramda/ramda-tests.ts
index 2f68808d17..61f09c1f40 100644
--- a/types/ramda/ramda-tests.ts
+++ b/types/ramda/ramda-tests.ts
@@ -1306,14 +1306,19 @@ type Pair = KeyValuePair<string, number>;
 };
 
 () => {
-    const fn        = R.cond([
-        [R.equals(0), R.always("water freezes at 0°C")],
-        [R.equals(100), R.always("water boils at 100°C")],
-        [R.T, (temp: number) => `nothing special happens at ${temp}°C`]
+    const f = R.cond<number, string>([
+        [x => x === 0, () => "a"],
+        [() => true, () => "b"],
     ]);
-    const a: string = fn(0); // => 'water freezes at 0°C'
-    const b: string = fn(50); // => 'nothing special happens at 50°C'
-    const c: string = fn(100); // => 'water boils at 100°C'
+    f(0); // $ExpectType string
+    f(""); // $ExpectError
+
+    const g = R.cond([
+        [x => x === 0, () => "a"],
+        [() => true, () => "b"],
+    ]);
+    g(0);
+    g("");
 };
 
 () => {

From bd6515d5871238514dab001bcf0c062f0f25d721 Mon Sep 17 00:00:00 2001
From: TeamworkGuy2 <straitfrommars@rocketmail.com>
Date: Thu, 22 Nov 2018 16:34:26 +0000
Subject: [PATCH 193/836] [cached-path-relative] Add cached-path-relative@1.0.2
 definition

---
 .../cached-path-relative-tests.ts             |  7 ++++++
 types/cached-path-relative/index.d.ts         |  8 +++++++
 types/cached-path-relative/tsconfig.json      | 23 +++++++++++++++++++
 types/cached-path-relative/tslint.json        |  1 +
 4 files changed, 39 insertions(+)
 create mode 100644 types/cached-path-relative/cached-path-relative-tests.ts
 create mode 100644 types/cached-path-relative/index.d.ts
 create mode 100644 types/cached-path-relative/tsconfig.json
 create mode 100644 types/cached-path-relative/tslint.json

diff --git a/types/cached-path-relative/cached-path-relative-tests.ts b/types/cached-path-relative/cached-path-relative-tests.ts
new file mode 100644
index 0000000000..22e6af97df
--- /dev/null
+++ b/types/cached-path-relative/cached-path-relative-tests.ts
@@ -0,0 +1,7 @@
+import cachedPathRelative = require("cached-path-relative");
+
+function browserifyTest() {
+    const file = "file.txt";
+    const m1: string = cachedPathRelative("./", file).replace(/\\/g, '/');
+    return m1;
+}
diff --git a/types/cached-path-relative/index.d.ts b/types/cached-path-relative/index.d.ts
new file mode 100644
index 0000000000..56076870bc
--- /dev/null
+++ b/types/cached-path-relative/index.d.ts
@@ -0,0 +1,8 @@
+// Type definitions for cached-path-relative 1.0
+// Project: https://github.com/ashaffer/cached-path-relative
+// Definitions by: TeamworkGuy2 <https://github.com/TeamworkGuy2>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare function cachedPathRelative(from: string, to: string): string;
+
+export = cachedPathRelative;
diff --git a/types/cached-path-relative/tsconfig.json b/types/cached-path-relative/tsconfig.json
new file mode 100644
index 0000000000..e69970c325
--- /dev/null
+++ b/types/cached-path-relative/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "cached-path-relative-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/cached-path-relative/tslint.json b/types/cached-path-relative/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/cached-path-relative/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 402324af7b7157e809f604d4536e7fd9cda24ca2 Mon Sep 17 00:00:00 2001
From: Wose <Jacksonteather@hotmail.com>
Date: Thu, 22 Nov 2018 11:35:25 -0500
Subject: [PATCH 194/836] Fix extra spaces in previous commit
 (mongoose-posthook-overload)

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

diff --git a/types/mongoose/index.d.ts b/types/mongoose/index.d.ts
index aa24ca16b1..3672b75b8f 100644
--- a/types/mongoose/index.d.ts
+++ b/types/mongoose/index.d.ts
@@ -811,8 +811,8 @@ declare module "mongoose" {
      * @param fn callback
      */
     post<T extends Document>(method: string, fn: (
-        doc: T, next: (err?: NativeError) => void
-      ) => void): this;
+      doc: T, next: (err?: NativeError) => void
+    ) => void): this;
 
     post<T extends Document>(method: string, fn: (
       error: mongodb.MongoError, doc: T, next: (err?: NativeError) => void

From a133ea37430313b85c65bbc775ba909c58e40a30 Mon Sep 17 00:00:00 2001
From: Markus Lasermann <markus.lasermann@ptvgroup.com>
Date: Thu, 22 Nov 2018 17:56:50 +0100
Subject: [PATCH 195/836] add types for
 https://github.com/zesik/react-splitter-layout

---
 types/react-splitter-layout/index.d.ts        | 100 ++++++++++++++++++
 .../react-splitter-layout-tests.tsx           |  17 +++
 types/react-splitter-layout/tsconfig.json     |  25 +++++
 types/react-splitter-layout/tslint.json       |   1 +
 4 files changed, 143 insertions(+)
 create mode 100644 types/react-splitter-layout/index.d.ts
 create mode 100644 types/react-splitter-layout/react-splitter-layout-tests.tsx
 create mode 100644 types/react-splitter-layout/tsconfig.json
 create mode 100644 types/react-splitter-layout/tslint.json

diff --git a/types/react-splitter-layout/index.d.ts b/types/react-splitter-layout/index.d.ts
new file mode 100644
index 0000000000..ec25b5fe1a
--- /dev/null
+++ b/types/react-splitter-layout/index.d.ts
@@ -0,0 +1,100 @@
+// Type definitions for react-splitter-layout v3.0.1
+// Project: https://github.com/zesik/react-splitter-layout#readme
+// Definitions by: Markus Lasermann <https://github.com/snaptags/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 3.1.6
+
+import * as React from "react";
+
+export default SplitterLayout;
+
+declare class SplitterLayout extends React.PureComponent<SplitterLayoutProps> {
+}
+
+type TPrimaryIndex = 0|1;
+
+export interface SplitterLayoutProps {
+    /**
+     * Custom CSS class name applied to the layout div.
+     * You can use this to customize layout style.
+     * Refers to the original stylesheet to see what you can customize.
+     */
+    customClassName?: string;
+
+    /**
+     * Determine whether the layout should be a horizontal split or a vertical split.
+     *
+     * @default false
+     */
+    vertical?: boolean;
+
+    /**
+     * Determine whether the width of each pane should be calculated in percentage or by pixels.
+     * The default value is false, which means width is calculated in pixels.
+     *
+     * @default false
+     */
+    percentage?: boolean;
+
+    /**
+     * Index of the primary pane.
+     * Since SplitterLayout supports at most 2 children, only 0 or 1 is allowed.
+     *
+     * A primary pane is used to show users primary content, while a secondary pane is the other pane.
+     * When window size changes and percentage is set to false, primary pane's size is flexible
+     * and secondary pane's size is kept unchanged. However, when the window size is not enough
+     * for showing both minimal primary pane and minimal secondary pane,
+     * the primary pane's size is served first.
+     *
+     * @default 0
+     */
+    primaryIndex?: TPrimaryIndex;
+
+    /**
+     * Minimal size of primary pane.
+     * When percentage is set to false, this value is pixel size (25 means 25px).
+     * When percentage is set to true, this value is percentage (25 means 25%).
+     *
+     * @default 0
+     */
+    primaryMinSize?: number;
+
+    /**
+     * Minimal size of secondary pane.
+     */
+    secondaryMinSize?: number;
+
+    /**
+     * Initial size of secondary pane when page loads.
+     * If this prop is not defined, SplitterLayout tries to split the layout with equal sizes.
+     * (Note: equal size may not apply when there are nested layouts.)
+     *
+     * @default undefined
+     */
+    secondaryInitialSize?: number;
+
+    /**
+     * Called when dragging is started.
+     *
+     * No parameter will be passed to event handlers.
+     */
+    onDragStart?: () => void;
+
+    /**
+     * Called when dragging finishes.
+     *
+     * No parameter will be passed to event handlers.
+     */
+    onDragEnd?: () => void;
+
+    /**
+     * Called when the size of secondary pane is changed.
+     *
+     * Event handlers will be passed with a single parameter of number type representing
+     * new size of secondary pane.
+     * When percentage is set to false, the value is in pixel size.
+     * When percentage is set to true, the value is in percentage.
+     */
+    onSecondaryPaneSizeChange?: (value: number) => void;
+}
+
diff --git a/types/react-splitter-layout/react-splitter-layout-tests.tsx b/types/react-splitter-layout/react-splitter-layout-tests.tsx
new file mode 100644
index 0000000000..1f97db7077
--- /dev/null
+++ b/types/react-splitter-layout/react-splitter-layout-tests.tsx
@@ -0,0 +1,17 @@
+import * as React from "react";
+import SplitterLayout, {SplitterLayoutProps} from "react-splitter-layout";
+
+export class SplitterLayoutTest extends React.PureComponent<{}> {
+    render(): JSX.Element {
+        const props: SplitterLayoutProps = {
+            percentage: true,
+            secondaryInitialSize: 30,
+        };
+        return (
+            <SplitterLayout {...props}>
+                <div>1st</div>
+                <div>2nd</div>
+            </SplitterLayout>
+        );
+    }
+}
diff --git a/types/react-splitter-layout/tsconfig.json b/types/react-splitter-layout/tsconfig.json
new file mode 100644
index 0000000000..e268261ea1
--- /dev/null
+++ b/types/react-splitter-layout/tsconfig.json
@@ -0,0 +1,25 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "jsx": "react",
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "react-splitter-layout-tests.tsx"
+    ]
+}
diff --git a/types/react-splitter-layout/tslint.json b/types/react-splitter-layout/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-splitter-layout/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From c2fac6d23595aebaae11bbb4e45b598ceae29bd0 Mon Sep 17 00:00:00 2001
From: Kon Pik <485881+konpikwastaken@users.noreply.github.com>
Date: Thu, 22 Nov 2018 09:14:42 -0800
Subject: [PATCH 196/836] Updating definitions for combined-stream v1.0.7
 (#30295)

* updates

* PR feedback

* updated PR changes
---
 .../combined-stream/combined-stream-tests.ts  | 35 +++++++++++-----
 types/combined-stream/index.d.ts              | 40 +++++++++----------
 2 files changed, 46 insertions(+), 29 deletions(-)

diff --git a/types/combined-stream/combined-stream-tests.ts b/types/combined-stream/combined-stream-tests.ts
index ffdc0eaac7..540db77b68 100644
--- a/types/combined-stream/combined-stream-tests.ts
+++ b/types/combined-stream/combined-stream-tests.ts
@@ -1,17 +1,17 @@
-import CombinedStream = require("combined-stream");
-import { createReadStream, createWriteStream } from "fs";
+import CombinedStream = require('combined-stream');
+import { createReadStream, createWriteStream } from 'fs';
 
 const stream1 = new CombinedStream();
 
-stream1.append(createReadStream("tsconfig.json"));
-stream1.append(createReadStream("tslint.json"));
-stream1.append(createReadStream("index.d.ts"));
+stream1.append(createReadStream('tsconfig.json'));
+stream1.append(createReadStream('tslint.json'));
+stream1.append(createReadStream('index.d.ts'));
 
-stream1.pipe(createWriteStream("combined.txt"));
+stream1.pipe(createWriteStream('combined.txt'));
 
 const stream2 = CombinedStream.create({
     maxDataSize: 1 << 32,
-    pauseStreams: false,
+    pauseStreams: false
 });
 
 stream1.destroy();
@@ -19,12 +19,29 @@ stream1.destroy();
 // should log true
 console.log(CombinedStream.isStreamLike(stream2));
 
-stream2.on("data", (data) => {
+stream2.on('data', data => {
     console.log(data);
 });
 
-stream2.pipe(createWriteStream("combined.txt"));
+stream2.pipe(createWriteStream('combined.txt'));
 
 stream2.write(CombinedStream.name);
 
 stream2.destroy();
+
+const arrowFunction = (): CombinedStream => {
+    const stream3 = new CombinedStream();
+
+    // test next function
+    stream3.append(next => {
+        stream3.append('hello world');
+        next(createReadStream(''));
+    });
+
+    // next function with no next
+    stream3.append(() => {
+        stream3.append('hello again');
+    });
+
+    return stream3;
+};
diff --git a/types/combined-stream/index.d.ts b/types/combined-stream/index.d.ts
index 271814a4af..b82b399e7f 100644
--- a/types/combined-stream/index.d.ts
+++ b/types/combined-stream/index.d.ts
@@ -1,19 +1,27 @@
 // Type definitions for combined-stream 1.0
 // Project: https://github.com/felixge/node-combined-stream
-// Definitions by: Felix Geisendörfer <https://github.com/felixge>, Tomek Łaziuk <https://github.com/tlaziuk>
+// Definitions by: Felix Geisendörfer <https://github.com/felixge>, Tomek Łaziuk <https://github.com/tlaziuk>, Kon Pik <https://github.com/konpikwastaken>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="node" />
 
-import { Stream } from "stream";
+import { Stream } from 'stream';
 
-declare class CombinedStream extends Stream implements CombinedStream.Options {
+type Appendable = NodeJS.ReadableStream | NodeJS.WritableStream | Buffer | string | NextFunction;
+type NextFunction = (next: (stream: Appendable) => any) => any;
+
+interface Options {
+    maxDataSize?: number;
+    pauseStreams?: boolean;
+}
+
+declare class CombinedStream extends Stream implements Options {
     readonly writable: boolean;
     readonly readable: boolean;
     readonly dataSize: number;
     maxDataSize: number;
     pauseStreams: boolean;
-    append(stream: NodeJS.ReadableStream | NodeJS.WritableStream | Buffer | string): this;
+    append(stream: Appendable): this;
     write(data: any): void;
     pause(): void;
     resume(): void;
@@ -34,23 +42,15 @@ declare class CombinedStream extends Stream implements CombinedStream.Options {
     _emitError(error: Error): void;
 
     // events
-    on(event: "close" | "end" | "resume" | "pause", cb: () => void): this;
-    on(event: "error", cb: (err: Error) => void): this;
-    on(event: "data", cb: (data: any) => void): this;
-    once(event: "close" | "end" | "resume" | "pause", cb: () => void): this;
-    once(event: "error", cb: (err: Error) => void): this;
-    once(event: "data", cb: (data: any) => void): this;
-}
+    on(event: 'close' | 'end' | 'resume' | 'pause', cb: () => void): this;
+    on(event: 'error', cb: (err: Error) => void): this;
+    on(event: 'data', cb: (data: any) => void): this;
+    once(event: 'close' | 'end' | 'resume' | 'pause', cb: () => void): this;
+    once(event: 'error', cb: (err: Error) => void): this;
+    once(event: 'data', cb: (data: any) => void): this;
 
-declare namespace CombinedStream {
-    interface Options {
-        maxDataSize?: number;
-        pauseStreams?: boolean;
-    }
-
-    function create(options?: Options): CombinedStream;
-
-    function isStreamLike(stream: any): stream is Stream;
+    static create(options?: Options): CombinedStream;
+    static isStreamLike(stream: any): stream is Stream;
 }
 
 export = CombinedStream;

From a6be7b57b6776a1ece8dabbdc991042275144f92 Mon Sep 17 00:00:00 2001
From: Benny van Reeven <benny.van.reeven@mendix.com>
Date: Thu, 22 Nov 2018 20:15:06 +0100
Subject: [PATCH 197/836] Add minimumBytes property to file-type

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

diff --git a/types/file-type/file-type-tests.ts b/types/file-type/file-type-tests.ts
index ecfd658a1a..640d2c8fb0 100644
--- a/types/file-type/file-type-tests.ts
+++ b/types/file-type/file-type-tests.ts
@@ -2,3 +2,5 @@ import fileType = require("file-type");
 
 fileType(new Buffer([0xFF, 0xD8, 0xFF]));
 fileType(new Uint8Array([0xFF, 0xD8, 0xFF]));
+
+const minimumBytes: number = fileType.minimumBytes;
diff --git a/types/file-type/index.d.ts b/types/file-type/index.d.ts
index c7f95c256e..2a0deee26a 100644
--- a/types/file-type/index.d.ts
+++ b/types/file-type/index.d.ts
@@ -15,4 +15,6 @@ declare namespace FileType {
         ext: string;
         mime: string;
     }
+
+    const minimumBytes: number;
 }

From 1cd0b9e3df80430b42c3886f696dfb2e79a24e86 Mon Sep 17 00:00:00 2001
From: Justin Grant <justingrant@users.noreply.github.com>
Date: Thu, 22 Nov 2018 11:22:47 -0800
Subject: [PATCH 198/836] Bump library version to 1.8 to prepare for 2.00

react-datepicker recently released a 2.00 release with lots of breaking changes.  The current typings file is version 1.1. Before updating the typings version to 2.00, it makes sense to bring the current typings version up to 1.8 (the latest library version before 2.0) to make it easier for future pre-2.0 library users to find the correct typings version to use.

To see why this is needed, imagine a future developer who is sticking with version 1.8 of the library to defer rewriting from Moment to Date. If you're that developer, should you use version 1.1 or 2.0 of the typings?  If we bump the typings version to 1.8, then that choice is obvious.

This PR doesn't make any typings or tests changes-- it only bumps the library version in the first header line so that the version of the resulting @types/react-datepicker package will also be 1.8.
---
 types/react-datepicker/index.d.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/types/react-datepicker/index.d.ts b/types/react-datepicker/index.d.ts
index 23e542d322..4af6cae9b2 100644
--- a/types/react-datepicker/index.d.ts
+++ b/types/react-datepicker/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for react-datepicker 1.1
+// Type definitions for react-datepicker 1.8
 // Project: https://github.com/Hacker0x01/react-datepicker
 // Definitions by: Rajab Shakirov <https://github.com/radziksh>,
 //                 Andrey Balokha <https://github.com/andrewBalekha>,
@@ -7,6 +7,7 @@
 //                 Roy Xue <https://github.com/royxue>
 //                 Koala Human <https://github.com/KoalaHuman>
 //                 Sean Kelley <https://github.com/seansfkelley>
+//                 Justin Grant <https://github.com/justingrant>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 

From dabc2bf03a3acd325f92078c2139bd5d37dd9424 Mon Sep 17 00:00:00 2001
From: Fellipe Chagas <chagas.0@gmail.com>
Date: Thu, 22 Nov 2018 18:41:13 -0200
Subject: [PATCH 199/836] Adds JSDocs to the new NavigationLeafRoute params

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

diff --git a/types/react-navigation/index.d.ts b/types/react-navigation/index.d.ts
index e51629f3af..615d79353d 100644
--- a/types/react-navigation/index.d.ts
+++ b/types/react-navigation/index.d.ts
@@ -133,7 +133,13 @@ export interface NavigationLeafRoute<Params = NavigationParams> {
    * e.g. `{ car_id: 123 }` in a route that displays a car.
    */
   params?: Params;
+  /**
+   * Array containing the navigator's routes
+   */
   routes: NavigationRoute[];
+  /**
+   * Flag that indicates the transition state of the route
+   */
   isTransitioning: boolean;
 }
 

From 756349c67c53c76888b575abe1c7e545378b72fe Mon Sep 17 00:00:00 2001
From: Boris Sergeyev <surgeboris@gmail.com>
Date: Thu, 22 Nov 2018 21:43:51 +0100
Subject: [PATCH 200/836] [react-redux] fixed mistreating of action thunk
 creator parameters

---
 types/react-redux/index.d.ts            | 11 +++++++---
 types/react-redux/react-redux-tests.tsx | 27 ++++++++++++++++---------
 2 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/types/react-redux/index.d.ts b/types/react-redux/index.d.ts
index 2f919581f4..1cccae6d01 100644
--- a/types/react-redux/index.d.ts
+++ b/types/react-redux/index.d.ts
@@ -13,7 +13,7 @@
 //                 Anatoli Papirovski <https://github.com/apapirovski>
 //                 Boris Sergeyev <https://github.com/surgeboris>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.8
+// TypeScript Version: 3.0
 
 // Known Issue:
 // There is a known issue in TypeScript, which doesn't allow decorators to change the signature of the classes
@@ -112,9 +112,14 @@ export type InferableComponentEnhancerWithProps<TInjectedProps, TNeedsProps> =
 export type InferableComponentEnhancer<TInjectedProps> =
     InferableComponentEnhancerWithProps<TInjectedProps, {}>;
 
+export type WrappedThunkActionCreator<TActionCreator extends (...args: any[]) => any> =
+    TActionCreator extends (...args: infer TParams) => (...args: any[]) => infer TReturn
+        ? (...args: TParams) => TReturn
+        : TActionCreator;
+
 export type HandleThunkActionCreator<TActionCreator> =
-    TActionCreator extends (...args: any[]) => (...args: any[]) => any
-        ? ReturnType<TActionCreator>
+    TActionCreator extends (...args: any[]) => any
+        ? WrappedThunkActionCreator<TActionCreator>
         : TActionCreator;
 
 // redux-thunk middleware returns thunk's return value from dispatch call
diff --git a/types/react-redux/react-redux-tests.tsx b/types/react-redux/react-redux-tests.tsx
index aff8515e87..f47683047e 100644
--- a/types/react-redux/react-redux-tests.tsx
+++ b/types/react-redux/react-redux-tests.tsx
@@ -102,20 +102,27 @@ function MapDispatch() {
 }
 
 function MapDispatchWithThunkActionCreators() {
-    class TestComponent extends React.Component<{
-        foo: string,
-        onClick(): void,
-        thunkAction(): Promise<void>
-    }> {}
-
-    const mapDispatchToProps = () => ({
-        onClick: () => {},
-        thunkAction: () => async () => {}
+    const simpleAction = (payload: boolean) => ({
+        type: 'SIMPLE_ACTION',
+        payload,
     });
+    const thunkAction = (param1: number, param2: string) => (
+        async (dispatch: Dispatch, { foo }: OwnProps) => {
+            return foo;
+        }
+    );
+    interface OwnProps {
+        foo: string;
+    }
+    interface TestComponentProps extends OwnProps {
+        simpleAction: typeof simpleAction;
+        thunkAction(param1: number, param2: string): Promise<string>;
+   }
+    class TestComponent extends React.Component<TestComponentProps> {}
 
     const Test = connect(
         null,
-        mapDispatchToProps,
+        ({ simpleAction, thunkAction }),
     )(TestComponent);
 
     const verify = <Test foo='bar' />;

From 35d989dce077cdd42be9943a53895eeebf569fb8 Mon Sep 17 00:00:00 2001
From: Boris Sergeyev <surgeboris@gmail.com>
Date: Thu, 22 Nov 2018 22:16:23 +0100
Subject: [PATCH 201/836] [react-redux] bumped TS versions of packages
 dependent on react-redux

---
 types/mirrorx/index.d.ts                   | 2 +-
 types/next-redux-saga/index.d.ts           | 2 +-
 types/next-redux-wrapper/index.d.ts        | 2 +-
 types/react-intl-redux/index.d.ts          | 2 +-
 types/react-lifecycle-component/index.d.ts | 2 +-
 types/react-redux-toastr/index.d.ts        | 2 +-
 types/react-router-redux/index.d.ts        | 2 +-
 types/redux-auth-wrapper/index.d.ts        | 2 +-
 types/redux-devtools/index.d.ts            | 2 +-
 types/redux-form/index.d.ts                | 2 +-
 types/redux-form/v6/index.d.ts             | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/types/mirrorx/index.d.ts b/types/mirrorx/index.d.ts
index 443712c325..e2fa0ee465 100644
--- a/types/mirrorx/index.d.ts
+++ b/types/mirrorx/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/mirrorjs/mirror
 // Definitions by: Aaronphy <https://github.com/aaronphy>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.8
+// TypeScript Version: 3.0
 
 import * as H from 'history';
 
diff --git a/types/next-redux-saga/index.d.ts b/types/next-redux-saga/index.d.ts
index b7575fba16..0366868d97 100644
--- a/types/next-redux-saga/index.d.ts
+++ b/types/next-redux-saga/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/bmealhouse/next-redux-saga
 // Definitions by: Leo Cavalcante <https://github.com/leocavalcante>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.8
+// TypeScript Version: 3.0
 
 import { ComponentType } from "react";
 
diff --git a/types/next-redux-wrapper/index.d.ts b/types/next-redux-wrapper/index.d.ts
index 16af858743..cbf56579d5 100644
--- a/types/next-redux-wrapper/index.d.ts
+++ b/types/next-redux-wrapper/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Steve <https://github.com/stevegeek>
 //                 Jungwoo-An <https://github.com/Jungwoo-An>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.8
+// TypeScript Version: 3.0
 
 /// <reference types="node" />
 
diff --git a/types/react-intl-redux/index.d.ts b/types/react-intl-redux/index.d.ts
index 9d9e805df9..4410e7c019 100644
--- a/types/react-intl-redux/index.d.ts
+++ b/types/react-intl-redux/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/ratson/react-intl-redux
 // Definitions by: Karol Janyst <https://github.com/LKay>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.8
+// TypeScript Version: 3.0
 
 import { Action, AnyAction } from "redux"
 import { Provider as ReduxProvider } from "react-redux"
diff --git a/types/react-lifecycle-component/index.d.ts b/types/react-lifecycle-component/index.d.ts
index 315d04f7fb..bb6dc65dd8 100644
--- a/types/react-lifecycle-component/index.d.ts
+++ b/types/react-lifecycle-component/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/JamieDixon/react-lifecycle-component
 // Definitions by: Alexander Fisher <https://github.com/pixelshaded>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.8
+// TypeScript Version: 3.0
 
 import { ComponentLifecycle, Component, ComponentClass } from 'react';
 import { Connect } from 'react-redux';
diff --git a/types/react-redux-toastr/index.d.ts b/types/react-redux-toastr/index.d.ts
index fc11da9c43..9a7a115725 100644
--- a/types/react-redux-toastr/index.d.ts
+++ b/types/react-redux-toastr/index.d.ts
@@ -4,7 +4,7 @@
 //                 Artyom Stukans <https://github.com/artyomsv>
 //                 Mika Kuitunen <https://github.com/kulmajaba>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.8
+// TypeScript Version: 3.0
 
 import { Component } from 'react';
 import { Action, Reducer } from 'redux';
diff --git a/types/react-router-redux/index.d.ts b/types/react-router-redux/index.d.ts
index 9dfbd58c11..7abdc88505 100644
--- a/types/react-router-redux/index.d.ts
+++ b/types/react-router-redux/index.d.ts
@@ -4,7 +4,7 @@
 //                 Shoya Tanaka <https://github.com/8398a7>
 //                 Mykolas <https://github.com/mykolas>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.8
+// TypeScript Version: 3.0
 
 import {
     Store,
diff --git a/types/redux-auth-wrapper/index.d.ts b/types/redux-auth-wrapper/index.d.ts
index 728be4a54b..3ec88b50dc 100644
--- a/types/redux-auth-wrapper/index.d.ts
+++ b/types/redux-auth-wrapper/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/mjrussell/redux-auth-wrapper
 // Definitions by: Karol Janyst <https://github.com/LKay>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.8
+// TypeScript Version: 3.0
 
 import { ComponentClass, StatelessComponent, ComponentType, ReactType } from "react";
 
diff --git a/types/redux-devtools/index.d.ts b/types/redux-devtools/index.d.ts
index 234fb9a4bb..ddead025ff 100644
--- a/types/redux-devtools/index.d.ts
+++ b/types/redux-devtools/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/gaearon/redux-devtools
 // Definitions by: Petryshyn Sergii <https://github.com/mc-petry>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.8
+// TypeScript Version: 3.0
 
 import * as React from 'react';
 import { GenericStoreEnhancer } from 'redux';
diff --git a/types/redux-form/index.d.ts b/types/redux-form/index.d.ts
index e80c196c0a..5851728369 100644
--- a/types/redux-form/index.d.ts
+++ b/types/redux-form/index.d.ts
@@ -12,7 +12,7 @@
 //                 Maddi Joyce <https://github.com/maddijoyce>
 //                 Kamil Wojcik <https://github.com/smifun>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.9
+// TypeScript Version: 3.0
 import {
   ComponentClass,
   StatelessComponent,
diff --git a/types/redux-form/v6/index.d.ts b/types/redux-form/v6/index.d.ts
index a8209a7643..5127457884 100644
--- a/types/redux-form/v6/index.d.ts
+++ b/types/redux-form/v6/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/erikras/redux-form
 // Definitions by: Carson Full <https://github.com/carsonf>, Daniel Lytkin <https://github.com/aikoven>, Karol Janyst <https://github.com/LKay>, Luka Zakrajsek <https://github.com/bancek>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.8
+// TypeScript Version: 3.0
 
 import {
   ComponentClass,

From 2d5a8af9f819fad592387f8b4ce3731643125b05 Mon Sep 17 00:00:00 2001
From: Boris Sergeyev <surgeboris@gmail.com>
Date: Thu, 22 Nov 2018 22:18:01 +0100
Subject: [PATCH 202/836] [react-redux] used whitespace consistently (no tabs)

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

diff --git a/types/react-redux/index.d.ts b/types/react-redux/index.d.ts
index 1cccae6d01..bf65d89fd5 100644
--- a/types/react-redux/index.d.ts
+++ b/types/react-redux/index.d.ts
@@ -65,11 +65,11 @@ export type AdvancedComponentDecorator<TProps, TOwnProps> =
  *   DecorationTargetProps[P] definition, its definition will be that of InjectedProps[P]
  */
 export type Matching<InjectedProps, DecorationTargetProps> = {
-	[P in keyof DecorationTargetProps]: P extends keyof InjectedProps
-		? InjectedProps[P] extends DecorationTargetProps[P]
-			? DecorationTargetProps[P]
-			: InjectedProps[P]
-		: DecorationTargetProps[P];
+    [P in keyof DecorationTargetProps]: P extends keyof InjectedProps
+        ? InjectedProps[P] extends DecorationTargetProps[P]
+            ? DecorationTargetProps[P]
+            : InjectedProps[P]
+        : DecorationTargetProps[P];
 };
 
 /**
@@ -95,16 +95,16 @@ export type GetProps<C> = C extends ComponentType<infer P> ? P : never;
 // Applies LibraryManagedAttributes (proper handling of defaultProps
 // and propTypes), as well as defines WrappedComponent.
 export type ConnectedComponentClass<C, P> = ComponentClass<JSX.LibraryManagedAttributes<C, P>> & {
-	WrappedComponent: C;
+    WrappedComponent: C;
 };
 
 // Injects props and removes them from the prop requirements.
 // Will not pass through the injected props if they are passed in during
 // render. Also adds new prop requirements from TNeedsProps.
 export type InferableComponentEnhancerWithProps<TInjectedProps, TNeedsProps> =
-	<C extends ComponentType<Matching<TInjectedProps, GetProps<C>>>>(
-		component: C
-	) => ConnectedComponentClass<C, Omit<GetProps<C>, keyof Shared<TInjectedProps, GetProps<C>>> & TNeedsProps>;
+    <C extends ComponentType<Matching<TInjectedProps, GetProps<C>>>>(
+        component: C
+    ) => ConnectedComponentClass<C, Omit<GetProps<C>, keyof Shared<TInjectedProps, GetProps<C>>> & TNeedsProps>;
 
 // Injects props and removes them from the prop requirements.
 // Will not pass through the injected props if they are passed in during

From fe3f2298c762fae51ed5a2882967c26434fa86dc Mon Sep 17 00:00:00 2001
From: Jessica <jessicamfranco3@gmail.com>
Date: Fri, 23 Nov 2018 14:48:52 +0900
Subject: [PATCH 203/836] Add failing test

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

diff --git a/types/styled-components/test/index.tsx b/types/styled-components/test/index.tsx
index e435d90011..50a17b7069 100644
--- a/types/styled-components/test/index.tsx
+++ b/types/styled-components/test/index.tsx
@@ -99,6 +99,21 @@ const fadeIn = keyframes`
   }
 `;
 
+const showAnimation = css`
+  opacity: 1;
+  transform: scale(1) translateY(0);
+`;
+
+const hideAnimation = css`
+  opacity: 0;
+  transform: scale(0.95, 0.8) translateY(20px);
+`;
+
+const entryAnimation = keyframes`
+  from { ${hideAnimation} }
+  to { ${showAnimation} }
+`;
+
 const animationRule = css`
     ${fadeIn} 1s infinite alternate;
 `;

From ad2da6f44867a1b9bd1d248c68452a77dd65697e Mon Sep 17 00:00:00 2001
From: Jessica <jessicamfranco3@gmail.com>
Date: Fri, 23 Nov 2018 14:52:35 +0900
Subject: [PATCH 204/836] Add overload to fix test

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

diff --git a/types/styled-components/index.d.ts b/types/styled-components/index.d.ts
index a842c94c63..1b26568498 100644
--- a/types/styled-components/index.d.ts
+++ b/types/styled-components/index.d.ts
@@ -287,6 +287,10 @@ export type ThemedStyledInterface<T extends object> = ThemedBaseStyledInterface<
 export type StyledInterface = ThemedStyledInterface<DefaultTheme>;
 
 export interface BaseThemedCssFunction<T extends object> {
+    (
+        first: TemplateStringsArray | NonNullable<SimpleInterpolation>,
+        ...interpolations: SimpleInterpolation[]
+    ): FlattenSimpleInterpolation;
     (
         first:
             | TemplateStringsArray

From 4dd9510a504875fb79a399d468e8f39e892af617 Mon Sep 17 00:00:00 2001
From: Jessica <jessicamfranco3@gmail.com>
Date: Fri, 23 Nov 2018 15:05:46 +0900
Subject: [PATCH 205/836] Strengthen type of ReactType to also validate
 intrinsic elements

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

diff --git a/types/react/index.d.ts b/types/react/index.d.ts
index 25f3c710ae..522a106944 100644
--- a/types/react/index.d.ts
+++ b/types/react/index.d.ts
@@ -50,7 +50,11 @@ declare namespace React {
     // React Elements
     // ----------------------------------------------------------------------
 
-    type ReactType<P = any> = string | ComponentType<P>;
+    type ReactType<P = any> =
+        {
+            [K in keyof JSX.IntrinsicElements]: P extends JSX.IntrinsicElements[K] ? K : never
+        }[keyof JSX.IntrinsicElements] |
+        ComponentType<P>;
     type ComponentType<P = {}> = ComponentClass<P> | FunctionComponent<P>;
 
     type Key = string | number;
@@ -713,17 +717,17 @@ declare namespace React {
      * NOTE: prefer ComponentPropsWithRef, if the ref is forwarded,
      * or ComponentPropsWithoutRef when refs are not supported.
      */
-    type ComponentProps<T extends keyof JSX.IntrinsicElements | ComponentType<any>> =
+    type ComponentProps<T extends ReactType> =
         T extends ComponentType<infer P>
             ? P
             : T extends keyof JSX.IntrinsicElements
                 ? JSX.IntrinsicElements[T]
                 : {};
-    type ComponentPropsWithRef<T extends keyof JSX.IntrinsicElements | ComponentType<any>> =
+    type ComponentPropsWithRef<T extends ReactType> =
         T extends ComponentClass<infer P>
             ? PropsWithoutRef<P> & RefAttributes<InstanceType<T>>
             : PropsWithRef<ComponentProps<T>>;
-    type ComponentPropsWithoutRef<T extends keyof JSX.IntrinsicElements | ComponentType<any>> =
+    type ComponentPropsWithoutRef<T extends ReactType> =
         PropsWithoutRef<ComponentProps<T>>;
 
     // will show `Memo(${Component.displayName || Component.name})` in devtools by default,
diff --git a/types/react/test/tsx.tsx b/types/react/test/tsx.tsx
index f344fb2838..a8ca2ae1ea 100644
--- a/types/react/test/tsx.tsx
+++ b/types/react/test/tsx.tsx
@@ -325,3 +325,10 @@ type ImgPropsWithRefRef = ImgPropsWithRef['ref'];
 type ImgPropsWithoutRef = React.ComponentPropsWithoutRef<'img'>;
 // $ExpectType false
 type ImgPropsHasRef = 'ref' extends keyof ImgPropsWithoutRef ? true : false;
+
+const HasClassName: React.ReactType<{ className?: string }> = 'a';
+const HasFoo: React.ReactType<{ foo: boolean }> = 'a'; // $ExpectError
+const HasFoo2: React.ReactType<{ foo: boolean }> = (props: { foo: boolean }) => null;
+const HasFoo3: React.ReactType<{ foo: boolean }> = (props: { foo: string }) => null; // $ExpectError
+const HasHref: React.ReactType<{ href?: string }> = 'a';
+const HasHref2: React.ReactType<{ href?: string }> = 'div'; // $ExpectError

From 3667c06d4542fdc415e5b43accf66c5a44cde4d6 Mon Sep 17 00:00:00 2001
From: Markus Lasermann <markus.lasermann@ptvgroup.com>
Date: Fri, 23 Nov 2018 10:05:15 +0100
Subject: [PATCH 206/836] travis build could not parse version

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

diff --git a/types/react-splitter-layout/index.d.ts b/types/react-splitter-layout/index.d.ts
index ec25b5fe1a..4ee438e983 100644
--- a/types/react-splitter-layout/index.d.ts
+++ b/types/react-splitter-layout/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/zesik/react-splitter-layout#readme
 // Definitions by: Markus Lasermann <https://github.com/snaptags/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 3.1.6
+// TypeScript Version: 2.8
 
 import * as React from "react";
 

From deab75bde42b5a82aeb951f5a2edaa09922853f4 Mon Sep 17 00:00:00 2001
From: AzSiAz <AzSiAz@users.noreply.github.com>
Date: Fri, 23 Nov 2018 10:06:23 +0100
Subject: [PATCH 207/836] requested correction

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

diff --git a/types/cheerio/index.d.ts b/types/cheerio/index.d.ts
index b04e0f009d..6c893021a3 100644
--- a/types/cheerio/index.d.ts
+++ b/types/cheerio/index.d.ts
@@ -111,10 +111,8 @@ interface Cheerio {
 
     eq(index: number): Cheerio;
 
-	get(): any[]
-    get(): string[];
-    get(): CheerioElement[];
-    get(index: number): CheerioElement;
+    get(): any[];
+    get(index: number): any;
 
     index(): number;
     index(selector: string): number;

From 63e3bac336f8fcccf25224f77202a6a88f5e041c Mon Sep 17 00:00:00 2001
From: Markus Lasermann <markus.lasermann@ptvgroup.com>
Date: Fri, 23 Nov 2018 10:33:36 +0100
Subject: [PATCH 208/836] tslint

---
 types/react-splitter-layout/index.d.ts | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/types/react-splitter-layout/index.d.ts b/types/react-splitter-layout/index.d.ts
index 4ee438e983..29273e87ef 100644
--- a/types/react-splitter-layout/index.d.ts
+++ b/types/react-splitter-layout/index.d.ts
@@ -1,17 +1,15 @@
-// Type definitions for react-splitter-layout v3.0.1
-// Project: https://github.com/zesik/react-splitter-layout#readme
-// Definitions by: Markus Lasermann <https://github.com/snaptags/>
+// Type definitions for react-splitter-layout 3.0
+// Project: https://github.com/zesik/react-splitter-layout
+// Definitions by: Markus Lasermann <https://github.com/snaptags>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 
 import * as React from "react";
 
-export default SplitterLayout;
-
-declare class SplitterLayout extends React.PureComponent<SplitterLayoutProps> {
+export default class SplitterLayout extends React.PureComponent<SplitterLayoutProps> {
 }
 
-type TPrimaryIndex = 0|1;
+export type TPrimaryIndex = 0|1;
 
 export interface SplitterLayoutProps {
     /**
@@ -97,4 +95,3 @@ export interface SplitterLayoutProps {
      */
     onSecondaryPaneSizeChange?: (value: number) => void;
 }
-

From 294e39f046ff91c20f653edf23a1f4522ee37de0 Mon Sep 17 00:00:00 2001
From: luz-alphacode <luz_alphacode@outlook.com>
Date: Fri, 23 Nov 2018 18:27:15 +0800
Subject: [PATCH 209/836] [@type/paper] fillColor/strokeColor/shaderColor can
 be null to set it off

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

diff --git a/types/paper/index.d.ts b/types/paper/index.d.ts
index 016581f16c..d3c818b112 100644
--- a/types/paper/index.d.ts
+++ b/types/paper/index.d.ts
@@ -1491,7 +1491,7 @@ declare module paper {
         /**
          * The color of the stroke.
          */
-        strokeColor: Color | string;
+        strokeColor: Color | string | null;
 
         /**
          * The width of the stroke.
@@ -1539,7 +1539,7 @@ declare module paper {
         /**
          * The fill color of the item.
          */
-        fillColor: Color | string;
+        fillColor: Color | string | null;
 
         /**
          * The fill-rule with which the shape gets filled. Please note that only modern browsers support fill-rules other than 'nonzero'.
@@ -1551,7 +1551,7 @@ declare module paper {
         /**
          * The shadow color.
          */
-        shadowColor: Color | string;
+        shadowColor: Color | string | null;
 
         /**
          * The shadow’s blur radius.

From e547598a4f1c96bf1bff1774d0fc173b977ecb8d Mon Sep 17 00:00:00 2001
From: Markus Lasermann <markus.lasermann@ptvgroup.com>
Date: Fri, 23 Nov 2018 11:34:42 +0100
Subject: [PATCH 210/836] fix tests

---
 types/react-splitter-layout/react-splitter-layout-tests.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/types/react-splitter-layout/react-splitter-layout-tests.tsx b/types/react-splitter-layout/react-splitter-layout-tests.tsx
index 1f97db7077..fa9860a2b7 100644
--- a/types/react-splitter-layout/react-splitter-layout-tests.tsx
+++ b/types/react-splitter-layout/react-splitter-layout-tests.tsx
@@ -1,11 +1,11 @@
 import * as React from "react";
-import SplitterLayout, {SplitterLayoutProps} from "react-splitter-layout";
+import SplitterLayout, { SplitterLayoutProps } from "react-splitter-layout";
 
-export class SplitterLayoutTest extends React.PureComponent<{}> {
+export class SplitterLayoutTest extends React.PureComponent {
     render(): JSX.Element {
         const props: SplitterLayoutProps = {
             percentage: true,
-            secondaryInitialSize: 30,
+            secondaryInitialSize: 40,
         };
         return (
             <SplitterLayout {...props}>

From d1e1def886504a65ed94965fb9d4bd5cc78ec273 Mon Sep 17 00:00:00 2001
From: Bastien Chevallier <cheval_b@etna-alternance.net>
Date: Fri, 23 Nov 2018 12:08:45 +0100
Subject: [PATCH 211/836] Update react-tag-input type

Based on this documentation : https://github.com/prakhar1989/react-tags#readme
---
 types/react-tag-input/index.d.ts | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/types/react-tag-input/index.d.ts b/types/react-tag-input/index.d.ts
index 39654e5b31..380ab93693 100644
--- a/types/react-tag-input/index.d.ts
+++ b/types/react-tag-input/index.d.ts
@@ -18,20 +18,26 @@ export interface ReactTagsProps {
     handleAddition: ((tag: {id: string, text: string}) => void);
     handleDelete: ((i: number) => void);
     handleDrag?: ((tag: { id: string; text: string; }, currPos: number, newPos: number) => void);
-    handleInputChange?: ((value: string) => void);
     handleFilterSuggestions?: ((textInputValue: string, possibleSuggestionsArray: Array<{ id: string, text: string }>) => Array<{ id: string, text: string }>);
-    handleInputBlur?: ((textInputValue: string) => void);
+    handleTagClick?: ((i: number) => void);
 
     autofocus?: boolean;
     allowDeleteFromEmptyInput?: boolean;
+    handleInputChange?: ((value: string) => void);
+    handleInputFocus?: ((value: string) => void);
+    handleInputBlur?: ((textInputValue: string) => void);
     minQueryLength?: number;
     removeComponent?: React.Component<any, any>;
     autocomplete?: boolean | 1;
     readOnly?: boolean;
-    maxLength?: number;
 
     name?: string;
     id?: string;
+    maxLength?: number;
+    
+    inline?: boolean;
+    allowUnique?: boolean;
+    allowDragDrop?: boolean;
 }
 
 export class WithContext extends React.Component<ReactTagsProps> { }

From 3334e0c4ed52f904bc7820f22c1d28b1e9fe5e65 Mon Sep 17 00:00:00 2001
From: Richard Honor <me@r-honor.uk>
Date: Fri, 23 Nov 2018 11:12:34 +0000
Subject: [PATCH 212/836] Add modes to merge config

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

diff --git a/types/seamless-immutable/index.d.ts b/types/seamless-immutable/index.d.ts
index cc115c6d55..b77e20d196 100644
--- a/types/seamless-immutable/index.d.ts
+++ b/types/seamless-immutable/index.d.ts
@@ -16,6 +16,7 @@ declare namespace SeamlessImmutable {
 
     interface MergeConfig {
         deep?: boolean;
+        mode?: 'replace' | 'merge';
         merger?(a: any, b: any, config: any): any;
     }
 
@@ -93,7 +94,7 @@ declare namespace SeamlessImmutable {
     type BaseImmutable<T> = T extends any[] ? ImmutableArrayMixin<T> : ImmutableObjectMixin<T>;
 
     type Immutable<T> = {
-        readonly [P in keyof T]: T[P] extends object ? Immutable<T[P]> : T[P]
+        readonly [P in keyof T]: T[P] extends object ? Immutable<T[P]> : T[P];
     } & BaseImmutable<T>;
 
     function from<T>(obj: T, options?: Options): Immutable<T>;
diff --git a/types/seamless-immutable/seamless-immutable-tests.ts b/types/seamless-immutable/seamless-immutable-tests.ts
index 54136f46db..0f24523963 100644
--- a/types/seamless-immutable/seamless-immutable-tests.ts
+++ b/types/seamless-immutable/seamless-immutable-tests.ts
@@ -112,6 +112,8 @@ interface ExtendedUser extends User {
 
     // merge: merged part is strongly checked as a deeply partial object
     const mergedUser: Immutable.Immutable<User> = immutableUserEx.merge({ address: { line1: 'Small house' }, firstName: 'Jack' });
+    // accepts merge config
+    const mergedUser2: Immutable.Immutable<User> = immutableUserEx.merge({ address: { line1: 'Small house' }, firstName: 'Jack' }, { mode: 'merge', deep: true });
 
     // update: property name is strongly checked
     const updatedUser41: Immutable.Immutable<User> = immutableUser.update('firstName', x => x.toLowerCase() + ' Whirlwind');

From 179975f7d52965b9897cd466146d4d14d36a0f0e Mon Sep 17 00:00:00 2001
From: Bastien Chevallier <cheval_b@etna-alternance.net>
Date: Fri, 23 Nov 2018 12:18:06 +0100
Subject: [PATCH 213/836] Fix trailing space

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

diff --git a/types/react-tag-input/index.d.ts b/types/react-tag-input/index.d.ts
index 380ab93693..f659faedf3 100644
--- a/types/react-tag-input/index.d.ts
+++ b/types/react-tag-input/index.d.ts
@@ -34,7 +34,7 @@ export interface ReactTagsProps {
     name?: string;
     id?: string;
     maxLength?: number;
-    
+
     inline?: boolean;
     allowUnique?: boolean;
     allowDragDrop?: boolean;

From b4dee98a6c42291a8e25fd49125dcf7df69f03bf Mon Sep 17 00:00:00 2001
From: Pavlos Vinieratos <pvinis@gmail.com>
Date: Fri, 23 Nov 2018 12:31:17 +0100
Subject: [PATCH 214/836] make optional, since they have a default value

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

diff --git a/types/react-native-safe-area/index.d.ts b/types/react-native-safe-area/index.d.ts
index a6e922e083..fd38aec0a5 100644
--- a/types/react-native-safe-area/index.d.ts
+++ b/types/react-native-safe-area/index.d.ts
@@ -43,6 +43,6 @@ export type Direction =
 
 export function withSafeArea(
     WrappedComponent: React.ComponentType<any>,
-    applyTo: 'margin' | 'padding' | 'absolutePosition' | 'contentInset',
-    direction: Direction,
+    applyTo?: 'margin' | 'padding' | 'absolutePosition' | 'contentInset',
+    direction?: Direction,
 ): React.ComponentType<any>;

From f03ea514f73de0a92337a3ccfabf18559ff6a432 Mon Sep 17 00:00:00 2001
From: Dimitri Benin <dimitri.benin@gmail.com>
Date: Wed, 21 Nov 2018 16:49:40 +0100
Subject: [PATCH 215/836] Update types for ltx

---
 types/ltx/index.d.ts             |  26 +++---
 types/ltx/lib/Element.d.ts       |  97 ++++++++++----------
 types/ltx/lib/Parser.d.ts        |  14 ++-
 types/ltx/lib/clone.d.ts         |   4 +-
 types/ltx/lib/createElement.d.ts |   8 +-
 types/ltx/lib/equal.d.ts         |  10 ++-
 types/ltx/lib/escape.d.ts        |   8 +-
 types/ltx/lib/is.d.ts            |   8 +-
 types/ltx/lib/parse.d.ts         |   5 +-
 types/ltx/lib/stringify.d.ts     |   4 +-
 types/ltx/lib/tag.d.ts           |   4 +-
 types/ltx/lib/tagString.d.ts     |   2 +-
 types/ltx/ltx-tests.ts           | 148 ++++++++++++++++++++++++++++---
 types/ltx/tslint.json            |   8 +-
 14 files changed, 250 insertions(+), 96 deletions(-)

diff --git a/types/ltx/index.d.ts b/types/ltx/index.d.ts
index 33311a3175..1c313c5541 100644
--- a/types/ltx/index.d.ts
+++ b/types/ltx/index.d.ts
@@ -1,17 +1,17 @@
-// Type definitions for ltx 2.6
+// Type definitions for ltx 2.8
 // Project: github.com/node-xmpp/ltx/
 // Definitions by: PJakcson <https://github.com/PJakcson>
+//                 BendingBender <https://github.com/BendingBender>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
 
-export {Element } from './lib/Element';
-export {nameEqual, attrsEqual, childrenEqual, equal} from './lib/equal';
-export {isNode, isElement, isText} from './lib/is';
-export {clone} from './lib/clone';
-export {createElement} from './lib/createElement';
-export {escapeXML, unescapeXML, escapeXMLText, unescapeXMLText} from './lib/escape';
-export {Parser} from './lib/Parser';
-export {parse} from './lib/parse';
-export {tag} from './lib/tag';
-export {tagString} from './lib/tagString';
-export {stringify} from './lib/stringify';
+export * from './lib/Element';
+export * from './lib/equal';
+export * from './lib/is';
+export * from './lib/clone';
+export * from './lib/createElement';
+export * from './lib/escape';
+export * from './lib/Parser';
+export * from './lib/parse';
+export * from './lib/tag';
+export * from './lib/tagString';
+export * from './lib/stringify';
diff --git a/types/ltx/lib/Element.d.ts b/types/ltx/lib/Element.d.ts
index 203eaa93b6..7f0d3de62e 100644
--- a/types/ltx/lib/Element.d.ts
+++ b/types/ltx/lib/Element.d.ts
@@ -1,21 +1,26 @@
+import { clone } from './clone';
+
+export type Node = Element | TextNode;
+export type TextNode = string | number;
+
 /**
  * Element
  *
  * Attributes are in the element.attrs object. Children is a list of
  * either other Elements or Strings for text content.
- **/
-export declare class Element {
+ */
+export class Element {
     name: string;
-    parent: Element;
+    parent: Element | null;
     children: Element[];
-    attrs: any;
+    attrs: { [attrName: string]: any };
 
-    constructor(name: string, attrs?: any);
+    constructor(name: string, attrs?: string | { [attrName: string]: any });
 
     /**
      * if (element.is('message', 'jabber:client')) ...
-     **/
-    is(name: string, xmlns?: any): boolean;
+     */
+    is(name: string, xmlns?: string): boolean;
 
     /**
      * without prefix.
@@ -24,50 +29,44 @@ export declare class Element {
 
     /**
      * retrieves the namespace of the current element, upwards recursively
-     **/
-    getNS(): any;
+     */
+    getNS(): string | undefined;
 
     /**
      * find the namespace to the given prefix, upwards recursively
-     **/
-    findNS(prefix: string): any;
+     */
+    findNS(prefix: string): string | undefined;
 
     /**
      * Recursiverly gets all xmlns defined, in the form of {url:prefix}
-     **/
-    getXmlns(): any;
+     */
+    getXmlns(): { [key: string]: string };
 
-    setAttrs(attrs: any): void;
+    setAttrs(attrs: string | { [attrName: string]: any }): void;
 
     /**
-     * xmlns can be null, returns the matching attribute.
-     **/
-    getAttr(name: string, xmlns?: any): any;
+     * returns the matching attribute.
+     */
+    getAttr(name: string, xmlns?: string): any;
 
-    /**
-     * xmlns can be null
-     **/
-    getChild(name: string, xmlns?: any): Element;
+    getChild(name: string, xmlns?: string): Element | undefined;
 
-    /**
-     * xmlns can be null
-     **/
-    getChildren(name: string, xmlns?: any): Element[];
+    getChildren(name: string, xmlns?: string): Element[];
 
-    /**
-     * xmlns and recursive can be null
-     **/
-    getChildByAttr(attr: any, val: any, xmlns?: any, recursive?: any): Element;
+    getChildByAttr(
+        attr: string,
+        val: any,
+        xmlns?: string,
+        recursive?: boolean
+    ): Element | undefined;
 
+    getChildrenByAttr(attr: string, val: any, xmlns?: string, recursive?: boolean): Element[];
 
-    /**
-     * xmlns and recursive can be null
-     **/
-    getChildrenByAttr(attr: any, val: any, xmlns?: any, recursive?: any): Element[];
+    getChildrenByFilter(filter: (child: Node) => boolean, recursive?: boolean): Element[];
 
     getText(): string;
 
-    getChildText(name: string, xmlns?: any): string;
+    getChildText(name: string, xmlns?: string): string | null;
 
     /**
      * Return all direct descendents that are Elements.
@@ -77,37 +76,39 @@ export declare class Element {
     getChildElements(): Element[];
 
     /** returns uppermost parent */
-    root(): Element;
+    root(): Element | this;
 
-    tree(): Element;
+    tree(): Element | this;
 
     /** just parent or itself */
-    up(): Element;
+    up(): Element | this;
 
     /** create child node and return it */
-    c(name: string, attrs?: any): Element;
+    c(name: string, attrs?: { [key: string]: any }): Element;
+
+    cnode<T extends Element>(child: T): T;
 
     /** add text node and return element */
-    t(text: string): Element;
+    t(text: TextNode): this;
 
     /**
      * Either:
      *   el.remove(childEl)
      *   el.remove('author', 'urn:...')
      */
-    remove(el: Element, xmlns?: any): Element;
+    remove(el: Element | string, xmlns?: string): this;
 
-    clone(): Element;
+    clone: typeof clone;
 
-    text(val: string): string;
+    text(val?: string): string;
 
-    attr(attr: any, val: any): any;
+    attr(attr: string, val?: any): any;
 
     toString(): string;
 
-    toJSON(): any;
+    toJSON(): ElementJson;
 
-    write(writer: any): void;
+    write(writer: (part: string) => void): void;
 
     nameEquals(el: Element): boolean;
 
@@ -117,3 +118,9 @@ export declare class Element {
 
     equals(el: Element): boolean;
 }
+
+export interface ElementJson {
+    name: string;
+    attrs: { [attrName: string]: any };
+    children: Array<ElementJson | TextNode>;
+}
diff --git a/types/ltx/lib/Parser.d.ts b/types/ltx/lib/Parser.d.ts
index 083e3ace66..463029286f 100644
--- a/types/ltx/lib/Parser.d.ts
+++ b/types/ltx/lib/Parser.d.ts
@@ -1,5 +1,15 @@
 /// <reference types="node" />
 import { EventEmitter } from 'events';
-export declare class Parser extends EventEmitter {
-    constructor(options?: any);
+import { Element } from './Element';
+
+export class Parser extends EventEmitter {
+    constructor(options?: ParserOptions);
+
+    write(data: string): void;
+    end(data: string): void;
+}
+
+export interface ParserOptions {
+    Parser?: typeof Parser;
+    Element?: typeof Element;
 }
diff --git a/types/ltx/lib/clone.d.ts b/types/ltx/lib/clone.d.ts
index 41193a3f40..15369e00d5 100644
--- a/types/ltx/lib/clone.d.ts
+++ b/types/ltx/lib/clone.d.ts
@@ -1 +1,3 @@
-export declare function clone(el: any): any;
+import { Element } from './Element';
+
+export function clone<T extends Element>(el: T): T;
diff --git a/types/ltx/lib/createElement.d.ts b/types/ltx/lib/createElement.d.ts
index c372f11150..21527ae1b6 100644
--- a/types/ltx/lib/createElement.d.ts
+++ b/types/ltx/lib/createElement.d.ts
@@ -1,2 +1,6 @@
-import { Element } from './Element';
-export declare function createElement(name: string, attrs: any): Element;
+import { Element, Node } from './Element';
+export function createElement(
+    name: string,
+    attrs?: string | { [attrName: string]: any },
+    ...children: Node[]
+): Element;
diff --git a/types/ltx/lib/equal.d.ts b/types/ltx/lib/equal.d.ts
index 520555e098..f7548c526b 100644
--- a/types/ltx/lib/equal.d.ts
+++ b/types/ltx/lib/equal.d.ts
@@ -1,4 +1,6 @@
-export declare function nameEqual(a: any, b: any): boolean;
-export declare function attrsEqual(a: any, b: any): boolean;
-export declare function childrenEqual(a: any, b: any): boolean;
-export declare function equal(a: any, b: any): boolean;
+import { Element } from './Element';
+
+export function nameEqual(a: Element, b: Element): boolean;
+export function attrsEqual(a: Element, b: Element): boolean;
+export function childrenEqual(a: Element, b: Element): boolean;
+export function equal(a: Element, b: Element): boolean;
diff --git a/types/ltx/lib/escape.d.ts b/types/ltx/lib/escape.d.ts
index 4bc45c223a..d390e860ed 100644
--- a/types/ltx/lib/escape.d.ts
+++ b/types/ltx/lib/escape.d.ts
@@ -1,4 +1,4 @@
-export declare function escapeXML(s: string): string;
-export declare function unescapeXML(s: string): string;
-export declare function escapeXMLText(s: string): string;
-export declare function unescapeXMLText(s: string): string;
+export function escapeXML(s: string): string;
+export function unescapeXML(s: string): string;
+export function escapeXMLText(s: string): string;
+export function unescapeXMLText(s: string): string;
diff --git a/types/ltx/lib/is.d.ts b/types/ltx/lib/is.d.ts
index 6515d23f80..e62d919267 100644
--- a/types/ltx/lib/is.d.ts
+++ b/types/ltx/lib/is.d.ts
@@ -1,3 +1,5 @@
-export declare function isNode(el: any): boolean;
-export declare function isElement(el: any): boolean;
-export declare function isText(el: any): boolean;
+import { Element, Node } from './Element';
+
+export function isNode(el: any): el is Node;
+export function isElement(el: any): el is Element;
+export function isText(el: any): el is string;
diff --git a/types/ltx/lib/parse.d.ts b/types/ltx/lib/parse.d.ts
index cc4073113a..0e0a9b17cb 100644
--- a/types/ltx/lib/parse.d.ts
+++ b/types/ltx/lib/parse.d.ts
@@ -1 +1,4 @@
-export declare function parse(data: any, options?: any): any;
+import { ParserOptions, Parser } from './Parser';
+import { Element } from './Element';
+
+export function parse(data: string, options?: ParserOptions | Parser): Element;
diff --git a/types/ltx/lib/stringify.d.ts b/types/ltx/lib/stringify.d.ts
index 770f7d324f..9913f2318c 100644
--- a/types/ltx/lib/stringify.d.ts
+++ b/types/ltx/lib/stringify.d.ts
@@ -1 +1,3 @@
-export declare function stringify(el: any, indent: any, level: any): string;
+import { Element } from './Element';
+
+export function stringify(el: Element, indent?: number, level?: number): string;
diff --git a/types/ltx/lib/tag.d.ts b/types/ltx/lib/tag.d.ts
index 8bbcb6fe7b..11a9784bf0 100644
--- a/types/ltx/lib/tag.d.ts
+++ b/types/ltx/lib/tag.d.ts
@@ -1 +1,3 @@
-export declare function tag(d: any): any;
+import { Element } from './Element';
+
+export function tag(literals: string[], ...substitutions: string[]): Element;
diff --git a/types/ltx/lib/tagString.d.ts b/types/ltx/lib/tagString.d.ts
index 44036ce037..619ccbdb23 100644
--- a/types/ltx/lib/tagString.d.ts
+++ b/types/ltx/lib/tagString.d.ts
@@ -1 +1 @@
-export declare function tagString(d: any): string;
+export function tagString(literals: string[], ...substitutions: string[]): string;
diff --git a/types/ltx/ltx-tests.ts b/types/ltx/ltx-tests.ts
index 522b7673c8..a7342ef54b 100644
--- a/types/ltx/ltx-tests.ts
+++ b/types/ltx/ltx-tests.ts
@@ -1,21 +1,147 @@
 import * as ltx from 'ltx';
 
-ltx.parse('<document/>');
+let el: ltx.Element = null as any;
+let maybeEl: ltx.Element | undefined = null as any;
+let els: ltx.Element[] = [];
+let bool: boolean;
+const any: any = null;
+let str: string = null as any;
 
-const getChildTextElement = ltx.parse('<test><child>body text</child></test>') as ltx.Element;
-if (getChildTextElement.getChildText('child') !== 'body text') {
-    throw new Error("body does not match");
+el = ltx.clone(el);
+
+bool = ltx.nameEqual(el, el);
+bool = ltx.attrsEqual(el, el);
+bool = ltx.childrenEqual(el, el);
+bool = ltx.equal(el, el);
+
+el = ltx.createElement('el');
+el = ltx.createElement('el', 'xml');
+el = ltx.createElement('el', { foo: 'bar' });
+el = ltx.createElement('el', { foo: 'bar' }, el);
+el = ltx.createElement('el', { foo: 'bar' }, 'hi');
+
+if (ltx.isNode(any)) {
+    // $ExpectType Node
+    any;
+}
+if (ltx.isElement(any)) {
+    // $ExpectType Element
+    any;
+}
+if (ltx.isText(any)) {
+    // $ExpectType string
+    any;
 }
 
-const p = new ltx.Parser();
+str = ltx.escapeXML(str);
+str = ltx.unescapeXML(str);
+str = ltx.escapeXMLText(str);
+str = ltx.unescapeXMLText(str);
+
+el = ltx.parse('<document/>');
+el = ltx.parse('<document/>', (null as any) as ltx.Parser);
+el = ltx.parse('<document/>', { Parser: (null as any) as typeof ltx.Parser });
+el = ltx.parse('<document/>', { Element: (null as any) as typeof ltx.Element });
+
+el = ltx.tag(['document'], 'foo');
+str = ltx.tagString(['document'], 'foo');
+
+str = ltx.stringify(el);
+str = ltx.stringify(el, 1);
+str = ltx.stringify(el, 1, 1);
+
+const getChildTextElement = ltx.parse('<test><child>body text</child></test>');
+if (getChildTextElement.getChildText('child') !== 'body text') {
+    throw new Error('body does not match');
+}
+
+let p: ltx.Parser;
+p = new ltx.Parser();
+p = new ltx.Parser({ Parser: (null as any) as typeof ltx.Parser });
+p = new ltx.Parser({ Element: (null as any) as typeof ltx.Element });
 
 p.on('tree', (ignored: any) => {});
-
 p.on('error', (ignored: any) => {});
 
-const el = new ltx.Element('root').c('children');
-el.c('child', {age: 5}).t('Hello').up()
-    .c('child', {age: 7}).t('Hello').up()
-    .c('child', {age: 99}).t('Hello').up();
+el = new ltx.Element('root').c('children');
 
-el.root().toString();
+bool = el.is('el');
+bool = el.is('el', 'ns');
+str = el.getName();
+let s: string | undefined = el.getNS();
+s = el.findNS('ns');
+const xmlns: { [key: string]: string } = el.getXmlns();
+el.setAttrs('ho');
+el.setAttrs({ my: 'attr' });
+el.getAttr('ho');
+el.getAttr('ho', 'ns');
+maybeEl = el.getChild('el');
+maybeEl = el.getChild('el', 'ns');
+els = el.getChildren('el');
+els = el.getChildren('el', 'ns');
+maybeEl = el.getChildByAttr('my', 'attr');
+maybeEl = el.getChildByAttr('my', 'attr', 'ns');
+maybeEl = el.getChildByAttr('my', 'attr', 'ns', true);
+els = el.getChildrenByAttr('my', 'attr');
+els = el.getChildrenByAttr('my', 'attr', 'ns');
+els = el.getChildrenByAttr('my', 'attr', 'ns', true);
+els = el.getChildrenByFilter(child => {
+    // $ExpectType Node
+    child;
+    return true;
+});
+els = el.getChildrenByFilter(child => {
+    // $ExpectType Node
+    child;
+    return true;
+}, true);
+str = el.getText();
+let maybeS: string | null = el.getChildText('hi');
+maybeS = el.getChildText('hi', 'ns');
+els = el.getChildElements();
+
+class MyEl extends ltx.Element {
+    foo: 'bar';
+}
+let myEl = new MyEl('el');
+
+// $ExpectType Element | MyEl
+myEl.root();
+// $ExpectType Element | MyEl
+myEl.tree();
+// $ExpectType Element | MyEl
+myEl.up();
+
+el = el.c('hi');
+el = el.c('hi', { my: 'attr' });
+myEl = myEl.cnode(myEl);
+myEl = myEl.t('hi');
+myEl = myEl.t(1);
+myEl = myEl.remove(el);
+myEl = myEl.remove('el');
+myEl = myEl.remove('el', 'ns');
+myEl = myEl.clone(myEl);
+str = el.text();
+str = el.text('val');
+el.attr('my');
+el.attr('my', 'attr');
+str = el.toString();
+const json: ltx.ElementJson = el.toJSON();
+el.write(part => {
+    // $ExpectType string
+    part;
+});
+bool = el.nameEquals(el);
+bool = el.attrsEquals(el);
+bool = el.childrenEquals(el);
+bool = el.equals(el);
+
+el.c('child', { age: 5 })
+    .t('Hello')
+    .up()
+    .c('child', { age: 7 })
+    .t('Hello')
+    .up()
+    .c('child', { age: 99 })
+    .t('Hello')
+    .up();
diff --git a/types/ltx/tslint.json b/types/ltx/tslint.json
index 5bb1e8735d..f93cf8562a 100644
--- a/types/ltx/tslint.json
+++ b/types/ltx/tslint.json
@@ -1,9 +1,3 @@
 {
-    "extends": "dtslint/dt.json",
-    "rules": {
-        // All are TODOs
-        "jsdoc-format": false,
-        "no-consecutive-blank-lines": false,
-        "strict-export-declare-modifiers": false
-    }
+    "extends": "dtslint/dt.json"
 }

From 16033f3b89831cdd6f23c1236ed8a0b741ca522e Mon Sep 17 00:00:00 2001
From: Dimitri Benin <dimitri.benin@gmail.com>
Date: Mon, 19 Nov 2018 21:43:50 +0100
Subject: [PATCH 216/836] Correct return types for p-defer

---
 types/p-defer/index.d.ts       | 17 +++++++++--------
 types/p-defer/p-defer-tests.ts | 12 ++++++------
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/types/p-defer/index.d.ts b/types/p-defer/index.d.ts
index 7eff607e7d..8386706d89 100644
--- a/types/p-defer/index.d.ts
+++ b/types/p-defer/index.d.ts
@@ -1,16 +1,17 @@
 // Type definitions for p-defer 1.0
 // Project: https://github.com/sindresorhus/p-defer
 // Definitions by: Sam Verschueren <https://github.com/SamVerschueren>
+//                 BendingBender <https://github.com/BendingBender>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare namespace pDefer {
-	interface DeferredPromise<T> {
-		resolve<U>(value?: U | PromiseLike<U>): Promise<U>;
-		reject(reason: any): Promise<never>;
-		promise: Promise<T>;
-	}
-}
+export = pDefer;
 
 declare function pDefer<T>(): pDefer.DeferredPromise<T>;
 
-export = pDefer;
+declare namespace pDefer {
+    interface DeferredPromise<T> {
+        resolve(value?: T | PromiseLike<T>): void;
+        reject(reason: any): void;
+        promise: Promise<T>;
+    }
+}
diff --git a/types/p-defer/p-defer-tests.ts b/types/p-defer/p-defer-tests.ts
index 9ea4647620..f61bce624b 100644
--- a/types/p-defer/p-defer-tests.ts
+++ b/types/p-defer/p-defer-tests.ts
@@ -1,13 +1,13 @@
 import pDefer = require('p-defer');
 
-function delay(deferred: pDefer.DeferredPromise<string>,  ms: number) {
+function delay(deferred: pDefer.DeferredPromise<string>, ms: number) {
     setTimeout(deferred.resolve, ms, '🦄');
     return deferred.promise;
 }
 
-let s: string;
-async function f() { s = await delay(pDefer<string>(), 100); }
+const s: Promise<string> = delay(pDefer<string>(), 100);
 
-async function u() {
-	const u: Promise<any> = pDefer().resolve();
-}
+// $ExpectType void
+pDefer().resolve();
+// $ExpectType void
+pDefer().reject('oh no');

From 36a32d8a728c5d69685b115703b4d06c5c91b87d Mon Sep 17 00:00:00 2001
From: Jessica Franco <jessicamfranco3@gmail.com>
Date: Fri, 23 Nov 2018 22:31:04 +0900
Subject: [PATCH 217/836] Correct name in credits (#30772)

---
 types/emoji-mart/index.d.ts     | 2 +-
 types/qhistory/index.d.ts       | 2 +-
 types/react-loadable/index.d.ts | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/types/emoji-mart/index.d.ts b/types/emoji-mart/index.d.ts
index 38acd9e021..a92bcb77ff 100644
--- a/types/emoji-mart/index.d.ts
+++ b/types/emoji-mart/index.d.ts
@@ -1,6 +1,6 @@
 // Type definitions for emoji-mart 2.8
 // Project: https://github.com/missive/emoji-mart
-// Definitions by: Diogo Franco <https://github.com/Kovensky>
+// Definitions by: Jessica Franco <https://github.com/Kovensky>
 //                 Nick Winans <https://github.com/Nicell>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
diff --git a/types/qhistory/index.d.ts b/types/qhistory/index.d.ts
index 84bd4e6d83..6269c25e82 100644
--- a/types/qhistory/index.d.ts
+++ b/types/qhistory/index.d.ts
@@ -1,6 +1,6 @@
 // Type definitions for qhistory 1.0
 // Project: https://github.com/pshrmn/qhistory#readme
-// Definitions by: Diogo Franco <https://github.com/Kovensky>
+// Definitions by: Jessica Franco <https://github.com/Kovensky>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
diff --git a/types/react-loadable/index.d.ts b/types/react-loadable/index.d.ts
index b27a4de764..bf8af8e794 100644
--- a/types/react-loadable/index.d.ts
+++ b/types/react-loadable/index.d.ts
@@ -1,6 +1,6 @@
 // Type definitions for react-loadable 5.4
 // Project: https://github.com/thejameskyle/react-loadable#readme
-// Definitions by: Diogo Franco <https://github.com/Kovensky>
+// Definitions by: Jessica Franco <https://github.com/Kovensky>
 //                 Oden S. <https://github.com/odensc>
 //                 Ian Ker-Seymer <https://github.com/ianks>
 //                 Tomek Łaziuk <https://github.com/tlaziuk>

From 184879995c1fb1d1f4a8803246fd0ecc41166a4d Mon Sep 17 00:00:00 2001
From: rvitorsantos <rvitor2004@gmail.com>
Date: Fri, 23 Nov 2018 11:38:27 -0200
Subject: [PATCH 218/836] Add typing for Abstract Grant Type

* Add typing for Abstract Grant Type
* Add parameter extendedGrantTypes in TokenModel interface
---
 types/oauth2-server/index.d.ts | 61 +++++++++++++++++++++++++++++++++-
 1 file changed, 60 insertions(+), 1 deletion(-)

diff --git a/types/oauth2-server/index.d.ts b/types/oauth2-server/index.d.ts
index 27a863051f..4d4715b41f 100644
--- a/types/oauth2-server/index.d.ts
+++ b/types/oauth2-server/index.d.ts
@@ -2,7 +2,8 @@
 // Project: https://github.com/oauthjs/node-oauth2-server
 // Definitions by:  Robbie Van Gorkom <https://github.com/vangorra>,
 //                  Charles Irick <https://github.com/cirick>,
-//                  Daniel Fischer <https://github.com/d-fischer>
+//                  Daniel Fischer <https://github.com/d-fischer>,
+//                  Vitor Santos <https://github.com/rvitorsantos>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
 
@@ -112,6 +113,59 @@ declare namespace OAuth2Server {
         redirect(url: string): void;
     }
 
+    abstract class AbstractGrantType {
+
+        /**
+         * Instantiates AbstractGrantType using the supplied options.
+         *
+         */
+        constructor(options: TokenOptions)
+
+        /**
+         * Generate access token. Calls Model#generateAccessToken() if implemented.
+         *
+         */
+        generateAccessToken(client: Client, user: User, scope: string | string[]): Promise<string>;
+
+        /**
+         * Generate refresh token. Calls
+         *
+         */
+        generateRefreshToken(client: Client, user: User, scope: string | string[]): Promise<string>;
+
+        /**
+         * Get access token expiration date.
+         *
+         */
+        getAccessTokenExpiresAt(): Date;
+
+        /**
+         * Get refresh token expiration date.
+         *
+         */
+        getRefreshTokenExpiresAt(): Date;
+
+        /**
+         * Get scope from the request body.
+         *
+         */
+        getScope(request: Request): string;
+
+        /**
+         * Validate requested scope. Calls Model#validateScope() if implemented.
+         *
+         */
+        validateScope(user: User, client: Client, scope: string | string[]): Promise<string | string[] | Falsey>;
+
+        /**
+         * Retrieve info from the request and client and return token
+         *
+         */
+        abstract handle(request: Request, client: Client): Promise<Token | Falsey>;
+
+    }
+
+
     interface ServerOptions extends AuthenticateOptions, AuthorizeOptions, TokenOptions {
         /**
          * Model object
@@ -183,6 +237,11 @@ declare namespace OAuth2Server {
          * Always revoke the used refresh token and issue a new one for the refresh_token grant.
          */
         alwaysIssueNewRefreshToken?: boolean;
+
+        /**
+         * Additional supported grant types.
+         */
+        extendedGrantTypes?: {[key: string]: typeof AbstractGrantType };
     }
 
     /**

From 7c04ee0c8a64870649ce8c618399f26ee9fd9dde Mon Sep 17 00:00:00 2001
From: Mihai Dinculescu <Mihai.Dinculescu@credit360global.com>
Date: Fri, 23 Nov 2018 14:04:06 +0000
Subject: [PATCH 219/836] Code review changes.

---
 .../index.d.ts                                |  2 +-
 .../redux-immutable-state-invariant-tests.ts  |  1 -
 .../tslint.json                               | 78 +------------------
 3 files changed, 2 insertions(+), 79 deletions(-)

diff --git a/types/redux-immutable-state-invariant/index.d.ts b/types/redux-immutable-state-invariant/index.d.ts
index 502f7e65bf..b4e7bcd0e2 100644
--- a/types/redux-immutable-state-invariant/index.d.ts
+++ b/types/redux-immutable-state-invariant/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for redux-immutable-state-invariant v2.1.0
+// Type definitions for redux-immutable-state-invariant 2.1
 // Project: https://github.com/leoasis/redux-immutable-state-invariant
 // Definitions by: Remo H. Jansen <https://github.com/remojansen>, Ben Rogers <https://github.com/highflying>, Mihai Dinculescu <https://github.com/mihai-dinculescu>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/redux-immutable-state-invariant/redux-immutable-state-invariant-tests.ts b/types/redux-immutable-state-invariant/redux-immutable-state-invariant-tests.ts
index f6c26b6777..98abf5ac59 100644
--- a/types/redux-immutable-state-invariant/redux-immutable-state-invariant-tests.ts
+++ b/types/redux-immutable-state-invariant/redux-immutable-state-invariant-tests.ts
@@ -1,4 +1,3 @@
-
 import { applyMiddleware } from "redux";
 import immutableStateInvariantMiddleware from "redux-immutable-state-invariant";
 
diff --git a/types/redux-immutable-state-invariant/tslint.json b/types/redux-immutable-state-invariant/tslint.json
index a41bf5d19a..f93cf8562a 100644
--- a/types/redux-immutable-state-invariant/tslint.json
+++ b/types/redux-immutable-state-invariant/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 2a7faa683c4a80cb6f0a76f0dcc3180a79317911 Mon Sep 17 00:00:00 2001
From: Nicolas Biehler <biehler.nicolas@gmail.com>
Date: Fri, 23 Nov 2018 15:35:35 +0100
Subject: [PATCH 220/836] fix: extend elasticsearch alias params

As shown in elasticsearch documentation (https://www.elastic.co/guide/en/elasticsearch/reference/current/indices-aliases.html#filtered), an alias can have a routing value and a filter specified.
---
 types/elasticsearch/index.d.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/types/elasticsearch/index.d.ts b/types/elasticsearch/index.d.ts
index 0d16cc6a4b..62202dbc90 100644
--- a/types/elasticsearch/index.d.ts
+++ b/types/elasticsearch/index.d.ts
@@ -1400,11 +1400,15 @@ export interface IndicesUpdateAliasesParamsAction {
         index?: string;
         indices?: string[];
         alias: string;
+        routing?: string;
+        filter?: object;
     };
     remove?: {
         index?: string;
         indices?: string[];
         alias: string;
+        routing?: string;
+        filter?: object;
     };
     remove_index?: {
         index: string;

From cc8f6fcd7c73631c582b611359fadd0241e81cce Mon Sep 17 00:00:00 2001
From: Jessica <jessicamfranco3@gmail.com>
Date: Sat, 24 Nov 2018 00:08:22 +0900
Subject: [PATCH 221/836] Fix incorrect type caught by stricter ReactType

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

diff --git a/types/react-native-scrollable-tab-view/index.d.ts b/types/react-native-scrollable-tab-view/index.d.ts
index 9be23aa66c..d992012856 100644
--- a/types/react-native-scrollable-tab-view/index.d.ts
+++ b/types/react-native-scrollable-tab-view/index.d.ts
@@ -125,7 +125,7 @@ export default class ScrollableTabView extends React.Component<ScrollableTabView
 // Each top-level child component should have a tabLabel prop
 // that can be used by the tab bar component to render out the labels.
 export type TabProps<T = {}> = T & {
-    tabLabel: React.ReactType;
+    tabLabel: React.ReactChild;
 };
 
 export interface DefaultTabBarProps {

From 8beb9e99a78464b855da7011872ba15575e023d6 Mon Sep 17 00:00:00 2001
From: Jessica <jessicamfranco3@gmail.com>
Date: Sat, 24 Nov 2018 00:08:43 +0900
Subject: [PATCH 222/836] Fix test, add test to demonstrate how custom elements
 will work

---
 .../react-test-renderer-tests.ts                    |  8 ++++----
 types/react/test/tsx.tsx                            | 13 +++++++++++++
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/types/react-test-renderer/react-test-renderer-tests.ts b/types/react-test-renderer/react-test-renderer-tests.ts
index 45568c81a7..83dc510e2b 100644
--- a/types/react-test-renderer/react-test-renderer-tests.ts
+++ b/types/react-test-renderer/react-test-renderer-tests.ts
@@ -43,14 +43,14 @@ function testInstance(inst: ReactTestInstance) {
     inst.props = {
         prop1: "p",
     };
-    inst.type = "t";
-    testInstance(inst.find(n => n.type === "t"));
+    inst.type = "a";
+    testInstance(inst.find(n => n.type === "a"));
     testInstance(inst.findByProps({ prop1: "p" }));
-    testInstance(inst.findByType("t"));
+    testInstance(inst.findByType("a"));
     testInstance(inst.findByType(TestComponent));
     inst.findAll(n => n.type === "t", { deep: true }).map(testInstance);
     inst.findAllByProps({ prop1: "p" }, { deep: true }).map(testInstance);
-    inst.findAllByType("t", { deep: true }).map(testInstance);
+    inst.findAllByType("a", { deep: true }).map(testInstance);
     inst.findAllByType(TestComponent, { deep: true }).map(testInstance);
 }
 
diff --git a/types/react/test/tsx.tsx b/types/react/test/tsx.tsx
index a8ca2ae1ea..60fcb6dccc 100644
--- a/types/react/test/tsx.tsx
+++ b/types/react/test/tsx.tsx
@@ -332,3 +332,16 @@ const HasFoo2: React.ReactType<{ foo: boolean }> = (props: { foo: boolean }) =>
 const HasFoo3: React.ReactType<{ foo: boolean }> = (props: { foo: string }) => null; // $ExpectError
 const HasHref: React.ReactType<{ href?: string }> = 'a';
 const HasHref2: React.ReactType<{ href?: string }> = 'div'; // $ExpectError
+
+const CustomElement: React.ReactType = 'my-undeclared-element'; // $ExpectError
+
+// custom elements now need to be declared as intrinsic elements
+declare global {
+    namespace JSX {
+        interface IntrinsicElements {
+            'my-declared-element': {};
+        }
+    }
+}
+
+const CustomElement2: React.ReactType = 'my-declared-element';

From adad38a0d50d2e53925bab47a87d09b1b9e4506d Mon Sep 17 00:00:00 2001
From: Vitor Santos <vitor@poppinapp.com.br>
Date: Fri, 23 Nov 2018 13:16:16 -0200
Subject: [PATCH 223/836] Fixed lint errors and incomplete comment

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

diff --git a/types/oauth2-server/index.d.ts b/types/oauth2-server/index.d.ts
index 4d4715b41f..a846c489a2 100644
--- a/types/oauth2-server/index.d.ts
+++ b/types/oauth2-server/index.d.ts
@@ -114,7 +114,6 @@ declare namespace OAuth2Server {
     }
 
     abstract class AbstractGrantType {
-
         /**
          * Instantiates AbstractGrantType using the supplied options.
          *
@@ -128,7 +127,7 @@ declare namespace OAuth2Server {
         generateAccessToken(client: Client, user: User, scope: string | string[]): Promise<string>;
 
         /**
-         * Generate refresh token. Calls
+         * Generate refresh token. Calls Model#generateRefreshToken() if implemented.
          *
          */
         generateRefreshToken(client: Client, user: User, scope: string | string[]): Promise<string>;
@@ -162,10 +161,8 @@ declare namespace OAuth2Server {
          *
          */
         abstract handle(request: Request, client: Client): Promise<Token | Falsey>;
-
     }
 
-
     interface ServerOptions extends AuthenticateOptions, AuthorizeOptions, TokenOptions {
         /**
          * Model object
@@ -241,7 +238,7 @@ declare namespace OAuth2Server {
         /**
          * Additional supported grant types.
          */
-        extendedGrantTypes?: {[key: string]: typeof AbstractGrantType };
+        extendedGrantTypes?: { [key: string]: typeof AbstractGrantType };
     }
 
     /**

From 2547248db261d514b845f3698d6c5036a410456a Mon Sep 17 00:00:00 2001
From: Yves Kaufmann <fxdapokalypse@googlemail.com>
Date: Fri, 23 Nov 2018 17:23:57 +0100
Subject: [PATCH 224/836] [mongodb] Add authMechanism parameter and replaces
 line comments with block comments

---
 types/mongodb/index.d.ts       | 582 +++++++++++++++++++++++++--------
 types/mongodb/mongodb-tests.ts |  13 +-
 2 files changed, 446 insertions(+), 149 deletions(-)

diff --git a/types/mongodb/index.d.ts b/types/mongodb/index.d.ts
index ab4d2f4c02..1ac38c79d5 100644
--- a/types/mongodb/index.d.ts
+++ b/types/mongodb/index.d.ts
@@ -79,7 +79,7 @@ export interface ClientSession extends EventEmitter {
     /** The server id associated with this session */
     id: any;
     /**
-     * Aborts the currently active transaction in this session. 
+     * Aborts the currently active transaction in this session.
      * @param {MongoCallback<void>} [cb] Optional callback for completion of this operation
      */
     abortTransaction(cb?: MongoCallback<void>): Promise<void>;
@@ -89,7 +89,7 @@ export interface ClientSession extends EventEmitter {
      */
     advanceOperationTime(operamtionTime: Timestamp): void;
     /**
-     * Commits the currently active transaction in this session. 
+     * Commits the currently active transaction in this session.
      * @param {MongoCallback<void>} [cb] Optional callback for completion of this operation
      */
     commitTransaction(cb?: MongoCallback<void>): Promise<void>;
@@ -110,7 +110,7 @@ export interface ClientSession extends EventEmitter {
      * Used to determine if this session equals another
      *
      * @param {ClientSession} session A class representing a client session on the server
-     * @returns {boolean} if the sessions are equal 
+     * @returns {boolean} if the sessions are equal
      */
     equals(session: ClientSession): boolean;
 
@@ -118,13 +118,13 @@ export interface ClientSession extends EventEmitter {
     incrementTransactionNumber(): void;
 
     /**
-     * @returns {boolean} this session is currently in a transaction or not 
+     * @returns {boolean} this session is currently in a transaction or not
      */
     inTransaction(): boolean;
 
     /**
      * Starts a new transaction with the given options.
-     * @param {TransactionOptions} options 
+     * @param {TransactionOptions} options
      * @memberof ClientSession
      */
     startTransaction(options?: TransactionOptions): void;
@@ -219,10 +219,10 @@ export class MongoError extends Error {
      * client/user (eg. "Email address must be unique" instead of "Both email
      * address and username must be unique") - which caters for a better (app)
      * user experience.
-     * 
+     *
      * Details: https://github.com/Automattic/mongoose/issues/2129 (issue for
      * mongoose, but the same applies for the native mongodb driver)
-     * 
+     *
      * Note that in mongoose (the link above) the prop in question is called
      * 'message' while in mongodb it is called 'errmsg'. This can be seen in
      * multiple places in the source code, for example here:
@@ -231,6 +231,7 @@ export class MongoError extends Error {
     errmsg?: string;
 }
 
+
 /** http://mongodb.github.io/node-mongodb-native/3.1/api/MongoClient.html#.connect */
 export interface MongoClientOptions extends
     DbCreateOptions,
@@ -240,57 +241,120 @@ export interface MongoClientOptions extends
     SocketOptions,
     SSLOptions,
     HighAvailabilityOptions {
-    // The logging level (error/warn/info/debug)
+
+    /**
+     * The logging level (error/warn/info/debug)
+     */
     loggerLevel?: string;
-    // Custom logger object
-    logger?: Object;
-    // Default: false;
+
+    /**
+     * Custom logger object
+     */
+    logger?: Object | log;
+
+    /**
+     * Validate MongoClient passed in options for correctness.
+     * Default: false
+     */
     validateOptions?: Object;
-    // The name of the application that created this MongoClient instance.
-    appname?: string;
+
+    /**
+     * The name of the application that created this MongoClient instance.
+     */
+     appname?: string;
+
+     /**
+      * Authentifikation credentials
+      */
     auth?: {
+        /**
+         * The username for auth
+         */
         user: string;
+        /**
+         * The password for auth
+         */
         password: string;
-    },
-    // Determines whether or not to use the new url parser
-    useNewUrlParser?: boolean
+    };
+
+    /**
+     * Determines whether or not to use the new url parser
+     */
+     useNewUrlParser?: boolean;
+
+    /**
+     * Mechanism for authentication: MDEFAULT, GSSAPI, PLAIN, MONGODB-X509, or SCRAM-SHA-1
+     */
+    authMechanism?: 'MDEFAULT' | 'GSSAPI' | 'PLAIN' | 'MONGODB-X509' | 'SCRAM-SHA-1' | string;
 }
 
 export interface SSLOptions {
-    // Passed directly through to tls.createSecureContext. See https://nodejs.org/dist/latest-v9.x/docs/api/tls.html#tls_tls_createsecurecontext_options for more info.
+    /**
+     * Passed directly through to tls.createSecureContext. See https://nodejs.org/dist/latest-v9.x/docs/api/tls.html#tls_tls_createsecurecontext_options for more info.
+     */
     ciphers?: string;
-    // Passed directly through to tls.createSecureContext. See https://nodejs.org/dist/latest-v9.x/docs/api/tls.html#tls_tls_createsecurecontext_options for more info.
+    /**
+     * Passed directly through to tls.createSecureContext. See https://nodejs.org/dist/latest-v9.x/docs/api/tls.html#tls_tls_createsecurecontext_options for more info.
+     */
     ecdhCurve?: string;
-    // Default:5; Number of connections for each server instance
+    /**
+     * Default:5; Number of connections for each server instance
+     */
     poolSize?: number;
-    // If present, the connection pool will be initialized with minSize connections, and will never dip below minSize connections
+    /**
+     * If present, the connection pool will be initialized with minSize connections, and will never dip below minSize connections
+     */
     minSize?: number;
-    // Use ssl connection (needs to have a mongod server with ssl support)
+    /**
+     * Use ssl connection (needs to have a mongod server with ssl support)
+     */
     ssl?: boolean;
-    // Default: true; Validate mongod server certificate against ca (mongod server >=2.4 with ssl support required)
+    /**
+     * Default: true; Validate mongod server certificate against ca (mongod server >=2.4 with ssl support required)
+     */
     sslValidate?: boolean;
-    // Default: true; Server identity checking during SSL
+    /**
+     * Default: true; Server identity checking during SSL
+     */
     checkServerIdentity?: boolean | Function;
-    // Array of valid certificates either as Buffers or Strings
+    /**
+     * Array of valid certificates either as Buffers or Strings
+     */
     sslCA?: Array<Buffer | string>;
-    // SSL Certificate revocation list binary buffer
+    /**
+     * SSL Certificate revocation list binary buffer
+     */
     sslCRL?: Array<Buffer | string>;
-    // SSL Certificate binary buffer
+    /**
+     * SSL Certificate binary buffer
+     */
     sslCert?: Buffer | string;
-    // SSL Key file binary buffer
+    /**
+     * SSL Key file binary buffer
+     */
     sslKey?: Buffer | string;
-    // SSL Certificate pass phrase
+    /**
+     * SSL Certificate pass phrase
+     */
     sslPass?: Buffer | string;
-    // String containing the server name requested via TLS SNI.
+    /**
+     * String containing the server name requested via TLS SNI.
+     */
     servername?: string;
 }
 
 export interface HighAvailabilityOptions {
-    // Default: true; Turn on high availability monitoring.
+    /**
+     * Default: true; Turn on high availability monitoring.
+     */
     ha?: boolean;
-    // Default: 10000; The High availability period for replicaset inquiry
+    /**
+     * Default: 10000; The High availability period for replicaset inquiry
+     */
     haInterval?: number;
-    // Default: false;
+    /**
+     * Default: false;
+     */
     domainsEnabled?: boolean;
 }
 
@@ -299,7 +363,12 @@ export class ReadPreference {
     constructor(mode: string, tags: Object);
     mode: string;
     tags: any;
-    options: { maxStalenessSeconds?: number }; // Max Secondary Read Stalleness in Seconds
+    options: {
+        /**
+         * Max Secondary Read Stalleness in Seconds
+         */
+        maxStalenessSeconds?: number
+    };
     static PRIMARY: string;
     static PRIMARY_PREFERRED: string;
     static SECONDARY: string;
@@ -311,86 +380,159 @@ export class ReadPreference {
 
 /** http://mongodb.github.io/node-mongodb-native/3.1/api/Db.html */
 export interface DbCreateOptions extends CommonOptions {
-    // If the database authentication is dependent on another databaseName.
+    /**
+     * If the database authentication is dependent on another databaseName.
+     */
     authSource?: string;
-    // Default: false; Force server to create _id fields instead of client.
+    /**
+     * Default: false; Force server to create _id fields instead of client.
+     */
     forceServerObjectId?: boolean;
-    // Default: false; Use c++ bson parser.
+    /**
+     * Default: false; Use c++ bson parser.
+     */
     native_parser?: boolean;
-    // Serialize functions on any object.
+    /**
+     * Serialize functions on any object.
+     */
     serializeFunctions?: boolean;
-    // Specify if the BSON serializer should ignore undefined fields.
+    /**
+     * Specify if the BSON serializer should ignore undefined fields.
+     */
     ignoreUndefined?: boolean;
-    // Return document results as raw BSON buffers.
+    /**
+     * Return document results as raw BSON buffers.
+     */
     raw?: boolean;
-    // Default: true; Promotes Long values to number if they fit inside the 53 bits resolution.
+    /**
+     * Default: true; Promotes Long values to number if they fit inside the 53 bits resolution.
+     */
     promoteLongs?: boolean;
-    // Default: false; Promotes Binary BSON values to native Node Buffers
+    /**
+     * Default: false; Promotes Binary BSON values to native Node Buffers
+     */
     promoteBuffers?: boolean;
-    // the prefered read preference. use 'ReadPreference' class.
+    /**
+     * the prefered read preference. use 'ReadPreference' class.
+     */
     readPreference?: ReadPreference | string;
-    // Default: true; Promotes BSON values to native types where possible, set to false to only receive wrapper types.
+    /**
+     * Default: true; Promotes BSON values to native types where possible, set to false to only receive wrapper types.
+     */
     promoteValues?: Object;
-    // Custom primary key factory to generate _id values (see Custom primary keys).
+    /**
+     * Custom primary key factory to generate _id values (see Custom primary keys).
+     */
     pkFactory?: Object;
-    // ES6 compatible promise constructor
+    /**
+     * ES6 compatible promise constructor
+     */
     promiseLibrary?: Object;
     /** https://docs.mongodb.com/manual/reference/read-concern/#read-concern */
     readConcern?: ReadConcern;
-    // Sets a cap on how many operations the driver will buffer up before giving up on getting a
-    // working connection, default is -1 which is unlimited.
+    /**
+     * Sets a cap on how many operations the driver will buffer up before giving up on getting a
+     */
+    /**
+     * working connection, default is -1 which is unlimited.
+     */
     bufferMaxEntries?: number;
 }
 
 /** http://mongodb.github.io/node-mongodb-native/3.1/api/Server.html */
 export interface SocketOptions {
-    // Reconnect on error. default:false
+    /**
+     * Reconnect on error. default:false
+     */
     autoReconnect?: boolean;
-    // TCP Socket NoDelay option. default:true
+    /**
+     * TCP Socket NoDelay option. default:true
+     */
     noDelay?: boolean;
-    // TCP KeepAlive enabled on the socket. default:true
+    /**
+     * TCP KeepAlive enabled on the socket. default:true
+     */
     keepAlive?: boolean;
-    // TCP KeepAlive initial delay before sending first keep-alive packet when idle. default:300000
+    /**
+     * TCP KeepAlive initial delay before sending first keep-alive packet when idle. default:300000
+     */
     keepAliveInitialDelay?: number;
-    // TCP Connection timeout setting. default 0
+    /**
+     * TCP Connection timeout setting. default 0
+     */
     connectTimeoutMS?: number;
-    // Version of IP stack. Can be 4, 6 or null. default: null.
-    // If null, will attempt to connect with IPv6, and will fall back to IPv4 on failure
-    // refer to http://mongodb.github.io/node-mongodb-native/3.1/api/MongoClient.html
+    /**
+     * Version of IP stack. Can be 4, 6 or null. default: null.
+     */
+    /**
+     * If null, will attempt to connect with IPv6, and will fall back to IPv4 on failure
+     */
+    /**
+     * refer to http://mongodb.github.io/node-mongodb-native/3.1/api/MongoClient.html
+     */
     family?: 4 | 6 | null;
-    // TCP Socket timeout setting. default 0
+    /**
+     * TCP Socket timeout setting. default 0
+     */
     socketTimeoutMS?: number;
 }
 
 /** http://mongodb.github.io/node-mongodb-native/3.1/api/Server.html */
 export interface ServerOptions extends SSLOptions {
-    // Default: 30;
+    /**
+     * Default: 30;
+     */
     reconnectTries?: number;
-    // Default: 1000;
+    /**
+     * Default: 1000;
+     */
     reconnectInterval?: number;
-    // Default: true;
+    /**
+     * Default: true;
+     */
     monitoring?: boolean
+
+    /**
+     * Socket Options
+     */
     socketOptions?: SocketOptions;
-    // Default: 10000; The High availability period for replicaset inquiry
+
+    /**
+     * Default: 10000; The High availability period for replicaset inquiry
+     */
     haInterval?: number;
-    // Default: false;
+    /**
+     * Default: false;
+     */
     domainsEnabled?: boolean;
 }
 
 /** http://mongodb.github.io/node-mongodb-native/3.1/api/Mongos.html */
 export interface MongosOptions extends SSLOptions, HighAvailabilityOptions {
-    // Default: 15; Cutoff latency point in MS for MongoS proxy selection
+    /**
+     * Default: 15; Cutoff latency point in MS for MongoS proxy selection
+     */
     acceptableLatencyMS?: number;
+
+     /**
+      * Socket Options
+      */
     socketOptions?: SocketOptions;
 }
 
 /** http://mongodb.github.io/node-mongodb-native/3.1/api/ReplSet.html */
 export interface ReplSetOptions extends SSLOptions, HighAvailabilityOptions {
-    // The max staleness to secondary reads (values under 10 seconds cannot be guaranteed);
+    /**
+     * The max staleness to secondary reads (values under 10 seconds cannot be guaranteed);
+     */
     maxStalenessSeconds?: number;
-    // The name of the replicaset to connect to.
+    /**
+     * The name of the replicaset to connect to.
+     */
     replicaSet?: string;
-    // Default: 15 ; Range of servers to pick when using NEAREST (lowest ping ms + the latency fence, ex: range of 1 to (1 + 15) ms)
+    /**
+     * Default: 15 ; Range of servers to pick when using NEAREST (lowest ping ms + the latency fence, ex: range of 1 to (1 + 15) ms)
+     */
     secondaryAcceptableLatencyMS?: number;
     connectWithNoPrimary?: boolean;
     socketOptions?: SocketOptions;
@@ -482,28 +624,40 @@ export interface CommonOptions extends WriteConcern {
     session?: ClientSession;
 }
 
-// Deprecated http://mongodb.github.io/node-mongodb-native/3.1/api/Server.html
+/**
+ * @deprecated
+ * @see http://mongodb.github.io/node-mongodb-native/3.1/api/Server.html
+ */
 export class Server extends EventEmitter {
     constructor(host: string, port: number, options?: ServerOptions);
 
     connections(): Array<any>;
 }
 
-// Deprecated http://mongodb.github.io/node-mongodb-native/3.1/api/ReplSet.html
+/**
+ * @deprecated
+ * @see http://mongodb.github.io/node-mongodb-native/3.1/api/ReplSet.html
+ */
 export class ReplSet extends EventEmitter {
     constructor(servers: Array<Server>, options?: ReplSetOptions);
 
     connections(): Array<any>;
 }
 
-// Deprecated http://mongodb.github.io/node-mongodb-native/3.1/api/ReplSet.html
+/**
+ * @deprecated
+ * @see http://mongodb.github.io/node-mongodb-native/3.1/api/Mongos.html
+ */
 export class Mongos extends EventEmitter {
     constructor(servers: Array<Server>, options?: MongosOptions);
 
     connections(): Array<any>;
 }
 
-/** http://mongodb.github.io/node-mongodb-native/3.1/api/Db.html#addUser */
+/**
+ * @deprecated
+ * @see http://mongodb.github.io/node-mongodb-native/3.1/api/Db.html#addUser
+ */
 export interface DbAddUserOptions extends CommonOptions {
     customData?: Object;
     roles?: Object[];
@@ -543,27 +697,48 @@ export interface DbCollectionOptions extends CommonOptions {
 
 /** http://mongodb.github.io/node-mongodb-native/3.1/api/Db.html#createIndex */
 export interface IndexOptions extends CommonOptions {
-    // Creates an unique index.
+    /**
+     * Creates an unique index.
+     */
     unique?: boolean;
-    // Creates a sparse index.
+    /**
+     * Creates a sparse index.
+     */
     sparse?: boolean;
-    // Creates the index in the background, yielding whenever possible.
+    /**
+     * Creates the index in the background, yielding whenever possible.
+     */
     background?: boolean;
-    // A unique index cannot be created on a key that has pre-existing duplicate values.
-    // If you would like to create the index anyway, keeping the first document the database indexes and
-    // deleting all subsequent documents that have duplicate value
+    /**
+     * A unique index cannot be created on a key that has pre-existing duplicate values.
+     *
+     * If you would like to create the index anyway, keeping the first document the database indexes and
+     * deleting all subsequent documents that have duplicate value
+     */
     dropDups?: boolean;
-    // For geo spatial indexes set the lower bound for the co-ordinates.
+    /**
+     * For geo spatial indexes set the lower bound for the co-ordinates.
+     */
     min?: number;
-    // For geo spatial indexes set the high bound for the co-ordinates.
+    /**
+     * For geo spatial indexes set the high bound for the co-ordinates.
+     */
     max?: number;
-    // Specify the format version of the indexes.
+    /**
+     * Specify the format version of the indexes.
+     */
     v?: number;
-    // Allows you to expire data on indexes applied to a data (MongoDB 2.2 or higher)
+    /**
+     * Allows you to expire data on indexes applied to a data (MongoDB 2.2 or higher)
+     */
     expireAfterSeconds?: number;
-    // Override the auto generated index name (useful if the resulting name is larger than 128 bytes)
+    /**
+     * Override the auto generated index name (useful if the resulting name is larger than 128 bytes)
+     */
     name?: string;
-    // Creates a partial index based on the given filter object (MongoDB 3.2 or higher)
+    /**
+     * Creates a partial index based on the given filter object (MongoDB 3.2 or higher)
+     */
     partialFilterExpression?: any;
     collation?: Object;
     default_language?: string
@@ -619,17 +794,27 @@ export interface FSyncOptions extends CommonOptions {
     fsync?: boolean
 }
 
-// Documentation : http://mongodb.github.io/node-mongodb-native/3.1/api/Collection.html
+/** http://mongodb.github.io/node-mongodb-native/3.1/api/Collection.html */
 export interface Collection<TSchema = Default> {
-    // Get the collection name.
+    /**
+     * Get the collection name.
+     */
     collectionName: string;
-    // Get the full collection namespace.
+    /**
+     * Get the full collection namespace.
+     */
     namespace: string;
-    // The current write concern values.
+    /**
+     * The current write concern values.
+     */
     writeConcern: any;
-    // The current read concern values.
+    /**
+     * The current read concern values.
+     */
     readConcern: ReadConcern;
-    // Get current index hint for collection.
+    /**
+     * Get current index hint for collection.
+     */
     hint: any;
     /** http://mongodb.github.io/node-mongodb-native/3.0/api/Collection.html#aggregate */
     aggregate<T = TSchema>(callback: MongoCallback<AggregationCursor<T>>): AggregationCursor<T>;
@@ -880,40 +1065,70 @@ export type FilterQuery<T> = {
     [P in keyof T]?: T[P] | Condition<T, P>;
 } | { [key: string]: any };
 
-// Documentation: http://docs.mongodb.org/manual/reference/command/collStats/
+/** http://docs.mongodb.org/manual/reference/command/collStats/ */
 export interface CollStats {
-    // Namespace.
+    /**
+     * Namespace.
+     */
     ns: string;
-    // Number of documents.
+    /**
+     * Number of documents.
+     */
     count: number;
-    // Collection size in bytes.
+    /**
+     * Collection size in bytes.
+     */
     size: number;
-    // Average object size in bytes.
+    /**
+     * Average object size in bytes.
+     */
     avgObjSize: number;
-    // (Pre)allocated space for the collection in bytes.
+    /**
+     * (Pre)allocated space for the collection in bytes.
+     */
     storageSize: number;
-    // Number of extents (contiguously allocated chunks of datafile space).
+    /**
+     * Number of extents (contiguously allocated chunks of datafile space).
+     */
     numExtents: number;
-    // Number of indexes.
+    /**
+     * Number of indexes.
+     */
     nindexes: number;
-    // Size of the most recently created extent in bytes.
+    /**
+     * Size of the most recently created extent in bytes.
+     */
     lastExtentSize: number;
-    // Padding can speed up updates if documents grow.
+    /**
+     * Padding can speed up updates if documents grow.
+     */
     paddingFactor: number;
-    // A number that indicates the user-set flags on the collection. userFlags only appears when using the mmapv1 storage engine.
+    /**
+     * A number that indicates the user-set flags on the collection. userFlags only appears when using the mmapv1 storage engine.
+     */
     userFlags?: number;
-    // Total index size in bytes.
+    /**
+     * Total index size in bytes.
+     */
     totalIndexSize: number;
-    // Size of specific indexes in bytes.
+    /**
+     * Size of specific indexes in bytes.
+     */
     indexSizes: {
         _id_: number;
         [index: string]: number;
     };
-    // `true` if the collection is capped.
+    /**
+     * `true` if the collection is capped.
+     */
     capped: boolean;
-    // The maximum number of documents that may be present in a capped collection.
+    /**
+     * The maximum number of documents that may be present in a capped collection.
+     */
     max: number;
-    // The maximum size of a capped collection.
+    /**
+     * The maximum size of a capped collection.
+     */
     maxSize: number;
     wiredTiger?: WiredTigerData;
     indexDetails?: any;
@@ -1059,18 +1274,28 @@ export interface WiredTigerData {
 /** http://mongodb.github.io/node-mongodb-native/3.1/api/Collection.html#aggregate */
 export interface CollectionAggregationOptions {
     readPreference?: ReadPreference | string;
-    // Return the query as cursor, on 2.6 > it returns as a real cursor
-    // on pre 2.6 it returns as an emulated cursor.
+    /**
+     * Return the query as cursor, on 2.6 > it returns as a real cursor
+     * on pre 2.6 it returns as an emulated cursor.
+     */
     cursor?: { batchSize?: number };
-    // Explain returns the aggregation execution plan (requires mongodb 2.6 >).
+    /**
+     * Explain returns the aggregation execution plan (requires mongodb 2.6 >).
+     */
     explain?: boolean;
-    // lets the server know if it can use disk to store
-    // temporary results for the aggregation (requires mongodb 2.6 >).
+    /**
+     * Lets the server know if it can use disk to store
+     * temporary results for the aggregation (requires mongodb 2.6 >).
+     */
     allowDiskUse?: boolean;
-    // specifies a cumulative time limit in milliseconds for processing operations
-    // on the cursor. MongoDB interrupts the operation at the earliest following interrupt point.
+    /**
+     * specifies a cumulative time limit in milliseconds for processing operations
+     * on the cursor. MongoDB interrupts the operation at the earliest following interrupt point.
+     */
     maxTimeMS?: number;
-    // Allow driver to bypass schema validation in MongoDB 3.2 or higher.
+    /**
+     * Allow driver to bypass schema validation in MongoDB 3.2 or higher.
+     */
     bypassDocumentValidation?: boolean;
     raw?: boolean;
     promoteLongs?: boolean;
@@ -1084,23 +1309,37 @@ export interface CollectionAggregationOptions {
 
 /** http://mongodb.github.io/node-mongodb-native/3.1/api/Collection.html#insertMany */
 export interface CollectionInsertManyOptions extends CommonOptions {
-    // Serialize functions on any object.
+    /**
+     * Serialize functions on any object.
+     */
     serializeFunctions?: boolean;
-    //Force server to assign _id values instead of driver.
+    /**
+     * Force server to assign _id values instead of driver.
+     */
     forceServerObjectId?: boolean;
-    // Allow driver to bypass schema validation in MongoDB 3.2 or higher.
+    /**
+     * Allow driver to bypass schema validation in MongoDB 3.2 or higher.
+     */
     bypassDocumentValidation?: boolean;
-    // If true, when an insert fails, don't execute the remaining writes. If false, continue with remaining inserts when one fails.
+    /**
+     * If true, when an insert fails, don't execute the remaining writes. If false, continue with remaining inserts when one fails.
+     */
     ordered?: boolean;
 }
 
 /** http://mongodb.github.io/node-mongodb-native/3.1/api/Collection.html#bulkWrite */
 export interface CollectionBulkWriteOptions extends CommonOptions {
-    // Serialize functions on any object.
+    /**
+     * Serialize functions on any object.
+     */
     serializeFunctions?: boolean;
-    // Execute write operation in ordered or unordered fashion.
+    /**
+     * Execute write operation in ordered or unordered fashion.
+     */
     ordered?: boolean;
-    // Allow driver to bypass schema validation in MongoDB 3.2 or higher.
+    /**
+     * Allow driver to bypass schema validation in MongoDB 3.2 or higher.
+     */
     bypassDocumentValidation?: boolean;
     //Force server to assign _id values instead of driver.
     forceServerObjectId?: boolean;
@@ -1120,13 +1359,21 @@ export interface BulkWriteOpResultObject {
 
 /** http://mongodb.github.io/node-mongodb-native/3.1/api/Collection.html#count */
 export interface MongoCountPreferences {
-    // The limit of documents to count.
+    /**
+     * The limit of documents to count.
+     */
     limit?: number;
-    // The number of documents to skip for the count.
+    /**
+     * The number of documents to skip for the count.
+     */
     skip?: boolean;
-    // An index name hint for the query.
+    /**
+     * An index name hint for the query.
+     */
     hint?: string;
-    // The preferred read preference
+    /**
+     * The preferred read preference
+     */
     readPreference?: ReadPreference | string;
     maxTimeMS?: number;
     session?: ClientSession;
@@ -1292,7 +1539,10 @@ export interface FindOneOptions {
     limit?: number;
     sort?: Array<any> | Object;
     projection?: Object;
-    fields?: Object; // Deprecated Use options.projection instead
+    /**
+     * @deprecated Use options.projection instead
+     */
+    fields?: Object;
     skip?: number;
     hint?: Object;
     explain?: boolean;
@@ -1328,7 +1578,9 @@ export interface InsertWriteOpResult {
 
 /** http://mongodb.github.io/node-mongodb-native/3.1/api/Collection.html#insertOne */
 export interface CollectionInsertOneOptions extends CommonOptions {
-    // Serialize functions on any object.
+    /**
+     * Serialize functions on any object.
+     */
     serializeFunctions?: boolean;
     //Force server to assign _id values instead of driver.
     forceServerObjectId?: boolean;
@@ -1683,17 +1935,29 @@ export class GridFSBucketWriteStream extends Writable {
 
 /** https://mongodb.github.io/node-mongodb-native/3.1/api/GridFSBucketWriteStream.html */
 export interface GridFSBucketWriteStreamOptions {
-    /** Custom file id for the GridFS file. */
+    /**
+     * Custom file id for the GridFS file.
+     **/
     id?: GridFSBucketWriteStreamId,
-    /** The chunk size to use, in bytes */
+    /**
+     * The chunk size to use, in bytes
+     */
     chunkSizeBytes?: number,
-    /** The write concern */
+    /**
+     * The write concern
+     */
     w?: number,
-    /** The write concern timeout */
+    /**
+     * The write concern timeout
+     */
     wtimeout?: number,
-    /** The journal write concern */
+    /**
+     * The journal write concern
+     */
     j?: number
-    /** Default false; If true, disables adding an md5 field to file data */
+    /**
+     * Default false; If true, disables adding an md5 field to file data
+     */
     disableMD5?: boolean
 }
 
@@ -1732,8 +1996,14 @@ export interface ChangeStreamOptions {
 type GridFSBucketWriteStreamId = string | number | Object | ObjectID;
 
 export interface LoggerOptions {
-    loggerLevel?: string // Custom logger function
-    logger?: log // Override default global log level.
+    /**
+     * Custom logger function
+     */
+    loggerLevel?: string
+    /**
+     * Override default global log level.
+     */
+    logger?: log
 }
 
 export type log = (message?: string, state?: LoggerState) => void
@@ -1749,30 +2019,54 @@ export interface LoggerState {
 /** http://mongodb.github.io/node-mongodb-native/3.1/api/Logger.html */
 export class Logger {
     constructor(className: string, options?: LoggerOptions)
-    // Log a message at the debug level
+    /**
+     * Log a message at the debug level
+     */
     debug(message: string, state: LoggerState): void
-    // Log a message at the warn level
+    /**
+     * Log a message at the warn level
+     */
     warn(message: string, state: LoggerState): void
-    // Log a message at the info level
+    /**
+     * Log a message at the info level
+     */
     info(message: string, state: LoggerState): void
-    // Log a message at the error level
+    /**
+     * Log a message at the error level
+     */
     error(message: string, state: LoggerState): void
-    // Is the logger set at info level
+    /**
+     * Is the logger set at info level
+     */
     isInfo(): boolean
-    // Is the logger set at error level
+    /**
+     * Is the logger set at error level
+     */
     isError(): boolean
-    // Is the logger set at error level
+    /**
+     * Is the logger set at error level
+     */
     isWarn(): boolean
-    // Is the logger set at debug level
+    /**
+     * Is the logger set at debug level
+     */
     isDebug(): boolean
-    // Resets the logger to default settings, error and no filtered classes
+    /**
+     * Resets the logger to default settings, error and no filtered classes
+     */
     static reset(): void
-    // Get the current logger function
+    /**
+     * Get the current logger function
+     */
     static currentLogger(): log
     //Set the current logger function
     static setCurrentLogger(log: log): void
-    // Set what classes to log.
+    /**
+     * Set what classes to log.
+     */
     static filter(type: string, values: string[]): void
-    // Set the current log level
+    /**
+     * Set the current log level
+     */
     static setLevel(level: string): void
 }
diff --git a/types/mongodb/mongodb-tests.ts b/types/mongodb/mongodb-tests.ts
index b9b4a63c8d..ea755a8eb1 100644
--- a/types/mongodb/mongodb-tests.ts
+++ b/types/mongodb/mongodb-tests.ts
@@ -7,6 +7,7 @@ const connectionString = 'mongodb://127.0.0.1:27017/test';
 var format = require('util').format;
 let options: mongodb.MongoClientOptions = {
     authSource: ' ',
+    loggerLevel: 'debug',
     w: 1,
     wtimeout: 300,
     j: true,
@@ -21,7 +22,6 @@ let options: mongodb.MongoClientOptions = {
 
     reconnectTries: 123456,
     reconnectInterval: 123456,
-
     ssl: true,
     sslValidate: false,
     checkServerIdentity: function () { },
@@ -31,12 +31,14 @@ let options: mongodb.MongoClientOptions = {
     sslKey: new Buffer(999),
     sslPass: new Buffer(999),
     promoteBuffers: false,
-    useNewUrlParser: false
+    useNewUrlParser: false,
+    authMechanism: 'SCRAM-SHA-1',
+    forceServerObjectId: false
 }
 MongoClient.connect(connectionString, options, function (err: mongodb.MongoError, client: mongodb.MongoClient) {
     if (err) throw err;
     const db = client.db('test');
-	
+
     var collection = db.collection('test_insert');
     collection.insertOne({ a: 2 }, function (err: mongodb.MongoError, docs: any) {
 
@@ -263,11 +265,11 @@ async function transfer(client: mongodb.MongoClient, from: any, to: any, amount:
         // `session.abortTransaction()` will undo the above `findOneAndUpdate()`
         throw new Error('Insufficient funds: ' + (A.balance + amount));
       }
-  
+
       const B = await db.collection('Account').
         findOneAndUpdate({ name: to }, { $inc: { balance: amount } }, opts).
         then(res => res.value);
-  
+
       await session.commitTransaction();
       session.endSession();
       return { from: A, to: B };
@@ -287,3 +289,4 @@ mongodb.connect(connectionString).then((client) => {
     );
 });
 
+

From 64df3bfb11d384c4d404c71e05ff47aea9b7e8cb Mon Sep 17 00:00:00 2001
From: Alan Plum <me@pluma.io>
Date: Fri, 23 Nov 2018 17:53:22 +0100
Subject: [PATCH 225/836] Add mcrypt@0.1

---
 types/mcrypt/index.d.ts      | 31 ++++++++++++++++++++++
 types/mcrypt/mcrypt-tests.ts | 51 ++++++++++++++++++++++++++++++++++++
 types/mcrypt/tsconfig.json   | 16 +++++++++++
 types/mcrypt/tslint.json     |  1 +
 4 files changed, 99 insertions(+)
 create mode 100644 types/mcrypt/index.d.ts
 create mode 100644 types/mcrypt/mcrypt-tests.ts
 create mode 100644 types/mcrypt/tsconfig.json
 create mode 100644 types/mcrypt/tslint.json

diff --git a/types/mcrypt/index.d.ts b/types/mcrypt/index.d.ts
new file mode 100644
index 0000000000..945cb88e59
--- /dev/null
+++ b/types/mcrypt/index.d.ts
@@ -0,0 +1,31 @@
+// Type definitions for mcrypt 0.1
+// Project: https://github.com/tugrul/node-mcrypt
+// Definitions by: Alan Plum <https://github.com/pluma>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.1
+
+/// <reference types="node" />
+
+export function getAlgorithmNames(): string[];
+export function getModeNames(): string[];
+
+export class MCrypt {
+    constructor(algorithm: string, mode: string);
+    open(key: string | Buffer, iv?: string | Buffer): void;
+    encrypt(plaintext: string | Buffer): Buffer;
+    decrypt(ciphertext: Buffer): Buffer;
+    generateIv(): Buffer;
+    validateKeySize(validate: boolean): void;
+    validateIvSize(validate: boolean): void;
+    selfTest(): boolean;
+    isBlockAlgorithmMode(): boolean;
+    isBlockAlgorithm(): boolean;
+    isBlockMode(): boolean;
+    getBlockSize(): number;
+    getKeySize(): number;
+    getSupportedKeySizes(): number[];
+    getIvSize(): number;
+    hasIv(): boolean;
+    getAlgorithmName(): string;
+    getModeName(): string;
+}
diff --git a/types/mcrypt/mcrypt-tests.ts b/types/mcrypt/mcrypt-tests.ts
new file mode 100644
index 0000000000..66614e08e3
--- /dev/null
+++ b/types/mcrypt/mcrypt-tests.ts
@@ -0,0 +1,51 @@
+import { getAlgorithmNames, getModeNames, MCrypt } from "mcrypt";
+
+let plaintext: Buffer;
+let ciphertext: Buffer;
+
+for (const algo of getAlgorithmNames()) {
+    console.log(algo.toUpperCase());
+}
+for (const mode of getModeNames()) {
+    console.log(mode.toUpperCase());
+}
+
+const desEcb = new MCrypt("des", "ecb");
+desEcb.open("madepass");
+
+ciphertext = desEcb.encrypt("too many secrets");
+console.log(ciphertext.toString("base64"));
+
+plaintext = desEcb.decrypt(ciphertext);
+console.log(plaintext.toString());
+
+const blowfishCfb = new MCrypt("blowfish", "cfb");
+const iv = blowfishCfb.generateIv();
+blowfishCfb.open("somekey", iv);
+ciphertext = blowfishCfb.encrypt("sometext");
+console.log(Buffer.concat([iv, ciphertext]).toString("base64"));
+
+const bfEcb = new MCrypt("blowfish", "ecb");
+bfEcb.validateKeySize(false);
+bfEcb.open("typeconfig.sys^_-");
+
+const rjCbc = new MCrypt("rijndael-256", "cbc");
+rjCbc.validateIvSize(false);
+rjCbc.open("$verysec$retkey$", "foobar");
+
+console.log(blowfishCfb.getBlockSize() * 8);
+console.log(blowfishCfb.getKeySize() * 8);
+console.log(blowfishCfb.getSupportedKeySizes().map(v => v * 8));
+console.log(blowfishCfb.getIvSize() * 8);
+console.log(blowfishCfb.getAlgorithmName().toUpperCase());
+console.log(blowfishCfb.getModeName().toUpperCase());
+
+function assertBool(value: boolean) {
+    return value;
+}
+
+assertBool(blowfishCfb.selfTest());
+assertBool(blowfishCfb.isBlockAlgorithmMode());
+assertBool(blowfishCfb.isBlockAlgorithm());
+assertBool(blowfishCfb.isBlockMode());
+assertBool(blowfishCfb.hasIv());
diff --git a/types/mcrypt/tsconfig.json b/types/mcrypt/tsconfig.json
new file mode 100644
index 0000000000..1bb1454ce5
--- /dev/null
+++ b/types/mcrypt/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": ["es6"],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": ["../"],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": ["index.d.ts", "mcrypt-tests.ts"]
+}
diff --git a/types/mcrypt/tslint.json b/types/mcrypt/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/mcrypt/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 3a606a9bae048b370ab8dac3a57e1bf92bd97da6 Mon Sep 17 00:00:00 2001
From: Kurt Preston <kpreston@drw.com>
Date: Fri, 23 Nov 2018 12:21:51 -0600
Subject: [PATCH 226/836] Removing self as definition owner in reactstrap and
 react-jsonschema-form

---
 .github/CODEOWNERS                     | 4 ++--
 types/react-jsonschema-form/index.d.ts | 1 -
 types/reactstrap/index.d.ts            | 1 -
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index df45a8a9e7..3cd81571a0 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -3833,7 +3833,7 @@
 /types/react-json/                                  @spielc
 /types/react-json-pretty/                           @LKay
 /types/react-json-tree/                             @gnestor
-/types/react-jsonschema-form/                       @iamdanfox @iplus26 @KurtPreston @phbou72 @LucianBuzzo @sthenault @sbusch
+/types/react-jsonschema-form/                       @iamdanfox @iplus26 @phbou72 @LucianBuzzo @sthenault @sbusch
 /types/react-jss/                                   @eps1lon
 /types/react-lazyload/                              @m0a
 /types/react-lazylog/                               @benjaminRomano
@@ -4057,7 +4057,7 @@
 /types/reactable/                                   @spielc
 /types/reactcss/                                    @chrisgervang @LKay
 /types/reactstrap/v4/                               @alihammad @mfal @danilobjr @fabiopaiva
-/types/reactstrap/                                  @alihammad @mfal @danilobjr @FaithForHumans @KurtPreston @timc13 @patrickrgaffney @prabodht
+/types/reactstrap/                                  @alihammad @mfal @danilobjr @FaithForHumans @timc13 @patrickrgaffney @prabodht
 /types/read/                                        @timjk
 /types/read-chunk/                                  @crispybee
 /types/read-package-tree/                           @mgroenhoff
diff --git a/types/react-jsonschema-form/index.d.ts b/types/react-jsonschema-form/index.d.ts
index 7e1e1df7e3..c17bda1a94 100644
--- a/types/react-jsonschema-form/index.d.ts
+++ b/types/react-jsonschema-form/index.d.ts
@@ -2,7 +2,6 @@
 // Project: https://github.com/mozilla-services/react-jsonschema-form
 // Definitions by: Dan Fox <https://github.com/iamdanfox>
 //                 Ivan Jiang <https://github.com/iplus26>
-//                 Kurt Preston <https://github.com/KurtPreston>
 //                 Philippe Bourdages <https://github.com/phbou72>
 //                 Lucian Buzzo <https://github.com/LucianBuzzo>
 //                 Sylvain Thénault <https://github.com/sthenault>
diff --git a/types/reactstrap/index.d.ts b/types/reactstrap/index.d.ts
index 62ee3ec6d0..8197cf5bb1 100644
--- a/types/reactstrap/index.d.ts
+++ b/types/reactstrap/index.d.ts
@@ -4,7 +4,6 @@
 //                 Marco Falkenberg <https://github.com/mfal>
 //                 Danilo Barros <https://github.com/danilobjr>
 //                 FaithForHumans <https://github.com/FaithForHumans>
-//                 Kurt Preston <https://github.com/KurtPreston>
 //                 Tim Chen <https://github.com/timc13>
 //                 Pat Gaffney <https://github.com/patrickrgaffney>
 //                 Prabodh Tiwari <https://github.com/prabodht>

From 12a360ab0cee924cbf658f3b23cfdf3645368015 Mon Sep 17 00:00:00 2001
From: Lucas <git@roang.info>
Date: Fri, 23 Nov 2018 19:49:32 +0100
Subject: [PATCH 227/836] Update index.d.ts

Remove umd namespace
---
 types/kdbxweb/index.d.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/types/kdbxweb/index.d.ts b/types/kdbxweb/index.d.ts
index 805a45a2b0..f2f487156c 100644
--- a/types/kdbxweb/index.d.ts
+++ b/types/kdbxweb/index.d.ts
@@ -4,8 +4,6 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
 
-export as namespace kdbxweb;
-
 export type KdbxObject = Entry | Group;
 export type StringProtected = ProtectedValue | string;
 

From 4e31c72dfdc1f7f61ef666a6667b8bcfff6a0824 Mon Sep 17 00:00:00 2001
From: Yves Kaufmann <fxdapokalypse@googlemail.com>
Date: Fri, 23 Nov 2018 21:33:48 +0100
Subject: [PATCH 228/836] [MONGODB] Fixes possible authMechanism values

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

diff --git a/types/mongodb/index.d.ts b/types/mongodb/index.d.ts
index 1ac38c79d5..e516e4d31f 100644
--- a/types/mongodb/index.d.ts
+++ b/types/mongodb/index.d.ts
@@ -283,9 +283,9 @@ export interface MongoClientOptions extends
      useNewUrlParser?: boolean;
 
     /**
-     * Mechanism for authentication: MDEFAULT, GSSAPI, PLAIN, MONGODB-X509, or SCRAM-SHA-1
+     * Mechanism for authentication: DEFAULT, GSSAPI, PLAIN, MONGODB-X509, 'MONGODB-CR', SCRAM-SHA-1 or SCRAM-SHA-256
      */
-    authMechanism?: 'MDEFAULT' | 'GSSAPI' | 'PLAIN' | 'MONGODB-X509' | 'SCRAM-SHA-1' | string;
+    authMechanism?: 'DEFAULT' | 'GSSAPI' | 'PLAIN' | 'MONGODB-X509' | 'MONGODB-CR' | 'SCRAM-SHA-1' | 'SCRAM-SHA-256' | string;
 }
 
 export interface SSLOptions {

From 47a677d74878a66f09b1b6ea0168184068f73aed Mon Sep 17 00:00:00 2001
From: Matt Ferderer <matt@mattferderer.com>
Date: Fri, 23 Nov 2018 15:29:05 -0600
Subject: [PATCH 229/836] Fixed amount token property to be optional

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

diff --git a/types/stripejs/token.d.ts b/types/stripejs/token.d.ts
index dac3308393..89da22bf8e 100644
--- a/types/stripejs/token.d.ts
+++ b/types/stripejs/token.d.ts
@@ -59,7 +59,7 @@ export interface TokenData {
     /**
      * The amount paid, not a decimal. In USD this is in cents.
      */
-    amount: number;
+    amount?: number;
 
     /**
      * Fields for billing address information.

From 3df7d2836e432e949b26de57741265aad9cf1e8d Mon Sep 17 00:00:00 2001
From: Alan Plum <me@pluma.io>
Date: Fri, 23 Nov 2018 23:45:29 +0100
Subject: [PATCH 230/836] Add promised-ldap@0.3

---
 types/promised-ldap/index.d.ts             | 95 ++++++++++++++++++++++
 types/promised-ldap/promised-ldap-tests.ts | 39 +++++++++
 types/promised-ldap/tsconfig.json          | 16 ++++
 types/promised-ldap/tslint.json            |  1 +
 4 files changed, 151 insertions(+)
 create mode 100644 types/promised-ldap/index.d.ts
 create mode 100644 types/promised-ldap/promised-ldap-tests.ts
 create mode 100644 types/promised-ldap/tsconfig.json
 create mode 100644 types/promised-ldap/tslint.json

diff --git a/types/promised-ldap/index.d.ts b/types/promised-ldap/index.d.ts
new file mode 100644
index 0000000000..53f215b2b8
--- /dev/null
+++ b/types/promised-ldap/index.d.ts
@@ -0,0 +1,95 @@
+// Type definitions for promised-ldap 0.3
+// Project: https://github.com/stewartml/promised-ldap#readme
+// Definitions by: My Self <https://github.com/me>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+import { EventEmitter } from "events";
+import * as ldap from "ldapjs";
+
+declare class Client extends EventEmitter {
+    constructor({ url }: { url: string });
+
+    search(
+        base: string,
+        options: ldap.SearchOptions,
+        controls?: ldap.Control | ldap.Control[]
+    ): Promise<{
+        entries: any[];
+        references: any[];
+    }>;
+
+    authenticate(base: string, dn: string, password: string): Promise<any>;
+    authenticateUser(
+        base: string,
+        dn: string,
+        password: string
+    ): Promise<{ name: string; email: string; groups: string[] } | null>;
+
+    bind(
+        dn: string,
+        password: string,
+        controls?: ldap.Control | ldap.Control[]
+    ): Promise<any>;
+
+    add(
+        name: string,
+        entry: object,
+        controls?: ldap.Control | ldap.Control[]
+    ): Promise<any>;
+
+    compare(
+        name: string,
+        attr: string,
+        value: string,
+        controls?: ldap.Control | ldap.Control[]
+    ): Promise<boolean>;
+
+    del(name: string, controls?: ldap.Control | ldap.Control[]): Promise<any>;
+
+    exop(
+        name: string,
+        value: string,
+        controls?: ldap.Control | ldap.Control[]
+    ): Promise<any>;
+
+    modify(
+        name: string,
+        change: ldap.Change | ldap.Change[],
+        controls?: ldap.Control | ldap.Control[]
+    ): Promise<any>;
+
+    modifyDN(
+        name: string,
+        newName: string,
+        controls?: ldap.Control | ldap.Control[]
+    ): Promise<any>;
+
+    _search(
+        base: string,
+        options: ldap.SearchOptions,
+        controls?: ldap.Control | ldap.Control[],
+        _bypass?: boolean
+    ): Promise<EventEmitter>;
+    _search(
+        base: string,
+        options: ldap.SearchOptions,
+        _bypass: boolean
+    ): Promise<EventEmitter>;
+
+    starttls(
+        options: object,
+        controls: ldap.Control | ldap.Control[],
+        _bypass?: boolean
+    ): Promise<any>;
+
+    unbind(): Promise<void>;
+
+    destroy(err?: any): void;
+}
+
+declare namespace Client {
+    type SearchOptions = ldap.SearchOptions;
+}
+
+export = Client;
diff --git a/types/promised-ldap/promised-ldap-tests.ts b/types/promised-ldap/promised-ldap-tests.ts
new file mode 100644
index 0000000000..b61f7ef6fc
--- /dev/null
+++ b/types/promised-ldap/promised-ldap-tests.ts
@@ -0,0 +1,39 @@
+import ldap = require("promised-ldap");
+import ldapjs = require("ldapjs");
+
+const client = new ldap({
+    url: "ldap://127.0.0.1:1389"
+});
+
+client.authenticate("test", "cn=root", "secret").then((res: any) => {
+    console.log(res);
+});
+
+client.authenticateUser("test", "cn=root", "secret").then((res: any) => {
+    console.log(res);
+});
+
+client.bind("cn=root", "secret").catch((err: Error) => {
+    console.error(err);
+});
+
+const opts: ldap.SearchOptions = {
+    filter: "(&(l=Seattle)(email=*@foo.com))",
+    scope: "sub",
+    attributes: ["dn", "sn", "cn"]
+};
+
+client._search("o=example", opts).then((res: NodeJS.EventEmitter) => {
+    console.log(res);
+});
+
+const change = new ldapjs.Change({
+    operation: "add",
+    modification: {
+        pets: ["cat", "dog"]
+    }
+});
+
+client.modify("cn=foo, o=example", change).catch((err: Error) => {
+    console.error(err);
+});
diff --git a/types/promised-ldap/tsconfig.json b/types/promised-ldap/tsconfig.json
new file mode 100644
index 0000000000..89b60715eb
--- /dev/null
+++ b/types/promised-ldap/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": ["es6"],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": ["../"],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": ["index.d.ts", "promised-ldap-tests.ts"]
+}
diff --git a/types/promised-ldap/tslint.json b/types/promised-ldap/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/promised-ldap/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 1cef81059eccb564654a9942955300c2073bb3f3 Mon Sep 17 00:00:00 2001
From: Alan Plum <me@pluma.io>
Date: Sat, 24 Nov 2018 01:45:43 +0100
Subject: [PATCH 231/836] Update index.d.ts

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

diff --git a/types/promised-ldap/index.d.ts b/types/promised-ldap/index.d.ts
index 53f215b2b8..8b0182bea6 100644
--- a/types/promised-ldap/index.d.ts
+++ b/types/promised-ldap/index.d.ts
@@ -1,6 +1,6 @@
 // Type definitions for promised-ldap 0.3
-// Project: https://github.com/stewartml/promised-ldap#readme
-// Definitions by: My Self <https://github.com/me>
+// Project: https://github.com/stewartml/promised-ldap
+// Definitions by: Alan Plum <https://github.com/pluma>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
 

From c0df17945ec4488f75c6eb4cc121926601e901fc Mon Sep 17 00:00:00 2001
From: Alan Plum <me@pluma.io>
Date: Sat, 24 Nov 2018 02:11:50 +0100
Subject: [PATCH 232/836] Added ldap-filters@2.2

---
 types/ldap-filters/index.d.ts            | 60 ++++++++++++++++++++++++
 types/ldap-filters/ldap-filters-tests.ts | 28 +++++++++++
 types/ldap-filters/tsconfig.json         | 16 +++++++
 types/ldap-filters/tslint.json           |  1 +
 4 files changed, 105 insertions(+)
 create mode 100644 types/ldap-filters/index.d.ts
 create mode 100644 types/ldap-filters/ldap-filters-tests.ts
 create mode 100644 types/ldap-filters/tsconfig.json
 create mode 100644 types/ldap-filters/tslint.json

diff --git a/types/ldap-filters/index.d.ts b/types/ldap-filters/index.d.ts
new file mode 100644
index 0000000000..46e1c24fa8
--- /dev/null
+++ b/types/ldap-filters/index.d.ts
@@ -0,0 +1,60 @@
+// Type definitions for ldap-filters 2.2
+// Project: https://github.com/tapmodo/node-ldap-filters
+// Definitions by: Alan Plum <https://github.com/pluma>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+interface Filter {
+    toString(indent?: boolean | number): string;
+    simplify(): Filter;
+    match(data: object): boolean;
+}
+
+declare namespace Filter {
+    let escape_chars: string[];
+    let indent: number;
+    let indent_char: string;
+    let collapse_not: boolean;
+
+    function escape(value: string): string;
+    function unescape(value: string): string;
+    function parse(input: string): Filter;
+    function matchString(data: string | string[], filter: Filter): boolean;
+    function matchSubstring(data: string | string[], filter: Filter): boolean;
+    function matchApprox(data: string | string[], filter: Filter): boolean;
+    function matchGTE(data: string | string[], filter: Filter): boolean;
+    function matchLTE(data: string | string[], filter: Filter): boolean;
+    function attribute(name: string): Attribute;
+    function AND(filters: Filter[]): Group;
+    function OR(filters: Filter[]): Group;
+    function NOT(filter: Filter): GroupNot;
+
+    interface Group {
+        type: string;
+        comp: string;
+        filters: Filter[];
+        toString(indent?: boolean | number): string;
+        match(data: object): boolean;
+    }
+
+    interface GroupNot extends Group {
+        simplify(): Filter;
+    }
+
+    interface Attribute {
+        name: string;
+        escapeChars: string[];
+        escape(value: string): string;
+        present(): Filter;
+        raw(value: string): Filter;
+        equalTo(value: string): Filter;
+        endsWith(value: string): Filter;
+        startsWith(value: string): Filter;
+        contains(value: string): Filter;
+        approx(value: string): Filter;
+        lte(value: string): Filter;
+        gte(value: string): Filter;
+    }
+}
+
+export = Filter;
diff --git a/types/ldap-filters/ldap-filters-tests.ts b/types/ldap-filters/ldap-filters-tests.ts
new file mode 100644
index 0000000000..5111af785e
--- /dev/null
+++ b/types/ldap-filters/ldap-filters-tests.ts
@@ -0,0 +1,28 @@
+/// <reference types="node" />
+
+import Filter = require("ldap-filters");
+
+Filter.collapse_not = false;
+
+const output = Filter.AND([
+    Filter.attribute("givenName").equalTo("jenny"),
+    Filter.attribute("sn").equalTo("jensen")
+]);
+
+console.log(output.toString());
+
+Filter.parse("(&(givenName=jenny)(sn=jensen))");
+
+Filter.parse("(&(uid=jenny))").simplify();
+
+const filter = Filter.parse(
+    "(&(givenName=jenny)(sn=jensen)(|(c=us)(st=ontario)))"
+);
+
+filter.toString();
+filter.toString(true);
+filter.toString(2);
+
+const parsed = Filter.parse("(&(givenName~=jeni)(sn=jensen))");
+const data = { givenName: "Jenny", sn: "Jensen" };
+console.log(parsed.match(data));
diff --git a/types/ldap-filters/tsconfig.json b/types/ldap-filters/tsconfig.json
new file mode 100644
index 0000000000..9d4f5aa560
--- /dev/null
+++ b/types/ldap-filters/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": ["es6"],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": ["../"],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": ["index.d.ts", "ldap-filters-tests.ts"]
+}
diff --git a/types/ldap-filters/tslint.json b/types/ldap-filters/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/ldap-filters/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From da0630fa320071bbd5713ea86c11de6a50725b43 Mon Sep 17 00:00:00 2001
From: Hiroshi Ioka <hirochachacha@gmail.com>
Date: Sat, 24 Nov 2018 13:51:49 +0900
Subject: [PATCH 233/836] @types/mockingoose: add new package

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

diff --git a/types/mockingoose/index.d.ts b/types/mockingoose/index.d.ts
new file mode 100644
index 0000000000..a1597bd4e5
--- /dev/null
+++ b/types/mockingoose/index.d.ts
@@ -0,0 +1,40 @@
+// Type definitions for mockingoose 2.11
+// Project: https://github.com/alonronin/mockingoose#readme
+// Definitions by: Hiroshi Ioka <https://github.com/hirochachacha>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+type Op =
+  | 'find'
+  | 'findOne'
+  | 'count'
+  | 'countDocuments'
+  | 'estimatedDocumentCount'
+  | 'distinct'
+  | 'findOneAndUpdate'
+  | 'findOneAndRemove'
+  | 'remove'
+  | 'update'
+  | 'deleteOne'
+  | 'deleteMany'
+  | 'save';
+
+declare class Mock {
+  toReturn(expected: any, op?: Op): this;
+  reset(op: Op): this;
+  toJSON(): any;
+}
+
+interface Target {
+  __mocks: any;
+  resetAll(): void;
+  toJSON(): any;
+}
+
+type Proxy = Target & {
+  [index: string]: Mock;
+};
+
+declare const mockingoose: Proxy;
+
+export default mockingoose;
diff --git a/types/mockingoose/mockingoose-tests.ts b/types/mockingoose/mockingoose-tests.ts
new file mode 100644
index 0000000000..09a00ad274
--- /dev/null
+++ b/types/mockingoose/mockingoose-tests.ts
@@ -0,0 +1,9 @@
+import mockingoose from 'mockingoose';
+
+mockingoose.User
+  .toReturn({ name: 'name' })
+  .toReturn({ name: 'a name too' }, 'findOne')
+  .toReturn({ name: 'another name' }, 'save')
+  .reset('find');
+
+mockingoose.resetAll();
diff --git a/types/mockingoose/tsconfig.json b/types/mockingoose/tsconfig.json
new file mode 100644
index 0000000000..a6f171944a
--- /dev/null
+++ b/types/mockingoose/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "mockingoose-tests.ts"
+    ]
+}
diff --git a/types/mockingoose/tslint.json b/types/mockingoose/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/mockingoose/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From e0a0256b1706edcbe9079d492c34e28f3682ad4a Mon Sep 17 00:00:00 2001
From: Sibiraj <dev.sibiraj@outlook.com>
Date: Sat, 24 Nov 2018 12:49:36 +0530
Subject: [PATCH 234/836] fix(prettier): use correct parser type for
 SupportLanguages

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

diff --git a/types/prettier/index.d.ts b/types/prettier/index.d.ts
index 3a64129364..71bb080e9f 100644
--- a/types/prettier/index.d.ts
+++ b/types/prettier/index.d.ts
@@ -256,7 +256,7 @@ export function clearConfigCache(): void;
 export interface SupportLanguage {
     name: string;
     since?: string;
-    parsers: string[];
+    parsers: BuiltInParserName[];
     group?: string;
     tmScope: string;
     aceMode: string;

From c7d8952d428367898f9eac35057bf693f080766b Mon Sep 17 00:00:00 2001
From: muzea <mr.muzea@gmail.com>
Date: Sat, 24 Nov 2018 18:16:56 +0800
Subject: [PATCH 235/836] fix(babel__core): the transform actually return FIle

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

diff --git a/types/babel__core/babel__core-tests.ts b/types/babel__core/babel__core-tests.ts
index a873c3392f..1957209a20 100644
--- a/types/babel__core/babel__core-tests.ts
+++ b/types/babel__core/babel__core-tests.ts
@@ -7,15 +7,18 @@ const options: babel.TransformOptions = {
 
 babel.transform("code();", options, (err, result) => {
     const { code, map, ast } = result!;
+    const { body } = ast!.program;
 });
 
 const transformSyncResult = babel.transformSync("code();", options);
 if (transformSyncResult) {
     const { code, map, ast } = transformSyncResult;
+    const { body } = ast!.program;
 }
 
 babel.transformFile("filename.js", options, (err, result) => {
     const { code, map, ast } = result!;
+    const { body } = ast!.program;
 });
 
 babel.transformFileSync("filename.js", options)!.code;
@@ -25,7 +28,9 @@ const parsedAst = babel.parse(sourceCode, options);
 
 babel.transformFromAst(parsedAst!, sourceCode, options, (err, result) => {
     const { code, map, ast } = result!;
+    const { body } = ast!.program;
 });
 
 const transformFromAstSyncResult = babel.transformFromAstSync(parsedAst!, sourceCode, options);
 const { code, map, ast } = transformFromAstSyncResult!;
+const { body } = ast!.program;
diff --git a/types/babel__core/index.d.ts b/types/babel__core/index.d.ts
index 85a89392af..f57f9e27b6 100644
--- a/types/babel__core/index.d.ts
+++ b/types/babel__core/index.d.ts
@@ -365,7 +365,7 @@ export interface PluginObj<S = {}> {
 }
 
 export interface BabelFileResult {
-    ast?: Node | null;
+    ast?: t.File | null;
     code?: string | null;
     ignored?: boolean;
     map?: {

From 55ab68c976231b6c2d0c34e6761d5f91c7027383 Mon Sep 17 00:00:00 2001
From: Sibiraj <20282546+sibiraj-s@users.noreply.github.com>
Date: Sat, 24 Nov 2018 16:13:17 +0530
Subject: [PATCH 236/836] fix: update types to support external plugins

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

diff --git a/types/prettier/index.d.ts b/types/prettier/index.d.ts
index 71bb080e9f..6cef2ef27a 100644
--- a/types/prettier/index.d.ts
+++ b/types/prettier/index.d.ts
@@ -256,7 +256,7 @@ export function clearConfigCache(): void;
 export interface SupportLanguage {
     name: string;
     since?: string;
-    parsers: BuiltInParserName[];
+    parsers: BuiltInParserName[] | string[];
     group?: string;
     tmScope: string;
     aceMode: string;

From ec0977d8d5f20dd2a41c859cdbf5f4c0c4e12337 Mon Sep 17 00:00:00 2001
From: Igor Stepanov <sigorilla@yandex-team.ru>
Date: Sat, 24 Nov 2018 15:24:34 +0300
Subject: [PATCH 237/836] @types/got: add TimeoutError interface

Add `got.TimeoutError` in accordance with sindresorhus/got@da4f23699dead63f17b5e27f9cadd9e4cb95e9a9
---
 types/got/got-tests.ts | 1 +
 types/got/index.d.ts   | 7 ++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/types/got/got-tests.ts b/types/got/got-tests.ts
index 934adfc9a8..55680e7d27 100644
--- a/types/got/got-tests.ts
+++ b/types/got/got-tests.ts
@@ -269,3 +269,4 @@ got('http://todomvc.com', { retry: 2 });
 got('http://todomvc.com', { retry: { retries: 2, methods: ['GET'], statusCodes: [408, 504], maxRetryAfter: 1 } });
 got('http://todomvc.com', { throwHttpErrors: false });
 got('http://todomvc.com', { hooks: { beforeRequest: [ () => 'foo']} });
+got('http://todomvc.com', { timeout: 1 }).catch((e) => e instanceof got.TimeoutError);
diff --git a/types/got/index.d.ts b/types/got/index.d.ts
index 6b0929fdcf..d0cfc682dc 100644
--- a/types/got/index.d.ts
+++ b/types/got/index.d.ts
@@ -53,6 +53,10 @@ declare class CancelError extends StdError {
     name: 'CancelError';
 }
 
+declare class TimeoutError extends StdError {
+    name: 'TimeoutError';
+}
+
 declare class StdError extends Error {
     code?: string;
     host?: string;
@@ -75,6 +79,7 @@ declare const got: got.GotFn &
         MaxRedirectsError: typeof MaxRedirectsError;
         UnsupportedProtocolError: typeof UnsupportedProtocolError;
         CancelError: typeof CancelError;
+        TimeoutError: typeof TimeoutError;
     };
 
 interface InternalRequestOptions extends https.RequestOptions {
@@ -215,7 +220,7 @@ declare namespace got {
         removeListener(event: 'uploadProgress', listener: (progress: Progress) => void): this;
     }
 
-    type GotError = RequestError | ReadError | ParseError | HTTPError | MaxRedirectsError | UnsupportedProtocolError | CancelError;
+    type GotError = RequestError | ReadError | ParseError | HTTPError | MaxRedirectsError | UnsupportedProtocolError | CancelError | TimeoutError;
 
     interface Progress {
         percent: number;

From a169bc5dda5c595439062712c4d0429b4def512d Mon Sep 17 00:00:00 2001
From: TeamworkGuy2 <straitfrommars@rocketmail.com>
Date: Sat, 24 Nov 2018 14:26:28 +0000
Subject: [PATCH 238/836] [cached-path-relative] Add documentation to new
 definition

---
 types/cached-path-relative/index.d.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/types/cached-path-relative/index.d.ts b/types/cached-path-relative/index.d.ts
index 56076870bc..b2af5ea81c 100644
--- a/types/cached-path-relative/index.d.ts
+++ b/types/cached-path-relative/index.d.ts
@@ -3,6 +3,11 @@
 // Definitions by: TeamworkGuy2 <https://github.com/TeamworkGuy2>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
+/**
+ * Memoize the results of the path.relative function. path.relative can be an expensive operation
+ * if it happens a lot, and its results shouldn't change for the same arguments.
+ * Use it just like your normal path.relative, but it's memoized.
+ */
 declare function cachedPathRelative(from: string, to: string): string;
 
 export = cachedPathRelative;

From 16770fa6e199f01f83957339c25bc9ce1095329c Mon Sep 17 00:00:00 2001
From: Leonard Thieu <leonard.thieu@gmail.com>
Date: Wed, 24 Oct 2018 08:11:51 -0400
Subject: [PATCH 239/836] [jquery] Add deprecation notice for `Event.which`.

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

diff --git a/types/jquery/misc.d.ts b/types/jquery/misc.d.ts
index 7b09b6a4dc..8488d49f00 100644
--- a/types/jquery/misc.d.ts
+++ b/types/jquery/misc.d.ts
@@ -4305,6 +4305,7 @@ $( "a" ).click(function( event ) {
          * For key or mouse events, this property indicates the specific key or button that was pressed.
          * @see \`{@link https://api.jquery.com/event.which/ }\`
          * @since 1.1.3
+         * @deprecated ​ Deprecated since 3.3. See \`{@link https://github.com/jquery/api.jquery.com/issues/821 }\`.
          * @example ​ ````Log which key was depressed.
 ```html
 <!doctype html>

From e64bea6d884096561c30e067804e9d58afde5926 Mon Sep 17 00:00:00 2001
From: Leonard Thieu <leonard.thieu@gmail.com>
Date: Fri, 26 Oct 2018 09:17:54 -0400
Subject: [PATCH 240/836] [jquery] Remove `jQuery.event.fixHooks`.

See https://jquery.com/upgrade-guide/3.0/#breaking-change-jquery-event-props-and-jquery-event-fixhooks-removed.
---
 types/jquery/jquery-tests.ts     | 16 -------
 types/jquery/misc.d.ts           | 74 --------------------------------
 types/jquery/test/learn-tests.ts | 18 --------
 3 files changed, 108 deletions(-)

diff --git a/types/jquery/jquery-tests.ts b/types/jquery/jquery-tests.ts
index 515715bf14..21b4f8fdef 100644
--- a/types/jquery/jquery-tests.ts
+++ b/types/jquery/jquery-tests.ts
@@ -8427,22 +8427,6 @@ function JQuery_Event() {
 }
 
 function JQuery_EventExtensions() {
-    function fixHooks() {
-        jQuery.event.fixHooks.drop = {
-            props: ['dataTransfer'],
-            filter(event, originalEvent) {
-                // $ExpectType Event<EventTarget, null>
-                event;
-                // $ExpectType Event
-                originalEvent;
-            },
-        };
-
-        // Weak type test. This may be removed if the TypeScript requirement is increased to 2.4+.
-        // $ExpectError
-        jQuery.event.fixHooks.drop = ['dataTransfer'];
-    }
-
     function special() {
         jQuery.event.special.multiclick = {
             noBubble: true,
diff --git a/types/jquery/misc.d.ts b/types/jquery/misc.d.ts
index 8488d49f00..c466004c58 100644
--- a/types/jquery/misc.d.ts
+++ b/types/jquery/misc.d.ts
@@ -4734,11 +4734,6 @@ $( "ul" ).click( handler ).find( "ul" ).hide();
          * @see \`{@link https://learn.jquery.com/events/event-extensions/#jquery-event-props-array }\`
          */
         props: string[];
-        /**
-         * The `fixHooks` interface provides a per-event-type way to extend or normalize the event object that jQuery creates when it processes a _native_ browser event.
-         * @see \`{@link https://learn.jquery.com/events/event-extensions/#jquery-event-fixhooks-object }\`
-         */
-        fixHooks: FixHooks;
         /**
          * The jQuery special event hooks are a set of per-event-name functions and properties that allow code to control the behavior of event processing within jQuery. The mechanism is similar to `fixHooks` in that the special event information is stored in `jQuery.event.special.NAME`, where `NAME` is the name of the special event. Event names are case sensitive.
          *
@@ -4748,75 +4743,6 @@ $( "ul" ).click( handler ).find( "ul" ).hide();
         special: SpecialEventHooks;
     }
 
-    // region Fix hooks
-    // #region Fix hooks
-
-    // Workaround for TypeScript 2.3 which does not have support for weak types handling.
-    type FixHook = {
-        /**
-         * Strings representing properties that should be copied from the browser's event object to the jQuery event object. If omitted, no additional properties are copied beyond the standard ones that jQuery copies and normalizes (e.g. `event.target` and `event.relatedTarget`).
-         */
-        props: string[];
-    } | {
-        /**
-         * jQuery calls this function after it constructs the `jQuery.Event` object, copies standard properties from `jQuery.event.props`, and copies the `fixHooks`-specific props (if any) specified above. The function can create new properties on the event object or modify existing ones. The second argument is the browser's native event object, which is also available in `event.originalEvent`.
-         *
-         * Note that for all events, the browser's native event object is available in `event.originalEvent`; if the jQuery event handler examines the properties there instead of jQuery's normalized `event` object, there is no need to create a `fixHooks` entry to copy or modify the properties.
-         * @example ​ ````For example, to set a hook for the "drop" event that copies the `dataTransfer` property, assign an object to `jQuery.event.fixHooks.drop`:
-```javascript
-jQuery.event.fixHooks.drop = {
-    props: [ "dataTransfer" ]
-};
-```
-
-Since fixHooks is an advanced feature and rarely used externally, jQuery does not include code or
-interfaces to deal with conflict resolution. If there is a chance that some other code may be assigning
-`fixHooks` to the same events, the code should check for an existing hook and take appropriate measures.
-A simple solution might look like this:
-
-```javascript
-if ( jQuery.event.fixHooks.drop ) {
-    throw new Error( "Someone else took the jQuery.event.fixHooks.drop hook!" );
-}
-
-jQuery.event.fixHooks.drop = {
-    props: [ "dataTransfer" ]
-};
-```
-
-When there are known cases of different plugins wanting to attach to the drop hook, this solution might be more appropriate:
-
-```javascript
-var existingHook = jQuery.event.fixHooks.drop;
-
-if ( !existingHook ) {
-    jQuery.event.fixHooks.drop = {
-        props: [ "dataTransfer" ]
-    };
-} else {
-    if ( existingHook.props ) {
-        existingHook.props.push( "dataTransfer" );
-    } else {
-        existingHook.props = [ "dataTransfer" ];
-    }
-}
-```
-         */
-        filter(event: Event, originalEvent: _Event): void;
-    } | {
-        [key: string]: never;
-    };
-
-    /**
-     * The `fixHooks` interface provides a per-event-type way to extend or normalize the event object that jQuery creates when it processes a _native_ browser event.
-     * @see \`{@link https://learn.jquery.com/events/event-extensions/#jquery-event-fixhooks-object }\`
-     */
-    interface FixHooks {
-        [event: string]: FixHook;
-    }
-
-    // #endregion
-
     // region Special event hooks
     // #region Special event hooks
 
diff --git a/types/jquery/test/learn-tests.ts b/types/jquery/test/learn-tests.ts
index 8ef5eb2cfa..523385b644 100644
--- a/types/jquery/test/learn-tests.ts
+++ b/types/jquery/test/learn-tests.ts
@@ -21,24 +21,6 @@ jQuery("a").greenify(); // Makes all the links green.
 
 // Events
 
-function fixHooks() {
-    function setHook() {
-        jQuery.event.fixHooks.drop = {
-            props: ["dataTransfer"]
-        };
-    }
-
-    function conflictResolution() {
-        if (jQuery.event.fixHooks.drop) {
-            throw new Error("Someone else took the jQuery.event.fixHooks.drop hook!");
-        }
-
-        jQuery.event.fixHooks.drop = {
-            props: ["dataTransfer"]
-        };
-    }
-}
-
 function special() {
     function defineSpecialEvent() {
         jQuery.event.special.pushy = {

From 50b56a19ce4cb93b1de1f87ef029938068f0198c Mon Sep 17 00:00:00 2001
From: Leonard Thieu <leonard.thieu@gmail.com>
Date: Fri, 26 Oct 2018 09:18:35 -0400
Subject: [PATCH 241/836] [jquery] Remove `jQuery.event.props`.

See https://jquery.com/upgrade-guide/3.0/#breaking-change-jquery-event-props-and-jquery-event-fixhooks-removed.
---
 types/jquery/misc.d.ts | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/types/jquery/misc.d.ts b/types/jquery/misc.d.ts
index c466004c58..5aa957f4c5 100644
--- a/types/jquery/misc.d.ts
+++ b/types/jquery/misc.d.ts
@@ -4727,13 +4727,6 @@ $( "ul" ).click( handler ).find( "ul" ).hide();
     // #region Event extensions
 
     interface EventExtensions {
-        /**
-         * jQuery defines an \`{@link https://api.jquery.com/category/events/event-object/ Event object}\` that represents a cross-browser subset of the information available when an event occurs. The `jQuery.event.props` property is an array of string names for properties that are always copied when jQuery processes a native browser event. (Events fired in code by `.trigger()` do not use this list, since the code can construct a `jQuery.Event` object with the needed values and trigger using that object.)
-         *
-         * To add a property name to this list, use `jQuery.event.props.push( "newPropertyName" )`. However, be aware that every event processed by jQuery will now attempt to copy this property name from the native browser event to jQuery's constructed event. If the property does not exist for that event type, it will get an undefined value. Adding many properties to this list can significantly reduce event delivery performance, so for infrequently-needed properties it is more efficient to use the value directly from `event.originalEvent` instead. If properties must be copied, you are strongly advised to use `jQuery.event.fixHooks` as of version 1.7.
-         * @see \`{@link https://learn.jquery.com/events/event-extensions/#jquery-event-props-array }\`
-         */
-        props: string[];
         /**
          * The jQuery special event hooks are a set of per-event-name functions and properties that allow code to control the behavior of event processing within jQuery. The mechanism is similar to `fixHooks` in that the special event information is stored in `jQuery.event.special.NAME`, where `NAME` is the name of the special event. Event names are case sensitive.
          *

From 32e0482fb5df663b228e8eb7de1cde1c5b41f9b0 Mon Sep 17 00:00:00 2001
From: Leonard Thieu <leonard.thieu@gmail.com>
Date: Sun, 21 Oct 2018 09:54:12 -0400
Subject: [PATCH 242/836] [jquery] Remove `jQuery.Event(EventLike)` signatures
 and `EventLike` interface.

These are undocumented and don't appear to be intended to be public.
---
 types/jquery/jquery-tests.ts | 10 ----------
 types/jquery/misc.d.ts       |  8 --------
 2 files changed, 18 deletions(-)

diff --git a/types/jquery/jquery-tests.ts b/types/jquery/jquery-tests.ts
index 21b4f8fdef..eba206f323 100644
--- a/types/jquery/jquery-tests.ts
+++ b/types/jquery/jquery-tests.ts
@@ -8400,21 +8400,11 @@ function JQuery_Event() {
     function call_signature() {
         // $ExpectType Event<HTMLElement, null> & Coordinates
         $.Event('keydown', $('p').offset());
-
-        // $ExpectType Event<HTMLElement, null> & { type: string; }
-        $.Event({
-            type: 'keydown'
-        });
     }
 
     function constructor() {
         // $ExpectType Event<HTMLElement, null> & Coordinates
         new $.Event('keydown', $('p').offset());
-
-        // $ExpectType Event<HTMLElement, null> & { type: string; }
-        new $.Event({
-            type: 'keydown'
-        });
     }
 
     // https://stackoverflow.com/questions/49892574/trigger-a-jquery-3-event-with-ctrlkey-set
diff --git a/types/jquery/misc.d.ts b/types/jquery/misc.d.ts
index 5aa957f4c5..94f7279e63 100644
--- a/types/jquery/misc.d.ts
+++ b/types/jquery/misc.d.ts
@@ -3986,11 +3986,7 @@ $( "input" ).click(function() {
         // tslint:disable-next-line:no-unnecessary-generics
         <T extends object, TTarget extends EventTarget = HTMLElement>(event: string, properties?: T): Event<TTarget> & T;
         // tslint:disable-next-line:no-unnecessary-generics
-        <T extends EventLike, TTarget extends EventTarget = HTMLElement>(properties: T): Event<TTarget> & T;
-        // tslint:disable-next-line:no-unnecessary-generics
         new <T extends object, TTarget extends EventTarget = HTMLElement>(event: string, properties?: T): Event<TTarget> & T;
-        // tslint:disable-next-line:no-unnecessary-generics
-        new <T extends EventLike, TTarget extends EventTarget = HTMLElement>(properties: T): Event<TTarget> & T;
     }
 
     // Instance members
@@ -4712,10 +4708,6 @@ $( "ul" ).click( handler ).find( "ul" ).hide();
         target: TTarget;
     }
 
-    interface EventLike {
-        type: string;
-    }
-
     // #endregion
 
     interface EventHandler<TCurrentTarget, TData = null> extends EventHandlerBase<TCurrentTarget, Event<TCurrentTarget, TData>> { }

From c1ec1c28e5c9f6e6f0cb16b37de27d7c66c5a513 Mon Sep 17 00:00:00 2001
From: Leonard Thieu <leonard.thieu@gmail.com>
Date: Fri, 26 Oct 2018 10:43:45 -0400
Subject: [PATCH 243/836] [jquery] Remove `JQuery.EventHandlerBase<TContext =
 any, JQuery.Event>` from handler types.

Handler types previously included `JQuery.EventHandlerBase<TContext = any, JQuery.Event>`. This was a fix to what turned out to be a problem with `jQuery.proxy`. That issue was properly fixed by https://github.com/DefinitelyTyped/DefinitelyTyped/pull/29930.
---
 types/jquery/JQuery.d.ts     | 136 +++----
 types/jquery/jquery-tests.ts | 744 +----------------------------------
 2 files changed, 89 insertions(+), 791 deletions(-)

diff --git a/types/jquery/JQuery.d.ts b/types/jquery/JQuery.d.ts
index 7453457953..70cfaa0e03 100644
--- a/types/jquery/JQuery.d.ts
+++ b/types/jquery/JQuery.d.ts
@@ -1331,7 +1331,7 @@ $( "p" ).before( $( "b" ) );
      */
     bind<TData>(eventType: string,
                 eventData: TData,
-                handler: JQuery.EventHandler<TElement, TData> | JQuery.EventHandlerBase<any, JQuery.Event<TElement, TData>>): this;
+                handler: JQuery.EventHandler<TElement, TData>): this;
     /**
      * Attach a handler to an event for the elements.
      * @param eventType A string containing one or more DOM event types, such as "click" or "submit," or custom event names.
@@ -1459,7 +1459,7 @@ $( "button" ).click(function() {
 ```
      */
     bind(eventType: string,
-         handler_preventBubble: JQuery.EventHandler<TElement> | JQuery.EventHandlerBase<any, JQuery.Event<TElement>> | false | null | undefined): this;
+         handler_preventBubble: JQuery.EventHandler<TElement> | false | null | undefined): this;
     /**
      * Attach a handler to an event for the elements.
      * @param events An object containing one or more DOM event types and functions to execute for them.
@@ -1485,7 +1485,7 @@ $( "div.test" ).bind({
 });
 ```
      */
-    bind(events: JQuery.PlainObject<JQuery.EventHandler<TElement> | JQuery.EventHandlerBase<any, JQuery.Event<TElement>> | false>): this;
+    bind(events: JQuery.PlainObject<JQuery.EventHandler<TElement> | false>): this;
     /**
      * Bind an event handler to the "blur" JavaScript event, or trigger that event on an element.
      * @param eventData An object containing data that will be passed to the event handler.
@@ -1499,7 +1499,7 @@ $( "div.test" ).bind({
      * **Solution**: Instead of `.click(fn)` use `.on("click", fn)`. Instead of `.click()` use `.trigger("click")`.
      */
     blur<TData>(eventData: TData,
-                handler: JQuery.EventHandler<TElement, TData> | JQuery.EventHandlerBase<any, JQuery.Event<TElement, TData>>): this;
+                handler: JQuery.EventHandler<TElement, TData>): this;
     /**
      * Bind an event handler to the "blur" JavaScript event, or trigger that event on an element.
      * @param handler A function to execute each time the event is triggered.
@@ -1515,7 +1515,7 @@ $( "div.test" ).bind({
 $( "p" ).blur();
 ```
      */
-    blur(handler?: JQuery.EventHandler<TElement> | JQuery.EventHandlerBase<any, JQuery.Event<TElement>> | false): this;
+    blur(handler?: JQuery.EventHandler<TElement> | false): this;
     /**
      * Bind an event handler to the "change" JavaScript event, or trigger that event on an element.
      * @param eventData An object containing data that will be passed to the event handler.
@@ -1529,7 +1529,7 @@ $( "p" ).blur();
      * **Solution**: Instead of `.click(fn)` use `.on("click", fn)`. Instead of `.click()` use `.trigger("click")`.
      */
     change<TData>(eventData: TData,
-                  handler: JQuery.EventHandler<TElement, TData> | JQuery.EventHandlerBase<any, JQuery.Event<TElement, TData>>): this;
+                  handler: JQuery.EventHandler<TElement, TData>): this;
     /**
      * Bind an event handler to the "change" JavaScript event, or trigger that event on an element.
      * @param handler A function to execute each time the event is triggered.
@@ -1588,7 +1588,7 @@ $( "input[type='text']" ).change(function() {
 });
 ```
      */
-    change(handler?: JQuery.EventHandler<TElement> | JQuery.EventHandlerBase<any, JQuery.Event<TElement>> | false): this;
+    change(handler?: JQuery.EventHandler<TElement> | false): this;
     /**
      * Get the children of each element in the set of matched elements, optionally filtered by a selector.
      * @param selector A string containing a selector expression to match elements against.
@@ -1841,7 +1841,7 @@ $( "#stop" ).click(function() {
      * **Solution**: Instead of `.click(fn)` use `.on("click", fn)`. Instead of `.click()` use `.trigger("click")`.
      */
     click<TData>(eventData: TData,
-                 handler: JQuery.EventHandler<TElement, TData> | JQuery.EventHandlerBase<any, JQuery.Event<TElement, TData>>): this;
+                 handler: JQuery.EventHandler<TElement, TData>): this;
     /**
      * Bind an event handler to the "click" JavaScript event, or trigger that event on an element.
      * @param handler A function to execute each time the event is triggered.
@@ -1891,7 +1891,7 @@ $( "p" ).click(function() {
 $( "p" ).click();
 ```
      */
-    click(handler?: JQuery.EventHandler<TElement> | JQuery.EventHandlerBase<any, JQuery.Event<TElement>> | false): this;
+    click(handler?: JQuery.EventHandler<TElement> | false): this;
     /**
      * Create a deep copy of the set of matched elements.
      * @param withDataAndEvents A Boolean indicating whether event handlers and data should be copied along with the elements. The
@@ -2079,7 +2079,7 @@ $( "#frameDemo" ).contents().find( "a" ).css( "background-color", "#BADA55" );
      * **Solution**: Instead of `.click(fn)` use `.on("click", fn)`. Instead of `.click()` use `.trigger("click")`.
      */
     contextmenu<TData>(eventData: TData,
-                       handler: JQuery.EventHandler<TElement, TData> | JQuery.EventHandlerBase<any, JQuery.Event<TElement, TData>>): this;
+                       handler: JQuery.EventHandler<TElement, TData>): this;
     /**
      * Bind an event handler to the "contextmenu" JavaScript event, or trigger that event on an element.
      * @param handler A function to execute each time the event is triggered.
@@ -2133,7 +2133,7 @@ div.contextmenu(function() {
 </html>
 ```
      */
-    contextmenu(handler?: JQuery.EventHandler<TElement> | JQuery.EventHandlerBase<any, JQuery.Event<TElement>> | false): this;
+    contextmenu(handler?: JQuery.EventHandler<TElement> | false): this;
     /**
      * Set one or more CSS properties for the set of matched elements.
      * @param propertyName A CSS property name.
@@ -2594,7 +2594,7 @@ $( "button" ).click(function() {
      * **Solution**: Instead of `.click(fn)` use `.on("click", fn)`. Instead of `.click()` use `.trigger("click")`.
      */
     dblclick<TData>(eventData: TData,
-                    handler: JQuery.EventHandler<TElement, TData> | JQuery.EventHandlerBase<any, JQuery.Event<TElement, TData>>): this;
+                    handler: JQuery.EventHandler<TElement, TData>): this;
     /**
      * Bind an event handler to the "dblclick" JavaScript event, or trigger that event on an element.
      * @param handler A function to execute each time the event is triggered.
@@ -2648,7 +2648,7 @@ divdbl.dblclick(function() {
 </html>
 ```
      */
-    dblclick(handler?: JQuery.EventHandler<TElement> | JQuery.EventHandlerBase<any, JQuery.Event<TElement>> | false): this;
+    dblclick(handler?: JQuery.EventHandler<TElement> | false): this;
     /**
      * Set a timer to delay execution of subsequent items in the queue.
      * @param duration An integer indicating the number of milliseconds to delay execution of the next item in the queue.
@@ -2716,7 +2716,7 @@ $( "button" ).click(function() {
     delegate<TData>(selector: JQuery.Selector,
                     eventType: string,
                     eventData: TData,
-                    handler: JQuery.EventHandler<TElement, TData> | JQuery.EventHandlerBase<any, JQuery.Event<TElement, TData>>): this;
+                    handler: JQuery.EventHandler<TElement, TData>): this;
     /**
      * Attach a handler to one or more events for all elements that match the selector, now or in the future, based on a specific set of root elements.
      * @param selector A selector to filter the elements that trigger the event.
@@ -2830,7 +2830,7 @@ $( "button" ).click(function() {
      */
     delegate(selector: JQuery.Selector,
              eventType: string,
-             handler: JQuery.EventHandler<TElement> | JQuery.EventHandlerBase<any, JQuery.Event<TElement>> | false): this;
+             handler: JQuery.EventHandler<TElement> | false): this;
     /**
      * Attach a handler to one or more events for all elements that match the selector, now or in the future, based on a specific set of root elements.
      * @param selector A selector to filter the elements that trigger the event.
@@ -2844,7 +2844,7 @@ $( "button" ).click(function() {
      * **Solution**: Change the method call to use `.on()` or `.off()`, the documentation for the old methods include specific instructions. In general, the `.bind()` and `.unbind()` methods can be renamed directly to `.on()` and `.off()` respectively since the argument orders are identical.
      */
     delegate(selector: JQuery.Selector,
-             events: JQuery.PlainObject<JQuery.EventHandler<TElement> | JQuery.EventHandlerBase<any, JQuery.Event<TElement>> | false>): this;
+             events: JQuery.PlainObject<JQuery.EventHandler<TElement> | false>): this;
     /**
      * Execute the next function on the queue for the matched elements.
      * @param queueName A string containing the name of the queue. Defaults to fx, the standard effects queue.
@@ -4264,7 +4264,7 @@ $( "p span" ).first().addClass( "highlight" );
      * **Solution**: Instead of `.click(fn)` use `.on("click", fn)`. Instead of `.click()` use `.trigger("click")`.
      */
     focus<TData>(eventData: TData,
-                 handler: JQuery.EventHandler<TElement, TData> | JQuery.EventHandlerBase<any, JQuery.Event<TElement, TData>>): this;
+                 handler: JQuery.EventHandler<TElement, TData>): this;
     /**
      * Bind an event handler to the "focus" JavaScript event, or trigger that event on an element.
      * @param handler A function to execute each time the event is triggered.
@@ -4316,7 +4316,7 @@ $( document ).ready(function() {
 });
 ```
      */
-    focus(handler?: JQuery.EventHandler<TElement> | JQuery.EventHandlerBase<any, JQuery.Event<TElement>> | false): this;
+    focus(handler?: JQuery.EventHandler<TElement> | false): this;
     /**
      * Bind an event handler to the "focusin" event.
      * @param eventData An object containing data that will be passed to the event handler.
@@ -4330,7 +4330,7 @@ $( document ).ready(function() {
      * **Solution**: Instead of `.click(fn)` use `.on("click", fn)`. Instead of `.click()` use `.trigger("click")`.
      */
     focusin<TData>(eventData: TData,
-                   handler: JQuery.EventHandler<TElement, TData> | JQuery.EventHandlerBase<any, JQuery.Event<TElement, TData>>): this;
+                   handler: JQuery.EventHandler<TElement, TData>): this;
     /**
      * Bind an event handler to the "focusin" event.
      * @param handler A function to execute each time the event is triggered.
@@ -4370,7 +4370,7 @@ $( "p" ).focusin(function() {
 </html>
 ```
      */
-    focusin(handler?: JQuery.EventHandler<TElement> | JQuery.EventHandlerBase<any, JQuery.Event<TElement>> | false): this;
+    focusin(handler?: JQuery.EventHandler<TElement> | false): this;
     /**
      * Bind an event handler to the "focusout" JavaScript event.
      * @param eventData An object containing data that will be passed to the event handler.
@@ -4384,7 +4384,7 @@ $( "p" ).focusin(function() {
      * **Solution**: Instead of `.click(fn)` use `.on("click", fn)`. Instead of `.click()` use `.trigger("click")`.
      */
     focusout<TData>(eventData: TData,
-                    handler: JQuery.EventHandler<TElement, TData> | JQuery.EventHandlerBase<any, JQuery.Event<TElement, TData>>): this;
+                    handler: JQuery.EventHandler<TElement, TData>): this;
     /**
      * Bind an event handler to the "focusout" JavaScript event.
      * @param handler A function to execute each time the event is triggered.
@@ -4445,7 +4445,7 @@ $( "p" )
 </html>
 ```
      */
-    focusout(handler?: JQuery.EventHandler<TElement> | JQuery.EventHandlerBase<any, JQuery.Event<TElement>> | false): this;
+    focusout(handler?: JQuery.EventHandler<TElement> | false): this;
     /**
      * Retrieve one of the elements matched by the jQuery object.
      * @param index A zero-based integer indicating which element to retrieve.
@@ -5018,8 +5018,8 @@ $( "li" )
      */
     // HACK: The type parameter T is not used but ensures the 'event' callback parameter is typed correctly.
     // tslint:disable-next-line:no-unnecessary-generics
-    hover<T>(handlerInOut: JQuery.EventHandler<TElement> | JQuery.EventHandlerBase<any, JQuery.Event<TElement>> | false,
-             handlerOut?: JQuery.EventHandler<TElement> | JQuery.EventHandlerBase<any, JQuery.Event<TElement>> | false): this;
+    hover<T>(handlerInOut: JQuery.EventHandler<TElement> | false,
+             handlerOut?: JQuery.EventHandler<TElement> | false): this;
     /**
      * Set the HTML contents of each element in the set of matched elements.
      * @param htmlString_function _&#x40;param_ `htmlString_function`
@@ -5833,7 +5833,7 @@ $( "li" ).click(function() {
      * **Solution**: Instead of `.click(fn)` use `.on("click", fn)`. Instead of `.click()` use `.trigger("click")`.
      */
     keydown<TData>(eventData: TData,
-                   handler: JQuery.EventHandler<TElement, TData> | JQuery.EventHandlerBase<any, JQuery.Event<TElement, TData>>): this;
+                   handler: JQuery.EventHandler<TElement, TData>): this;
     /**
      * Bind an event handler to the "keydown" JavaScript event, or trigger that event on an element.
      * @param handler A function to execute each time the event is triggered.
@@ -5905,7 +5905,7 @@ $( "#other" ).click(function() {
 </html>
 ```
      */
-    keydown(handler?: JQuery.EventHandler<TElement> | JQuery.EventHandlerBase<any, JQuery.Event<TElement>> | false): this;
+    keydown(handler?: JQuery.EventHandler<TElement> | false): this;
     /**
      * Bind an event handler to the "keypress" JavaScript event, or trigger that event on an element.
      * @param eventData An object containing data that will be passed to the event handler.
@@ -5919,7 +5919,7 @@ $( "#other" ).click(function() {
      * **Solution**: Instead of `.click(fn)` use `.on("click", fn)`. Instead of `.click()` use `.trigger("click")`.
      */
     keypress<TData>(eventData: TData,
-                    handler: JQuery.EventHandler<TElement, TData> | JQuery.EventHandlerBase<any, JQuery.Event<TElement, TData>>): this;
+                    handler: JQuery.EventHandler<TElement, TData>): this;
     /**
      * Bind an event handler to the "keypress" JavaScript event, or trigger that event on an element.
      * @param handler A function to execute each time the event is triggered.
@@ -5991,7 +5991,7 @@ $( "#other" ).click(function() {
 </html>
 ```
      */
-    keypress(handler?: JQuery.EventHandler<TElement> | JQuery.EventHandlerBase<any, JQuery.Event<TElement>> | false): this;
+    keypress(handler?: JQuery.EventHandler<TElement> | false): this;
     /**
      * Bind an event handler to the "keyup" JavaScript event, or trigger that event on an element.
      * @param eventData An object containing data that will be passed to the event handler.
@@ -6005,7 +6005,7 @@ $( "#other" ).click(function() {
      * **Solution**: Instead of `.click(fn)` use `.on("click", fn)`. Instead of `.click()` use `.trigger("click")`.
      */
     keyup<TData>(eventData: TData,
-                 handler: JQuery.EventHandler<TElement, TData> | JQuery.EventHandlerBase<any, JQuery.Event<TElement, TData>>): this;
+                 handler: JQuery.EventHandler<TElement, TData>): this;
     /**
      * Bind an event handler to the "keyup" JavaScript event, or trigger that event on an element.
      * @param handler A function to execute each time the event is triggered.
@@ -6078,7 +6078,7 @@ $( "#other").click(function() {
 </html>
 ```
      */
-    keyup(handler?: JQuery.EventHandler<TElement> | JQuery.EventHandlerBase<any, JQuery.Event<TElement>> | false): this;
+    keyup(handler?: JQuery.EventHandler<TElement> | false): this;
     /**
      * Reduce the set of matched elements to the final one in the set.
      * @see \`{@link https://api.jquery.com/last/ }\`
@@ -6367,7 +6367,7 @@ $( "input" ).click(function() {
      * **Solution**: Instead of `.click(fn)` use `.on("click", fn)`. Instead of `.click()` use `.trigger("click")`.
      */
     mousedown<TData>(eventData: TData,
-                     handler: JQuery.EventHandler<TElement, TData> | JQuery.EventHandlerBase<any, JQuery.Event<TElement, TData>>): this;
+                     handler: JQuery.EventHandler<TElement, TData>): this;
     /**
      * Bind an event handler to the "mousedown" JavaScript event, or trigger that event on an element.
      * @param handler A function to execute each time the event is triggered.
@@ -6405,7 +6405,7 @@ $( "p" )
 </html>
 ```
      */
-    mousedown(handler?: JQuery.EventHandler<TElement> | JQuery.EventHandlerBase<any, JQuery.Event<TElement>> | false): this;
+    mousedown(handler?: JQuery.EventHandler<TElement> | false): this;
     /**
      * Bind an event handler to be fired when the mouse enters an element, or trigger that handler on an element.
      * @param eventData An object containing data that will be passed to the event handler.
@@ -6419,7 +6419,7 @@ $( "p" )
      * **Solution**: Instead of `.click(fn)` use `.on("click", fn)`. Instead of `.click()` use `.trigger("click")`.
      */
     mouseenter<TData>(eventData: TData,
-                      handler: JQuery.EventHandler<TElement, TData> | JQuery.EventHandlerBase<any, JQuery.Event<TElement, TData>>): this;
+                      handler: JQuery.EventHandler<TElement, TData>): this;
     /**
      * Bind an event handler to be fired when the mouse enters an element, or trigger that handler on an element.
      * @param handler A function to execute each time the event is triggered.
@@ -6500,7 +6500,7 @@ $( "div.enterleave" )
 </html>
 ```
      */
-    mouseenter(handler?: JQuery.EventHandler<TElement> | JQuery.EventHandlerBase<any, JQuery.Event<TElement>> | false): this;
+    mouseenter(handler?: JQuery.EventHandler<TElement> | false): this;
     /**
      * Bind an event handler to be fired when the mouse leaves an element, or trigger that handler on an element.
      * @param eventData An object containing data that will be passed to the event handler.
@@ -6514,7 +6514,7 @@ $( "div.enterleave" )
      * **Solution**: Instead of `.click(fn)` use `.on("click", fn)`. Instead of `.click()` use `.trigger("click")`.
      */
     mouseleave<TData>(eventData: TData,
-                      handler: JQuery.EventHandler<TElement, TData> | JQuery.EventHandlerBase<any, JQuery.Event<TElement, TData>>): this;
+                      handler: JQuery.EventHandler<TElement, TData>): this;
     /**
      * Bind an event handler to be fired when the mouse leaves an element, or trigger that handler on an element.
      * @param handler A function to execute each time the event is triggered.
@@ -6593,7 +6593,7 @@ $( "div.enterleave" )
 </html>
 ```
      */
-    mouseleave(handler?: JQuery.EventHandler<TElement> | JQuery.EventHandlerBase<any, JQuery.Event<TElement>> | false): this;
+    mouseleave(handler?: JQuery.EventHandler<TElement> | false): this;
     /**
      * Bind an event handler to the "mousemove" JavaScript event, or trigger that event on an element.
      * @param eventData An object containing data that will be passed to the event handler.
@@ -6607,7 +6607,7 @@ $( "div.enterleave" )
      * **Solution**: Instead of `.click(fn)` use `.on("click", fn)`. Instead of `.click()` use `.trigger("click")`.
      */
     mousemove<TData>(eventData: TData,
-                     handler: JQuery.EventHandler<TElement, TData> | JQuery.EventHandlerBase<any, JQuery.Event<TElement, TData>>): this;
+                     handler: JQuery.EventHandler<TElement, TData>): this;
     /**
      * Bind an event handler to the "mousemove" JavaScript event, or trigger that event on an element.
      * @param handler A function to execute each time the event is triggered.
@@ -6671,7 +6671,7 @@ $( "div" ).mousemove(function( event ) {
 </html>
 ```
      */
-    mousemove(handler?: JQuery.EventHandler<TElement> | JQuery.EventHandlerBase<any, JQuery.Event<TElement>> | false): this;
+    mousemove(handler?: JQuery.EventHandler<TElement> | false): this;
     /**
      * Bind an event handler to the "mouseout" JavaScript event, or trigger that event on an element.
      * @param eventData An object containing data that will be passed to the event handler.
@@ -6685,7 +6685,7 @@ $( "div" ).mousemove(function( event ) {
      * **Solution**: Instead of `.click(fn)` use `.on("click", fn)`. Instead of `.click()` use `.trigger("click")`.
      */
     mouseout<TData>(eventData: TData,
-                    handler: JQuery.EventHandler<TElement, TData> | JQuery.EventHandlerBase<any, JQuery.Event<TElement, TData>>): this;
+                    handler: JQuery.EventHandler<TElement, TData>): this;
     /**
      * Bind an event handler to the "mouseout" JavaScript event, or trigger that event on an element.
      * @param handler A function to execute each time the event is triggered.
@@ -6766,7 +6766,7 @@ $( "div.enterleave" )
 </html>
 ```
      */
-    mouseout(handler?: JQuery.EventHandler<TElement> | JQuery.EventHandlerBase<any, JQuery.Event<TElement>> | false): this;
+    mouseout(handler?: JQuery.EventHandler<TElement> | false): this;
     /**
      * Bind an event handler to the "mouseover" JavaScript event, or trigger that event on an element.
      * @param eventData An object containing data that will be passed to the event handler.
@@ -6780,7 +6780,7 @@ $( "div.enterleave" )
      * **Solution**: Instead of `.click(fn)` use `.on("click", fn)`. Instead of `.click()` use `.trigger("click")`.
      */
     mouseover<TData>(eventData: TData,
-                     handler: JQuery.EventHandler<TElement, TData> | JQuery.EventHandlerBase<any, JQuery.Event<TElement, TData>>): this;
+                     handler: JQuery.EventHandler<TElement, TData>): this;
     /**
      * Bind an event handler to the "mouseover" JavaScript event, or trigger that event on an element.
      * @param handler A function to execute each time the event is triggered.
@@ -6861,7 +6861,7 @@ $( "div.enterleave" )
 </html>
 ```
      */
-    mouseover(handler?: JQuery.EventHandler<TElement> | JQuery.EventHandlerBase<any, JQuery.Event<TElement>> | false): this;
+    mouseover(handler?: JQuery.EventHandler<TElement> | false): this;
     /**
      * Bind an event handler to the "mouseup" JavaScript event, or trigger that event on an element.
      * @param eventData An object containing data that will be passed to the event handler.
@@ -6875,7 +6875,7 @@ $( "div.enterleave" )
      * **Solution**: Instead of `.click(fn)` use `.on("click", fn)`. Instead of `.click()` use `.trigger("click")`.
      */
     mouseup<TData>(eventData: TData,
-                   handler: JQuery.EventHandler<TElement, TData> | JQuery.EventHandlerBase<any, JQuery.Event<TElement, TData>>): this;
+                   handler: JQuery.EventHandler<TElement, TData>): this;
     /**
      * Bind an event handler to the "mouseup" JavaScript event, or trigger that event on an element.
      * @param handler A function to execute each time the event is triggered.
@@ -6913,7 +6913,7 @@ $( "p" )
 </html>
 ```
      */
-    mouseup(handler?: JQuery.EventHandler<TElement> | JQuery.EventHandlerBase<any, JQuery.Event<TElement>> | false): this;
+    mouseup(handler?: JQuery.EventHandler<TElement> | false): this;
     /**
      * Get the immediately following sibling of each element in the set of matched elements. If a selector is provided, it retrieves the next sibling only if it matches that selector.
      * @param selector A string containing a selector expression to match elements against.
@@ -7471,7 +7471,7 @@ $( "*", document.body ).click(function( event ) {
     on<TData>(events: string,
               selector: JQuery.Selector | null,
               data: TData,
-              handler: JQuery.EventHandler<TElement, TData> | JQuery.EventHandlerBase<any, JQuery.Event<TElement, TData>>): this;
+              handler: JQuery.EventHandler<TElement, TData>): this;
     /**
      * Attach an event handler function for one or more events to the selected elements.
      * @param events One or more space-separated event types and optional namespaces, such as "click" or "keydown.myPlugin".
@@ -7549,7 +7549,7 @@ $( "body" ).on( "click", "a", function( event ) {
      */
     on(events: string,
        selector: JQuery.Selector,
-       handler: JQuery.EventHandler<TElement> | JQuery.EventHandlerBase<any, JQuery.Event<TElement>> | false): this;
+       handler: JQuery.EventHandler<TElement> | false): this;
     /**
      * Attach an event handler function for one or more events to the selected elements.
      * @param events One or more space-separated event types and optional namespaces, such as "click" or "keydown.myPlugin".
@@ -7631,7 +7631,7 @@ $( "p" ).on( "click", { foo: "bar" }, myHandler );
      */
     on<TData>(events: string,
               data: TData,
-              handler: JQuery.EventHandler<TElement, TData> | JQuery.EventHandlerBase<any, JQuery.Event<TElement, TData>>): this;
+              handler: JQuery.EventHandler<TElement, TData>): this;
     /**
      * Attach an event handler function for one or more events to the selected elements.
      * @param events One or more space-separated event types and optional namespaces, such as "click" or "keydown.myPlugin".
@@ -7744,7 +7744,7 @@ $( "#cart" ).on( "mouseenter mouseleave", function( event ) {
 ```
      */
     on(events: string,
-       handler: JQuery.EventHandler<TElement> | JQuery.EventHandlerBase<any, JQuery.Event<TElement>> | false): this;
+       handler: JQuery.EventHandler<TElement> | false): this;
     /**
      * Attach an event handler function for one or more events to the selected elements.
      * @param events One or more space-separated event types and optional namespaces, such as "click" or "keydown.myPlugin".
@@ -7849,7 +7849,7 @@ $( "#cart" ).on( "mouseenter mouseleave", function( event ) {
      * @see \`{@link https://api.jquery.com/on/ }\`
      * @since 1.7
      */
-    on<TData>(events: JQuery.PlainObject<JQuery.EventHandler<TElement, TData> | JQuery.EventHandlerBase<any, JQuery.Event<TElement, TData>> | false>,
+    on<TData>(events: JQuery.PlainObject<JQuery.EventHandler<TElement, TData> | false>,
               selector: JQuery.Selector | null,
               data: TData): this;
     /**
@@ -7861,7 +7861,7 @@ $( "#cart" ).on( "mouseenter mouseleave", function( event ) {
      * @see \`{@link https://api.jquery.com/on/ }\`
      * @since 1.7
      */
-    on(events: JQuery.PlainObject<JQuery.EventHandler<TElement> | JQuery.EventHandlerBase<any, JQuery.Event<TElement>> | false>,
+    on(events: JQuery.PlainObject<JQuery.EventHandler<TElement> | false>,
        // tslint:disable-next-line:unified-signatures
        selector: JQuery.Selector): this;
     /**
@@ -7872,7 +7872,7 @@ $( "#cart" ).on( "mouseenter mouseleave", function( event ) {
      * @see \`{@link https://api.jquery.com/on/ }\`
      * @since 1.7
      */
-    on<TData>(events: JQuery.PlainObject<JQuery.EventHandler<TElement, TData> | JQuery.EventHandlerBase<any, JQuery.Event<TElement, TData>> | false>,
+    on<TData>(events: JQuery.PlainObject<JQuery.EventHandler<TElement, TData> | false>,
               data: TData): this;
     /**
      * Attach an event handler function for one or more events to the selected elements.
@@ -7922,7 +7922,7 @@ $( "div.test" ).on({
 </html>
 ```
      */
-    on(events: JQuery.PlainObject<JQuery.EventHandler<TElement> | JQuery.EventHandlerBase<any, JQuery.Event<TElement>> | false>): this;
+    on(events: JQuery.PlainObject<JQuery.EventHandler<TElement> | false>): this;
     /**
      * Attach a handler to an event for the elements. The handler is executed at most once per element per event type.
      * @param events One or more space-separated event types and optional namespaces, such as "click" or "keydown.myPlugin".
@@ -7936,7 +7936,7 @@ $( "div.test" ).on({
     one<TData>(events: string,
                selector: JQuery.Selector | null,
                data: TData,
-               handler: JQuery.EventHandler<TElement, TData> | JQuery.EventHandlerBase<any, JQuery.Event<TElement, TData>>): this;
+               handler: JQuery.EventHandler<TElement, TData>): this;
     /**
      * Attach a handler to an event for the elements. The handler is executed at most once per element per event type.
      * @param events One or more space-separated event types and optional namespaces, such as "click" or "keydown.myPlugin".
@@ -7949,7 +7949,7 @@ $( "div.test" ).on({
      */
     one(events: string,
         selector: JQuery.Selector,
-        handler: JQuery.EventHandler<TElement> | JQuery.EventHandlerBase<any, JQuery.Event<TElement>> | false): this;
+        handler: JQuery.EventHandler<TElement> | false): this;
     /**
      * Attach a handler to an event for the elements. The handler is executed at most once per element per event type.
      * @param events One or more space-separated event types and optional namespaces, such as "click" or "keydown.myPlugin".
@@ -7960,7 +7960,7 @@ $( "div.test" ).on({
      */
     one<TData>(events: string,
                data: TData,
-               handler: JQuery.EventHandler<TElement, TData> | JQuery.EventHandlerBase<any, JQuery.Event<TElement, TData>>): this;
+               handler: JQuery.EventHandler<TElement, TData>): this;
     /**
      * Attach a handler to an event for the elements. The handler is executed at most once per element per event type.
      * @param events One or more space-separated event types and optional namespaces, such as "click" or "keydown.myPlugin".
@@ -8050,7 +8050,7 @@ $(".target").one("click mouseenter", function() {
 ```
      */
     one(events: string,
-        handler: JQuery.EventHandler<TElement> | JQuery.EventHandlerBase<any, JQuery.Event<TElement>> | false): this;
+        handler: JQuery.EventHandler<TElement> | false): this;
     /**
      * Attach a handler to an event for the elements. The handler is executed at most once per element per event type.
      * @param events An object in which the string keys represent one or more space-separated event types and optional
@@ -8061,7 +8061,7 @@ $(".target").one("click mouseenter", function() {
      * @see \`{@link https://api.jquery.com/one/ }\`
      * @since 1.7
      */
-    one<TData>(events: JQuery.PlainObject<JQuery.EventHandler<TElement, TData> | JQuery.EventHandlerBase<any, JQuery.Event<TElement, TData>> | false>,
+    one<TData>(events: JQuery.PlainObject<JQuery.EventHandler<TElement, TData> | false>,
                selector: JQuery.Selector | null,
                data: TData): this;
     /**
@@ -8073,7 +8073,7 @@ $(".target").one("click mouseenter", function() {
      * @see \`{@link https://api.jquery.com/one/ }\`
      * @since 1.7
      */
-    one(events: JQuery.PlainObject<JQuery.EventHandler<TElement> | JQuery.EventHandlerBase<any, JQuery.Event<TElement>> | false>,
+    one(events: JQuery.PlainObject<JQuery.EventHandler<TElement> | false>,
         // tslint:disable-next-line:unified-signatures
         selector: JQuery.Selector): this;
     /**
@@ -8084,7 +8084,7 @@ $(".target").one("click mouseenter", function() {
      * @see \`{@link https://api.jquery.com/one/ }\`
      * @since 1.7
      */
-    one<TData>(events: JQuery.PlainObject<JQuery.EventHandler<TElement, TData> | JQuery.EventHandlerBase<any, JQuery.Event<TElement, TData>> | false>,
+    one<TData>(events: JQuery.PlainObject<JQuery.EventHandler<TElement, TData> | false>,
                data: TData): this;
     /**
      * Attach a handler to an event for the elements. The handler is executed at most once per element per event type.
@@ -8093,7 +8093,7 @@ $(".target").one("click mouseenter", function() {
      * @see \`{@link https://api.jquery.com/one/ }\`
      * @since 1.7
      */
-    one(events: JQuery.PlainObject<JQuery.EventHandler<TElement> | JQuery.EventHandlerBase<any, JQuery.Event<TElement>> | false>): this;
+    one(events: JQuery.PlainObject<JQuery.EventHandler<TElement> | false>): this;
     /**
      * Set the CSS outer height of each element in the set of matched elements.
      * @param value_function _&#x40;param_ `value_function`
@@ -9851,7 +9851,7 @@ $( "button" ).on( "click", function() {
      * **Solution**: Instead of `.click(fn)` use `.on("click", fn)`. Instead of `.click()` use `.trigger("click")`.
      */
     resize<TData>(eventData: TData,
-                  handler: JQuery.EventHandler<TElement, TData> | JQuery.EventHandlerBase<any, JQuery.Event<TElement, TData>>): this;
+                  handler: JQuery.EventHandler<TElement, TData>): this;
     /**
      * Bind an event handler to the "resize" JavaScript event, or trigger that event on an element.
      * @param handler A function to execute each time the event is triggered.
@@ -9869,7 +9869,7 @@ $( window ).resize(function() {
 });
 ```
      */
-    resize(handler?: JQuery.EventHandler<TElement> | JQuery.EventHandlerBase<any, JQuery.Event<TElement>> | false): this;
+    resize(handler?: JQuery.EventHandler<TElement> | false): this;
     /**
      * Bind an event handler to the "scroll" JavaScript event, or trigger that event on an element.
      * @param eventData An object containing data that will be passed to the event handler.
@@ -9883,7 +9883,7 @@ $( window ).resize(function() {
      * **Solution**: Instead of `.click(fn)` use `.on("click", fn)`. Instead of `.click()` use `.trigger("click")`.
      */
     scroll<TData>(eventData: TData,
-                  handler: JQuery.EventHandler<TElement, TData> | JQuery.EventHandlerBase<any, JQuery.Event<TElement, TData>>): this;
+                  handler: JQuery.EventHandler<TElement, TData>): this;
     /**
      * Bind an event handler to the "scroll" JavaScript event, or trigger that event on an element.
      * @param handler A function to execute each time the event is triggered.
@@ -9933,7 +9933,7 @@ $( window ).scroll(function() {
 </html>
 ```
      */
-    scroll(handler?: JQuery.EventHandler<TElement> | JQuery.EventHandlerBase<any, JQuery.Event<TElement>> | false): this;
+    scroll(handler?: JQuery.EventHandler<TElement> | false): this;
     /**
      * Set the current horizontal position of the scroll bar for each of the set of matched elements.
      * @param value An integer indicating the new position to set the scroll bar to.
@@ -10107,7 +10107,7 @@ $( "p:last" ).text( "scrollTop:" + p.scrollTop() );
      * **Solution**: Instead of `.click(fn)` use `.on("click", fn)`. Instead of `.click()` use `.trigger("click")`.
      */
     select<TData>(eventData: TData,
-                  handler: JQuery.EventHandler<TElement, TData> | JQuery.EventHandlerBase<any, JQuery.Event<TElement, TData>>): this;
+                  handler: JQuery.EventHandler<TElement, TData>): this;
     /**
      * Bind an event handler to the "select" JavaScript event, or trigger that event on an element.
      * @param handler A function to execute each time the event is triggered.
@@ -10156,7 +10156,7 @@ $( ":input" ).select(function() {
 $( "input" ).select();
 ```
      */
-    select(handler?: JQuery.EventHandler<TElement> | JQuery.EventHandlerBase<any, JQuery.Event<TElement>> | false): this;
+    select(handler?: JQuery.EventHandler<TElement> | false): this;
     /**
      * Encode a set of form elements as a string for submission.
      * @see \`{@link https://api.jquery.com/serialize/ }\`
@@ -11127,7 +11127,7 @@ $( "#toggle" ).on( "click", function() {
      * **Solution**: Instead of `.click(fn)` use `.on("click", fn)`. Instead of `.click()` use `.trigger("click")`.
      */
     submit<TData>(eventData: TData,
-                  handler: JQuery.EventHandler<TElement, TData> | JQuery.EventHandlerBase<any, JQuery.Event<TElement, TData>>): this;
+                  handler: JQuery.EventHandler<TElement, TData>): this;
     /**
      * Bind an event handler to the "submit" JavaScript event, or trigger that event on an element.
      * @param handler A function to execute each time the event is triggered.
@@ -11196,7 +11196,7 @@ $( "form" ).submit(function() {
 $( "form:first" ).submit();
 ```
      */
-    submit(handler?: JQuery.EventHandler<TElement> | JQuery.EventHandlerBase<any, JQuery.Event<TElement>> | false): this;
+    submit(handler?: JQuery.EventHandler<TElement> | false): this;
     /**
      * Set the content of each element in the set of matched elements to the specified text.
      * @param text_function _&#x40;param_ `text_function`
diff --git a/types/jquery/jquery-tests.ts b/types/jquery/jquery-tests.ts
index eba206f323..4f848cc7bb 100644
--- a/types/jquery/jquery-tests.ts
+++ b/types/jquery/jquery-tests.ts
@@ -3883,8 +3883,6 @@ function JQuery() {
     function events() {
         // [bind() overloads] https://github.com/jquery/api.jquery.com/issues/1048
         function bind() {
-            interface J1 { kind: 'J1'; }
-
             // $ExpectType JQuery<HTMLElement>
             $('p').bind('myEvent', 'myData', function(event) {
                 // $ExpectType HTMLElement
@@ -3893,14 +3891,6 @@ function JQuery() {
                 event;
             });
 
-            // $ExpectType JQuery<HTMLElement>
-            $('p').bind('myEvent', 'myData', function(this: J1, event) {
-                // $ExpectType J1
-                this;
-                // $ExpectType Event<HTMLElement, string>
-                event;
-            });
-
             // $ExpectType JQuery<HTMLElement>
             $('p').bind('myEvent', function(event) {
                 // $ExpectType HTMLElement
@@ -3909,14 +3899,6 @@ function JQuery() {
                 event;
             });
 
-            // $ExpectType JQuery<HTMLElement>
-            $('p').bind('myEvent', function(this: J1, event) {
-                // $ExpectType J1
-                this;
-                // $ExpectType Event<HTMLElement, null>
-                event;
-            });
-
             // $ExpectType JQuery<HTMLElement>
             $('p').bind('myEvent', false);
 
@@ -3928,12 +3910,6 @@ function JQuery() {
                     this;
                     // $ExpectType Event<HTMLElement, null>
                     event;
-                },
-                myEvent3(this: J1, event) {
-                    // $ExpectType J1
-                    this;
-                    // $ExpectType Event<HTMLElement, null>
-                    event;
                 }
             });
 
@@ -3945,8 +3921,6 @@ function JQuery() {
         }
 
         function delegate() {
-            interface J1 { kind: 'J1'; }
-
             // $ExpectType JQuery<HTMLElement>
             $('table').delegate('td', 'myEvent', 'myData', function(event) {
                 // $ExpectType HTMLElement
@@ -3955,14 +3929,6 @@ function JQuery() {
                 event;
             });
 
-            // $ExpectType JQuery<HTMLElement>
-            $('table').delegate('td', 'myEvent', 'myData', function(this: J1, event) {
-                // $ExpectType J1
-                this;
-                // $ExpectType Event<HTMLElement, string>
-                event;
-            });
-
             // $ExpectType JQuery<HTMLElement>
             $('table').delegate('td', 'myEvent', function(event) {
                 // $ExpectType HTMLElement
@@ -3971,14 +3937,6 @@ function JQuery() {
                 event;
             });
 
-            // $ExpectType JQuery<HTMLElement>
-            $('table').delegate('td', 'myEvent', function(this: J1, event) {
-                // $ExpectType J1
-                this;
-                // $ExpectType Event<HTMLElement, null>
-                event;
-            });
-
             // $ExpectType JQuery<HTMLElement>
             $('table').delegate('td', 'myEvent', false);
 
@@ -3990,38 +3948,20 @@ function JQuery() {
                     // $ExpectType Event<HTMLElement, null>
                     event;
                 },
-                myEvent2: false,
-                myEvent3(this: J1, event) {
-                    // $ExpectType J1
-                    this;
-                    // $ExpectType Event<HTMLElement, null>
-                    event;
-                }
+                myEvent2: false
             });
         }
 
         function off() {
-            function defaultContext_defaultData(this: HTMLElement, event: JQuery.Event<HTMLElement>) { }
+            function defaultData(this: HTMLElement, event: JQuery.Event<HTMLElement>) { }
 
-            function defaultContext_customData(this: HTMLElement, event: JQuery.Event<HTMLElement, string>) { }
-
-            function customContext_defaultData(this: J1, event: JQuery.Event<HTMLElement>) { }
-
-            function customContext_customData(this: J1, event: JQuery.Event<HTMLElement, string>) { }
-
-            interface J1 { kind: 'J1'; }
+            function customData(this: HTMLElement, event: JQuery.Event<HTMLElement, string>) { }
 
             // $ExpectType JQuery<HTMLElement>
-            $('table').off('myEvent', 'td', defaultContext_defaultData);
+            $('table').off('myEvent', 'td', defaultData);
 
             // $ExpectType JQuery<HTMLElement>
-            $('table').off('myEvent', 'td', defaultContext_customData);
-
-            // $ExpectType JQuery<HTMLElement>
-            $('table').off('myEvent', 'td', customContext_defaultData);
-
-            // $ExpectType JQuery<HTMLElement>
-            $('table').off('myEvent', 'td', customContext_customData);
+            $('table').off('myEvent', 'td', customData);
 
             // $ExpectType JQuery<HTMLElement>
             $('table').off('myEvent', 'td', false);
@@ -4030,16 +3970,10 @@ function JQuery() {
             $('table').off('myEvent', 'td');
 
             // $ExpectType JQuery<HTMLElement>
-            $('table').off('myEvent', defaultContext_defaultData);
+            $('table').off('myEvent', defaultData);
 
             // $ExpectType JQuery<HTMLElement>
-            $('table').off('myEvent', defaultContext_customData);
-
-            // $ExpectType JQuery<HTMLElement>
-            $('table').off('myEvent', customContext_defaultData);
-
-            // $ExpectType JQuery<HTMLElement>
-            $('table').off('myEvent', customContext_customData);
+            $('table').off('myEvent', customData);
 
             // $ExpectType JQuery<HTMLElement>
             $('table').off('myEvent', false);
@@ -4050,19 +3984,15 @@ function JQuery() {
             // $ExpectType JQuery<HTMLElement>
             $('table').off({
                 myEvent1: false,
-                defaultContext_defaultData,
-                defaultContext_customData,
-                customContext_defaultData,
-                customContext_customData
+                defaultData,
+                customData
             }, 'td');
 
             // $ExpectType JQuery<HTMLElement>
             $('table').off({
                 myEvent1: false,
-                defaultContext_defaultData,
-                defaultContext_customData,
-                customContext_defaultData,
-                customContext_customData
+                defaultData,
+                customData
             });
 
             // $ExpectType JQuery<HTMLElement>
@@ -4073,8 +4003,6 @@ function JQuery() {
         }
 
         function on() {
-            interface J1 { kind: 'J1'; }
-
             // $ExpectType JQuery<HTMLElement>
             $('table').on('myEvent', 'td', 'myData', function(event) {
                 // $ExpectType HTMLElement
@@ -4091,14 +4019,6 @@ function JQuery() {
                 event;
             });
 
-            // $ExpectType JQuery<HTMLElement>
-            $('table').on('myEvent', 'td', 'myData', function(this: J1, event) {
-                // $ExpectType J1
-                this;
-                // $ExpectType Event<HTMLElement, string>
-                event;
-            });
-
             // $ExpectType JQuery<HTMLElement>
             $('table').on('myEvent', null, 'myData', function(event) {
                 // $ExpectType HTMLElement
@@ -4115,14 +4035,6 @@ function JQuery() {
                 event;
             });
 
-            // $ExpectType JQuery<HTMLElement>
-            $('table').on('myEvent', null, 'myData', function(this: J1, event) {
-                // $ExpectType J1
-                this;
-                // $ExpectType Event<HTMLElement, string>
-                event;
-            });
-
             // $ExpectType JQuery<HTMLElement>
             $('table').on('myEvent', 'td', function(event) {
                 // $ExpectType HTMLElement
@@ -4139,14 +4051,6 @@ function JQuery() {
                 event;
             });
 
-            // $ExpectType JQuery<HTMLElement>
-            $('table').on('myEvent', 'td', function(this: J1, event) {
-                // $ExpectType J1
-                this;
-                // $ExpectType Event<HTMLElement, null>
-                event;
-            });
-
             // $ExpectType JQuery<HTMLElement>
             $('table').on('myEvent', 'td', false);
 
@@ -4166,14 +4070,6 @@ function JQuery() {
                 event;
             });
 
-            // $ExpectType JQuery<HTMLElement>
-            $('table').on('myEvent', 3, function(this: J1, event) {
-                // $ExpectType J1
-                this;
-                // $ExpectType Event<HTMLElement, number>
-                event;
-            });
-
             // $ExpectType JQuery<HTMLElement>
             $('table').on('myEvent', function(event) {
                 // $ExpectType HTMLElement
@@ -4214,14 +4110,6 @@ function JQuery() {
                 event;
             });
 
-            // $ExpectType JQuery<HTMLElement>
-            $('table').on('myEvent', function(this: J1, event) {
-                // $ExpectType J1
-                this;
-                // $ExpectType Event<HTMLElement, null>
-                event;
-            });
-
             // $ExpectType JQuery<HTMLElement>
             $('table').on('myEvent', false);
 
@@ -4233,12 +4121,6 @@ function JQuery() {
                     this;
                     // $ExpectType Event<HTMLElement, string>
                     event;
-                },
-                myEvent3(this: J1, event) {
-                    // $ExpectType J1
-                    this;
-                    // $ExpectType Event<HTMLElement, string>
-                    event;
                 }
             }, 'td', 'myData');
 
@@ -4250,12 +4132,6 @@ function JQuery() {
                     this;
                     // $ExpectType Event<HTMLElement, string>
                     event;
-                },
-                myEvent3(this: J1, event) {
-                    // $ExpectType J1
-                    this;
-                    // $ExpectType Event<HTMLElement, string>
-                    event;
                 }
             }, null, 'myData');
 
@@ -4267,12 +4143,6 @@ function JQuery() {
                     this;
                     // $ExpectType Event<HTMLElement, null>
                     event;
-                },
-                myEvent3(this: J1, event) {
-                    // $ExpectType J1
-                    this;
-                    // $ExpectType Event<HTMLElement, null>
-                    event;
                 }
             }, 'td');
 
@@ -4284,12 +4154,6 @@ function JQuery() {
                     this;
                     // $ExpectType Event<HTMLElement, number>
                     event;
-                },
-                myEvent3(this: J1, event) {
-                    // $ExpectType J1
-                    this;
-                    // $ExpectType Event<HTMLElement, number>
-                    event;
                 }
             }, 3);
 
@@ -4301,19 +4165,11 @@ function JQuery() {
                     this;
                     // $ExpectType Event<HTMLElement, null>
                     event;
-                },
-                myEvent3(this: J1, event) {
-                    // $ExpectType J1
-                    this;
-                    // $ExpectType Event<HTMLElement, null>
-                    event;
                 }
             });
         }
 
         function one() {
-            interface J1 { kind: 'J1'; }
-
             // $ExpectType JQuery<HTMLElement>
             $('table').one('myEvent', 'td', 'myData', function(event) {
                 // $ExpectType HTMLElement
@@ -4322,14 +4178,6 @@ function JQuery() {
                 event;
             });
 
-            // $ExpectType JQuery<HTMLElement>
-            $('table').one('myEvent', 'td', 'myData', function(this: J1, event) {
-                // $ExpectType J1
-                this;
-                // $ExpectType Event<HTMLElement, string>
-                event;
-            });
-
             // $ExpectType JQuery<HTMLElement>
             $('table').one('myEvent', null, 'myData', function(event) {
                 // $ExpectType HTMLElement
@@ -4338,14 +4186,6 @@ function JQuery() {
                 event;
             });
 
-            // $ExpectType JQuery<HTMLElement>
-            $('table').one('myEvent', null, 'myData', function(this: J1, event) {
-                // $ExpectType J1
-                this;
-                // $ExpectType Event<HTMLElement, string>
-                event;
-            });
-
             // $ExpectType JQuery<HTMLElement>
             $('table').one('myEvent', 'td', function(event) {
                 // $ExpectType HTMLElement
@@ -4354,14 +4194,6 @@ function JQuery() {
                 event;
             });
 
-            // $ExpectType JQuery<HTMLElement>
-            $('table').one('myEvent', 'td', function(this: J1, event) {
-                // $ExpectType J1
-                this;
-                // $ExpectType Event<HTMLElement, null>
-                event;
-            });
-
             // $ExpectType JQuery<HTMLElement>
             $('table').one('myEvent', 'td', false);
 
@@ -4373,14 +4205,6 @@ function JQuery() {
                 event;
             });
 
-            // $ExpectType JQuery<HTMLElement>
-            $('table').one('myEvent', 3, function(this: J1, event) {
-                // $ExpectType J1
-                this;
-                // $ExpectType Event<HTMLElement, number>
-                event;
-            });
-
             // $ExpectType JQuery<HTMLElement>
             $('table').one('myEvent', function(event) {
                 // $ExpectType HTMLElement
@@ -4389,14 +4213,6 @@ function JQuery() {
                 event;
             });
 
-            // $ExpectType JQuery<HTMLElement>
-            $('table').one('myEvent', function(this: J1, event) {
-                // $ExpectType J1
-                this;
-                // $ExpectType Event<HTMLElement, null>
-                event;
-            });
-
             // $ExpectType JQuery<HTMLElement>
             $('table').one('myEvent', false);
 
@@ -4408,12 +4224,6 @@ function JQuery() {
                     this;
                     // $ExpectType Event<HTMLElement, string>
                     event;
-                },
-                myEvent3(this: J1, event) {
-                    // $ExpectType J1
-                    this;
-                    // $ExpectType Event<HTMLElement, string>
-                    event;
                 }
             }, 'td', 'myData');
 
@@ -4425,12 +4235,6 @@ function JQuery() {
                     this;
                     // $ExpectType Event<HTMLElement, string>
                     event;
-                },
-                myEvent3(this: J1, event) {
-                    // $ExpectType J1
-                    this;
-                    // $ExpectType Event<HTMLElement, string>
-                    event;
                 }
             }, null, 'myData');
 
@@ -4442,12 +4246,6 @@ function JQuery() {
                     this;
                     // $ExpectType Event<HTMLElement, null>
                     event;
-                },
-                myEvent3(this: J1, event) {
-                    // $ExpectType J1
-                    this;
-                    // $ExpectType Event<HTMLElement, null>
-                    event;
                 }
             }, 'td');
 
@@ -4459,12 +4257,6 @@ function JQuery() {
                     this;
                     // $ExpectType Event<HTMLElement, number>
                     event;
-                },
-                myEvent3(this: J1, event) {
-                    // $ExpectType J1
-                    this;
-                    // $ExpectType Event<HTMLElement, number>
-                    event;
                 }
             }, 3);
 
@@ -4476,12 +4268,6 @@ function JQuery() {
                     this;
                     // $ExpectType Event<HTMLElement, null>
                     event;
-                },
-                myEvent3(this: J1, event) {
-                    // $ExpectType J1
-                    this;
-                    // $ExpectType Event<HTMLElement, null>
-                    event;
                 }
             });
         }
@@ -4551,27 +4337,15 @@ function JQuery() {
         }
 
         function unbind() {
-            function defaultContext_defaultData(this: HTMLElement, event: JQuery.Event<HTMLElement>) { }
+            function defaultData(this: HTMLElement, event: JQuery.Event<HTMLElement>) { }
 
-            function defaultContext_customData(this: HTMLElement, event: JQuery.Event<HTMLElement, string>) { }
-
-            function customContext_defaultData(this: J1, event: JQuery.Event<HTMLElement>) { }
-
-            function customContext_customData(this: J1, event: JQuery.Event<HTMLElement, string>) { }
-
-            interface J1 { kind: 'J1'; }
+            function customData(this: HTMLElement, event: JQuery.Event<HTMLElement, string>) { }
 
             // $ExpectType JQuery<HTMLElement>
-            $('p').unbind('myEvent', defaultContext_defaultData);
+            $('p').unbind('myEvent', defaultData);
 
             // $ExpectType JQuery<HTMLElement>
-            $('p').unbind('myEvent', defaultContext_customData);
-
-            // $ExpectType JQuery<HTMLElement>
-            $('p').unbind('myEvent', customContext_defaultData);
-
-            // $ExpectType JQuery<HTMLElement>
-            $('p').unbind('myEvent', customContext_customData);
+            $('p').unbind('myEvent', customData);
 
             // $ExpectType JQuery<HTMLElement>
             $('p').unbind('myEvent', false);
@@ -4587,27 +4361,15 @@ function JQuery() {
         }
 
         function undelegate() {
-            function defaultContext_defaultData(this: HTMLElement, event: JQuery.Event<HTMLElement>) { }
+            function defaultData(this: HTMLElement, event: JQuery.Event<HTMLElement>) { }
 
-            function defaultContext_customData(this: HTMLElement, event: JQuery.Event<HTMLElement, string>) { }
-
-            function customContext_defaultData(this: J1, event: JQuery.Event<HTMLElement>) { }
-
-            function customContext_customData(this: J1, event: JQuery.Event<HTMLElement, string>) { }
-
-            interface J1 { kind: 'J1'; }
+            function customData(this: HTMLElement, event: JQuery.Event<HTMLElement, string>) { }
 
             // $ExpectType JQuery<HTMLElement>
-            $('table').undelegate('td', 'click', defaultContext_defaultData);
+            $('table').undelegate('td', 'click', defaultData);
 
             // $ExpectType JQuery<HTMLElement>
-            $('table').undelegate('td', 'click', defaultContext_customData);
-
-            // $ExpectType JQuery<HTMLElement>
-            $('table').undelegate('td', 'click', customContext_defaultData);
-
-            // $ExpectType JQuery<HTMLElement>
-            $('table').undelegate('td', 'click', customContext_customData);
+            $('table').undelegate('td', 'click', customData);
 
             // $ExpectType JQuery<HTMLElement>
             $('table').undelegate('td', 'click', false);
@@ -4618,10 +4380,8 @@ function JQuery() {
             // $ExpectType JQuery<HTMLElement>
             $('table').undelegate('td', {
                 myEvent1: false,
-                defaultContext_defaultData,
-                defaultContext_customData,
-                customContext_defaultData,
-                customContext_customData
+                defaultData,
+                customData
             });
 
             // $ExpectType JQuery<HTMLElement>
@@ -4632,8 +4392,6 @@ function JQuery() {
         }
 
         function blur() {
-            interface J1 { kind: 'J1'; }
-
             // $ExpectType JQuery<HTMLElement>
             $('p').blur('myData', function(event) {
                 // $ExpectType HTMLElement
@@ -4642,14 +4400,6 @@ function JQuery() {
                 event;
             });
 
-            // $ExpectType JQuery<HTMLElement>
-            $('p').blur('myData', function(this: J1, event) {
-                // $ExpectType J1
-                this;
-                // $ExpectType Event<HTMLElement, string>
-                event;
-            });
-
             // $ExpectType JQuery<HTMLElement>
             $('p').blur(function(event) {
                 // $ExpectType HTMLElement
@@ -4658,14 +4408,6 @@ function JQuery() {
                 event;
             });
 
-            // $ExpectType JQuery<HTMLElement>
-            $('p').blur(function(this: J1, event) {
-                // $ExpectType J1
-                this;
-                // $ExpectType Event<HTMLElement, null>
-                event;
-            });
-
             // $ExpectType JQuery<HTMLElement>
             $('p').blur(false);
 
@@ -4674,8 +4416,6 @@ function JQuery() {
         }
 
         function change() {
-            interface J1 { kind: 'J1'; }
-
             // $ExpectType JQuery<HTMLElement>
             $('p').change('myData', function(event) {
                 // $ExpectType HTMLElement
@@ -4684,14 +4424,6 @@ function JQuery() {
                 event;
             });
 
-            // $ExpectType JQuery<HTMLElement>
-            $('p').change('myData', function(this: J1, event) {
-                // $ExpectType J1
-                this;
-                // $ExpectType Event<HTMLElement, string>
-                event;
-            });
-
             // $ExpectType JQuery<HTMLElement>
             $('p').change(function(event) {
                 // $ExpectType HTMLElement
@@ -4700,14 +4432,6 @@ function JQuery() {
                 event;
             });
 
-            // $ExpectType JQuery<HTMLElement>
-            $('p').change(function(this: J1, event) {
-                // $ExpectType J1
-                this;
-                // $ExpectType Event<HTMLElement, null>
-                event;
-            });
-
             // $ExpectType JQuery<HTMLElement>
             $('p').change(false);
 
@@ -4716,8 +4440,6 @@ function JQuery() {
         }
 
         function click() {
-            interface J1 { kind: 'J1'; }
-
             // $ExpectType JQuery<HTMLElement>
             $('p').click('myData', function(event) {
                 // $ExpectType HTMLElement
@@ -4726,14 +4448,6 @@ function JQuery() {
                 event;
             });
 
-            // $ExpectType JQuery<HTMLElement>
-            $('p').click('myData', function(this: J1, event) {
-                // $ExpectType J1
-                this;
-                // $ExpectType Event<HTMLElement, string>
-                event;
-            });
-
             // $ExpectType JQuery<HTMLElement>
             $('p').click(function(event) {
                 // $ExpectType HTMLElement
@@ -4742,14 +4456,6 @@ function JQuery() {
                 event;
             });
 
-            // $ExpectType JQuery<HTMLElement>
-            $('p').click(function(this: J1, event) {
-                // $ExpectType J1
-                this;
-                // $ExpectType Event<HTMLElement, null>
-                event;
-            });
-
             // $ExpectType JQuery<HTMLElement>
             $('p').click(false);
 
@@ -4758,8 +4464,6 @@ function JQuery() {
         }
 
         function contextmenu() {
-            interface J1 { kind: 'J1'; }
-
             // $ExpectType JQuery<HTMLElement>
             $('p').contextmenu('myData', function(event) {
                 // $ExpectType HTMLElement
@@ -4768,14 +4472,6 @@ function JQuery() {
                 event;
             });
 
-            // $ExpectType JQuery<HTMLElement>
-            $('p').contextmenu('myData', function(this: J1, event) {
-                // $ExpectType J1
-                this;
-                // $ExpectType Event<HTMLElement, string>
-                event;
-            });
-
             // $ExpectType JQuery<HTMLElement>
             $('p').contextmenu(function(event) {
                 // $ExpectType HTMLElement
@@ -4784,14 +4480,6 @@ function JQuery() {
                 event;
             });
 
-            // $ExpectType JQuery<HTMLElement>
-            $('p').contextmenu(function(this: J1, event) {
-                // $ExpectType J1
-                this;
-                // $ExpectType Event<HTMLElement, null>
-                event;
-            });
-
             // $ExpectType JQuery<HTMLElement>
             $('p').contextmenu(false);
 
@@ -4800,8 +4488,6 @@ function JQuery() {
         }
 
         function dblclick() {
-            interface J1 { kind: 'J1'; }
-
             // $ExpectType JQuery<HTMLElement>
             $('p').dblclick('myData', function(event) {
                 // $ExpectType HTMLElement
@@ -4810,14 +4496,6 @@ function JQuery() {
                 event;
             });
 
-            // $ExpectType JQuery<HTMLElement>
-            $('p').dblclick('myData', function(this: J1, event) {
-                // $ExpectType J1
-                this;
-                // $ExpectType Event<HTMLElement, string>
-                event;
-            });
-
             // $ExpectType JQuery<HTMLElement>
             $('p').dblclick(function(event) {
                 // $ExpectType HTMLElement
@@ -4826,14 +4504,6 @@ function JQuery() {
                 event;
             });
 
-            // $ExpectType JQuery<HTMLElement>
-            $('p').dblclick(function(this: J1, event) {
-                // $ExpectType J1
-                this;
-                // $ExpectType Event<HTMLElement, null>
-                event;
-            });
-
             // $ExpectType JQuery<HTMLElement>
             $('p').dblclick(false);
 
@@ -4842,8 +4512,6 @@ function JQuery() {
         }
 
         function focus() {
-            interface J1 { kind: 'J1'; }
-
             // $ExpectType JQuery<HTMLElement>
             $('p').focus('myData', function(event) {
                 // $ExpectType HTMLElement
@@ -4852,14 +4520,6 @@ function JQuery() {
                 event;
             });
 
-            // $ExpectType JQuery<HTMLElement>
-            $('p').focus('myData', function(this: J1, event) {
-                // $ExpectType J1
-                this;
-                // $ExpectType Event<HTMLElement, string>
-                event;
-            });
-
             // $ExpectType JQuery<HTMLElement>
             $('p').focus(function(event) {
                 // $ExpectType HTMLElement
@@ -4868,14 +4528,6 @@ function JQuery() {
                 event;
             });
 
-            // $ExpectType JQuery<HTMLElement>
-            $('p').focus(function(this: J1, event) {
-                // $ExpectType J1
-                this;
-                // $ExpectType Event<HTMLElement, null>
-                event;
-            });
-
             // $ExpectType JQuery<HTMLElement>
             $('p').focus(false);
 
@@ -4884,8 +4536,6 @@ function JQuery() {
         }
 
         function focusin() {
-            interface J1 { kind: 'J1'; }
-
             // $ExpectType JQuery<HTMLElement>
             $('p').focusin('myData', function(event) {
                 // $ExpectType HTMLElement
@@ -4894,14 +4544,6 @@ function JQuery() {
                 event;
             });
 
-            // $ExpectType JQuery<HTMLElement>
-            $('p').focusin('myData', function(this: J1, event) {
-                // $ExpectType J1
-                this;
-                // $ExpectType Event<HTMLElement, string>
-                event;
-            });
-
             // $ExpectType JQuery<HTMLElement>
             $('p').focusin(function(event) {
                 // $ExpectType HTMLElement
@@ -4910,14 +4552,6 @@ function JQuery() {
                 event;
             });
 
-            // $ExpectType JQuery<HTMLElement>
-            $('p').focusin(function(this: J1, event) {
-                // $ExpectType J1
-                this;
-                // $ExpectType Event<HTMLElement, null>
-                event;
-            });
-
             // $ExpectType JQuery<HTMLElement>
             $('p').focusin(false);
 
@@ -4926,8 +4560,6 @@ function JQuery() {
         }
 
         function focusout() {
-            interface J1 { kind: 'J1'; }
-
             // $ExpectType JQuery<HTMLElement>
             $('p').focusout('myData', function(event) {
                 // $ExpectType HTMLElement
@@ -4936,14 +4568,6 @@ function JQuery() {
                 event;
             });
 
-            // $ExpectType JQuery<HTMLElement>
-            $('p').focusout('myData', function(this: J1, event) {
-                // $ExpectType J1
-                this;
-                // $ExpectType Event<HTMLElement, string>
-                event;
-            });
-
             // $ExpectType JQuery<HTMLElement>
             $('p').focusout(function(event) {
                 // $ExpectType HTMLElement
@@ -4952,14 +4576,6 @@ function JQuery() {
                 event;
             });
 
-            // $ExpectType JQuery<HTMLElement>
-            $('p').focusout(function(this: J1, event) {
-                // $ExpectType J1
-                this;
-                // $ExpectType Event<HTMLElement, null>
-                event;
-            });
-
             // $ExpectType JQuery<HTMLElement>
             $('p').focusout(false);
 
@@ -4968,8 +4584,6 @@ function JQuery() {
         }
 
         function keydown() {
-            interface J1 { kind: 'J1'; }
-
             // $ExpectType JQuery<HTMLElement>
             $('p').keydown('myData', function(event) {
                 // $ExpectType HTMLElement
@@ -4978,14 +4592,6 @@ function JQuery() {
                 event;
             });
 
-            // $ExpectType JQuery<HTMLElement>
-            $('p').keydown('myData', function(this: J1, event) {
-                // $ExpectType J1
-                this;
-                // $ExpectType Event<HTMLElement, string>
-                event;
-            });
-
             // $ExpectType JQuery<HTMLElement>
             $('p').keydown(function(event) {
                 // $ExpectType HTMLElement
@@ -4994,14 +4600,6 @@ function JQuery() {
                 event;
             });
 
-            // $ExpectType JQuery<HTMLElement>
-            $('p').keydown(function(this: J1, event) {
-                // $ExpectType J1
-                this;
-                // $ExpectType Event<HTMLElement, null>
-                event;
-            });
-
             // $ExpectType JQuery<HTMLElement>
             $('p').keydown(false);
 
@@ -5010,8 +4608,6 @@ function JQuery() {
         }
 
         function keypress() {
-            interface J1 { kind: 'J1'; }
-
             // $ExpectType JQuery<HTMLElement>
             $('p').keypress('myData', function(event) {
                 // $ExpectType HTMLElement
@@ -5020,14 +4616,6 @@ function JQuery() {
                 event;
             });
 
-            // $ExpectType JQuery<HTMLElement>
-            $('p').keypress('myData', function(this: J1, event) {
-                // $ExpectType J1
-                this;
-                // $ExpectType Event<HTMLElement, string>
-                event;
-            });
-
             // $ExpectType JQuery<HTMLElement>
             $('p').keypress(function(event) {
                 // $ExpectType HTMLElement
@@ -5036,14 +4624,6 @@ function JQuery() {
                 event;
             });
 
-            // $ExpectType JQuery<HTMLElement>
-            $('p').keypress(function(this: J1, event) {
-                // $ExpectType J1
-                this;
-                // $ExpectType Event<HTMLElement, null>
-                event;
-            });
-
             // $ExpectType JQuery<HTMLElement>
             $('p').keypress(false);
 
@@ -5052,8 +4632,6 @@ function JQuery() {
         }
 
         function keyup() {
-            interface J1 { kind: 'J1'; }
-
             // $ExpectType JQuery<HTMLElement>
             $('p').keyup('myData', function(event) {
                 // $ExpectType HTMLElement
@@ -5062,14 +4640,6 @@ function JQuery() {
                 event;
             });
 
-            // $ExpectType JQuery<HTMLElement>
-            $('p').keyup('myData', function(this: J1, event) {
-                // $ExpectType J1
-                this;
-                // $ExpectType Event<HTMLElement, string>
-                event;
-            });
-
             // $ExpectType JQuery<HTMLElement>
             $('p').keyup(function(event) {
                 // $ExpectType HTMLElement
@@ -5078,14 +4648,6 @@ function JQuery() {
                 event;
             });
 
-            // $ExpectType JQuery<HTMLElement>
-            $('p').keyup(function(this: J1, event) {
-                // $ExpectType J1
-                this;
-                // $ExpectType Event<HTMLElement, null>
-                event;
-            });
-
             // $ExpectType JQuery<HTMLElement>
             $('p').keyup(false);
 
@@ -5094,8 +4656,6 @@ function JQuery() {
         }
 
         function mousedown() {
-            interface J1 { kind: 'J1'; }
-
             // $ExpectType JQuery<HTMLElement>
             $('p').mousedown('myData', function(event) {
                 // $ExpectType HTMLElement
@@ -5104,14 +4664,6 @@ function JQuery() {
                 event;
             });
 
-            // $ExpectType JQuery<HTMLElement>
-            $('p').mousedown('myData', function(this: J1, event) {
-                // $ExpectType J1
-                this;
-                // $ExpectType Event<HTMLElement, string>
-                event;
-            });
-
             // $ExpectType JQuery<HTMLElement>
             $('p').mousedown(function(event) {
                 // $ExpectType HTMLElement
@@ -5120,14 +4672,6 @@ function JQuery() {
                 event;
             });
 
-            // $ExpectType JQuery<HTMLElement>
-            $('p').mousedown(function(this: J1, event) {
-                // $ExpectType J1
-                this;
-                // $ExpectType Event<HTMLElement, null>
-                event;
-            });
-
             // $ExpectType JQuery<HTMLElement>
             $('p').mousedown(false);
 
@@ -5136,8 +4680,6 @@ function JQuery() {
         }
 
         function mouseenter() {
-            interface J1 { kind: 'J1'; }
-
             // $ExpectType JQuery<HTMLElement>
             $('p').mouseenter('myData', function(event) {
                 // $ExpectType HTMLElement
@@ -5146,14 +4688,6 @@ function JQuery() {
                 event;
             });
 
-            // $ExpectType JQuery<HTMLElement>
-            $('p').mouseenter('myData', function(this: J1, event) {
-                // $ExpectType J1
-                this;
-                // $ExpectType Event<HTMLElement, string>
-                event;
-            });
-
             // $ExpectType JQuery<HTMLElement>
             $('p').mouseenter(function(event) {
                 // $ExpectType HTMLElement
@@ -5162,14 +4696,6 @@ function JQuery() {
                 event;
             });
 
-            // $ExpectType JQuery<HTMLElement>
-            $('p').mouseenter(function(this: J1, event) {
-                // $ExpectType J1
-                this;
-                // $ExpectType Event<HTMLElement, null>
-                event;
-            });
-
             // $ExpectType JQuery<HTMLElement>
             $('p').mouseenter(false);
 
@@ -5178,8 +4704,6 @@ function JQuery() {
         }
 
         function mouseleave() {
-            interface J1 { kind: 'J1'; }
-
             // $ExpectType JQuery<HTMLElement>
             $('p').mouseleave('myData', function(event) {
                 // $ExpectType HTMLElement
@@ -5188,14 +4712,6 @@ function JQuery() {
                 event;
             });
 
-            // $ExpectType JQuery<HTMLElement>
-            $('p').mouseleave('myData', function(this: J1, event) {
-                // $ExpectType J1
-                this;
-                // $ExpectType Event<HTMLElement, string>
-                event;
-            });
-
             // $ExpectType JQuery<HTMLElement>
             $('p').mouseleave(function(event) {
                 // $ExpectType HTMLElement
@@ -5204,14 +4720,6 @@ function JQuery() {
                 event;
             });
 
-            // $ExpectType JQuery<HTMLElement>
-            $('p').mouseleave(function(this: J1, event) {
-                // $ExpectType J1
-                this;
-                // $ExpectType Event<HTMLElement, null>
-                event;
-            });
-
             // $ExpectType JQuery<HTMLElement>
             $('p').mouseleave(false);
 
@@ -5220,8 +4728,6 @@ function JQuery() {
         }
 
         function mousemove() {
-            interface J1 { kind: 'J1'; }
-
             // $ExpectType JQuery<HTMLElement>
             $('p').mousemove('myData', function(event) {
                 // $ExpectType HTMLElement
@@ -5230,14 +4736,6 @@ function JQuery() {
                 event;
             });
 
-            // $ExpectType JQuery<HTMLElement>
-            $('p').mousemove('myData', function(this: J1, event) {
-                // $ExpectType J1
-                this;
-                // $ExpectType Event<HTMLElement, string>
-                event;
-            });
-
             // $ExpectType JQuery<HTMLElement>
             $('p').mousemove(function(event) {
                 // $ExpectType HTMLElement
@@ -5246,14 +4744,6 @@ function JQuery() {
                 event;
             });
 
-            // $ExpectType JQuery<HTMLElement>
-            $('p').mousemove(function(this: J1, event) {
-                // $ExpectType J1
-                this;
-                // $ExpectType Event<HTMLElement, null>
-                event;
-            });
-
             // $ExpectType JQuery<HTMLElement>
             $('p').mousemove(false);
 
@@ -5262,8 +4752,6 @@ function JQuery() {
         }
 
         function mouseout() {
-            interface J1 { kind: 'J1'; }
-
             // $ExpectType JQuery<HTMLElement>
             $('p').mouseout('myData', function(event) {
                 // $ExpectType HTMLElement
@@ -5272,14 +4760,6 @@ function JQuery() {
                 event;
             });
 
-            // $ExpectType JQuery<HTMLElement>
-            $('p').mouseout('myData', function(this: J1, event) {
-                // $ExpectType J1
-                this;
-                // $ExpectType Event<HTMLElement, string>
-                event;
-            });
-
             // $ExpectType JQuery<HTMLElement>
             $('p').mouseout(function(event) {
                 // $ExpectType HTMLElement
@@ -5288,14 +4768,6 @@ function JQuery() {
                 event;
             });
 
-            // $ExpectType JQuery<HTMLElement>
-            $('p').mouseout(function(this: J1, event) {
-                // $ExpectType J1
-                this;
-                // $ExpectType Event<HTMLElement, null>
-                event;
-            });
-
             // $ExpectType JQuery<HTMLElement>
             $('p').mouseout(false);
 
@@ -5304,8 +4776,6 @@ function JQuery() {
         }
 
         function mouseover() {
-            interface J1 { kind: 'J1'; }
-
             // $ExpectType JQuery<HTMLElement>
             $('p').mouseover('myData', function(event) {
                 // $ExpectType HTMLElement
@@ -5314,14 +4784,6 @@ function JQuery() {
                 event;
             });
 
-            // $ExpectType JQuery<HTMLElement>
-            $('p').mouseover('myData', function(this: J1, event) {
-                // $ExpectType J1
-                this;
-                // $ExpectType Event<HTMLElement, string>
-                event;
-            });
-
             // $ExpectType JQuery<HTMLElement>
             $('p').mouseover(function(event) {
                 // $ExpectType HTMLElement
@@ -5330,14 +4792,6 @@ function JQuery() {
                 event;
             });
 
-            // $ExpectType JQuery<HTMLElement>
-            $('p').mouseover(function(this: J1, event) {
-                // $ExpectType J1
-                this;
-                // $ExpectType Event<HTMLElement, null>
-                event;
-            });
-
             // $ExpectType JQuery<HTMLElement>
             $('p').mouseover(false);
 
@@ -5346,8 +4800,6 @@ function JQuery() {
         }
 
         function mouseup() {
-            interface J1 { kind: 'J1'; }
-
             // $ExpectType JQuery<HTMLElement>
             $('p').mouseup('myData', function(event) {
                 // $ExpectType HTMLElement
@@ -5356,14 +4808,6 @@ function JQuery() {
                 event;
             });
 
-            // $ExpectType JQuery<HTMLElement>
-            $('p').mouseup('myData', function(this: J1, event) {
-                // $ExpectType J1
-                this;
-                // $ExpectType Event<HTMLElement, string>
-                event;
-            });
-
             // $ExpectType JQuery<HTMLElement>
             $('p').mouseup(function(event) {
                 // $ExpectType HTMLElement
@@ -5372,14 +4816,6 @@ function JQuery() {
                 event;
             });
 
-            // $ExpectType JQuery<HTMLElement>
-            $('p').mouseup(function(this: J1, event) {
-                // $ExpectType J1
-                this;
-                // $ExpectType Event<HTMLElement, null>
-                event;
-            });
-
             // $ExpectType JQuery<HTMLElement>
             $('p').mouseup(false);
 
@@ -5388,8 +4824,6 @@ function JQuery() {
         }
 
         function resize() {
-            interface J1 { kind: 'J1'; }
-
             // $ExpectType JQuery<HTMLElement>
             $('p').resize('myData', function(event) {
                 // $ExpectType HTMLElement
@@ -5398,14 +4832,6 @@ function JQuery() {
                 event;
             });
 
-            // $ExpectType JQuery<HTMLElement>
-            $('p').resize('myData', function(this: J1, event) {
-                // $ExpectType J1
-                this;
-                // $ExpectType Event<HTMLElement, string>
-                event;
-            });
-
             // $ExpectType JQuery<HTMLElement>
             $('p').resize(function(event) {
                 // $ExpectType HTMLElement
@@ -5414,14 +4840,6 @@ function JQuery() {
                 event;
             });
 
-            // $ExpectType JQuery<HTMLElement>
-            $('p').resize(function(this: J1, event) {
-                // $ExpectType J1
-                this;
-                // $ExpectType Event<HTMLElement, null>
-                event;
-            });
-
             // $ExpectType JQuery<HTMLElement>
             $('p').resize(false);
 
@@ -5430,8 +4848,6 @@ function JQuery() {
         }
 
         function scroll() {
-            interface J1 { kind: 'J1'; }
-
             // $ExpectType JQuery<HTMLElement>
             $('p').scroll('myData', function(event) {
                 // $ExpectType HTMLElement
@@ -5440,14 +4856,6 @@ function JQuery() {
                 event;
             });
 
-            // $ExpectType JQuery<HTMLElement>
-            $('p').scroll('myData', function(this: J1, event) {
-                // $ExpectType J1
-                this;
-                // $ExpectType Event<HTMLElement, string>
-                event;
-            });
-
             // $ExpectType JQuery<HTMLElement>
             $('p').scroll(function(event) {
                 // $ExpectType HTMLElement
@@ -5456,14 +4864,6 @@ function JQuery() {
                 event;
             });
 
-            // $ExpectType JQuery<HTMLElement>
-            $('p').scroll(function(this: J1, event) {
-                // $ExpectType J1
-                this;
-                // $ExpectType Event<HTMLElement, null>
-                event;
-            });
-
             // $ExpectType JQuery<HTMLElement>
             $('p').scroll(false);
 
@@ -5472,8 +4872,6 @@ function JQuery() {
         }
 
         function select() {
-            interface J1 { kind: 'J1'; }
-
             // $ExpectType JQuery<HTMLElement>
             $('p').select('myData', function(event) {
                 // $ExpectType HTMLElement
@@ -5482,14 +4880,6 @@ function JQuery() {
                 event;
             });
 
-            // $ExpectType JQuery<HTMLElement>
-            $('p').select('myData', function(this: J1, event) {
-                // $ExpectType J1
-                this;
-                // $ExpectType Event<HTMLElement, string>
-                event;
-            });
-
             // $ExpectType JQuery<HTMLElement>
             $('p').select(function(event) {
                 // $ExpectType HTMLElement
@@ -5498,14 +4888,6 @@ function JQuery() {
                 event;
             });
 
-            // $ExpectType JQuery<HTMLElement>
-            $('p').select(function(this: J1, event) {
-                // $ExpectType J1
-                this;
-                // $ExpectType Event<HTMLElement, null>
-                event;
-            });
-
             // $ExpectType JQuery<HTMLElement>
             $('p').select(false);
 
@@ -5514,8 +4896,6 @@ function JQuery() {
         }
 
         function submit() {
-            interface J1 { kind: 'J1'; }
-
             // $ExpectType JQuery<HTMLElement>
             $('p').submit('myData', function(event) {
                 // $ExpectType HTMLElement
@@ -5524,14 +4904,6 @@ function JQuery() {
                 event;
             });
 
-            // $ExpectType JQuery<HTMLElement>
-            $('p').submit('myData', function(this: J1, event) {
-                // $ExpectType J1
-                this;
-                // $ExpectType Event<HTMLElement, string>
-                event;
-            });
-
             // $ExpectType JQuery<HTMLElement>
             $('p').submit(function(event) {
                 // $ExpectType HTMLElement
@@ -5540,14 +4912,6 @@ function JQuery() {
                 event;
             });
 
-            // $ExpectType JQuery<HTMLElement>
-            $('p').submit(function(this: J1, event) {
-                // $ExpectType J1
-                this;
-                // $ExpectType Event<HTMLElement, null>
-                event;
-            });
-
             // $ExpectType JQuery<HTMLElement>
             $('p').submit(false);
 
@@ -5556,9 +4920,6 @@ function JQuery() {
         }
 
         function hover() {
-            interface J1 { kind: 'J1'; }
-            interface J2 { kind: 'J2'; }
-
             // $ExpectType JQuery<HTMLElement>
             $('p').hover(function(event) {
                 // $ExpectType HTMLElement
@@ -5572,59 +4933,12 @@ function JQuery() {
                 event;
             });
 
-            // $ExpectType JQuery<HTMLElement>
-            $('p').hover(function(this: J1, event) {
-                // $ExpectType J1
-                this;
-                // $ExpectType Event<HTMLElement, null>
-                event;
-            }, function(event) {
-                // $ExpectType HTMLElement
-                this;
-                // $ExpectType Event<HTMLElement, null>
-                event;
-            });
-
             // $ExpectType JQuery<HTMLElement>
             $('p').hover(function(event) {
                 // $ExpectType HTMLElement
                 this;
                 // $ExpectType Event<HTMLElement, null>
                 event;
-            }, function(this: J1, event) {
-                // $ExpectType J1
-                this;
-                // $ExpectType Event<HTMLElement, null>
-                event;
-            });
-
-            // $ExpectType JQuery<HTMLElement>
-            $('p').hover(function(this: J1, event) {
-                // $ExpectType J1
-                this;
-                // $ExpectType Event<HTMLElement, null>
-                event;
-            }, function(this: J2, event) {
-                // $ExpectType J2
-                this;
-                // $ExpectType Event<HTMLElement, null>
-                event;
-            });
-
-            // $ExpectType JQuery<HTMLElement>
-            $('p').hover(function(event) {
-                // $ExpectType HTMLElement
-                this;
-                // $ExpectType Event<HTMLElement, null>
-                event;
-            }, false);
-
-            // $ExpectType JQuery<HTMLElement>
-            $('p').hover(function(this: J1, event) {
-                // $ExpectType J1
-                this;
-                // $ExpectType Event<HTMLElement, null>
-                event;
             }, false);
 
             // $ExpectType JQuery<HTMLElement>
@@ -5635,14 +4949,6 @@ function JQuery() {
                 event;
             });
 
-            // $ExpectType JQuery<HTMLElement>
-            $('p').hover(false, function(this: J1, event) {
-                // $ExpectType J1
-                this;
-                // $ExpectType Event<HTMLElement, null>
-                event;
-            });
-
             // $ExpectType JQuery<HTMLElement>
             $('p').hover(false, false);
 
@@ -5654,14 +4960,6 @@ function JQuery() {
                 event;
             });
 
-            // $ExpectType JQuery<HTMLElement>
-            $('p').hover(function(this: J1, event) {
-                // $ExpectType J1
-                this;
-                // $ExpectType Event<HTMLElement, null>
-                event;
-            });
-
             // $ExpectType JQuery<HTMLElement>
             $('p').hover(false);
         }

From f13af8beb0b54f71d8a070c99fdf76cf5601433b Mon Sep 17 00:00:00 2001
From: Leonard Thieu <leonard.thieu@gmail.com>
Date: Wed, 24 Oct 2018 08:38:23 -0400
Subject: [PATCH 244/836] [jquery] Improve declaration of Events API.

* Introduced the concept of a triggered event. A triggered event is a jQuery event that has been triggered (either manually by `.trigger()` or `.triggerHandler()`, or automatically by the user agent). Many properties on an event are not set until it has been triggered. Triggered events are now represented by `JQuery.TriggeredEvent`. `JQuery.Event` represents the object returned from the `jQuery.Event` constructor and serves as the base type for all jQuery events.

* Added a type parameter for `currentTarget` (`TCurrentTarget`). Previously, `currentTarget` was set to the type of `delegateTarget`. This was only correct for events received from directly bound event handlers. This allows delegate bound event handlers to specify the correct type of `currentTarget`.

* Added a type parameter for `target` (`TTarget`). Previously, `target` was set to the type of `delegateTarget`. This was not always correct. For delegate bound event handlers, `target` can be `delegateTarget` or any of its descendents. The exact type of `target` cannot be known until run time, so consumers should use a type assertion.

* Changed methods that bind event handlers to more accurately reflect the event object received through the callback. Both direct and delegate binding are now properly handled. This also includes a framework for providing more specific events for known event types.
---
 types/jquery/JQuery.d.ts            | 338 +++++++++++-----
 types/jquery/jquery-tests.ts        | 221 +++++++----
 types/jquery/misc.d.ts              | 588 ++++++++++++++++------------
 types/jquery/test/example-tests.ts  |  18 +-
 types/jquery/test/learn-tests.ts    |   2 +-
 types/jquery/test/longdesc-tests.ts |   4 +-
 6 files changed, 716 insertions(+), 455 deletions(-)

diff --git a/types/jquery/JQuery.d.ts b/types/jquery/JQuery.d.ts
index 70cfaa0e03..f9a06328e7 100644
--- a/types/jquery/JQuery.d.ts
+++ b/types/jquery/JQuery.d.ts
@@ -530,7 +530,10 @@ $( document ).ajaxComplete(function( event, request, settings ) {
 });
 ```
      */
-    ajaxComplete(handler: (this: Document, event: JQuery.Event<Document>, jqXHR: JQuery.jqXHR, ajaxOptions: JQuery.AjaxSettings) => void | false): this;
+    ajaxComplete(handler: (this: Document,
+                           event: JQuery.TriggeredEvent<Document, undefined, Document, Document>,
+                           jqXHR: JQuery.jqXHR,
+                           ajaxOptions: JQuery.AjaxSettings) => void | false): this;
     /**
      * Register a handler to be called when Ajax requests complete with an error. This is an Ajax Event.
      * @param handler The function to be invoked.
@@ -543,7 +546,11 @@ $( document ).ajaxError(function( event, request, settings ) {
 });
 ```
      */
-    ajaxError(handler: (this: Document, event: JQuery.Event<Document>, jqXHR: JQuery.jqXHR, ajaxSettings: JQuery.AjaxSettings, thrownError: string) => void | false): this;
+    ajaxError(handler: (this: Document,
+                        event: JQuery.TriggeredEvent<Document, undefined, Document, Document>,
+                        jqXHR: JQuery.jqXHR,
+                        ajaxSettings: JQuery.AjaxSettings,
+                        thrownError: string) => void | false): this;
     /**
      * Attach a function to be executed before an Ajax request is sent. This is an Ajax Event.
      * @param handler The function to be invoked.
@@ -556,7 +563,10 @@ $( document ).ajaxSend(function( event, request, settings ) {
 });
 ```
      */
-    ajaxSend(handler: (this: Document, event: JQuery.Event<Document>, jqXHR: JQuery.jqXHR, ajaxOptions: JQuery.AjaxSettings) => void | false): this;
+    ajaxSend(handler: (this: Document,
+                       event: JQuery.TriggeredEvent<Document, undefined, Document, Document>,
+                       jqXHR: JQuery.jqXHR,
+                       ajaxOptions: JQuery.AjaxSettings) => void | false): this;
     /**
      * Register a handler to be called when the first Ajax request begins. This is an Ajax Event.
      * @param handler The function to be invoked.
@@ -595,7 +605,11 @@ $( document ).ajaxSuccess(function( event, request, settings ) {
 });
 ```
      */
-    ajaxSuccess(handler: (this: Document, event: JQuery.Event<Document>, jqXHR: JQuery.jqXHR, ajaxOptions: JQuery.AjaxSettings, data: JQuery.PlainObject) => void | false): this;
+    ajaxSuccess(handler: (this: Document,
+                          event: JQuery.TriggeredEvent<Document, undefined, Document, Document>,
+                          jqXHR: JQuery.jqXHR,
+                          ajaxOptions: JQuery.AjaxSettings,
+                          data: JQuery.PlainObject) => void | false): this;
     /**
      * Perform a custom animation of a set of CSS properties.
      * @param properties An object of CSS properties and values that the animation will move toward.
@@ -1329,9 +1343,12 @@ $( "p" ).before( $( "b" ) );
      *
      * **Solution**: Change the method call to use `.on()` or `.off()`, the documentation for the old methods include specific instructions. In general, the `.bind()` and `.unbind()` methods can be renamed directly to `.on()` and `.off()` respectively since the argument orders are identical.
      */
-    bind<TData>(eventType: string,
-                eventData: TData,
-                handler: JQuery.EventHandler<TElement, TData>): this;
+    bind<TType extends string,
+         TData>(
+        eventType: TType,
+        eventData: TData,
+        handler: JQuery.TypeEventHandler<TElement, TData, TElement, TElement, TElement, TType>
+    ): this;
     /**
      * Attach a handler to an event for the elements.
      * @param eventType A string containing one or more DOM event types, such as "click" or "submit," or custom event names.
@@ -1458,8 +1475,13 @@ $( "button" ).click(function() {
 </html>
 ```
      */
-    bind(eventType: string,
-         handler_preventBubble: JQuery.EventHandler<TElement> | false | null | undefined): this;
+    bind<TType extends string>(
+        eventType: TType,
+        handler_preventBubble: JQuery.TypeEventHandler<TElement, undefined, TElement, TElement, TElement, TType> |
+                               false |
+                               null |
+                               undefined
+    ): this;
     /**
      * Attach a handler to an event for the elements.
      * @param events An object containing one or more DOM event types and functions to execute for them.
@@ -1485,7 +1507,7 @@ $( "div.test" ).bind({
 });
 ```
      */
-    bind(events: JQuery.PlainObject<JQuery.EventHandler<TElement> | false>): this;
+    bind(events: JQuery.TypeEventHandlers<TElement, undefined, TElement, TElement, TElement>): this;
     /**
      * Bind an event handler to the "blur" JavaScript event, or trigger that event on an element.
      * @param eventData An object containing data that will be passed to the event handler.
@@ -2713,10 +2735,13 @@ $( "button" ).click(function() {
      *
      * **Solution**: Change the method call to use `.on()` or `.off()`, the documentation for the old methods include specific instructions. In general, the `.bind()` and `.unbind()` methods can be renamed directly to `.on()` and `.off()` respectively since the argument orders are identical.
      */
-    delegate<TData>(selector: JQuery.Selector,
-                    eventType: string,
-                    eventData: TData,
-                    handler: JQuery.EventHandler<TElement, TData>): this;
+    delegate<TType extends string,
+             TData>(
+        selector: JQuery.Selector,
+        eventType: TType,
+        eventData: TData,
+        handler: JQuery.TypeEventHandler<TElement, TData, any, any, any, TType>
+    ): this;
     /**
      * Attach a handler to one or more events for all elements that match the selector, now or in the future, based on a specific set of root elements.
      * @param selector A selector to filter the elements that trigger the event.
@@ -2828,9 +2853,12 @@ $( "button" ).click(function() {
 </html>
 ```
      */
-    delegate(selector: JQuery.Selector,
-             eventType: string,
-             handler: JQuery.EventHandler<TElement> | false): this;
+    delegate<TType extends string>(
+        selector: JQuery.Selector,
+        eventType: TType,
+        handler: JQuery.TypeEventHandler<TElement, undefined, any, any, any, TType> |
+                 false
+    ): this;
     /**
      * Attach a handler to one or more events for all elements that match the selector, now or in the future, based on a specific set of root elements.
      * @param selector A selector to filter the elements that trigger the event.
@@ -2844,7 +2872,8 @@ $( "button" ).click(function() {
      * **Solution**: Change the method call to use `.on()` or `.off()`, the documentation for the old methods include specific instructions. In general, the `.bind()` and `.unbind()` methods can be renamed directly to `.on()` and `.off()` respectively since the argument orders are identical.
      */
     delegate(selector: JQuery.Selector,
-             events: JQuery.PlainObject<JQuery.EventHandler<TElement> | false>): this;
+             events: JQuery.TypeEventHandlers<TElement, undefined, any, any, any>
+    ): this;
     /**
      * Execute the next function on the queue for the matched elements.
      * @param queueName A string containing the name of the queue. Defaults to fx, the standard effects queue.
@@ -7245,7 +7274,10 @@ $( "body" ).on( "click", "p", foo );
 $( "body" ).off( "click", "p", foo );
 ```
      */
-    off(events: string, selector: JQuery.Selector, handler: JQuery.EventHandlerBase<any, JQuery.Event<TElement, any>> | false): this;
+    off(events: string,
+        selector: JQuery.Selector,
+        handler: JQuery.TypeEventHandler<TElement, any, any, any, any, string> |
+                 false): this;
     /**
      * Remove an event handler.
      * @param events One or more space-separated event types and optional namespaces, or just namespaces, such as
@@ -7275,7 +7307,10 @@ $( "form" ).on( "keypress.validator", "input[type='text']", validate );
 $( "form" ).off( ".validator" );
 ```
      */
-    off(events: string, selector_handler?: JQuery.Selector | JQuery.EventHandlerBase<any, JQuery.Event<TElement, any>> | false): this;
+    off(events: string,
+        selector_handler?: JQuery.Selector |
+                           JQuery.TypeEventHandler<TElement, any, any, any, any, string> |
+                           false): this;
     /**
      * Remove an event handler.
      * @param events An object where the string keys represent one or more space-separated event types and optional
@@ -7284,7 +7319,8 @@ $( "form" ).off( ".validator" );
      * @see \`{@link https://api.jquery.com/off/ }\`
      * @since 1.7
      */
-    off(events: JQuery.PlainObject<JQuery.EventHandlerBase<any, JQuery.Event<TElement, any>> | false>, selector?: JQuery.Selector): this;
+    off(events: JQuery.TypeEventHandlers<TElement, any, any, any, any>,
+        selector?: JQuery.Selector): this;
     /**
      * Remove an event handler.
      * @param event A jQuery.Event object.
@@ -7295,7 +7331,7 @@ $( "form" ).off( ".validator" );
 $( "p" ).off();
 ```
      */
-    off(event?: JQuery.Event<TElement>): this;
+    off(event?: JQuery.TriggeredEvent<TElement>): this;
     /**
      * Set the current coordinates of every element in the set of matched elements, relative to the document.
      * @param coordinates_function _&#x40;param_ `coordinates_function`
@@ -7468,10 +7504,30 @@ $( "*", document.body ).click(function( event ) {
      * @see \`{@link https://api.jquery.com/on/ }\`
      * @since 1.7
      */
-    on<TData>(events: string,
-              selector: JQuery.Selector | null,
-              data: TData,
-              handler: JQuery.EventHandler<TElement, TData>): this;
+    on<TType extends string,
+       TData>(
+        events: TType,
+        selector: JQuery.Selector,
+        data: TData,
+        handler: JQuery.TypeEventHandler<TElement, TData, any, any, any, TType>
+    ): this;
+    /**
+     * Attach an event handler function for one or more events to the selected elements.
+     * @param events One or more space-separated event types and optional namespaces, such as "click" or "keydown.myPlugin".
+     * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the
+     *                 selector is null or omitted, the event is always triggered when it reaches the selected element.
+     * @param data Data to be passed to the handler in event.data when an event is triggered.
+     * @param handler A function to execute when the event is triggered.
+     * @see \`{@link https://api.jquery.com/on/ }\`
+     * @since 1.7
+     */
+    on<TType extends string,
+       TData>(
+        events: TType,
+        selector: null | undefined,
+        data: TData,
+        handler: JQuery.TypeEventHandler<TElement, TData, TElement, TElement, TElement, TType>
+    ): this;
     /**
      * Attach an event handler function for one or more events to the selected elements.
      * @param events One or more space-separated event types and optional namespaces, such as "click" or "keydown.myPlugin".
@@ -7484,7 +7540,7 @@ $( "*", document.body ).click(function( event ) {
      * @deprecated ​ Deprecated. Use \`{@link JQuery.Event }\` in place of \`{@link JQueryEventObject }\`.
      */
     on(events: string,
-       selector: JQuery.Selector | null,
+       selector: JQuery.Selector | null | undefined,
        data: any,
        handler: ((event: JQueryEventObject) => void)): this;
     /**
@@ -7547,14 +7603,41 @@ $( "body" ).on( "click", "a", function( event ) {
 });
 ```
      */
-    on(events: string,
-       selector: JQuery.Selector,
-       handler: JQuery.EventHandler<TElement> | false): this;
+    on<TType extends string>(
+        events: TType,
+        selector: JQuery.Selector,
+        handler: JQuery.TypeEventHandler<TElement, undefined, any, any, any, TType> |
+                 false
+    ): this;
     /**
      * Attach an event handler function for one or more events to the selected elements.
      * @param events One or more space-separated event types and optional namespaces, such as "click" or "keydown.myPlugin".
-     * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the
-     *                 selector is null or omitted, the event is always triggered when it reaches the selected element.
+     * @param data Data to be passed to the handler in event.data when an event is triggered.
+     * @param handler A function to execute when the event is triggered.
+     * @see \`{@link https://api.jquery.com/on/ }\`
+     * @since 1.7
+     * @example ​ ````Pass data to the event handler, which is specified here by name:
+```javascript
+function myHandler( event ) {
+  alert( event.data.foo );
+}
+$( "p" ).on( "click", { foo: "bar" }, myHandler );
+```
+     */
+    on<TType extends string,
+       TData>(
+        events: TType,
+        data: TData,
+        handler: JQuery.TypeEventHandler<TElement, TData, TElement, TElement, TElement, TType>
+    ): this;
+    /**
+     * Attach an event handler function for one or more events to the selected elements.
+     * @param events One or more space-separated event types and optional namespaces, such as "click" or "keydown.myPlugin".
+     * @param selector_data _&#x40;param_ `selector_data`
+     * <br>
+     * * `selector` — A selector string to filter the descendants of the selected elements that trigger the event. If the
+     *                selector is null or omitted, the event is always triggered when it reaches the selected element. <br>
+     * * `data` — Data to be passed to the handler in event.data when an event is triggered.
      * @param handler A function to execute when the event is triggered.
      * @see \`{@link https://api.jquery.com/on/ }\`
      * @since 1.7
@@ -7609,37 +7692,6 @@ $( "body" ).on( "click", "a", function( event ) {
   event.preventDefault();
 });
 ```
-     */
-    on(events: string,
-       selector: JQuery.Selector,
-       // tslint:disable-next-line:unified-signatures
-       handler: ((event: JQueryEventObject) => void)): this;
-    /**
-     * Attach an event handler function for one or more events to the selected elements.
-     * @param events One or more space-separated event types and optional namespaces, such as "click" or "keydown.myPlugin".
-     * @param data Data to be passed to the handler in event.data when an event is triggered.
-     * @param handler A function to execute when the event is triggered.
-     * @see \`{@link https://api.jquery.com/on/ }\`
-     * @since 1.7
-     * @example ​ ````Pass data to the event handler, which is specified here by name:
-```javascript
-function myHandler( event ) {
-  alert( event.data.foo );
-}
-$( "p" ).on( "click", { foo: "bar" }, myHandler );
-```
-     */
-    on<TData>(events: string,
-              data: TData,
-              handler: JQuery.EventHandler<TElement, TData>): this;
-    /**
-     * Attach an event handler function for one or more events to the selected elements.
-     * @param events One or more space-separated event types and optional namespaces, such as "click" or "keydown.myPlugin".
-     * @param data Data to be passed to the handler in event.data when an event is triggered.
-     * @param handler A function to execute when the event is triggered.
-     * @see \`{@link https://api.jquery.com/on/ }\`
-     * @since 1.7
-     * @deprecated ​ Deprecated. Use \`{@link JQuery.Event }\` in place of \`{@link JQueryEventObject }\`.
      * @example ​ ````Pass data to the event handler, which is specified here by name:
 ```javascript
 function myHandler( event ) {
@@ -7649,8 +7701,7 @@ $( "p" ).on( "click", { foo: "bar" }, myHandler );
 ```
      */
     on(events: string,
-       // tslint:disable-next-line:unified-signatures
-       data: any,
+       selector_data: any,
        handler: ((event: JQueryEventObject) => void)): this;
     /**
      * Attach an event handler function for one or more events to the selected elements.
@@ -7743,8 +7794,11 @@ $( "#cart" ).on( "mouseenter mouseleave", function( event ) {
 });
 ```
      */
-    on(events: string,
-       handler: JQuery.EventHandler<TElement> | false): this;
+    on<TType extends string>(
+        events: TType,
+        handler: JQuery.TypeEventHandler<TElement, undefined, TElement, TElement, TElement, TType> |
+                 false
+    ): this;
     /**
      * Attach an event handler function for one or more events to the selected elements.
      * @param events One or more space-separated event types and optional namespaces, such as "click" or "keydown.myPlugin".
@@ -7837,7 +7891,6 @@ $( "#cart" ).on( "mouseenter mouseleave", function( event ) {
 ```
      */
     on(events: string,
-       // tslint:disable-next-line:unified-signatures
        handler: ((event: JQueryEventObject) => void)): this;
     /**
      * Attach an event handler function for one or more events to the selected elements.
@@ -7849,9 +7902,26 @@ $( "#cart" ).on( "mouseenter mouseleave", function( event ) {
      * @see \`{@link https://api.jquery.com/on/ }\`
      * @since 1.7
      */
-    on<TData>(events: JQuery.PlainObject<JQuery.EventHandler<TElement, TData> | false>,
-              selector: JQuery.Selector | null,
-              data: TData): this;
+    on<TData>(
+        events: JQuery.TypeEventHandlers<TElement, TData, any, any, any>,
+        selector: JQuery.Selector,
+        data: TData
+    ): this;
+    /**
+     * Attach an event handler function for one or more events to the selected elements.
+     * @param events An object in which the string keys represent one or more space-separated event types and optional
+     *               namespaces, and the values represent a handler function to be called for the event(s).
+     * @param selector A selector string to filter the descendants of the selected elements that will call the handler. If
+     *                 the selector is null or omitted, the handler is always called when it reaches the selected element.
+     * @param data Data to be passed to the handler in event.data when an event occurs.
+     * @see \`{@link https://api.jquery.com/on/ }\`
+     * @since 1.7
+     */
+    on<TData>(
+        events: JQuery.TypeEventHandlers<TElement, TData, TElement, TElement, TElement>,
+        selector: null | undefined,
+        data: TData
+    ): this;
     /**
      * Attach an event handler function for one or more events to the selected elements.
      * @param events An object in which the string keys represent one or more space-separated event types and optional
@@ -7861,9 +7931,9 @@ $( "#cart" ).on( "mouseenter mouseleave", function( event ) {
      * @see \`{@link https://api.jquery.com/on/ }\`
      * @since 1.7
      */
-    on(events: JQuery.PlainObject<JQuery.EventHandler<TElement> | false>,
-       // tslint:disable-next-line:unified-signatures
-       selector: JQuery.Selector): this;
+    on(events: JQuery.TypeEventHandlers<TElement, undefined, any, any, any>,
+       selector: JQuery.Selector
+    ): this;
     /**
      * Attach an event handler function for one or more events to the selected elements.
      * @param events An object in which the string keys represent one or more space-separated event types and optional
@@ -7872,8 +7942,10 @@ $( "#cart" ).on( "mouseenter mouseleave", function( event ) {
      * @see \`{@link https://api.jquery.com/on/ }\`
      * @since 1.7
      */
-    on<TData>(events: JQuery.PlainObject<JQuery.EventHandler<TElement, TData> | false>,
-              data: TData): this;
+    on<TData>(
+        events: JQuery.TypeEventHandlers<TElement, TData, TElement, TElement, TElement>,
+        data: TData
+    ): this;
     /**
      * Attach an event handler function for one or more events to the selected elements.
      * @param events An object in which the string keys represent one or more space-separated event types and optional
@@ -7922,7 +7994,7 @@ $( "div.test" ).on({
 </html>
 ```
      */
-    on(events: JQuery.PlainObject<JQuery.EventHandler<TElement> | false>): this;
+    on(events: JQuery.TypeEventHandlers<TElement, undefined, TElement, TElement, TElement>): this;
     /**
      * Attach a handler to an event for the elements. The handler is executed at most once per element per event type.
      * @param events One or more space-separated event types and optional namespaces, such as "click" or "keydown.myPlugin".
@@ -7933,10 +8005,30 @@ $( "div.test" ).on({
      * @see \`{@link https://api.jquery.com/one/ }\`
      * @since 1.7
      */
-    one<TData>(events: string,
-               selector: JQuery.Selector | null,
-               data: TData,
-               handler: JQuery.EventHandler<TElement, TData>): this;
+    one<TType extends string,
+        TData>(
+        events: TType,
+        selector: JQuery.Selector,
+        data: TData,
+        handler: JQuery.TypeEventHandler<TElement, TData, any, any, any, TType>
+    ): this;
+    /**
+     * Attach a handler to an event for the elements. The handler is executed at most once per element per event type.
+     * @param events One or more space-separated event types and optional namespaces, such as "click" or "keydown.myPlugin".
+     * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the
+     *                 selector is null or omitted, the event is always triggered when it reaches the selected element.
+     * @param data Data to be passed to the handler in event.data when an event is triggered.
+     * @param handler A function to execute when the event is triggered.
+     * @see \`{@link https://api.jquery.com/one/ }\`
+     * @since 1.7
+     */
+    one<TType extends string,
+        TData>(
+        events: TType,
+        selector: null | undefined,
+        data: TData,
+        handler: JQuery.TypeEventHandler<TElement, TData, TElement, TElement, TElement, TType>
+    ): this;
     /**
      * Attach a handler to an event for the elements. The handler is executed at most once per element per event type.
      * @param events One or more space-separated event types and optional namespaces, such as "click" or "keydown.myPlugin".
@@ -7947,9 +8039,12 @@ $( "div.test" ).on({
      * @see \`{@link https://api.jquery.com/one/ }\`
      * @since 1.7
      */
-    one(events: string,
+    one<TType extends string>(
+        events: TType,
         selector: JQuery.Selector,
-        handler: JQuery.EventHandler<TElement> | false): this;
+        handler: JQuery.TypeEventHandler<TElement, undefined, any, any, any, TType> |
+                 false
+    ): this;
     /**
      * Attach a handler to an event for the elements. The handler is executed at most once per element per event type.
      * @param events One or more space-separated event types and optional namespaces, such as "click" or "keydown.myPlugin".
@@ -7958,9 +8053,12 @@ $( "div.test" ).on({
      * @see \`{@link https://api.jquery.com/one/ }\`
      * @since 1.7
      */
-    one<TData>(events: string,
-               data: TData,
-               handler: JQuery.EventHandler<TElement, TData>): this;
+    one<TType extends string,
+        TData>(
+        events: TType,
+        data: TData,
+        handler: JQuery.TypeEventHandler<TElement, TData, TElement, TElement, TElement, TType>
+    ): this;
     /**
      * Attach a handler to an event for the elements. The handler is executed at most once per element per event type.
      * @param events One or more space-separated event types and optional namespaces, such as "click" or "keydown.myPlugin".
@@ -8049,8 +8147,11 @@ $(".target").one("click mouseenter", function() {
 </html>
 ```
      */
-    one(events: string,
-        handler: JQuery.EventHandler<TElement> | false): this;
+    one<TType extends string>(
+        events: TType,
+        handler: JQuery.TypeEventHandler<TElement, undefined, TElement, TElement, TElement, TType>|
+                 false
+    ): this;
     /**
      * Attach a handler to an event for the elements. The handler is executed at most once per element per event type.
      * @param events An object in which the string keys represent one or more space-separated event types and optional
@@ -8061,9 +8162,26 @@ $(".target").one("click mouseenter", function() {
      * @see \`{@link https://api.jquery.com/one/ }\`
      * @since 1.7
      */
-    one<TData>(events: JQuery.PlainObject<JQuery.EventHandler<TElement, TData> | false>,
-               selector: JQuery.Selector | null,
-               data: TData): this;
+    one<TData>(
+        events: JQuery.TypeEventHandlers<TElement, TData, any, any, any>,
+        selector: JQuery.Selector,
+        data: TData
+    ): this;
+    /**
+     * Attach a handler to an event for the elements. The handler is executed at most once per element per event type.
+     * @param events An object in which the string keys represent one or more space-separated event types and optional
+     *               namespaces, and the values represent a handler function to be called for the event(s).
+     * @param selector A selector string to filter the descendants of the selected elements that will call the handler. If
+     *                 the selector is null or omitted, the handler is always called when it reaches the selected element.
+     * @param data Data to be passed to the handler in event.data when an event occurs.
+     * @see \`{@link https://api.jquery.com/one/ }\`
+     * @since 1.7
+     */
+    one<TData>(
+        events: JQuery.TypeEventHandlers<TElement, TData, TElement, TElement, TElement>,
+        selector: null | undefined,
+        data: TData
+    ): this;
     /**
      * Attach a handler to an event for the elements. The handler is executed at most once per element per event type.
      * @param events An object in which the string keys represent one or more space-separated event types and optional
@@ -8073,8 +8191,7 @@ $(".target").one("click mouseenter", function() {
      * @see \`{@link https://api.jquery.com/one/ }\`
      * @since 1.7
      */
-    one(events: JQuery.PlainObject<JQuery.EventHandler<TElement> | false>,
-        // tslint:disable-next-line:unified-signatures
+    one(events: JQuery.TypeEventHandlers<TElement, undefined, any, any, any>,
         selector: JQuery.Selector): this;
     /**
      * Attach a handler to an event for the elements. The handler is executed at most once per element per event type.
@@ -8084,8 +8201,10 @@ $(".target").one("click mouseenter", function() {
      * @see \`{@link https://api.jquery.com/one/ }\`
      * @since 1.7
      */
-    one<TData>(events: JQuery.PlainObject<JQuery.EventHandler<TElement, TData> | false>,
-               data: TData): this;
+    one<TData>(
+        events: JQuery.TypeEventHandlers<TElement, TData, TElement, TElement, TElement>,
+        data: TData
+    ): this;
     /**
      * Attach a handler to an event for the elements. The handler is executed at most once per element per event type.
      * @param events An object in which the string keys represent one or more space-separated event types and optional
@@ -8093,7 +8212,7 @@ $(".target").one("click mouseenter", function() {
      * @see \`{@link https://api.jquery.com/one/ }\`
      * @since 1.7
      */
-    one(events: JQuery.PlainObject<JQuery.EventHandler<TElement> | false>): this;
+    one(events: JQuery.TypeEventHandlers<TElement, undefined, TElement, TElement, TElement>): this;
     /**
      * Set the CSS outer height of each element in the set of matched elements.
      * @param value_function _&#x40;param_ `value_function`
@@ -11704,7 +11823,7 @@ $( "body" ).trigger({
 });
 ```
      */
-    trigger(eventType_event: string | JQuery.Event<TElement>, extraParameters?: any[] | JQuery.PlainObject | string | number | boolean): this;
+    trigger(eventType_event: string | JQuery.Event, extraParameters?: any[] | JQuery.PlainObject | string | number | boolean): this;
     /**
      * Execute all handlers attached to an element for an event.
      * @param eventType_event _&#x40;param_ `eventType_event`
@@ -11747,7 +11866,7 @@ $( "input" ).focus(function() {
 </html>
 ```
      */
-    triggerHandler(eventType_event: string | JQuery.Event<TElement>, extraParameters?: any[] | JQuery.PlainObject | string | number | boolean): any;
+    triggerHandler(eventType_event: string | JQuery.Event, extraParameters?: any[] | JQuery.PlainObject | string | number | boolean): any;
     /**
      * Remove a previously-attached event handler from the elements.
      * @param event A string containing one or more DOM event types, such as "click" or "submit," or custom event names.
@@ -11815,7 +11934,10 @@ $( "p" ).bind( "click", foo ); // ... Now foo will be called when paragraphs are
 $( "p" ).unbind( "click", foo ); // ... foo will no longer be called.
 ```
      */
-    unbind(event: string, handler: JQuery.EventHandlerBase<any, JQuery.Event<TElement, any>> | false): this;
+    unbind(event: string,
+           handler: JQuery.TypeEventHandler<TElement, any, TElement, TElement, TElement, string> |
+                    false
+    ): this;
     /**
      * Remove a previously-attached event handler from the elements.
      * @param event A string containing one or more DOM event types, such as "click" or "submit," or custom event names.
@@ -11836,7 +11958,7 @@ $( "p" ).unbind();
 $( "p" ).unbind( "click" );
 ```
      */
-    unbind(event?: string | JQuery.Event<TElement>): this;
+    unbind(event?: string | JQuery.TriggeredEvent<TElement>): this;
     /**
      * Remove a handler from the event for all elements which match the current selector, based upon a specific set of root elements.
      * @param selector A selector which will be used to filter the event results.
@@ -11906,12 +12028,18 @@ $( "body" ).delegate( "p", "click", foo );
 $( "body" ).undelegate( "p", "click", foo );
 ```
      */
-    undelegate(selector: JQuery.Selector, eventType: string, handler: JQuery.EventHandlerBase<any, JQuery.Event<TElement, any>> | false): this;
+    undelegate(selector: JQuery.Selector,
+               eventType: string,
+               handler: JQuery.TypeEventHandler<TElement, any, any, any, any, string> |
+                        false
+    ): this;
     /**
      * Remove a handler from the event for all elements which match the current selector, based upon a specific set of root elements.
      * @param selector A selector which will be used to filter the event results.
-     * @param eventTypes A string containing a JavaScript event type, such as "click" or "keydown"
-     *                   An object of one or more event types and previously bound functions to unbind from them.
+     * @param eventType_events _&#x40;param_ `eventType_events`
+     * <br>
+     * * `eventType` — A string containing a JavaScript event type, such as "click" or "keydown" <br>
+     * * `events` — An object of one or more event types and previously bound functions to unbind from them.
      * @see \`{@link https://api.jquery.com/undelegate/ }\`
      * @since 1.4.2
      * @since 1.4.3
@@ -11921,7 +12049,9 @@ $( "body" ).undelegate( "p", "click", foo );
      *
      * **Solution**: Change the method call to use `.on()` or `.off()`, the documentation for the old methods include specific instructions. In general, the `.bind()` and `.unbind()` methods can be renamed directly to `.on()` and `.off()` respectively since the argument orders are identical.
      */
-    undelegate(selector: JQuery.Selector, eventTypes: string | JQuery.PlainObject<JQuery.EventHandlerBase<any, JQuery.Event<TElement, any>> | false>): this;
+    undelegate(selector: JQuery.Selector,
+               eventType_events: string |
+                                 JQuery.TypeEventHandlers<TElement, any, any, any, any>): this;
     /**
      * Remove a handler from the event for all elements which match the current selector, based upon a specific set of root elements.
      * @param namespace A selector which will be used to filter the event results.
diff --git a/types/jquery/jquery-tests.ts b/types/jquery/jquery-tests.ts
index 4f848cc7bb..b08b48d0b0 100644
--- a/types/jquery/jquery-tests.ts
+++ b/types/jquery/jquery-tests.ts
@@ -2430,7 +2430,7 @@ function JQuery() {
             $(document).ajaxComplete(function(event, jqXHR, ajaxOptions) {
                 // $ExpectType Document
                 this;
-                // $ExpectType Event<Document, null>
+                // $ExpectType TriggeredEvent<Document, undefined, Document, Document>
                 event;
                 // $ExpectType jqXHR<any>
                 jqXHR;
@@ -2446,7 +2446,7 @@ function JQuery() {
             $(document).ajaxError(function(event, jqXHR, ajaxSettings, thrownError) {
                 // $ExpectType Document
                 this;
-                // $ExpectType Event<Document, null>
+                // $ExpectType TriggeredEvent<Document, undefined, Document, Document>
                 event;
                 // $ExpectType jqXHR<any>
                 jqXHR;
@@ -2464,7 +2464,7 @@ function JQuery() {
             $(document).ajaxSend(function(event, jqXHR, ajaxOptions) {
                 // $ExpectType Document
                 this;
-                // $ExpectType Event<Document, null>
+                // $ExpectType TriggeredEvent<Document, undefined, Document, Document>
                 event;
                 // $ExpectType jqXHR<any>
                 jqXHR;
@@ -2500,7 +2500,7 @@ function JQuery() {
             $(document).ajaxSuccess(function(event, jqXHR, ajaxOptions, data) {
                 // $ExpectType Document
                 this;
-                // $ExpectType Event<Document, null>
+                // $ExpectType TriggeredEvent<Document, undefined, Document, Document>
                 event;
                 // $ExpectType jqXHR<any>
                 jqXHR;
@@ -3887,7 +3887,7 @@ function JQuery() {
             $('p').bind('myEvent', 'myData', function(event) {
                 // $ExpectType HTMLElement
                 this;
-                // $ExpectType Event<HTMLElement, string>
+                // $ExpectType TriggeredEvent<HTMLElement, string, HTMLElement, HTMLElement>
                 event;
             });
 
@@ -3895,45 +3895,45 @@ function JQuery() {
             $('p').bind('myEvent', function(event) {
                 // $ExpectType HTMLElement
                 this;
-                // $ExpectType Event<HTMLElement, null>
+                // $ExpectType TriggeredEvent<HTMLElement, undefined, HTMLElement, HTMLElement>
                 event;
             });
 
             // $ExpectType JQuery<HTMLElement>
             $('p').bind('myEvent', false);
 
+            // $ExpectType JQuery<HTMLElement>
+            $('p').bind('myEvent', null);
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').bind('myEvent', undefined);
+
             // $ExpectType JQuery<HTMLElement>
             $('p').bind({
                 myEvent1: false,
                 myEvent2(event) {
                     // $ExpectType HTMLElement
                     this;
-                    // $ExpectType Event<HTMLElement, null>
+                    // $ExpectType TriggeredEvent<HTMLElement, undefined, HTMLElement, HTMLElement>
                     event;
                 }
             });
-
-            // $ExpectType JQuery<HTMLElement>
-            $('p').bind('myEvent', null);
-
-            // $ExpectType JQuery<HTMLElement>
-            $('p').bind('myEvent', undefined);
-        }
+       }
 
         function delegate() {
             // $ExpectType JQuery<HTMLElement>
             $('table').delegate('td', 'myEvent', 'myData', function(event) {
-                // $ExpectType HTMLElement
+                // $ExpectType any
                 this;
-                // $ExpectType Event<HTMLElement, string>
+                // $ExpectType TriggeredEvent<HTMLElement, string, any, any>
                 event;
             });
 
             // $ExpectType JQuery<HTMLElement>
             $('table').delegate('td', 'myEvent', function(event) {
-                // $ExpectType HTMLElement
+                // $ExpectType any
                 this;
-                // $ExpectType Event<HTMLElement, null>
+                // $ExpectType TriggeredEvent<HTMLElement, undefined, any, any>
                 event;
             });
 
@@ -3942,20 +3942,20 @@ function JQuery() {
 
             // $ExpectType JQuery<HTMLElement>
             $('table').delegate('td', {
-                myEvent1(event) {
-                    // $ExpectType HTMLElement
+                myEvent1: false,
+                myEvent2(event) {
+                    // $ExpectType any
                     this;
-                    // $ExpectType Event<HTMLElement, null>
+                    // $ExpectType TriggeredEvent<HTMLElement, undefined, any, any>
                     event;
-                },
-                myEvent2: false
+                }
             });
         }
 
         function off() {
-            function defaultData(this: HTMLElement, event: JQuery.Event<HTMLElement>) { }
+            function defaultData(this: HTMLElement, event: JQuery.TriggeredEvent<HTMLElement>) { }
 
-            function customData(this: HTMLElement, event: JQuery.Event<HTMLElement, string>) { }
+            function customData(this: HTMLElement, event: JQuery.TriggeredEvent<HTMLElement, string>) { }
 
             // $ExpectType JQuery<HTMLElement>
             $('table').off('myEvent', 'td', defaultData);
@@ -3995,27 +3995,19 @@ function JQuery() {
                 customData
             });
 
+            const ev: JQuery.TriggeredEvent<HTMLElement> = undefined!;
             // $ExpectType JQuery<HTMLElement>
-            $('table').off($.Event('myEvent'));
+            $('table').off(ev);
 
             // $ExpectType JQuery<HTMLElement>
             $('table').off();
         }
 
         function on() {
-            // $ExpectType JQuery<HTMLElement>
             $('table').on('myEvent', 'td', 'myData', function(event) {
-                // $ExpectType HTMLElement
+                // $ExpectType any
                 this;
-                // $ExpectType Event<HTMLElement, string>
-                event;
-            });
-
-            // $ExpectType JQuery<HTMLElement>
-            $('table').on('myEvent', 'td', 'myData', function(event: JQueryEventObject) {
-                // $ExpectType HTMLElement
-                this;
-                // $ExpectType JQueryEventObject
+                // $ExpectType TriggeredEvent<HTMLElement, string, any, any>
                 event;
             });
 
@@ -4023,12 +4015,38 @@ function JQuery() {
             $('table').on('myEvent', null, 'myData', function(event) {
                 // $ExpectType HTMLElement
                 this;
-                // $ExpectType Event<HTMLElement, string>
+                // $ExpectType TriggeredEvent<HTMLElement, string, HTMLElement, HTMLElement>
+                event;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('table').on('myEvent', undefined, 'myData', function(event) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType TriggeredEvent<HTMLElement, string, HTMLElement, HTMLElement>
+                event;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('table').on('myEvent', 'td', 'myData', function(event: JQueryEventObject) {
+                // $ExpectType any
+                this;
+                // $ExpectType JQueryEventObject
                 event;
             });
 
             // $ExpectType JQuery<HTMLElement>
             $('table').on('myEvent', null, 'myData', function(event: JQueryEventObject) {
+                // TODO: Why is this HTMLElement? The callback signature doesn't even have `this` declared.
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType JQueryEventObject
+                event;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('table').on('myEvent', undefined, 'myData', function(event: JQueryEventObject) {
+                // TODO: Why is this HTMLElement? The callback signature doesn't even have `this` declared.
                 // $ExpectType HTMLElement
                 this;
                 // $ExpectType JQueryEventObject
@@ -4037,17 +4055,9 @@ function JQuery() {
 
             // $ExpectType JQuery<HTMLElement>
             $('table').on('myEvent', 'td', function(event) {
-                // $ExpectType HTMLElement
+                // $ExpectType any
                 this;
-                // $ExpectType Event<HTMLElement, null>
-                event;
-            });
-
-            // $ExpectType JQuery<HTMLElement>
-            $('table').on('myEvent', 'td', function(event: JQueryEventObject) {
-                // $ExpectType HTMLElement
-                this;
-                // $ExpectType JQueryEventObject
+                // $ExpectType TriggeredEvent<HTMLElement, undefined, any, any>
                 event;
             });
 
@@ -4058,7 +4068,15 @@ function JQuery() {
             $('table').on('myEvent', 3, function(event) {
                 // $ExpectType HTMLElement
                 this;
-                // $ExpectType Event<HTMLElement, number>
+                // $ExpectType TriggeredEvent<HTMLElement, number, HTMLElement, HTMLElement>
+                event;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('table').on('myEvent', 'td', function(event: JQueryEventObject) {
+                // $ExpectType any
+                this;
+                // $ExpectType JQueryEventObject
                 event;
             });
 
@@ -4074,10 +4092,13 @@ function JQuery() {
             $('table').on('myEvent', function(event) {
                 // $ExpectType HTMLElement
                 this;
-                // $ExpectType Event<HTMLElement, null>
+                // $ExpectType TriggeredEvent<HTMLElement, undefined, HTMLElement, HTMLElement>
                 event;
             });
 
+            // $ExpectType JQuery<HTMLElement>
+            $('table').on('myEvent', false);
+
             // $ExpectType JQuery<HTMLElement>
             $('table').on('myEvent', function(event: JQueryEventObject) {
                 // $ExpectType HTMLElement
@@ -4110,16 +4131,13 @@ function JQuery() {
                 event;
             });
 
-            // $ExpectType JQuery<HTMLElement>
-            $('table').on('myEvent', false);
-
             // $ExpectType JQuery<HTMLElement>
             $('table').on({
                 myEvent1: false,
                 myEvent2(event) {
-                    // $ExpectType HTMLElement
+                    // $ExpectType any
                     this;
-                    // $ExpectType Event<HTMLElement, string>
+                    // $ExpectType TriggeredEvent<HTMLElement, string, any, any>
                     event;
                 }
             }, 'td', 'myData');
@@ -4130,7 +4148,7 @@ function JQuery() {
                 myEvent2(event) {
                     // $ExpectType HTMLElement
                     this;
-                    // $ExpectType Event<HTMLElement, string>
+                    // $ExpectType TriggeredEvent<HTMLElement, string, HTMLElement, HTMLElement>
                     event;
                 }
             }, null, 'myData');
@@ -4141,7 +4159,18 @@ function JQuery() {
                 myEvent2(event) {
                     // $ExpectType HTMLElement
                     this;
-                    // $ExpectType Event<HTMLElement, null>
+                    // $ExpectType TriggeredEvent<HTMLElement, string, HTMLElement, HTMLElement>
+                    event;
+                }
+            }, undefined, 'myData');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('table').on({
+                myEvent1: false,
+                myEvent2(event) {
+                    // $ExpectType any
+                    this;
+                    // $ExpectType TriggeredEvent<HTMLElement, undefined, any, any>
                     event;
                 }
             }, 'td');
@@ -4152,7 +4181,7 @@ function JQuery() {
                 myEvent2(event) {
                     // $ExpectType HTMLElement
                     this;
-                    // $ExpectType Event<HTMLElement, number>
+                    // $ExpectType TriggeredEvent<HTMLElement, number, HTMLElement, HTMLElement>
                     event;
                 }
             }, 3);
@@ -4163,7 +4192,7 @@ function JQuery() {
                 myEvent2(event) {
                     // $ExpectType HTMLElement
                     this;
-                    // $ExpectType Event<HTMLElement, null>
+                    // $ExpectType TriggeredEvent<HTMLElement, undefined, HTMLElement, HTMLElement>
                     event;
                 }
             });
@@ -4172,9 +4201,9 @@ function JQuery() {
         function one() {
             // $ExpectType JQuery<HTMLElement>
             $('table').one('myEvent', 'td', 'myData', function(event) {
-                // $ExpectType HTMLElement
+                // $ExpectType any
                 this;
-                // $ExpectType Event<HTMLElement, string>
+                // $ExpectType TriggeredEvent<HTMLElement, string, any, any>
                 event;
             });
 
@@ -4182,15 +4211,23 @@ function JQuery() {
             $('table').one('myEvent', null, 'myData', function(event) {
                 // $ExpectType HTMLElement
                 this;
-                // $ExpectType Event<HTMLElement, string>
+                // $ExpectType TriggeredEvent<HTMLElement, string, HTMLElement, HTMLElement>
+                event;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('table').one('myEvent', undefined, 'myData', function(event) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType TriggeredEvent<HTMLElement, string, HTMLElement, HTMLElement>
                 event;
             });
 
             // $ExpectType JQuery<HTMLElement>
             $('table').one('myEvent', 'td', function(event) {
-                // $ExpectType HTMLElement
+                // $ExpectType any
                 this;
-                // $ExpectType Event<HTMLElement, null>
+                // $ExpectType TriggeredEvent<HTMLElement, undefined, any, any>
                 event;
             });
 
@@ -4201,7 +4238,7 @@ function JQuery() {
             $('table').one('myEvent', 3, function(event) {
                 // $ExpectType HTMLElement
                 this;
-                // $ExpectType Event<HTMLElement, number>
+                // $ExpectType TriggeredEvent<HTMLElement, number, HTMLElement, HTMLElement>
                 event;
             });
 
@@ -4209,7 +4246,7 @@ function JQuery() {
             $('table').one('myEvent', function(event) {
                 // $ExpectType HTMLElement
                 this;
-                // $ExpectType Event<HTMLElement, null>
+                // $ExpectType TriggeredEvent<HTMLElement, undefined, HTMLElement, HTMLElement>
                 event;
             });
 
@@ -4220,9 +4257,9 @@ function JQuery() {
             $('table').one({
                 myEvent1: false,
                 myEvent2(event) {
-                    // $ExpectType HTMLElement
+                    // $ExpectType any
                     this;
-                    // $ExpectType Event<HTMLElement, string>
+                    // $ExpectType TriggeredEvent<HTMLElement, string, any, any>
                     event;
                 }
             }, 'td', 'myData');
@@ -4233,7 +4270,7 @@ function JQuery() {
                 myEvent2(event) {
                     // $ExpectType HTMLElement
                     this;
-                    // $ExpectType Event<HTMLElement, string>
+                    // $ExpectType TriggeredEvent<HTMLElement, string, HTMLElement, HTMLElement>
                     event;
                 }
             }, null, 'myData');
@@ -4244,7 +4281,18 @@ function JQuery() {
                 myEvent2(event) {
                     // $ExpectType HTMLElement
                     this;
-                    // $ExpectType Event<HTMLElement, null>
+                    // $ExpectType TriggeredEvent<HTMLElement, string, HTMLElement, HTMLElement>
+                    event;
+                }
+            }, undefined, 'myData');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('table').one({
+                myEvent1: false,
+                myEvent2(event) {
+                    // $ExpectType any
+                    this;
+                    // $ExpectType TriggeredEvent<HTMLElement, undefined, any, any>
                     event;
                 }
             }, 'td');
@@ -4255,7 +4303,7 @@ function JQuery() {
                 myEvent2(event) {
                     // $ExpectType HTMLElement
                     this;
-                    // $ExpectType Event<HTMLElement, number>
+                    // $ExpectType TriggeredEvent<HTMLElement, number, HTMLElement, HTMLElement>
                     event;
                 }
             }, 3);
@@ -4266,7 +4314,7 @@ function JQuery() {
                 myEvent2(event) {
                     // $ExpectType HTMLElement
                     this;
-                    // $ExpectType Event<HTMLElement, null>
+                    // $ExpectType TriggeredEvent<HTMLElement, undefined, HTMLElement, HTMLElement>
                     event;
                 }
             });
@@ -4337,9 +4385,9 @@ function JQuery() {
         }
 
         function unbind() {
-            function defaultData(this: HTMLElement, event: JQuery.Event<HTMLElement>) { }
+            function defaultData(this: HTMLElement, event: JQuery.TriggeredEvent<HTMLElement>) { }
 
-            function customData(this: HTMLElement, event: JQuery.Event<HTMLElement, string>) { }
+            function customData(this: HTMLElement, event: JQuery.TriggeredEvent<HTMLElement, string>) { }
 
             // $ExpectType JQuery<HTMLElement>
             $('p').unbind('myEvent', defaultData);
@@ -4353,17 +4401,18 @@ function JQuery() {
             // $ExpectType JQuery<HTMLElement>
             $('p').unbind('myEvent');
 
+            const ev: JQuery.TriggeredEvent<HTMLElement> = undefined!;
             // $ExpectType JQuery<HTMLElement>
-            $('p').unbind($.Event('myEvent'));
+            $('p').unbind(ev);
 
             // $ExpectType JQuery<HTMLElement>
             $('p').unbind();
         }
 
         function undelegate() {
-            function defaultData(this: HTMLElement, event: JQuery.Event<HTMLElement>) { }
+            function defaultData(this: HTMLElement, event: JQuery.TriggeredEvent<HTMLElement>) { }
 
-            function customData(this: HTMLElement, event: JQuery.Event<HTMLElement, string>) { }
+            function customData(this: HTMLElement, event: JQuery.TriggeredEvent<HTMLElement, string>) { }
 
             // $ExpectType JQuery<HTMLElement>
             $('table').undelegate('td', 'click', defaultData);
@@ -7696,18 +7745,18 @@ function JQuery_Effects() {
 
 function JQuery_Event() {
     function call_signature() {
-        // $ExpectType Event<HTMLElement, null> & Coordinates
+        // $ExpectType Event & Coordinates
         $.Event('keydown', $('p').offset());
     }
 
     function constructor() {
-        // $ExpectType Event<HTMLElement, null> & Coordinates
+        // $ExpectType Event & Coordinates
         new $.Event('keydown', $('p').offset());
     }
 
     // https://stackoverflow.com/questions/49892574/trigger-a-jquery-3-event-with-ctrlkey-set
     function stackoverflow_49892574() {
-        const event = $.Event<object, Window>("keydown");
+        const event = $.Event("keydown");
         event.which = 77;
         event.ctrlKey = true;
         $(window).trigger(event);
@@ -7727,7 +7776,7 @@ function JQuery_EventExtensions() {
                 data;
                 // $ExpectType string
                 namespaces;
-                // $ExpectType EventHandler<EventTarget, any>
+                // $ExpectType EventHandlerBase<EventTarget, TriggeredEvent<EventTarget, any, any, any>>
                 eventHandle;
 
                 return false;
@@ -7753,7 +7802,7 @@ function JQuery_EventExtensions() {
             trigger(event, data) {
                 // $ExpectType EventTarget
                 this;
-                // $ExpectType Event<EventTarget, any>
+                // $ExpectType Event
                 event;
                 // $ExpectType any
                 data;
@@ -7761,7 +7810,7 @@ function JQuery_EventExtensions() {
                 return false;
             },
             _default(event, data) {
-                // $ExpectType Event<EventTarget, any>
+                // $ExpectType TriggeredEvent<EventTarget, any, any, any>
                 event;
                 // $ExpectType any
                 data;
@@ -7769,7 +7818,7 @@ function JQuery_EventExtensions() {
                 return false;
             },
             handle(event, data) {
-                // $ExpectType Event<EventTarget, any> & { handleObj: HandleObject<EventTarget, any>; }
+                // $ExpectType TriggeredEvent<EventTarget, any, any, any> & { handleObj: HandleObject<EventTarget, any>; }
                 event;
                 // $ExpectType any
                 data;
@@ -7777,7 +7826,7 @@ function JQuery_EventExtensions() {
             preDispatch(event) {
                 // $ExpectType EventTarget
                 this;
-                // $ExpectType Event<EventTarget, any>
+                // $ExpectType Event
                 event;
 
                 return false;
@@ -7785,7 +7834,7 @@ function JQuery_EventExtensions() {
             postDispatch(event) {
                 // $ExpectType EventTarget
                 this;
-                // $ExpectType Event<EventTarget, any>
+                // $ExpectType Event
                 event;
             }
         };
diff --git a/types/jquery/misc.d.ts b/types/jquery/misc.d.ts
index 94f7279e63..d966f1b787 100644
--- a/types/jquery/misc.d.ts
+++ b/types/jquery/misc.d.ts
@@ -3981,45 +3981,97 @@ $( "input" ).click(function() {
 
     // This should be a class but doesn't work correctly under the JQuery namespace. Event should be an inner class of jQuery.
 
-    // Static members
+    /**
+     * jQuery's event system normalizes the event object according to W3C standards. The event object is guaranteed to be passed to the event handler (no checks for window.event required). It normalizes the target, relatedTarget, which, metaKey and pageX/Y properties and provides both stopPropagation() and preventDefault() methods.
+     *
+     * Those properties are all documented, and accompanied by examples, on the \`{@link http://api.jquery.com/category/events/event-object/ Event object}\` page.
+     *
+     * The standard events in the Document Object Model are: `blur`, `focus`, `load`, `resize`, `scroll`, `unload`, `beforeunload`, `click`, `dblclick`, `mousedown`, `mouseup`, `mousemove`, `mouseover`, `mouseout`, `mouseenter`, `mouseleave`, `change`, `select`, `submit`, `keydown`, `keypress`, and `keyup`. Since the DOM event names have predefined meanings for some elements, using them for other purposes is not recommended. jQuery's event model can trigger an event by any name on an element, and it is propagated up the DOM tree to which that element belongs, if any.
+     * @see \`{@link https://api.jquery.com/category/events/event-object/ }\`
+     */
     interface EventStatic {
-        // tslint:disable-next-line:no-unnecessary-generics
-        <T extends object, TTarget extends EventTarget = HTMLElement>(event: string, properties?: T): Event<TTarget> & T;
-        // tslint:disable-next-line:no-unnecessary-generics
-        new <T extends object, TTarget extends EventTarget = HTMLElement>(event: string, properties?: T): Event<TTarget> & T;
+        /**
+         * The jQuery.Event constructor is exposed and can be used when calling trigger. The new operator is optional.
+         *
+         * Check \`{@link https://api.jquery.com/trigger/ trigger}\`'s documentation to see how to combine it with your own event object.
+         * @see \`{@link https://api.jquery.com/category/events/event-object/ }\`
+         * @since 1.6
+         * @example
+```javascript
+//Create a new jQuery.Event object without the "new" operator.
+var e = jQuery.Event( "click" );
+​
+// trigger an artificial click event
+jQuery( "body" ).trigger( e );
+```
+         * @example
+```javascript
+// Create a new jQuery.Event object with specified event properties.
+var e = jQuery.Event( "keydown", { keyCode: 64 } );
+​
+// trigger an artificial keydown event with keyCode 64
+jQuery( "body" ).trigger( e );
+```
+         */
+        <T extends object>(event: string, properties?: T): Event & T;
+        /**
+         * The jQuery.Event constructor is exposed and can be used when calling trigger. The new operator is optional.
+         *
+         * Check \`{@link https://api.jquery.com/trigger/ trigger}\`'s documentation to see how to combine it with your own event object.
+         * @see \`{@link https://api.jquery.com/category/events/event-object/ }\`
+         * @since 1.6
+         * @example
+```javascript
+//Create a new jQuery.Event object without the "new" operator.
+var e = jQuery.Event( "click" );
+​
+// trigger an artificial click event
+jQuery( "body" ).trigger( e );
+```
+         * @example
+```javascript
+// Create a new jQuery.Event object with specified event properties.
+var e = jQuery.Event( "keydown", { keyCode: 64 } );
+​
+// trigger an artificial keydown event with keyCode 64
+jQuery( "body" ).trigger( e );
+```
+         */
+        new <T extends object>(event: string, properties?: T): Event & T;
     }
 
-    // Instance members
+    /**
+     * jQuery's event system normalizes the event object according to W3C standards. The event object is guaranteed to be passed to the event handler (no checks for window.event required). It normalizes the target, relatedTarget, which, metaKey and pageX/Y properties and provides both stopPropagation() and preventDefault() methods.
+     *
+     * Those properties are all documented, and accompanied by examples, on the \`{@link http://api.jquery.com/category/events/event-object/ Event object}\` page.
+     *
+     * The standard events in the Document Object Model are: `blur`, `focus`, `load`, `resize`, `scroll`, `unload`, `beforeunload`, `click`, `dblclick`, `mousedown`, `mouseup`, `mousemove`, `mouseover`, `mouseout`, `mouseenter`, `mouseleave`, `change`, `select`, `submit`, `keydown`, `keypress`, and `keyup`. Since the DOM event names have predefined meanings for some elements, using them for other purposes is not recommended. jQuery's event model can trigger an event by any name on an element, and it is propagated up the DOM tree to which that element belongs, if any.
+     * @see \`{@link https://api.jquery.com/category/events/event-object/ }\`
+     * @see \`{@link TriggeredEvent }\`
+     */
     interface Event {
         // region Copied properties
         // #region Copied properties
 
-        // region Event
-        // #region Event
+        // Event
 
-        bubbles?: boolean;
-        cancelable?: boolean;
-        eventPhase?: number;
+        bubbles: boolean | undefined;
+        cancelable: boolean | undefined;
+        eventPhase: number | undefined;
 
-        // #endregion
+        // UIEvent
 
-        // region UIEvent
-        // #region UIEvent
+        detail: number | undefined;
+        view: Window | undefined;
 
-        detail?: number;
-        view?: Window;
+        // MouseEvent
 
-        // #endregion
-
-        // region MouseEvent
-        // #region MouseEvent
-
-        button?: number;
-        buttons?: number;
-        clientX?: number;
-        clientY?: number;
-        offsetX?: number;
-        offsetY?: number;
+        button: number | undefined;
+        buttons: number | undefined;
+        clientX: number | undefined;
+        clientY: number | undefined;
+        offsetX: number | undefined;
+        offsetY: number | undefined;
         /**
          * The mouse position relative to the left edge of the document.
          * @see \`{@link https://api.jquery.com/event.pageX/ }\`
@@ -4055,7 +4107,7 @@ $( document ).on( "mousemove", function( event ) {
 </html>
 ```
          */
-        pageX: number;
+        pageX: number | undefined;
         /**
          * The mouse position relative to the top edge of the document.
          * @see \`{@link https://api.jquery.com/event.pageY/ }\`
@@ -4091,49 +4143,93 @@ $( document ).on( "mousemove", function( event ) {
 </html>
 ```
          */
-        pageY: number;
-        screenX?: number;
-        screenY?: number;
+        pageY: number | undefined;
+        screenX: number | undefined;
+        screenY: number | undefined;
         /** @deprecated */
-        toElement?: Element;
+        toElement: Element | undefined;
 
-        // #endregion
+        // PointerEvent
 
-        // region PointerEvent
-        // #region PointerEvent
+        pointerId: number | undefined;
+        pointerType: string | undefined;
 
-        pointerId?: number;
-        pointerType?: string;
-
-        // #endregion
-
-        // region KeyboardEvent
-        // #region KeyboardEvent
+        // KeyboardEvent
 
         /** @deprecated */
-        char?: string;
+        char: string | undefined;
         /** @deprecated */
-        charCode?: number;
-        key?: string;
+        charCode: number | undefined;
+        key: string | undefined;
         /** @deprecated */
-        keyCode?: number;
+        keyCode: number | undefined;
 
-        // #endregion
+        // TouchEvent
 
-        // region TouchEvent
-        // #region TouchEvent
+        changedTouches: TouchList | undefined;
+        targetTouches: TouchList | undefined;
+        touches: TouchList | undefined;
 
-        changedTouches?: TouchList;
-        targetTouches?: TouchList;
-        touches?: TouchList;
+        // MouseEvent, KeyboardEvent
 
-        // #endregion
+        /**
+         * For key or mouse events, this property indicates the specific key or button that was pressed.
+         * @see \`{@link https://api.jquery.com/event.which/ }\`
+         * @since 1.1.3
+         * @deprecated ​ Deprecated since 3.3. See \`{@link https://github.com/jquery/api.jquery.com/issues/821 }\`.
+         * @example ​ ````Log which key was depressed.
+```html
+<!doctype html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <title>event.which demo</title>
+  <script src="https://code.jquery.com/jquery-3.3.1.js"></script>
+</head>
+<body>
+​
+<input id="whichkey" value="type something">
+<div id="log"></div>
+​
+<script>
+$( "#whichkey" ).on( "keydown", function( event ) {
+  $( "#log" ).html( event.type + ": " +  event.which );
+});
+</script>
+​
+</body>
+</html>
+```
+         * @example ​ ````Log which mouse button was depressed.
+```html
+<!doctype html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <title>event.which demo</title>
+  <script src="https://code.jquery.com/jquery-3.3.1.js"></script>
+</head>
+<body>
+​
+<input id="whichkey" value="click here">
+<div id="log"></div>
+​
+<script>
+$( "#whichkey" ).on( "mousedown", function( event ) {
+  $( "#log" ).html( event.type + ": " +  event.which );
+});
+</script>
+​
+</body>
+</html>
+```
+         */
+        which: number | undefined;
 
-        // region MouseEvent, KeyboardEvent, TouchEvent
-        // #region MouseEvent, KeyboardEvent, TouchEvent
+        // MouseEvent, KeyboardEvent, TouchEvent
 
-        altKey?: boolean;
-        ctrlKey?: boolean;
+        altKey: boolean | undefined;
+        ctrlKey: boolean | undefined;
         /**
          * Indicates whether the META key was pressed when the event fired.
          * @see \`{@link https://api.jquery.com/event.metaKey/ }\`
@@ -4170,77 +4266,11 @@ $( "#checkMetaKey" ).click(function( event ) {
 </html>
 ```
          */
-        metaKey: boolean;
-        shiftKey?: boolean;
+        metaKey: boolean | undefined;
+        shiftKey: boolean | undefined;
 
         // #endregion
 
-        // #endregion
-
-        /**
-         * The namespace specified when the event was triggered.
-         * @see \`{@link https://api.jquery.com/event.namespace/ }\`
-         * @since 1.4.3
-         * @example ​ ````Determine the event namespace used.
-```html
-<!doctype html>
-<html lang="en">
-<head>
-  <meta charset="utf-8">
-  <title>event.namespace demo</title>
-  <script src="https://code.jquery.com/jquery-3.3.1.js"></script>
-</head>
-<body>
-​
-<button>display event.namespace</button>
-<p></p>
-​
-<script>
-$( "p" ).on( "test.something", function( event ) {
-  alert( event.namespace );
-});
-$( "button" ).click(function( event ) {
-  $( "p" ).trigger( "test.something" );
-});
-</script>
-​
-</body>
-</html>
-```
-         */
-        namespace: string;
-        /**
-         * The last value returned by an event handler that was triggered by this event, unless the value was undefined.
-         * @see \`{@link https://api.jquery.com/event.result/ }\`
-         * @since 1.3
-         * @example ​ ````Display previous handler&#39;s return value
-```html
-<!doctype html>
-<html lang="en">
-<head>
-  <meta charset="utf-8">
-  <title>event.result demo</title>
-  <script src="https://code.jquery.com/jquery-3.3.1.js"></script>
-</head>
-<body>
-​
-<button>display event.result</button>
-<p></p>
-​
-<script>
-$( "button" ).click(function( event ) {
-  return "hey";
-});
-$( "button" ).click(function( event ) {
-  $( "p" ).html( event.result );
-});
-</script>
-​
-</body>
-</html>
-```
-         */
-        result: any;
         /**
          * The difference in milliseconds between the time the browser created the event and January 1, 1970.
          * @see \`{@link https://api.jquery.com/event.timeStamp/ }\`
@@ -4297,59 +4327,6 @@ $( "a" ).click(function( event ) {
 ```
          */
         type: string;
-        /**
-         * For key or mouse events, this property indicates the specific key or button that was pressed.
-         * @see \`{@link https://api.jquery.com/event.which/ }\`
-         * @since 1.1.3
-         * @deprecated ​ Deprecated since 3.3. See \`{@link https://github.com/jquery/api.jquery.com/issues/821 }\`.
-         * @example ​ ````Log which key was depressed.
-```html
-<!doctype html>
-<html lang="en">
-<head>
-  <meta charset="utf-8">
-  <title>event.which demo</title>
-  <script src="https://code.jquery.com/jquery-3.3.1.js"></script>
-</head>
-<body>
-​
-<input id="whichkey" value="type something">
-<div id="log"></div>
-​
-<script>
-$( "#whichkey" ).on( "keydown", function( event ) {
-  $( "#log" ).html( event.type + ": " +  event.which );
-});
-</script>
-​
-</body>
-</html>
-```
-         * @example ​ ````Log which mouse button was depressed.
-```html
-<!doctype html>
-<html lang="en">
-<head>
-  <meta charset="utf-8">
-  <title>event.which demo</title>
-  <script src="https://code.jquery.com/jquery-3.3.1.js"></script>
-</head>
-<body>
-​
-<input id="whichkey" value="click here">
-<div id="log"></div>
-​
-<script>
-$( "#whichkey" ).on( "mousedown", function( event ) {
-  $( "#log" ).html( event.type + ": " +  event.which );
-});
-</script>
-​
-</body>
-</html>
-```
-         */
-        which: number;
         /**
          * Returns whether event.preventDefault() was ever called on this event object.
          * @see \`{@link https://api.jquery.com/event.isDefaultPrevented/ }\`
@@ -4542,11 +4519,17 @@ $( "p" ).click(function( event ) {
         stopPropagation(): void;
     }
 
-    // Generic members
-    interface Event<
-        TTarget = EventTarget,
-        TData = null
-    > {
+    // #endregion
+
+    /**
+     * Base type for jQuery events that have been triggered (including events triggered on plain objects).
+     */
+    interface TriggeredEvent<
+        TDelegateTarget = any,
+        TData = any,
+        TCurrentTarget = any,
+        TTarget = any
+    > extends Event {
         /**
          * The current DOM element within the event bubbling phase.
          * @see \`{@link https://api.jquery.com/event.currentTarget/ }\`
@@ -4557,51 +4540,8 @@ $( "p" ).click(function( event ) {
   alert( event.currentTarget === this ); // true
 });
 ```
-         */
-        currentTarget: TTarget;
-        /**
-         * An optional object of data passed to an event method when the current executing handler is bound.
-         * @see \`{@link https://api.jquery.com/event.data/ }\`
-         * @since 1.1
-         * @example ​ ````Within a for loop, pass the value of i to the .on() method so that the current iteration&#39;s value is preserved.
-```html
-<!doctype html>
-<html lang="en">
-<head>
-  <meta charset="utf-8">
-  <title>event.data demo</title>
-  <script src="https://code.jquery.com/jquery-3.3.1.js"></script>
-</head>
-<body>
-​
-<button> 0 </button>
-<button> 1 </button>
-<button> 2 </button>
-<button> 3 </button>
-<button> 4 </button>
-​
-<div id="log"></div>
-​
-<script>
-var logDiv = $( "#log" );
-​
-for ( var i = 0; i < 5; i++ ) {
-  $( "button" ).eq( i ).on( "click", { value: i }, function( event ) {
-    var msgs = [
-      "button = " + $( this ).index(),
-      "event.data.value = " + event.data.value,
-      "i = " + i
-    ];
-    logDiv.append( msgs.join( ", " ) + "<br>" );
-  });
-}
-</script>
-​
-</body>
-</html>
-```
-         */
-        data: TData;
+        */
+        currentTarget: TCurrentTarget;
         /**
          * The element where the currently-called jQuery event handler was attached.
          * @see \`{@link https://api.jquery.com/event.delegateTarget/ }\`
@@ -4612,21 +4552,8 @@ $( ".box" ).on( "click", "button", function( event ) {
   $( event.delegateTarget ).css( "background-color", "red" );
 });
 ```
-         */
-        delegateTarget: TTarget;
-        originalEvent: _Event;
-        /**
-         * The other DOM element involved in the event, if any.
-         * @see \`{@link https://api.jquery.com/event.relatedTarget/ }\`
-         * @since 1.1.4
-         * @example ​ ````On mouseout of anchors, alert the element type being entered.
-```javascript
-$( "a" ).mouseout(function( event ) {
-  alert( event.relatedTarget.nodeName ); // "DIV"
-});
-```
-         */
-        relatedTarget: TTarget | null;
+        */
+        delegateTarget: TDelegateTarget;
         /**
          * The DOM element that initiated the event.
          * @see \`{@link https://api.jquery.com/event.target/ }\`
@@ -4704,17 +4631,173 @@ $( "ul" ).click( handler ).find( "ul" ).hide();
 </body>
 </html>
 ```
-         */
+        */
         target: TTarget;
+
+        /**
+         * An optional object of data passed to an event method when the current executing handler is bound.
+         * @see \`{@link https://api.jquery.com/event.data/ }\`
+         * @since 1.1
+         * @example ​ ````Within a for loop, pass the value of i to the .on() method so that the current iteration&#39;s value is preserved.
+```html
+<!doctype html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <title>event.data demo</title>
+  <script src="https://code.jquery.com/jquery-3.3.1.js"></script>
+</head>
+<body>
+​
+<button> 0 </button>
+<button> 1 </button>
+<button> 2 </button>
+<button> 3 </button>
+<button> 4 </button>
+​
+<div id="log"></div>
+​
+<script>
+var logDiv = $( "#log" );
+​
+for ( var i = 0; i < 5; i++ ) {
+  $( "button" ).eq( i ).on( "click", { value: i }, function( event ) {
+    var msgs = [
+      "button = " + $( this ).index(),
+      "event.data.value = " + event.data.value,
+      "i = " + i
+    ];
+    logDiv.append( msgs.join( ", " ) + "<br>" );
+  });
+}
+</script>
+​
+</body>
+</html>
+```
+        */
+        data: TData;
+
+        /**
+         * The namespace specified when the event was triggered.
+         * @see \`{@link https://api.jquery.com/event.namespace/ }\`
+         * @since 1.4.3
+         * @example ​ ````Determine the event namespace used.
+```html
+<!doctype html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <title>event.namespace demo</title>
+  <script src="https://code.jquery.com/jquery-3.3.1.js"></script>
+</head>
+<body>
+​
+<button>display event.namespace</button>
+<p></p>
+​
+<script>
+$( "p" ).on( "test.something", function( event ) {
+  alert( event.namespace );
+});
+$( "button" ).click(function( event ) {
+  $( "p" ).trigger( "test.something" );
+});
+</script>
+​
+</body>
+</html>
+```
+         */
+        namespace?: string;
+        /**
+         * The last value returned by an event handler that was triggered by this event, unless the value was undefined.
+         * @see \`{@link https://api.jquery.com/event.result/ }\`
+         * @since 1.3
+         * @example ​ ````Display previous handler&#39;s return value
+```html
+<!doctype html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <title>event.result demo</title>
+  <script src="https://code.jquery.com/jquery-3.3.1.js"></script>
+</head>
+<body>
+​
+<button>display event.result</button>
+<p></p>
+​
+<script>
+$( "button" ).click(function( event ) {
+  return "hey";
+});
+$( "button" ).click(function( event ) {
+  $( "p" ).html( event.result );
+});
+</script>
+​
+</body>
+</html>
+```
+         */
+        result?: any;
     }
 
-    // #endregion
-
-    interface EventHandler<TCurrentTarget, TData = null> extends EventHandlerBase<TCurrentTarget, Event<TCurrentTarget, TData>> { }
+    interface TypeToTriggeredEventMap<
+        TDelegateTarget,
+        TData,
+        TCurrentTarget,
+        TTarget
+    > {
+        [type: string]: TriggeredEvent<TDelegateTarget, TData, TCurrentTarget, TTarget>;
+    }
 
     // Extra parameters can be passed from trigger()
     type EventHandlerBase<TContext, T> = (this: TContext, t: T, ...args: any[]) => any;
 
+    type EventHandler<
+        TCurrentTarget,
+        TData = undefined
+    > = EventHandlerBase<TCurrentTarget, TriggeredEvent<TCurrentTarget, TData>>;
+
+    type TypeEventHandler<
+        TDelegateTarget,
+        TData,
+        TCurrentTarget,
+        TTarget,
+        TContext,
+        TType extends keyof TypeToTriggeredEventMap<TDelegateTarget, TData, TCurrentTarget, TTarget>
+    > = EventHandlerBase<TContext, TypeToTriggeredEventMap<TDelegateTarget, TData, TCurrentTarget, TTarget>[TType]>;
+
+    interface TypeEventHandlers<
+        TDelegateTarget,
+        TData,
+        TCurrentTarget,
+        TTarget,
+        TContext
+    > extends _TypeEventHandlers<TDelegateTarget, TData, TCurrentTarget, TTarget, TContext> {
+        // No idea why it's necessary to include `object` in the union but otherwise TypeScript complains that
+        // derived types of Event are not assignable to Event.
+        [type: string]: TypeEventHandler<TDelegateTarget, TData, TCurrentTarget, TTarget, TContext, string> |
+                        false |
+                        undefined |
+                        object;
+    }
+
+    type _TypeEventHandlers<
+        TDelegateTarget,
+        TData,
+        TCurrentTarget,
+        TTarget,
+        TContext
+    > = {
+        [TType in keyof TypeToTriggeredEventMap<TDelegateTarget, TData, TCurrentTarget, TTarget>]?:
+            TypeEventHandler<TDelegateTarget, TData, TCurrentTarget, TTarget, TContext, TType> |
+            false |
+            object;
+    };
+
     // region Event extensions
     // #region Event extensions
 
@@ -4791,13 +4874,13 @@ $( "ul" ).click( handler ).find( "ul" ).hide();
          * The trigger hook is called early in the process of triggering an event, just after the `jQuery.Event` object is constructed and before any handlers have been called. It can process the triggered event in any way, for example by calling `event.stopPropagation()` or `event.preventDefault()` before returning. If the hook returns `false`, jQuery does not perform any further event triggering actions and returns immediately. Otherwise, it performs the normal trigger processing, calling any event handlers for the element and bubbling the event (unless propagation is stopped in advance or `noBubble` was specified for the special event) to call event handlers attached to parent elements.
          * @see \`{@link https://learn.jquery.com/events/event-extensions/#trigger-function-event-jquery-event-data-object }\`
          */
-        trigger(this: TTarget, event: Event<TTarget, TData>, data: TData): void | false;
+        trigger(this: TTarget, event: Event, data: TData): void | false;
     } | {
         /**
          * When the `.trigger()` method finishes running all the event handlers for an event, it also looks for and runs any method on the target object by the same name unless of the handlers called `event.preventDefault()`. So, `.trigger( "submit" )` will execute the `submit()` method on the element if one exists. When a `_default` hook is specified, the hook is called just prior to checking for and executing the element's default method. If this hook returns the value `false` the element's default method will be called; otherwise it is not.
          * @see \`{@link https://learn.jquery.com/events/event-extensions/#_default-function-event-jquery-event-data-object }\`
          */
-        _default(event: Event<TTarget, TData>, data: TData): void | false;
+        _default(event: TriggeredEvent<TTarget, TData>, data: TData): void | false;
     } | {
         /**
          * jQuery calls a handle hook when the event has occurred and jQuery would normally call the user's event handler specified by `.on()` or another event binding method. If the hook exists, jQuery calls it _instead_ of that event handler, passing it the event and any data passed from `.trigger()` if it was not a native event. The `this` keyword is the DOM element being handled, and `event.handleObj` property has the detailed event information.
@@ -4805,11 +4888,11 @@ $( "ul" ).click( handler ).find( "ul" ).hide();
          * Based in the information it has, the handle hook should decide whether to call the original handler function which is in `event.handleObj.handler`. It can modify information in the event object before calling the original handler, but _must restore_ that data before returning or subsequent unrelated event handlers may act unpredictably. In most cases, the handle hook should return the result of the original handler, but that is at the discretion of the hook. The handle hook is unique in that it is the only special event function hook that is called under its original special event name when the type is mapped using `bindType` and `delegateType`. For that reason, it is almost always an error to have anything other than a handle hook present if the special event defines a `bindType` and `delegateType`, since those other hooks will never be called.
          * @see \`{@link https://learn.jquery.com/events/event-extensions/#handle-function-event-jquery-event-data-object }\`
          */
-        handle(this: TTarget, event: Event<TTarget, TData> & { handleObj: HandleObject<TTarget, TData>; }, ...data: TData[]): void;
+        handle(this: TTarget, event: TriggeredEvent<TTarget, TData> & { handleObj: HandleObject<TTarget, TData>; }, ...data: TData[]): void;
     } | {
-        preDispatch(this: TTarget, event: Event<TTarget, TData>): false | void;
+        preDispatch(this: TTarget, event: Event): false | void;
     } | {
-        postDispatch(this: TTarget, event: Event<TTarget, TData>): void;
+        postDispatch(this: TTarget, event: Event): void;
     } | {
         [key: string]: never;
     };
@@ -4901,7 +4984,6 @@ $( "ul" ).click( handler ).find( "ul" ).hide();
 declare const jQuery: JQueryStatic;
 declare const $: JQueryStatic;
 
-// Used by JQuery.Event
 type _Event = Event;
 
 // region ES5 compatibility
diff --git a/types/jquery/test/example-tests.ts b/types/jquery/test/example-tests.ts
index 7ecb1733a7..673e549c31 100644
--- a/types/jquery/test/example-tests.ts
+++ b/types/jquery/test/example-tests.ts
@@ -384,7 +384,7 @@ function examples() {
     }
 
     function bind_2() {
-        function handler(event: JQuery.Event<HTMLElement, any>) {
+        function handler(event: JQuery.TriggeredEvent<HTMLElement>) {
             alert(event.data.foo);
         }
 
@@ -830,7 +830,7 @@ function examples() {
             var len = kids.addClass('hilite').length;
 
             $('#results span:first').text(len);
-            $('#results span:last').text(event.target.tagName);
+            $('#results span:last').text((event.target as Element).tagName);
 
             event.preventDefault();
         });
@@ -1614,12 +1614,12 @@ function examples() {
 
     function event_target_0() {
         $('body').click(function(event) {
-            $('#log').html('clicked: ' + event.target.nodeName);
+            $('#log').html('clicked: ' + (event.target as Node).nodeName);
         });
     }
 
     function event_target_1() {
-        function handler(event: JQuery.Event) {
+        function handler(event: JQuery.TriggeredEvent) {
             var target = $(event.target);
             if (target.is('li')) {
                 target.children().toggle();
@@ -3018,10 +3018,10 @@ function examples() {
     function jQuery_proxy_0() {
         var me = {
             type: 'zombie',
-            test: function(event: JQuery.Event) {
+            test: function(event: JQuery.TriggeredEvent) {
                 // Without proxy, `this` would refer to the event target
                 // use event.target to reference that element.
-                var element = event.target;
+                var element = event.target as Element;
                 $(element).css('background-color', 'red');
 
                 // With proxy, `this` refers to the me object encapsulating
@@ -3033,7 +3033,7 @@ function examples() {
 
         var you = {
             type: 'person',
-            test: function(event: JQuery.Event) {
+            test: function(event: JQuery.TriggeredEvent) {
                 $('#log').append(this.type + ' ');
             },
         };
@@ -3075,7 +3075,7 @@ function examples() {
             type: 'dog',
 
             // Note that event comes *after* one and two
-            test: function(one: typeof you, two: typeof they, event: JQuery.Event<HTMLElement>) {
+            test: function(one: typeof you, two: typeof they, event: JQuery.TriggeredEvent<HTMLElement>) {
                 $('#log')
 
                 // `one` maps to `you`, the 1st additional
@@ -3796,7 +3796,7 @@ function examples() {
     }
 
     function on_1() {
-        function myHandler(event: JQuery.Event<HTMLElement, { foo: string; }>) {
+        function myHandler(event: JQuery.TriggeredEvent<HTMLElement, { foo: string; }>) {
             alert(event.data.foo);
         }
 
diff --git a/types/jquery/test/learn-tests.ts b/types/jquery/test/learn-tests.ts
index 523385b644..b1a0353b4e 100644
--- a/types/jquery/test/learn-tests.ts
+++ b/types/jquery/test/learn-tests.ts
@@ -35,7 +35,7 @@ function special() {
             bindType: "click",
             handle(event) {
                 const handleObj = event.handleObj;
-                const targetData = jQuery.data(event.target);
+                const targetData = jQuery.data(event.target as Element);
                 let ret = null;
 
                 // If a multiple of the click count, run the handler
diff --git a/types/jquery/test/longdesc-tests.ts b/types/jquery/test/longdesc-tests.ts
index bb3bb4c83c..f3cf559638 100644
--- a/types/jquery/test/longdesc-tests.ts
+++ b/types/jquery/test/longdesc-tests.ts
@@ -538,7 +538,7 @@ function longdesc() {
         $('#foo').slideUp(300).delay(800).fadeIn(400);
     }
 
-    function delegate_0(elements: HTMLElement[], selector: string, events: any, data: any, handler: JQuery.EventHandler<HTMLElement>) {
+    function delegate_0(elements: HTMLElement[], selector: string, events: string, data: any, handler: JQuery.TypeEventHandler<HTMLElement, any, any, any, any, string>) {
         // jQuery 1.4.3+
         $(elements).delegate(selector, events, data, handler);
         // jQuery 1.7+
@@ -2016,7 +2016,7 @@ function longdesc() {
     }
 
     function on_3() {
-        function greet(event: JQuery.Event<HTMLElement, { name: string; }>) {
+        function greet(event: JQuery.TriggeredEvent<HTMLElement, { name: string; }>) {
             alert('Hello ' + event.data.name);
         }
 

From 00c546398c4d3d98655a4bce525a077dd52c83c1 Mon Sep 17 00:00:00 2001
From: Leonard Thieu <leonard.thieu@gmail.com>
Date: Wed, 24 Oct 2018 10:26:51 -0400
Subject: [PATCH 245/836] [jquery] Add support for event types that have
 shorthand methods.

---
 types/jquery/JQuery.d.ts     |  136 ++--
 types/jquery/jquery-tests.ts |  197 ++++--
 types/jquery/misc.d.ts       | 1282 ++++++++++++++++++++++++++++++++++
 3 files changed, 1515 insertions(+), 100 deletions(-)

diff --git a/types/jquery/JQuery.d.ts b/types/jquery/JQuery.d.ts
index f9a06328e7..83e27c6754 100644
--- a/types/jquery/JQuery.d.ts
+++ b/types/jquery/JQuery.d.ts
@@ -1521,7 +1521,7 @@ $( "div.test" ).bind({
      * **Solution**: Instead of `.click(fn)` use `.on("click", fn)`. Instead of `.click()` use `.trigger("click")`.
      */
     blur<TData>(eventData: TData,
-                handler: JQuery.EventHandler<TElement, TData>): this;
+                handler: JQuery.TypeEventHandler<TElement, TData, TElement, TElement, TElement, 'blur'>): this;
     /**
      * Bind an event handler to the "blur" JavaScript event, or trigger that event on an element.
      * @param handler A function to execute each time the event is triggered.
@@ -1537,7 +1537,8 @@ $( "div.test" ).bind({
 $( "p" ).blur();
 ```
      */
-    blur(handler?: JQuery.EventHandler<TElement> | false): this;
+    blur(handler?: JQuery.TypeEventHandler<TElement, null, TElement, TElement, TElement, 'blur'> |
+                   false): this;
     /**
      * Bind an event handler to the "change" JavaScript event, or trigger that event on an element.
      * @param eventData An object containing data that will be passed to the event handler.
@@ -1551,7 +1552,7 @@ $( "p" ).blur();
      * **Solution**: Instead of `.click(fn)` use `.on("click", fn)`. Instead of `.click()` use `.trigger("click")`.
      */
     change<TData>(eventData: TData,
-                  handler: JQuery.EventHandler<TElement, TData>): this;
+                  handler: JQuery.TypeEventHandler<TElement, TData, TElement, TElement, TElement, 'change'>): this;
     /**
      * Bind an event handler to the "change" JavaScript event, or trigger that event on an element.
      * @param handler A function to execute each time the event is triggered.
@@ -1610,7 +1611,8 @@ $( "input[type='text']" ).change(function() {
 });
 ```
      */
-    change(handler?: JQuery.EventHandler<TElement> | false): this;
+    change(handler?: JQuery.TypeEventHandler<TElement, null, TElement, TElement, TElement, 'change'> |
+                     false): this;
     /**
      * Get the children of each element in the set of matched elements, optionally filtered by a selector.
      * @param selector A string containing a selector expression to match elements against.
@@ -1863,7 +1865,7 @@ $( "#stop" ).click(function() {
      * **Solution**: Instead of `.click(fn)` use `.on("click", fn)`. Instead of `.click()` use `.trigger("click")`.
      */
     click<TData>(eventData: TData,
-                 handler: JQuery.EventHandler<TElement, TData>): this;
+                 handler: JQuery.TypeEventHandler<TElement, TData, TElement, TElement, TElement, 'click'>): this;
     /**
      * Bind an event handler to the "click" JavaScript event, or trigger that event on an element.
      * @param handler A function to execute each time the event is triggered.
@@ -1913,7 +1915,8 @@ $( "p" ).click(function() {
 $( "p" ).click();
 ```
      */
-    click(handler?: JQuery.EventHandler<TElement> | false): this;
+    click(handler?: JQuery.TypeEventHandler<TElement, null, TElement, TElement, TElement, 'click'> |
+                    false): this;
     /**
      * Create a deep copy of the set of matched elements.
      * @param withDataAndEvents A Boolean indicating whether event handlers and data should be copied along with the elements. The
@@ -2101,7 +2104,7 @@ $( "#frameDemo" ).contents().find( "a" ).css( "background-color", "#BADA55" );
      * **Solution**: Instead of `.click(fn)` use `.on("click", fn)`. Instead of `.click()` use `.trigger("click")`.
      */
     contextmenu<TData>(eventData: TData,
-                       handler: JQuery.EventHandler<TElement, TData>): this;
+                       handler: JQuery.TypeEventHandler<TElement, TData, TElement, TElement, TElement, 'contextmenu'>): this;
     /**
      * Bind an event handler to the "contextmenu" JavaScript event, or trigger that event on an element.
      * @param handler A function to execute each time the event is triggered.
@@ -2155,7 +2158,8 @@ div.contextmenu(function() {
 </html>
 ```
      */
-    contextmenu(handler?: JQuery.EventHandler<TElement> | false): this;
+    contextmenu(handler?: JQuery.TypeEventHandler<TElement, null, TElement, TElement, TElement, 'contextmenu'> |
+                          false): this;
     /**
      * Set one or more CSS properties for the set of matched elements.
      * @param propertyName A CSS property name.
@@ -2616,7 +2620,7 @@ $( "button" ).click(function() {
      * **Solution**: Instead of `.click(fn)` use `.on("click", fn)`. Instead of `.click()` use `.trigger("click")`.
      */
     dblclick<TData>(eventData: TData,
-                    handler: JQuery.EventHandler<TElement, TData>): this;
+                    handler: JQuery.TypeEventHandler<TElement, TData, TElement, TElement, TElement, 'dblclick'>): this;
     /**
      * Bind an event handler to the "dblclick" JavaScript event, or trigger that event on an element.
      * @param handler A function to execute each time the event is triggered.
@@ -2670,7 +2674,8 @@ divdbl.dblclick(function() {
 </html>
 ```
      */
-    dblclick(handler?: JQuery.EventHandler<TElement> | false): this;
+    dblclick(handler?: JQuery.TypeEventHandler<TElement, null, TElement, TElement, TElement, 'dblclick'> |
+                       false): this;
     /**
      * Set a timer to delay execution of subsequent items in the queue.
      * @param duration An integer indicating the number of milliseconds to delay execution of the next item in the queue.
@@ -4293,7 +4298,7 @@ $( "p span" ).first().addClass( "highlight" );
      * **Solution**: Instead of `.click(fn)` use `.on("click", fn)`. Instead of `.click()` use `.trigger("click")`.
      */
     focus<TData>(eventData: TData,
-                 handler: JQuery.EventHandler<TElement, TData>): this;
+                 handler: JQuery.TypeEventHandler<TElement, TData, TElement, TElement, TElement, 'focus'>): this;
     /**
      * Bind an event handler to the "focus" JavaScript event, or trigger that event on an element.
      * @param handler A function to execute each time the event is triggered.
@@ -4345,7 +4350,8 @@ $( document ).ready(function() {
 });
 ```
      */
-    focus(handler?: JQuery.EventHandler<TElement> | false): this;
+    focus(handler?: JQuery.TypeEventHandler<TElement, null, TElement, TElement, TElement, 'focus'> |
+                    false): this;
     /**
      * Bind an event handler to the "focusin" event.
      * @param eventData An object containing data that will be passed to the event handler.
@@ -4359,7 +4365,7 @@ $( document ).ready(function() {
      * **Solution**: Instead of `.click(fn)` use `.on("click", fn)`. Instead of `.click()` use `.trigger("click")`.
      */
     focusin<TData>(eventData: TData,
-                   handler: JQuery.EventHandler<TElement, TData>): this;
+                   handler: JQuery.TypeEventHandler<TElement, TData, TElement, TElement, TElement, 'focusin'>): this;
     /**
      * Bind an event handler to the "focusin" event.
      * @param handler A function to execute each time the event is triggered.
@@ -4399,7 +4405,8 @@ $( "p" ).focusin(function() {
 </html>
 ```
      */
-    focusin(handler?: JQuery.EventHandler<TElement> | false): this;
+    focusin(handler?: JQuery.TypeEventHandler<TElement, null, TElement, TElement, TElement, 'focusin'> |
+                      false): this;
     /**
      * Bind an event handler to the "focusout" JavaScript event.
      * @param eventData An object containing data that will be passed to the event handler.
@@ -4413,7 +4420,7 @@ $( "p" ).focusin(function() {
      * **Solution**: Instead of `.click(fn)` use `.on("click", fn)`. Instead of `.click()` use `.trigger("click")`.
      */
     focusout<TData>(eventData: TData,
-                    handler: JQuery.EventHandler<TElement, TData>): this;
+                    handler: JQuery.TypeEventHandler<TElement, TData, TElement, TElement, TElement, 'focusout'>): this;
     /**
      * Bind an event handler to the "focusout" JavaScript event.
      * @param handler A function to execute each time the event is triggered.
@@ -4474,7 +4481,8 @@ $( "p" )
 </html>
 ```
      */
-    focusout(handler?: JQuery.EventHandler<TElement> | false): this;
+    focusout(handler?: JQuery.TypeEventHandler<TElement, null, TElement, TElement, TElement, 'focusout'> |
+                       false): this;
     /**
      * Retrieve one of the elements matched by the jQuery object.
      * @param index A zero-based integer indicating which element to retrieve.
@@ -4917,12 +4925,11 @@ $( "button" ).click(function() {
      */
     hide(duration_complete_options?: JQuery.Duration | ((this: TElement) => void) | JQuery.EffectsOptions<TElement>): this;
     /**
-     * Bind one or two handlers to the matched elements, to be executed when the mouse pointer enters and leaves the elements.
-     * @param handlerInOut A function to execute when the mouse pointer enters or leaves the element.
+     * Bind two handlers to the matched elements, to be executed when the mouse pointer enters and leaves the elements.
+     * @param handlerIn A function to execute when the mouse pointer enters the element.
      * @param handlerOut A function to execute when the mouse pointer leaves the element.
      * @see \`{@link https://api.jquery.com/hover/ }\`
      * @since 1.0
-     * @since 1.4
      * @deprecated ​ Deprecated.
      *
      * **Cause**: The `.hover()` method is a shorthand for the use of the `mouseover`/`mouseout` events. It is often a poor user interface choice because it does not allow for any small amounts of delay between when the mouse enters or exits an area and when the event fires. This can make it quite difficult to use with UI widgets such as drop-down menus. For more information on the problems of hovering, see the \`{@link http://cherne.net/brian/resources/jquery.hoverIntent.html hoverIntent plugin}\`.
@@ -4990,6 +4997,21 @@ $( "td" ).hover(
 ```javascript
 $( "td" ).off( "mouseenter mouseleave" );
 ```
+     */
+    hover(handlerIn: JQuery.TypeEventHandler<TElement, null, TElement, TElement, TElement, 'mouseenter'> |
+                     false,
+          handlerOut: JQuery.TypeEventHandler<TElement, null, TElement, TElement, TElement, 'mouseleave'> |
+                      false): this;
+    /**
+     * Bind a single handler to the matched elements, to be executed when the mouse pointer enters or leaves the elements.
+     * @param handlerInOut A function to execute when the mouse pointer enters or leaves the element.
+     * @see \`{@link https://api.jquery.com/hover/ }\`
+     * @since 1.4
+     * @deprecated ​ Deprecated.
+     *
+     * **Cause**: The `.hover()` method is a shorthand for the use of the `mouseover`/`mouseout` events. It is often a poor user interface choice because it does not allow for any small amounts of delay between when the mouse enters or exits an area and when the event fires. This can make it quite difficult to use with UI widgets such as drop-down menus. For more information on the problems of hovering, see the \`{@link http://cherne.net/brian/resources/jquery.hoverIntent.html hoverIntent plugin}\`.
+     *
+     * **Solution**: Review uses of `.hover()` to determine if they are appropriate, and consider use of plugins such as `hoverIntent` as an alternative. The direct replacement for `.hover(fn1, fn2)`, is `.on("mouseenter", fn1).on("mouseleave", fn2)`.
      * @example ​ ````Slide the next sibling LI up or down on hover, and toggle a class.
 ```html
 <!doctype html>
@@ -5045,10 +5067,8 @@ $( "li" )
 </html>
 ```
      */
-    // HACK: The type parameter T is not used but ensures the 'event' callback parameter is typed correctly.
-    // tslint:disable-next-line:no-unnecessary-generics
-    hover<T>(handlerInOut: JQuery.EventHandler<TElement> | false,
-             handlerOut?: JQuery.EventHandler<TElement> | false): this;
+    hover(handlerInOut: JQuery.TypeEventHandler<TElement, null, TElement, TElement, TElement, 'mouseenter' | 'mouseleave'> |
+                        false): this;
     /**
      * Set the HTML contents of each element in the set of matched elements.
      * @param htmlString_function _&#x40;param_ `htmlString_function`
@@ -5862,7 +5882,7 @@ $( "li" ).click(function() {
      * **Solution**: Instead of `.click(fn)` use `.on("click", fn)`. Instead of `.click()` use `.trigger("click")`.
      */
     keydown<TData>(eventData: TData,
-                   handler: JQuery.EventHandler<TElement, TData>): this;
+                   handler: JQuery.TypeEventHandler<TElement, TData, TElement, TElement, TElement, 'keydown'>): this;
     /**
      * Bind an event handler to the "keydown" JavaScript event, or trigger that event on an element.
      * @param handler A function to execute each time the event is triggered.
@@ -5934,7 +5954,8 @@ $( "#other" ).click(function() {
 </html>
 ```
      */
-    keydown(handler?: JQuery.EventHandler<TElement> | false): this;
+    keydown(handler?: JQuery.TypeEventHandler<TElement, null, TElement, TElement, TElement, 'keydown'> |
+                      false): this;
     /**
      * Bind an event handler to the "keypress" JavaScript event, or trigger that event on an element.
      * @param eventData An object containing data that will be passed to the event handler.
@@ -5948,7 +5969,7 @@ $( "#other" ).click(function() {
      * **Solution**: Instead of `.click(fn)` use `.on("click", fn)`. Instead of `.click()` use `.trigger("click")`.
      */
     keypress<TData>(eventData: TData,
-                    handler: JQuery.EventHandler<TElement, TData>): this;
+                    handler: JQuery.TypeEventHandler<TElement, TData, TElement, TElement, TElement, 'keypress'>): this;
     /**
      * Bind an event handler to the "keypress" JavaScript event, or trigger that event on an element.
      * @param handler A function to execute each time the event is triggered.
@@ -6020,7 +6041,8 @@ $( "#other" ).click(function() {
 </html>
 ```
      */
-    keypress(handler?: JQuery.EventHandler<TElement> | false): this;
+    keypress(handler?: JQuery.TypeEventHandler<TElement, null, TElement, TElement, TElement, 'keypress'> |
+                       false): this;
     /**
      * Bind an event handler to the "keyup" JavaScript event, or trigger that event on an element.
      * @param eventData An object containing data that will be passed to the event handler.
@@ -6034,7 +6056,7 @@ $( "#other" ).click(function() {
      * **Solution**: Instead of `.click(fn)` use `.on("click", fn)`. Instead of `.click()` use `.trigger("click")`.
      */
     keyup<TData>(eventData: TData,
-                 handler: JQuery.EventHandler<TElement, TData>): this;
+                 handler: JQuery.TypeEventHandler<TElement, TData, TElement, TElement, TElement, 'keyup'>): this;
     /**
      * Bind an event handler to the "keyup" JavaScript event, or trigger that event on an element.
      * @param handler A function to execute each time the event is triggered.
@@ -6107,7 +6129,8 @@ $( "#other").click(function() {
 </html>
 ```
      */
-    keyup(handler?: JQuery.EventHandler<TElement> | false): this;
+    keyup(handler?: JQuery.TypeEventHandler<TElement, null, TElement, TElement, TElement, 'keyup'> |
+                    false): this;
     /**
      * Reduce the set of matched elements to the final one in the set.
      * @see \`{@link https://api.jquery.com/last/ }\`
@@ -6396,7 +6419,7 @@ $( "input" ).click(function() {
      * **Solution**: Instead of `.click(fn)` use `.on("click", fn)`. Instead of `.click()` use `.trigger("click")`.
      */
     mousedown<TData>(eventData: TData,
-                     handler: JQuery.EventHandler<TElement, TData>): this;
+                     handler: JQuery.TypeEventHandler<TElement, TData, TElement, TElement, TElement, 'mousedown'>): this;
     /**
      * Bind an event handler to the "mousedown" JavaScript event, or trigger that event on an element.
      * @param handler A function to execute each time the event is triggered.
@@ -6434,7 +6457,8 @@ $( "p" )
 </html>
 ```
      */
-    mousedown(handler?: JQuery.EventHandler<TElement> | false): this;
+    mousedown(handler?: JQuery.TypeEventHandler<TElement, null, TElement, TElement, TElement, 'mousedown'> |
+                        false): this;
     /**
      * Bind an event handler to be fired when the mouse enters an element, or trigger that handler on an element.
      * @param eventData An object containing data that will be passed to the event handler.
@@ -6448,7 +6472,7 @@ $( "p" )
      * **Solution**: Instead of `.click(fn)` use `.on("click", fn)`. Instead of `.click()` use `.trigger("click")`.
      */
     mouseenter<TData>(eventData: TData,
-                      handler: JQuery.EventHandler<TElement, TData>): this;
+                      handler: JQuery.TypeEventHandler<TElement, TData, TElement, TElement, TElement, 'mouseenter'>): this;
     /**
      * Bind an event handler to be fired when the mouse enters an element, or trigger that handler on an element.
      * @param handler A function to execute each time the event is triggered.
@@ -6529,7 +6553,8 @@ $( "div.enterleave" )
 </html>
 ```
      */
-    mouseenter(handler?: JQuery.EventHandler<TElement> | false): this;
+    mouseenter(handler?: JQuery.TypeEventHandler<TElement, null, TElement, TElement, TElement, 'mouseenter'> |
+                         false): this;
     /**
      * Bind an event handler to be fired when the mouse leaves an element, or trigger that handler on an element.
      * @param eventData An object containing data that will be passed to the event handler.
@@ -6543,7 +6568,7 @@ $( "div.enterleave" )
      * **Solution**: Instead of `.click(fn)` use `.on("click", fn)`. Instead of `.click()` use `.trigger("click")`.
      */
     mouseleave<TData>(eventData: TData,
-                      handler: JQuery.EventHandler<TElement, TData>): this;
+                      handler: JQuery.TypeEventHandler<TElement, TData, TElement, TElement, TElement, 'mouseleave'>): this;
     /**
      * Bind an event handler to be fired when the mouse leaves an element, or trigger that handler on an element.
      * @param handler A function to execute each time the event is triggered.
@@ -6622,7 +6647,8 @@ $( "div.enterleave" )
 </html>
 ```
      */
-    mouseleave(handler?: JQuery.EventHandler<TElement> | false): this;
+    mouseleave(handler?: JQuery.TypeEventHandler<TElement, null, TElement, TElement, TElement, 'mouseleave'> |
+                         false): this;
     /**
      * Bind an event handler to the "mousemove" JavaScript event, or trigger that event on an element.
      * @param eventData An object containing data that will be passed to the event handler.
@@ -6636,7 +6662,7 @@ $( "div.enterleave" )
      * **Solution**: Instead of `.click(fn)` use `.on("click", fn)`. Instead of `.click()` use `.trigger("click")`.
      */
     mousemove<TData>(eventData: TData,
-                     handler: JQuery.EventHandler<TElement, TData>): this;
+                     handler: JQuery.TypeEventHandler<TElement, TData, TElement, TElement, TElement, 'mousemove'>): this;
     /**
      * Bind an event handler to the "mousemove" JavaScript event, or trigger that event on an element.
      * @param handler A function to execute each time the event is triggered.
@@ -6700,7 +6726,8 @@ $( "div" ).mousemove(function( event ) {
 </html>
 ```
      */
-    mousemove(handler?: JQuery.EventHandler<TElement> | false): this;
+    mousemove(handler?: JQuery.TypeEventHandler<TElement, null, TElement, TElement, TElement, 'mousemove'> |
+                        false): this;
     /**
      * Bind an event handler to the "mouseout" JavaScript event, or trigger that event on an element.
      * @param eventData An object containing data that will be passed to the event handler.
@@ -6714,7 +6741,7 @@ $( "div" ).mousemove(function( event ) {
      * **Solution**: Instead of `.click(fn)` use `.on("click", fn)`. Instead of `.click()` use `.trigger("click")`.
      */
     mouseout<TData>(eventData: TData,
-                    handler: JQuery.EventHandler<TElement, TData>): this;
+                    handler: JQuery.TypeEventHandler<TElement, TData, TElement, TElement, TElement, 'mouseout'>): this;
     /**
      * Bind an event handler to the "mouseout" JavaScript event, or trigger that event on an element.
      * @param handler A function to execute each time the event is triggered.
@@ -6795,7 +6822,8 @@ $( "div.enterleave" )
 </html>
 ```
      */
-    mouseout(handler?: JQuery.EventHandler<TElement> | false): this;
+    mouseout(handler?: JQuery.TypeEventHandler<TElement, null, TElement, TElement, TElement, 'mouseout'> |
+                       false): this;
     /**
      * Bind an event handler to the "mouseover" JavaScript event, or trigger that event on an element.
      * @param eventData An object containing data that will be passed to the event handler.
@@ -6809,7 +6837,7 @@ $( "div.enterleave" )
      * **Solution**: Instead of `.click(fn)` use `.on("click", fn)`. Instead of `.click()` use `.trigger("click")`.
      */
     mouseover<TData>(eventData: TData,
-                     handler: JQuery.EventHandler<TElement, TData>): this;
+                     handler: JQuery.TypeEventHandler<TElement, TData, TElement, TElement, TElement, 'mouseover'>): this;
     /**
      * Bind an event handler to the "mouseover" JavaScript event, or trigger that event on an element.
      * @param handler A function to execute each time the event is triggered.
@@ -6890,7 +6918,8 @@ $( "div.enterleave" )
 </html>
 ```
      */
-    mouseover(handler?: JQuery.EventHandler<TElement> | false): this;
+    mouseover(handler?: JQuery.TypeEventHandler<TElement, null, TElement, TElement, TElement, 'mouseover'> |
+                        false): this;
     /**
      * Bind an event handler to the "mouseup" JavaScript event, or trigger that event on an element.
      * @param eventData An object containing data that will be passed to the event handler.
@@ -6904,7 +6933,7 @@ $( "div.enterleave" )
      * **Solution**: Instead of `.click(fn)` use `.on("click", fn)`. Instead of `.click()` use `.trigger("click")`.
      */
     mouseup<TData>(eventData: TData,
-                   handler: JQuery.EventHandler<TElement, TData>): this;
+                   handler: JQuery.TypeEventHandler<TElement, TData, TElement, TElement, TElement, 'mouseup'>): this;
     /**
      * Bind an event handler to the "mouseup" JavaScript event, or trigger that event on an element.
      * @param handler A function to execute each time the event is triggered.
@@ -6942,7 +6971,8 @@ $( "p" )
 </html>
 ```
      */
-    mouseup(handler?: JQuery.EventHandler<TElement> | false): this;
+    mouseup(handler?: JQuery.TypeEventHandler<TElement, null, TElement, TElement, TElement, 'mouseup'> |
+                      false): this;
     /**
      * Get the immediately following sibling of each element in the set of matched elements. If a selector is provided, it retrieves the next sibling only if it matches that selector.
      * @param selector A string containing a selector expression to match elements against.
@@ -9970,7 +10000,7 @@ $( "button" ).on( "click", function() {
      * **Solution**: Instead of `.click(fn)` use `.on("click", fn)`. Instead of `.click()` use `.trigger("click")`.
      */
     resize<TData>(eventData: TData,
-                  handler: JQuery.EventHandler<TElement, TData>): this;
+                  handler: JQuery.TypeEventHandler<TElement, TData, TElement, TElement, TElement, 'resize'>): this;
     /**
      * Bind an event handler to the "resize" JavaScript event, or trigger that event on an element.
      * @param handler A function to execute each time the event is triggered.
@@ -9988,7 +10018,8 @@ $( window ).resize(function() {
 });
 ```
      */
-    resize(handler?: JQuery.EventHandler<TElement> | false): this;
+    resize(handler?: JQuery.TypeEventHandler<TElement, null, TElement, TElement, TElement, 'resize'> |
+                     false): this;
     /**
      * Bind an event handler to the "scroll" JavaScript event, or trigger that event on an element.
      * @param eventData An object containing data that will be passed to the event handler.
@@ -10002,7 +10033,7 @@ $( window ).resize(function() {
      * **Solution**: Instead of `.click(fn)` use `.on("click", fn)`. Instead of `.click()` use `.trigger("click")`.
      */
     scroll<TData>(eventData: TData,
-                  handler: JQuery.EventHandler<TElement, TData>): this;
+                  handler: JQuery.TypeEventHandler<TElement, TData, TElement, TElement, TElement, 'scroll'>): this;
     /**
      * Bind an event handler to the "scroll" JavaScript event, or trigger that event on an element.
      * @param handler A function to execute each time the event is triggered.
@@ -10052,7 +10083,8 @@ $( window ).scroll(function() {
 </html>
 ```
      */
-    scroll(handler?: JQuery.EventHandler<TElement> | false): this;
+    scroll(handler?: JQuery.TypeEventHandler<TElement, null, TElement, TElement, TElement, 'scroll'> |
+                     false): this;
     /**
      * Set the current horizontal position of the scroll bar for each of the set of matched elements.
      * @param value An integer indicating the new position to set the scroll bar to.
@@ -10226,7 +10258,7 @@ $( "p:last" ).text( "scrollTop:" + p.scrollTop() );
      * **Solution**: Instead of `.click(fn)` use `.on("click", fn)`. Instead of `.click()` use `.trigger("click")`.
      */
     select<TData>(eventData: TData,
-                  handler: JQuery.EventHandler<TElement, TData>): this;
+                  handler: JQuery.TypeEventHandler<TElement, TData, TElement, TElement, TElement, 'select'>): this;
     /**
      * Bind an event handler to the "select" JavaScript event, or trigger that event on an element.
      * @param handler A function to execute each time the event is triggered.
@@ -10275,7 +10307,8 @@ $( ":input" ).select(function() {
 $( "input" ).select();
 ```
      */
-    select(handler?: JQuery.EventHandler<TElement> | false): this;
+    select(handler?: JQuery.TypeEventHandler<TElement, null, TElement, TElement, TElement, 'select'> |
+                     false): this;
     /**
      * Encode a set of form elements as a string for submission.
      * @see \`{@link https://api.jquery.com/serialize/ }\`
@@ -11246,7 +11279,7 @@ $( "#toggle" ).on( "click", function() {
      * **Solution**: Instead of `.click(fn)` use `.on("click", fn)`. Instead of `.click()` use `.trigger("click")`.
      */
     submit<TData>(eventData: TData,
-                  handler: JQuery.EventHandler<TElement, TData>): this;
+                  handler: JQuery.TypeEventHandler<TElement, TData, TElement, TElement, TElement, 'submit'>): this;
     /**
      * Bind an event handler to the "submit" JavaScript event, or trigger that event on an element.
      * @param handler A function to execute each time the event is triggered.
@@ -11315,7 +11348,8 @@ $( "form" ).submit(function() {
 $( "form:first" ).submit();
 ```
      */
-    submit(handler?: JQuery.EventHandler<TElement> | false): this;
+    submit(handler?: JQuery.TypeEventHandler<TElement, null, TElement, TElement, TElement, 'submit'> |
+                     false): this;
     /**
      * Set the content of each element in the set of matched elements to the specified text.
      * @param text_function _&#x40;param_ `text_function`
diff --git a/types/jquery/jquery-tests.ts b/types/jquery/jquery-tests.ts
index b08b48d0b0..069e8613d6 100644
--- a/types/jquery/jquery-tests.ts
+++ b/types/jquery/jquery-tests.ts
@@ -3916,6 +3916,12 @@ function JQuery() {
                     this;
                     // $ExpectType TriggeredEvent<HTMLElement, undefined, HTMLElement, HTMLElement>
                     event;
+                },
+                click(event) {
+                    // $ExpectType HTMLElement
+                    this;
+                    // $ExpectType ClickEvent<HTMLElement, undefined, HTMLElement, HTMLElement>
+                    event;
                 }
             });
        }
@@ -3948,6 +3954,12 @@ function JQuery() {
                     this;
                     // $ExpectType TriggeredEvent<HTMLElement, undefined, any, any>
                     event;
+                },
+                click(event) {
+                    // $ExpectType any
+                    this;
+                    // $ExpectType ClickEvent<HTMLElement, undefined, any, any>
+                    event;
                 }
             });
         }
@@ -4139,6 +4151,12 @@ function JQuery() {
                     this;
                     // $ExpectType TriggeredEvent<HTMLElement, string, any, any>
                     event;
+                },
+                click(event) {
+                    // $ExpectType any
+                    this;
+                    // $ExpectType ClickEvent<HTMLElement, string, any, any>
+                    event;
                 }
             }, 'td', 'myData');
 
@@ -4150,6 +4168,12 @@ function JQuery() {
                     this;
                     // $ExpectType TriggeredEvent<HTMLElement, string, HTMLElement, HTMLElement>
                     event;
+                },
+                click(event) {
+                    // $ExpectType HTMLElement
+                    this;
+                    // $ExpectType ClickEvent<HTMLElement, string, HTMLElement, HTMLElement>
+                    event;
                 }
             }, null, 'myData');
 
@@ -4161,6 +4185,12 @@ function JQuery() {
                     this;
                     // $ExpectType TriggeredEvent<HTMLElement, string, HTMLElement, HTMLElement>
                     event;
+                },
+                click(event) {
+                    // $ExpectType HTMLElement
+                    this;
+                    // $ExpectType ClickEvent<HTMLElement, string, HTMLElement, HTMLElement>
+                    event;
                 }
             }, undefined, 'myData');
 
@@ -4172,6 +4202,12 @@ function JQuery() {
                     this;
                     // $ExpectType TriggeredEvent<HTMLElement, undefined, any, any>
                     event;
+                },
+                click(event) {
+                    // $ExpectType any
+                    this;
+                    // $ExpectType ClickEvent<HTMLElement, undefined, any, any>
+                    event;
                 }
             }, 'td');
 
@@ -4183,6 +4219,12 @@ function JQuery() {
                     this;
                     // $ExpectType TriggeredEvent<HTMLElement, number, HTMLElement, HTMLElement>
                     event;
+                },
+                click(event) {
+                    // $ExpectType HTMLElement
+                    this;
+                    // $ExpectType ClickEvent<HTMLElement, number, HTMLElement, HTMLElement>
+                    event;
                 }
             }, 3);
 
@@ -4194,6 +4236,12 @@ function JQuery() {
                     this;
                     // $ExpectType TriggeredEvent<HTMLElement, undefined, HTMLElement, HTMLElement>
                     event;
+                },
+                click(event) {
+                    // $ExpectType HTMLElement
+                    this;
+                    // $ExpectType ClickEvent<HTMLElement, undefined, HTMLElement, HTMLElement>
+                    event;
                 }
             });
         }
@@ -4261,6 +4309,12 @@ function JQuery() {
                     this;
                     // $ExpectType TriggeredEvent<HTMLElement, string, any, any>
                     event;
+                },
+                click(event) {
+                    // $ExpectType any
+                    this;
+                    // $ExpectType ClickEvent<HTMLElement, string, any, any>
+                    event;
                 }
             }, 'td', 'myData');
 
@@ -4272,6 +4326,12 @@ function JQuery() {
                     this;
                     // $ExpectType TriggeredEvent<HTMLElement, string, HTMLElement, HTMLElement>
                     event;
+                },
+                click(event) {
+                    // $ExpectType HTMLElement
+                    this;
+                    // $ExpectType ClickEvent<HTMLElement, string, HTMLElement, HTMLElement>
+                    event;
                 }
             }, null, 'myData');
 
@@ -4283,6 +4343,12 @@ function JQuery() {
                     this;
                     // $ExpectType TriggeredEvent<HTMLElement, string, HTMLElement, HTMLElement>
                     event;
+                },
+                click(event) {
+                    // $ExpectType HTMLElement
+                    this;
+                    // $ExpectType ClickEvent<HTMLElement, string, HTMLElement, HTMLElement>
+                    event;
                 }
             }, undefined, 'myData');
 
@@ -4294,6 +4360,12 @@ function JQuery() {
                     this;
                     // $ExpectType TriggeredEvent<HTMLElement, undefined, any, any>
                     event;
+                },
+                click(event) {
+                    // $ExpectType any
+                    this;
+                    // $ExpectType ClickEvent<HTMLElement, undefined, any, any>
+                    event;
                 }
             }, 'td');
 
@@ -4305,6 +4377,12 @@ function JQuery() {
                     this;
                     // $ExpectType TriggeredEvent<HTMLElement, number, HTMLElement, HTMLElement>
                     event;
+                },
+                click(event) {
+                    // $ExpectType HTMLElement
+                    this;
+                    // $ExpectType ClickEvent<HTMLElement, number, HTMLElement, HTMLElement>
+                    event;
                 }
             }, 3);
 
@@ -4316,6 +4394,12 @@ function JQuery() {
                     this;
                     // $ExpectType TriggeredEvent<HTMLElement, undefined, HTMLElement, HTMLElement>
                     event;
+                },
+                click(event) {
+                    // $ExpectType HTMLElement
+                    this;
+                    // $ExpectType ClickEvent<HTMLElement, undefined, HTMLElement, HTMLElement>
+                    event;
                 }
             });
         }
@@ -4445,7 +4529,7 @@ function JQuery() {
             $('p').blur('myData', function(event) {
                 // $ExpectType HTMLElement
                 this;
-                // $ExpectType Event<HTMLElement, string>
+                // $ExpectType BlurEvent<HTMLElement, string, HTMLElement, HTMLElement>
                 event;
             });
 
@@ -4453,7 +4537,7 @@ function JQuery() {
             $('p').blur(function(event) {
                 // $ExpectType HTMLElement
                 this;
-                // $ExpectType Event<HTMLElement, null>
+                // $ExpectType BlurEvent<HTMLElement, null, HTMLElement, HTMLElement>
                 event;
             });
 
@@ -4469,7 +4553,7 @@ function JQuery() {
             $('p').change('myData', function(event) {
                 // $ExpectType HTMLElement
                 this;
-                // $ExpectType Event<HTMLElement, string>
+                // $ExpectType ChangeEvent<HTMLElement, string, HTMLElement, HTMLElement>
                 event;
             });
 
@@ -4477,7 +4561,7 @@ function JQuery() {
             $('p').change(function(event) {
                 // $ExpectType HTMLElement
                 this;
-                // $ExpectType Event<HTMLElement, null>
+                // $ExpectType ChangeEvent<HTMLElement, null, HTMLElement, HTMLElement>
                 event;
             });
 
@@ -4493,7 +4577,7 @@ function JQuery() {
             $('p').click('myData', function(event) {
                 // $ExpectType HTMLElement
                 this;
-                // $ExpectType Event<HTMLElement, string>
+                // $ExpectType ClickEvent<HTMLElement, string, HTMLElement, HTMLElement>
                 event;
             });
 
@@ -4501,7 +4585,7 @@ function JQuery() {
             $('p').click(function(event) {
                 // $ExpectType HTMLElement
                 this;
-                // $ExpectType Event<HTMLElement, null>
+                // $ExpectType ClickEvent<HTMLElement, null, HTMLElement, HTMLElement>
                 event;
             });
 
@@ -4517,7 +4601,7 @@ function JQuery() {
             $('p').contextmenu('myData', function(event) {
                 // $ExpectType HTMLElement
                 this;
-                // $ExpectType Event<HTMLElement, string>
+                // $ExpectType ContextMenuEvent<HTMLElement, string, HTMLElement, HTMLElement>
                 event;
             });
 
@@ -4525,7 +4609,7 @@ function JQuery() {
             $('p').contextmenu(function(event) {
                 // $ExpectType HTMLElement
                 this;
-                // $ExpectType Event<HTMLElement, null>
+                // $ExpectType ContextMenuEvent<HTMLElement, null, HTMLElement, HTMLElement>
                 event;
             });
 
@@ -4541,7 +4625,7 @@ function JQuery() {
             $('p').dblclick('myData', function(event) {
                 // $ExpectType HTMLElement
                 this;
-                // $ExpectType Event<HTMLElement, string>
+                // $ExpectType DoubleClickEvent<HTMLElement, string, HTMLElement, HTMLElement>
                 event;
             });
 
@@ -4549,7 +4633,7 @@ function JQuery() {
             $('p').dblclick(function(event) {
                 // $ExpectType HTMLElement
                 this;
-                // $ExpectType Event<HTMLElement, null>
+                // $ExpectType DoubleClickEvent<HTMLElement, null, HTMLElement, HTMLElement>
                 event;
             });
 
@@ -4565,7 +4649,7 @@ function JQuery() {
             $('p').focus('myData', function(event) {
                 // $ExpectType HTMLElement
                 this;
-                // $ExpectType Event<HTMLElement, string>
+                // $ExpectType FocusEvent<HTMLElement, string, HTMLElement, HTMLElement>
                 event;
             });
 
@@ -4573,7 +4657,7 @@ function JQuery() {
             $('p').focus(function(event) {
                 // $ExpectType HTMLElement
                 this;
-                // $ExpectType Event<HTMLElement, null>
+                // $ExpectType FocusEvent<HTMLElement, null, HTMLElement, HTMLElement>
                 event;
             });
 
@@ -4589,7 +4673,7 @@ function JQuery() {
             $('p').focusin('myData', function(event) {
                 // $ExpectType HTMLElement
                 this;
-                // $ExpectType Event<HTMLElement, string>
+                // $ExpectType FocusInEvent<HTMLElement, string, HTMLElement, HTMLElement>
                 event;
             });
 
@@ -4597,7 +4681,7 @@ function JQuery() {
             $('p').focusin(function(event) {
                 // $ExpectType HTMLElement
                 this;
-                // $ExpectType Event<HTMLElement, null>
+                // $ExpectType FocusInEvent<HTMLElement, null, HTMLElement, HTMLElement>
                 event;
             });
 
@@ -4613,7 +4697,7 @@ function JQuery() {
             $('p').focusout('myData', function(event) {
                 // $ExpectType HTMLElement
                 this;
-                // $ExpectType Event<HTMLElement, string>
+                // $ExpectType FocusOutEvent<HTMLElement, string, HTMLElement, HTMLElement>
                 event;
             });
 
@@ -4621,7 +4705,7 @@ function JQuery() {
             $('p').focusout(function(event) {
                 // $ExpectType HTMLElement
                 this;
-                // $ExpectType Event<HTMLElement, null>
+                // $ExpectType FocusOutEvent<HTMLElement, null, HTMLElement, HTMLElement>
                 event;
             });
 
@@ -4637,7 +4721,7 @@ function JQuery() {
             $('p').keydown('myData', function(event) {
                 // $ExpectType HTMLElement
                 this;
-                // $ExpectType Event<HTMLElement, string>
+                // $ExpectType KeyDownEvent<HTMLElement, string, HTMLElement, HTMLElement>
                 event;
             });
 
@@ -4645,7 +4729,7 @@ function JQuery() {
             $('p').keydown(function(event) {
                 // $ExpectType HTMLElement
                 this;
-                // $ExpectType Event<HTMLElement, null>
+                // $ExpectType KeyDownEvent<HTMLElement, null, HTMLElement, HTMLElement>
                 event;
             });
 
@@ -4661,7 +4745,7 @@ function JQuery() {
             $('p').keypress('myData', function(event) {
                 // $ExpectType HTMLElement
                 this;
-                // $ExpectType Event<HTMLElement, string>
+                // $ExpectType KeyPressEvent<HTMLElement, string, HTMLElement, HTMLElement>
                 event;
             });
 
@@ -4669,7 +4753,7 @@ function JQuery() {
             $('p').keypress(function(event) {
                 // $ExpectType HTMLElement
                 this;
-                // $ExpectType Event<HTMLElement, null>
+                // $ExpectType KeyPressEvent<HTMLElement, null, HTMLElement, HTMLElement>
                 event;
             });
 
@@ -4685,7 +4769,7 @@ function JQuery() {
             $('p').keyup('myData', function(event) {
                 // $ExpectType HTMLElement
                 this;
-                // $ExpectType Event<HTMLElement, string>
+                // $ExpectType KeyUpEvent<HTMLElement, string, HTMLElement, HTMLElement>
                 event;
             });
 
@@ -4693,7 +4777,7 @@ function JQuery() {
             $('p').keyup(function(event) {
                 // $ExpectType HTMLElement
                 this;
-                // $ExpectType Event<HTMLElement, null>
+                // $ExpectType KeyUpEvent<HTMLElement, null, HTMLElement, HTMLElement>
                 event;
             });
 
@@ -4709,7 +4793,7 @@ function JQuery() {
             $('p').mousedown('myData', function(event) {
                 // $ExpectType HTMLElement
                 this;
-                // $ExpectType Event<HTMLElement, string>
+                // $ExpectType MouseDownEvent<HTMLElement, string, HTMLElement, HTMLElement>
                 event;
             });
 
@@ -4717,7 +4801,7 @@ function JQuery() {
             $('p').mousedown(function(event) {
                 // $ExpectType HTMLElement
                 this;
-                // $ExpectType Event<HTMLElement, null>
+                // $ExpectType MouseDownEvent<HTMLElement, null, HTMLElement, HTMLElement>
                 event;
             });
 
@@ -4733,7 +4817,7 @@ function JQuery() {
             $('p').mouseenter('myData', function(event) {
                 // $ExpectType HTMLElement
                 this;
-                // $ExpectType Event<HTMLElement, string>
+                // $ExpectType MouseEnterEvent<HTMLElement, string, HTMLElement, HTMLElement>
                 event;
             });
 
@@ -4741,7 +4825,7 @@ function JQuery() {
             $('p').mouseenter(function(event) {
                 // $ExpectType HTMLElement
                 this;
-                // $ExpectType Event<HTMLElement, null>
+                // $ExpectType MouseEnterEvent<HTMLElement, null, HTMLElement, HTMLElement>
                 event;
             });
 
@@ -4757,7 +4841,7 @@ function JQuery() {
             $('p').mouseleave('myData', function(event) {
                 // $ExpectType HTMLElement
                 this;
-                // $ExpectType Event<HTMLElement, string>
+                // $ExpectType MouseLeaveEvent<HTMLElement, string, HTMLElement, HTMLElement>
                 event;
             });
 
@@ -4765,7 +4849,7 @@ function JQuery() {
             $('p').mouseleave(function(event) {
                 // $ExpectType HTMLElement
                 this;
-                // $ExpectType Event<HTMLElement, null>
+                // $ExpectType MouseLeaveEvent<HTMLElement, null, HTMLElement, HTMLElement>
                 event;
             });
 
@@ -4781,7 +4865,7 @@ function JQuery() {
             $('p').mousemove('myData', function(event) {
                 // $ExpectType HTMLElement
                 this;
-                // $ExpectType Event<HTMLElement, string>
+                // $ExpectType MouseMoveEvent<HTMLElement, string, HTMLElement, HTMLElement>
                 event;
             });
 
@@ -4789,7 +4873,7 @@ function JQuery() {
             $('p').mousemove(function(event) {
                 // $ExpectType HTMLElement
                 this;
-                // $ExpectType Event<HTMLElement, null>
+                // $ExpectType MouseMoveEvent<HTMLElement, null, HTMLElement, HTMLElement>
                 event;
             });
 
@@ -4805,7 +4889,7 @@ function JQuery() {
             $('p').mouseout('myData', function(event) {
                 // $ExpectType HTMLElement
                 this;
-                // $ExpectType Event<HTMLElement, string>
+                // $ExpectType MouseOutEvent<HTMLElement, string, HTMLElement, HTMLElement>
                 event;
             });
 
@@ -4813,7 +4897,7 @@ function JQuery() {
             $('p').mouseout(function(event) {
                 // $ExpectType HTMLElement
                 this;
-                // $ExpectType Event<HTMLElement, null>
+                // $ExpectType MouseOutEvent<HTMLElement, null, HTMLElement, HTMLElement>
                 event;
             });
 
@@ -4829,7 +4913,7 @@ function JQuery() {
             $('p').mouseover('myData', function(event) {
                 // $ExpectType HTMLElement
                 this;
-                // $ExpectType Event<HTMLElement, string>
+                // $ExpectType MouseOverEvent<HTMLElement, string, HTMLElement, HTMLElement>
                 event;
             });
 
@@ -4837,7 +4921,7 @@ function JQuery() {
             $('p').mouseover(function(event) {
                 // $ExpectType HTMLElement
                 this;
-                // $ExpectType Event<HTMLElement, null>
+                // $ExpectType MouseOverEvent<HTMLElement, null, HTMLElement, HTMLElement>
                 event;
             });
 
@@ -4853,7 +4937,7 @@ function JQuery() {
             $('p').mouseup('myData', function(event) {
                 // $ExpectType HTMLElement
                 this;
-                // $ExpectType Event<HTMLElement, string>
+                // $ExpectType MouseUpEvent<HTMLElement, string, HTMLElement, HTMLElement>
                 event;
             });
 
@@ -4861,7 +4945,7 @@ function JQuery() {
             $('p').mouseup(function(event) {
                 // $ExpectType HTMLElement
                 this;
-                // $ExpectType Event<HTMLElement, null>
+                // $ExpectType MouseUpEvent<HTMLElement, null, HTMLElement, HTMLElement>
                 event;
             });
 
@@ -4877,7 +4961,7 @@ function JQuery() {
             $('p').resize('myData', function(event) {
                 // $ExpectType HTMLElement
                 this;
-                // $ExpectType Event<HTMLElement, string>
+                // $ExpectType ResizeEvent<HTMLElement, string, HTMLElement, HTMLElement>
                 event;
             });
 
@@ -4885,7 +4969,7 @@ function JQuery() {
             $('p').resize(function(event) {
                 // $ExpectType HTMLElement
                 this;
-                // $ExpectType Event<HTMLElement, null>
+                // $ExpectType ResizeEvent<HTMLElement, null, HTMLElement, HTMLElement>
                 event;
             });
 
@@ -4901,7 +4985,7 @@ function JQuery() {
             $('p').scroll('myData', function(event) {
                 // $ExpectType HTMLElement
                 this;
-                // $ExpectType Event<HTMLElement, string>
+                // $ExpectType ScrollEvent<HTMLElement, string, HTMLElement, HTMLElement>
                 event;
             });
 
@@ -4909,7 +4993,7 @@ function JQuery() {
             $('p').scroll(function(event) {
                 // $ExpectType HTMLElement
                 this;
-                // $ExpectType Event<HTMLElement, null>
+                // $ExpectType ScrollEvent<HTMLElement, null, HTMLElement, HTMLElement>
                 event;
             });
 
@@ -4925,7 +5009,7 @@ function JQuery() {
             $('p').select('myData', function(event) {
                 // $ExpectType HTMLElement
                 this;
-                // $ExpectType Event<HTMLElement, string>
+                // $ExpectType SelectEvent<HTMLElement, string, HTMLElement, HTMLElement>
                 event;
             });
 
@@ -4933,7 +5017,7 @@ function JQuery() {
             $('p').select(function(event) {
                 // $ExpectType HTMLElement
                 this;
-                // $ExpectType Event<HTMLElement, null>
+                // $ExpectType SelectEvent<HTMLElement, null, HTMLElement, HTMLElement>
                 event;
             });
 
@@ -4949,7 +5033,7 @@ function JQuery() {
             $('p').submit('myData', function(event) {
                 // $ExpectType HTMLElement
                 this;
-                // $ExpectType Event<HTMLElement, string>
+                // $ExpectType SubmitEvent<HTMLElement, string, HTMLElement, HTMLElement>
                 event;
             });
 
@@ -4957,7 +5041,7 @@ function JQuery() {
             $('p').submit(function(event) {
                 // $ExpectType HTMLElement
                 this;
-                // $ExpectType Event<HTMLElement, null>
+                // $ExpectType SubmitEvent<HTMLElement, null, HTMLElement, HTMLElement>
                 event;
             });
 
@@ -4973,12 +5057,12 @@ function JQuery() {
             $('p').hover(function(event) {
                 // $ExpectType HTMLElement
                 this;
-                // $ExpectType Event<HTMLElement, null>
+                // $ExpectType MouseEnterEvent<HTMLElement, null, HTMLElement, HTMLElement>
                 event;
             }, function(event) {
                 // $ExpectType HTMLElement
                 this;
-                // $ExpectType Event<HTMLElement, null>
+                // $ExpectType MouseLeaveEvent<HTMLElement, null, HTMLElement, HTMLElement>
                 event;
             });
 
@@ -4986,7 +5070,7 @@ function JQuery() {
             $('p').hover(function(event) {
                 // $ExpectType HTMLElement
                 this;
-                // $ExpectType Event<HTMLElement, null>
+                // $ExpectType MouseEnterEvent<HTMLElement, null, HTMLElement, HTMLElement>
                 event;
             }, false);
 
@@ -4994,7 +5078,7 @@ function JQuery() {
             $('p').hover(false, function(event) {
                 // $ExpectType HTMLElement
                 this;
-                // $ExpectType Event<HTMLElement, null>
+                // $ExpectType MouseLeaveEvent<HTMLElement, null, HTMLElement, HTMLElement>
                 event;
             });
 
@@ -5005,8 +5089,23 @@ function JQuery() {
             $('p').hover(function(event) {
                 // $ExpectType HTMLElement
                 this;
-                // $ExpectType Event<HTMLElement, null>
+                // $ExpectType MouseEnterEvent<HTMLElement, null, HTMLElement, HTMLElement> | MouseLeaveEvent<HTMLElement, null, HTMLElement, HTMLElement>
                 event;
+
+                switch (event.type) {
+                    case 'mouseover':
+                        // $ExpectType MouseEnterEvent<HTMLElement, null, HTMLElement, HTMLElement>
+                        event;
+                        break;
+                    case 'mouseout':
+                        // $ExpectType MouseLeaveEvent<HTMLElement, null, HTMLElement, HTMLElement>
+                        event;
+                        break;
+                    default:
+                        // $ExpectType never
+                        event;
+                        break;
+                }
             });
 
             // $ExpectType JQuery<HTMLElement>
diff --git a/types/jquery/misc.d.ts b/types/jquery/misc.d.ts
index d966f1b787..24979fb620 100644
--- a/types/jquery/misc.d.ts
+++ b/types/jquery/misc.d.ts
@@ -4744,12 +4744,1290 @@ $( "button" ).click(function( event ) {
         result?: any;
     }
 
+    // region Event
+    // #region Event
+
+    interface EventBase<
+        TDelegateTarget = any,
+        TData = any,
+        TCurrentTarget = any,
+        TTarget = any
+    > extends TriggeredEvent<TDelegateTarget, TData, TCurrentTarget, TTarget> {
+        /**
+         * The other DOM element involved in the event, if any.
+         * @see \`{@link https://api.jquery.com/event.relatedTarget/ }\`
+         * @since 1.1.4
+         * @example ​ ````On mouseout of anchors, alert the element type being entered.
+```javascript
+$( "a" ).mouseout(function( event ) {
+  alert( event.relatedTarget.nodeName ); // "DIV"
+});
+```
+        */
+        relatedTarget?: undefined;
+
+        // Event
+
+        bubbles: boolean;
+        cancelable: boolean;
+        eventPhase: number;
+
+        // UIEvent
+
+        detail: undefined;
+        view: undefined;
+
+        // MouseEvent
+
+        button: undefined;
+        buttons: undefined;
+        clientX: undefined;
+        clientY: undefined;
+        offsetX: undefined;
+        offsetY: undefined;
+        /**
+         * The mouse position relative to the left edge of the document.
+         * @see \`{@link https://api.jquery.com/event.pageX/ }\`
+         * @since 1.0.4
+         * @example ​ ````Show the mouse position relative to the left and top edges of the document (within this iframe).
+```html
+<!doctype html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <title>event.pageX demo</title>
+  <style>
+  body {
+    background-color: #eef;
+  }
+  div {
+    padding: 20px;
+  }
+  </style>
+  <script src="https://code.jquery.com/jquery-3.3.1.js"></script>
+</head>
+<body>
+​
+<div id="log"></div>
+​
+<script>
+$( document ).on( "mousemove", function( event ) {
+  $( "#log" ).text( "pageX: " + event.pageX + ", pageY: " + event.pageY );
+});
+</script>
+​
+</body>
+</html>
+```
+         */
+        pageX: undefined;
+        /**
+         * The mouse position relative to the top edge of the document.
+         * @see \`{@link https://api.jquery.com/event.pageY/ }\`
+         * @since 1.0.4
+         * @example ​ ````Show the mouse position relative to the left and top edges of the document (within this iframe).
+```html
+<!doctype html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <title>event.pageY demo</title>
+  <style>
+  body {
+    background-color: #eef;
+  }
+  div {
+    padding: 20px;
+  }
+  </style>
+  <script src="https://code.jquery.com/jquery-3.3.1.js"></script>
+</head>
+<body>
+​
+<div id="log"></div>
+​
+<script>
+$( document ).on( "mousemove", function( event ) {
+  $( "#log" ).text( "pageX: " + event.pageX + ", pageY: " + event.pageY );
+});
+</script>
+​
+</body>
+</html>
+```
+         */
+        pageY: undefined;
+        screenX: undefined;
+        screenY: undefined;
+        /** @deprecated */
+        toElement: undefined;
+
+        // PointerEvent
+
+        pointerId: undefined;
+        pointerType: undefined;
+
+        // KeyboardEvent
+
+        /** @deprecated */
+        char: undefined;
+        /** @deprecated */
+        charCode: undefined;
+        key: undefined;
+        /** @deprecated */
+        keyCode: undefined;
+
+        // TouchEvent
+
+        changedTouches: undefined;
+        targetTouches: undefined;
+        touches: undefined;
+
+        // MouseEvent, KeyboardEvent
+
+        /**
+         * For key or mouse events, this property indicates the specific key or button that was pressed.
+         * @see \`{@link https://api.jquery.com/event.which/ }\`
+         * @since 1.1.3
+         * @deprecated ​ Deprecated since 3.3. See \`{@link https://github.com/jquery/api.jquery.com/issues/821 }\`.
+         * @example ​ ````Log which key was depressed.
+```html
+<!doctype html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <title>event.which demo</title>
+  <script src="https://code.jquery.com/jquery-3.3.1.js"></script>
+</head>
+<body>
+​
+<input id="whichkey" value="type something">
+<div id="log"></div>
+​
+<script>
+$( "#whichkey" ).on( "keydown", function( event ) {
+  $( "#log" ).html( event.type + ": " +  event.which );
+});
+</script>
+​
+</body>
+</html>
+```
+         * @example ​ ````Log which mouse button was depressed.
+```html
+<!doctype html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <title>event.which demo</title>
+  <script src="https://code.jquery.com/jquery-3.3.1.js"></script>
+</head>
+<body>
+​
+<input id="whichkey" value="click here">
+<div id="log"></div>
+​
+<script>
+$( "#whichkey" ).on( "mousedown", function( event ) {
+  $( "#log" ).html( event.type + ": " +  event.which );
+});
+</script>
+​
+</body>
+</html>
+```
+         */
+        which: undefined;
+
+        // MouseEvent, KeyboardEvent, TouchEvent
+
+        altKey: undefined;
+        ctrlKey: undefined;
+        /**
+         * Indicates whether the META key was pressed when the event fired.
+         * @see \`{@link https://api.jquery.com/event.metaKey/ }\`
+         * @since 1.0.4
+         * @example ​ ````Determine whether the META key was pressed when the event fired.
+```html
+<!doctype html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <title>event.metaKey demo</title>
+  <style>
+  body {
+    background-color: #eef;
+  }
+  div {
+    padding: 20px;
+  }
+  </style>
+  <script src="https://code.jquery.com/jquery-3.3.1.js"></script>
+</head>
+<body>
+​
+<button value="Test" name="Test" id="checkMetaKey">Click me!</button>
+<div id="display"></div>
+​
+<script>
+$( "#checkMetaKey" ).click(function( event ) {
+  $( "#display" ).text( event.metaKey );
+});
+</script>
+​
+</body>
+</html>
+```
+         */
+        metaKey: undefined;
+        shiftKey: undefined;
+
+        originalEvent?: _Event;
+    }
+
+    interface ChangeEvent<
+        TDelegateTarget = any,
+        TData = any,
+        TCurrentTarget = any,
+        TTarget = any
+    > extends EventBase<TDelegateTarget, TData, TCurrentTarget, TTarget> {
+        type: 'change';
+    }
+
+    interface ResizeEvent<
+        TDelegateTarget = any,
+        TData = any,
+        TCurrentTarget = any,
+        TTarget = any
+    > extends EventBase<TDelegateTarget, TData, TCurrentTarget, TTarget> {
+        type: 'resize';
+    }
+
+    interface ScrollEvent<
+        TDelegateTarget = any,
+        TData = any,
+        TCurrentTarget = any,
+        TTarget = any
+    > extends EventBase<TDelegateTarget, TData, TCurrentTarget, TTarget> {
+        type: 'scroll';
+    }
+
+    interface SelectEvent<
+        TDelegateTarget = any,
+        TData = any,
+        TCurrentTarget = any,
+        TTarget = any
+    > extends EventBase<TDelegateTarget, TData, TCurrentTarget, TTarget> {
+        type: 'select';
+    }
+
+    interface SubmitEvent<
+        TDelegateTarget = any,
+        TData = any,
+        TCurrentTarget = any,
+        TTarget = any
+    > extends EventBase<TDelegateTarget, TData, TCurrentTarget, TTarget> {
+        type: 'submit';
+    }
+
+    // #endregion
+
+    // region UIEvent
+    // #region UIEvent
+
+    interface UIEventBase<
+        TDelegateTarget = any,
+        TData = any,
+        TCurrentTarget = any,
+        TTarget = any
+    > extends TriggeredEvent<TDelegateTarget, TData, TCurrentTarget, TTarget> {
+        // Event
+
+        bubbles: boolean;
+        cancelable: boolean;
+        eventPhase: number;
+
+        // UIEvent
+
+        detail: number;
+        view: Window;
+
+        originalEvent?: _UIEvent;
+    }
+
+    // region MouseEvent
+    // #region MouseEvent
+
+    interface MouseEventBase<
+        TDelegateTarget = any,
+        TData = any,
+        TCurrentTarget = any,
+        TTarget = any
+    > extends UIEventBase<TDelegateTarget, TData, TCurrentTarget, TTarget> {
+        /**
+         * The other DOM element involved in the event, if any.
+         * @see \`{@link https://api.jquery.com/event.relatedTarget/ }\`
+         * @since 1.1.4
+         * @example ​ ````On mouseout of anchors, alert the element type being entered.
+```javascript
+$( "a" ).mouseout(function( event ) {
+  alert( event.relatedTarget.nodeName ); // "DIV"
+});
+```
+        */
+        relatedTarget?: EventTarget | null;
+
+        // MouseEvent
+
+        button: number;
+        buttons: number;
+        clientX: number;
+        clientY: number;
+        offsetX: number;
+        offsetY: number;
+        /**
+         * The mouse position relative to the left edge of the document.
+         * @see \`{@link https://api.jquery.com/event.pageX/ }\`
+         * @since 1.0.4
+         * @example ​ ````Show the mouse position relative to the left and top edges of the document (within this iframe).
+```html
+<!doctype html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <title>event.pageX demo</title>
+  <style>
+  body {
+    background-color: #eef;
+  }
+  div {
+    padding: 20px;
+  }
+  </style>
+  <script src="https://code.jquery.com/jquery-3.3.1.js"></script>
+</head>
+<body>
+​
+<div id="log"></div>
+​
+<script>
+$( document ).on( "mousemove", function( event ) {
+  $( "#log" ).text( "pageX: " + event.pageX + ", pageY: " + event.pageY );
+});
+</script>
+​
+</body>
+</html>
+```
+         */
+        pageX: number;
+        /**
+         * The mouse position relative to the top edge of the document.
+         * @see \`{@link https://api.jquery.com/event.pageY/ }\`
+         * @since 1.0.4
+         * @example ​ ````Show the mouse position relative to the left and top edges of the document (within this iframe).
+```html
+<!doctype html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <title>event.pageY demo</title>
+  <style>
+  body {
+    background-color: #eef;
+  }
+  div {
+    padding: 20px;
+  }
+  </style>
+  <script src="https://code.jquery.com/jquery-3.3.1.js"></script>
+</head>
+<body>
+​
+<div id="log"></div>
+​
+<script>
+$( document ).on( "mousemove", function( event ) {
+  $( "#log" ).text( "pageX: " + event.pageX + ", pageY: " + event.pageY );
+});
+</script>
+​
+</body>
+</html>
+```
+         */
+        pageY: number;
+        screenX: number;
+        screenY: number;
+        /** @deprecated */
+        toElement: Element;
+
+        // PointerEvent
+
+        pointerId: undefined;
+        pointerType: undefined;
+
+        // KeyboardEvent
+
+        /** @deprecated */
+        char: undefined;
+        /** @deprecated */
+        charCode: undefined;
+        key: undefined;
+        /** @deprecated */
+        keyCode: undefined;
+
+        // TouchEvent
+
+        changedTouches: undefined;
+        targetTouches: undefined;
+        touches: undefined;
+
+        // MouseEvent, KeyboardEvent
+
+        /**
+         * For key or mouse events, this property indicates the specific key or button that was pressed.
+         * @see \`{@link https://api.jquery.com/event.which/ }\`
+         * @since 1.1.3
+         * @deprecated ​ Deprecated since 3.3. See \`{@link https://github.com/jquery/api.jquery.com/issues/821 }\`.
+         * @example ​ ````Log which key was depressed.
+```html
+<!doctype html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <title>event.which demo</title>
+  <script src="https://code.jquery.com/jquery-3.3.1.js"></script>
+</head>
+<body>
+​
+<input id="whichkey" value="type something">
+<div id="log"></div>
+​
+<script>
+$( "#whichkey" ).on( "keydown", function( event ) {
+  $( "#log" ).html( event.type + ": " +  event.which );
+});
+</script>
+​
+</body>
+</html>
+```
+         * @example ​ ````Log which mouse button was depressed.
+```html
+<!doctype html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <title>event.which demo</title>
+  <script src="https://code.jquery.com/jquery-3.3.1.js"></script>
+</head>
+<body>
+​
+<input id="whichkey" value="click here">
+<div id="log"></div>
+​
+<script>
+$( "#whichkey" ).on( "mousedown", function( event ) {
+  $( "#log" ).html( event.type + ": " +  event.which );
+});
+</script>
+​
+</body>
+</html>
+```
+         */
+        which: number;
+
+        // MouseEvent, KeyboardEvent, TouchEvent
+
+        altKey: boolean;
+        ctrlKey: boolean;
+        /**
+         * Indicates whether the META key was pressed when the event fired.
+         * @see \`{@link https://api.jquery.com/event.metaKey/ }\`
+         * @since 1.0.4
+         * @example ​ ````Determine whether the META key was pressed when the event fired.
+```html
+<!doctype html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <title>event.metaKey demo</title>
+  <style>
+  body {
+    background-color: #eef;
+  }
+  div {
+    padding: 20px;
+  }
+  </style>
+  <script src="https://code.jquery.com/jquery-3.3.1.js"></script>
+</head>
+<body>
+​
+<button value="Test" name="Test" id="checkMetaKey">Click me!</button>
+<div id="display"></div>
+​
+<script>
+$( "#checkMetaKey" ).click(function( event ) {
+  $( "#display" ).text( event.metaKey );
+});
+</script>
+​
+</body>
+</html>
+```
+         */
+        metaKey: boolean;
+        shiftKey: boolean;
+
+        originalEvent?: _MouseEvent;
+    }
+
+    interface ClickEvent<
+        TDelegateTarget = any,
+        TData = any,
+        TCurrentTarget = any,
+        TTarget = any
+    > extends MouseEventBase<TDelegateTarget, TData, TCurrentTarget, TTarget> {
+        /**
+         * The other DOM element involved in the event, if any.
+         * @see \`{@link https://api.jquery.com/event.relatedTarget/ }\`
+         * @since 1.1.4
+         * @example ​ ````On mouseout of anchors, alert the element type being entered.
+ ```javascript
+ $( "a" ).mouseout(function( event ) {
+  alert( event.relatedTarget.nodeName ); // "DIV"
+ });
+ ```
+        */
+        relatedTarget?: null;
+
+        type: 'click';
+    }
+
+    interface ContextMenuEvent<
+        TDelegateTarget = any,
+        TData = any,
+        TCurrentTarget = any,
+        TTarget = any
+    > extends MouseEventBase<TDelegateTarget, TData, TCurrentTarget, TTarget> {
+        /**
+         * The other DOM element involved in the event, if any.
+         * @see \`{@link https://api.jquery.com/event.relatedTarget/ }\`
+         * @since 1.1.4
+         * @example ​ ````On mouseout of anchors, alert the element type being entered.
+ ```javascript
+ $( "a" ).mouseout(function( event ) {
+  alert( event.relatedTarget.nodeName ); // "DIV"
+ });
+ ```
+        */
+        relatedTarget?: null;
+
+        type: 'contextmenu';
+    }
+
+    interface DoubleClickEvent<
+        TDelegateTarget = any,
+        TData = any,
+        TCurrentTarget = any,
+        TTarget = any
+    > extends MouseEventBase<TDelegateTarget, TData, TCurrentTarget, TTarget> {
+        /**
+         * The other DOM element involved in the event, if any.
+         * @see \`{@link https://api.jquery.com/event.relatedTarget/ }\`
+         * @since 1.1.4
+         * @example ​ ````On mouseout of anchors, alert the element type being entered.
+ ```javascript
+ $( "a" ).mouseout(function( event ) {
+  alert( event.relatedTarget.nodeName ); // "DIV"
+ });
+ ```
+        */
+        relatedTarget?: null;
+
+        type: 'dblclick';
+    }
+
+    interface MouseDownEvent<
+        TDelegateTarget = any,
+        TData = any,
+        TCurrentTarget = any,
+        TTarget = any
+    > extends MouseEventBase<TDelegateTarget, TData, TCurrentTarget, TTarget> {
+        /**
+         * The other DOM element involved in the event, if any.
+         * @see \`{@link https://api.jquery.com/event.relatedTarget/ }\`
+         * @since 1.1.4
+         * @example ​ ````On mouseout of anchors, alert the element type being entered.
+ ```javascript
+ $( "a" ).mouseout(function( event ) {
+  alert( event.relatedTarget.nodeName ); // "DIV"
+ });
+ ```
+        */
+        relatedTarget?: null;
+
+        type: 'mousedown';
+    }
+
+    interface MouseEnterEvent<
+        TDelegateTarget = any,
+        TData = any,
+        TCurrentTarget = any,
+        TTarget = any
+    > extends MouseEventBase<TDelegateTarget, TData, TCurrentTarget, TTarget> {
+        // Special handling by jQuery.
+        type: 'mouseover';
+    }
+
+    interface MouseLeaveEvent<
+        TDelegateTarget = any,
+        TData = any,
+        TCurrentTarget = any,
+        TTarget = any
+    > extends MouseEventBase<TDelegateTarget, TData, TCurrentTarget, TTarget> {
+        // Special handling by jQuery.
+        type: 'mouseout';
+    }
+
+    interface MouseMoveEvent<
+        TDelegateTarget = any,
+        TData = any,
+        TCurrentTarget = any,
+        TTarget = any
+    > extends MouseEventBase<TDelegateTarget, TData, TCurrentTarget, TTarget> {
+        /**
+         * The other DOM element involved in the event, if any.
+         * @see \`{@link https://api.jquery.com/event.relatedTarget/ }\`
+         * @since 1.1.4
+         * @example ​ ````On mouseout of anchors, alert the element type being entered.
+ ```javascript
+ $( "a" ).mouseout(function( event ) {
+  alert( event.relatedTarget.nodeName ); // "DIV"
+ });
+ ```
+        */
+        relatedTarget?: null;
+
+        type: 'mousemove';
+    }
+
+    interface MouseOutEvent<
+        TDelegateTarget = any,
+        TData = any,
+        TCurrentTarget = any,
+        TTarget = any
+    > extends MouseEventBase<TDelegateTarget, TData, TCurrentTarget, TTarget> {
+        type: 'mouseout';
+    }
+
+    interface MouseOverEvent<
+        TDelegateTarget = any,
+        TData = any,
+        TCurrentTarget = any,
+        TTarget = any
+    > extends MouseEventBase<TDelegateTarget, TData, TCurrentTarget, TTarget> {
+        type: 'mouseover';
+    }
+
+    interface MouseUpEvent<
+        TDelegateTarget = any,
+        TData = any,
+        TCurrentTarget = any,
+        TTarget = any
+    > extends MouseEventBase<TDelegateTarget, TData, TCurrentTarget, TTarget> {
+        /**
+         * The other DOM element involved in the event, if any.
+         * @see \`{@link https://api.jquery.com/event.relatedTarget/ }\`
+         * @since 1.1.4
+         * @example ​ ````On mouseout of anchors, alert the element type being entered.
+ ```javascript
+ $( "a" ).mouseout(function( event ) {
+  alert( event.relatedTarget.nodeName ); // "DIV"
+ });
+ ```
+        */
+        relatedTarget?: null;
+
+        type: 'mouseup';
+    }
+
+    // #endregion
+
+    // region KeyboardEvent
+    // #region KeyboardEvent
+
+    interface KeyboardEventBase<
+        TDelegateTarget = any,
+        TData = any,
+        TCurrentTarget = any,
+        TTarget = any
+    > extends UIEventBase<TDelegateTarget, TData, TCurrentTarget, TTarget> {
+        /**
+         * The other DOM element involved in the event, if any.
+         * @see \`{@link https://api.jquery.com/event.relatedTarget/ }\`
+         * @since 1.1.4
+         * @example ​ ````On mouseout of anchors, alert the element type being entered.
+```javascript
+$( "a" ).mouseout(function( event ) {
+  alert( event.relatedTarget.nodeName ); // "DIV"
+});
+```
+        */
+        relatedTarget?: undefined;
+
+        // MouseEvent
+
+        button: undefined;
+        buttons: undefined;
+        clientX: undefined;
+        clientY: undefined;
+        offsetX: undefined;
+        offsetY: undefined;
+        /**
+         * The mouse position relative to the left edge of the document.
+         * @see \`{@link https://api.jquery.com/event.pageX/ }\`
+         * @since 1.0.4
+         * @example ​ ````Show the mouse position relative to the left and top edges of the document (within this iframe).
+```html
+<!doctype html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <title>event.pageX demo</title>
+  <style>
+  body {
+    background-color: #eef;
+  }
+  div {
+    padding: 20px;
+  }
+  </style>
+  <script src="https://code.jquery.com/jquery-3.3.1.js"></script>
+</head>
+<body>
+​
+<div id="log"></div>
+​
+<script>
+$( document ).on( "mousemove", function( event ) {
+  $( "#log" ).text( "pageX: " + event.pageX + ", pageY: " + event.pageY );
+});
+</script>
+​
+</body>
+</html>
+```
+         */
+        pageX: undefined;
+        /**
+         * The mouse position relative to the top edge of the document.
+         * @see \`{@link https://api.jquery.com/event.pageY/ }\`
+         * @since 1.0.4
+         * @example ​ ````Show the mouse position relative to the left and top edges of the document (within this iframe).
+```html
+<!doctype html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <title>event.pageY demo</title>
+  <style>
+  body {
+    background-color: #eef;
+  }
+  div {
+    padding: 20px;
+  }
+  </style>
+  <script src="https://code.jquery.com/jquery-3.3.1.js"></script>
+</head>
+<body>
+​
+<div id="log"></div>
+​
+<script>
+$( document ).on( "mousemove", function( event ) {
+  $( "#log" ).text( "pageX: " + event.pageX + ", pageY: " + event.pageY );
+});
+</script>
+​
+</body>
+</html>
+```
+         */
+        pageY: undefined;
+        screenX: undefined;
+        screenY: undefined;
+        /** @deprecated */
+        toElement: undefined;
+
+        // PointerEvent
+
+        pointerId: undefined;
+        pointerType: undefined;
+
+        // KeyboardEvent
+
+        /** @deprecated */
+        char: string | undefined;
+        /** @deprecated */
+        charCode: number;
+        key: string;
+        /** @deprecated */
+        keyCode: number;
+
+        // TouchEvent
+
+        changedTouches: undefined;
+        targetTouches: undefined;
+        touches: undefined;
+
+        // MouseEvent, KeyboardEvent
+
+        /**
+         * For key or mouse events, this property indicates the specific key or button that was pressed.
+         * @see \`{@link https://api.jquery.com/event.which/ }\`
+         * @since 1.1.3
+         * @deprecated ​ Deprecated since 3.3. See \`{@link https://github.com/jquery/api.jquery.com/issues/821 }\`.
+         * @example ​ ````Log which key was depressed.
+```html
+<!doctype html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <title>event.which demo</title>
+  <script src="https://code.jquery.com/jquery-3.3.1.js"></script>
+</head>
+<body>
+​
+<input id="whichkey" value="type something">
+<div id="log"></div>
+​
+<script>
+$( "#whichkey" ).on( "keydown", function( event ) {
+  $( "#log" ).html( event.type + ": " +  event.which );
+});
+</script>
+​
+</body>
+</html>
+```
+         * @example ​ ````Log which mouse button was depressed.
+```html
+<!doctype html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <title>event.which demo</title>
+  <script src="https://code.jquery.com/jquery-3.3.1.js"></script>
+</head>
+<body>
+​
+<input id="whichkey" value="click here">
+<div id="log"></div>
+​
+<script>
+$( "#whichkey" ).on( "mousedown", function( event ) {
+  $( "#log" ).html( event.type + ": " +  event.which );
+});
+</script>
+​
+</body>
+</html>
+```
+         */
+        which: number;
+
+        // MouseEvent, KeyboardEvent, TouchEvent
+
+        altKey: boolean;
+        ctrlKey: boolean;
+        /**
+         * Indicates whether the META key was pressed when the event fired.
+         * @see \`{@link https://api.jquery.com/event.metaKey/ }\`
+         * @since 1.0.4
+         * @example ​ ````Determine whether the META key was pressed when the event fired.
+```html
+<!doctype html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <title>event.metaKey demo</title>
+  <style>
+  body {
+    background-color: #eef;
+  }
+  div {
+    padding: 20px;
+  }
+  </style>
+  <script src="https://code.jquery.com/jquery-3.3.1.js"></script>
+</head>
+<body>
+​
+<button value="Test" name="Test" id="checkMetaKey">Click me!</button>
+<div id="display"></div>
+​
+<script>
+$( "#checkMetaKey" ).click(function( event ) {
+  $( "#display" ).text( event.metaKey );
+});
+</script>
+​
+</body>
+</html>
+```
+         */
+        metaKey: boolean;
+        shiftKey: boolean;
+
+        originalEvent?: _KeyboardEvent;
+    }
+
+    interface KeyDownEvent<
+        TDelegateTarget = any,
+        TData = any,
+        TCurrentTarget = any,
+        TTarget = any
+    > extends KeyboardEventBase<TDelegateTarget, TData, TCurrentTarget, TTarget> {
+        type: 'keydown';
+    }
+
+    interface KeyPressEvent<
+        TDelegateTarget = any,
+        TData = any,
+        TCurrentTarget = any,
+        TTarget = any
+    > extends KeyboardEventBase<TDelegateTarget, TData, TCurrentTarget, TTarget> {
+        type: 'keypress';
+    }
+
+    interface KeyUpEvent<
+        TDelegateTarget = any,
+        TData = any,
+        TCurrentTarget = any,
+        TTarget = any
+    > extends KeyboardEventBase<TDelegateTarget, TData, TCurrentTarget, TTarget> {
+        type: 'keyup';
+    }
+
+    // #endregion
+
+    // region FocusEvent
+    // #region FocusEvent
+
+    interface FocusEventBase<
+        TDelegateTarget = any,
+        TData = any,
+        TCurrentTarget = any,
+        TTarget = any
+    > extends UIEventBase<TDelegateTarget, TData, TCurrentTarget, TTarget> {
+        /**
+         * The other DOM element involved in the event, if any.
+         * @see \`{@link https://api.jquery.com/event.relatedTarget/ }\`
+         * @since 1.1.4
+         * @example ​ ````On mouseout of anchors, alert the element type being entered.
+```javascript
+$( "a" ).mouseout(function( event ) {
+  alert( event.relatedTarget.nodeName ); // "DIV"
+});
+```
+        */
+        relatedTarget?: EventTarget | null;
+
+        // MouseEvent
+
+        button: undefined;
+        buttons: undefined;
+        clientX: undefined;
+        clientY: undefined;
+        offsetX: undefined;
+        offsetY: undefined;
+        /**
+         * The mouse position relative to the left edge of the document.
+         * @see \`{@link https://api.jquery.com/event.pageX/ }\`
+         * @since 1.0.4
+         * @example ​ ````Show the mouse position relative to the left and top edges of the document (within this iframe).
+```html
+<!doctype html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <title>event.pageX demo</title>
+  <style>
+  body {
+    background-color: #eef;
+  }
+  div {
+    padding: 20px;
+  }
+  </style>
+  <script src="https://code.jquery.com/jquery-3.3.1.js"></script>
+</head>
+<body>
+​
+<div id="log"></div>
+​
+<script>
+$( document ).on( "mousemove", function( event ) {
+  $( "#log" ).text( "pageX: " + event.pageX + ", pageY: " + event.pageY );
+});
+</script>
+​
+</body>
+</html>
+```
+         */
+        pageX: undefined;
+        /**
+         * The mouse position relative to the top edge of the document.
+         * @see \`{@link https://api.jquery.com/event.pageY/ }\`
+         * @since 1.0.4
+         * @example ​ ````Show the mouse position relative to the left and top edges of the document (within this iframe).
+```html
+<!doctype html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <title>event.pageY demo</title>
+  <style>
+  body {
+    background-color: #eef;
+  }
+  div {
+    padding: 20px;
+  }
+  </style>
+  <script src="https://code.jquery.com/jquery-3.3.1.js"></script>
+</head>
+<body>
+​
+<div id="log"></div>
+​
+<script>
+$( document ).on( "mousemove", function( event ) {
+  $( "#log" ).text( "pageX: " + event.pageX + ", pageY: " + event.pageY );
+});
+</script>
+​
+</body>
+</html>
+```
+         */
+        pageY: undefined;
+        screenX: undefined;
+        screenY: undefined;
+        /** @deprecated */
+        toElement: undefined;
+
+        // PointerEvent
+
+        pointerId: undefined;
+        pointerType: undefined;
+
+        // KeyboardEvent
+
+        /** @deprecated */
+        char: undefined;
+        /** @deprecated */
+        charCode: undefined;
+        key: undefined;
+        /** @deprecated */
+        keyCode: undefined;
+
+        // TouchEvent
+
+        changedTouches: undefined;
+        targetTouches: undefined;
+        touches: undefined;
+
+        // MouseEvent, KeyboardEvent
+
+        /**
+         * For key or mouse events, this property indicates the specific key or button that was pressed.
+         * @see \`{@link https://api.jquery.com/event.which/ }\`
+         * @since 1.1.3
+         * @deprecated ​ Deprecated since 3.3. See \`{@link https://github.com/jquery/api.jquery.com/issues/821 }\`.
+         * @example ​ ````Log which key was depressed.
+```html
+<!doctype html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <title>event.which demo</title>
+  <script src="https://code.jquery.com/jquery-3.3.1.js"></script>
+</head>
+<body>
+​
+<input id="whichkey" value="type something">
+<div id="log"></div>
+​
+<script>
+$( "#whichkey" ).on( "keydown", function( event ) {
+  $( "#log" ).html( event.type + ": " +  event.which );
+});
+</script>
+​
+</body>
+</html>
+```
+         * @example ​ ````Log which mouse button was depressed.
+```html
+<!doctype html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <title>event.which demo</title>
+  <script src="https://code.jquery.com/jquery-3.3.1.js"></script>
+</head>
+<body>
+​
+<input id="whichkey" value="click here">
+<div id="log"></div>
+​
+<script>
+$( "#whichkey" ).on( "mousedown", function( event ) {
+  $( "#log" ).html( event.type + ": " +  event.which );
+});
+</script>
+​
+</body>
+</html>
+```
+         */
+        which: undefined;
+
+        // MouseEvent, KeyboardEvent, TouchEvent
+
+        altKey: undefined;
+        ctrlKey: undefined;
+        /**
+         * Indicates whether the META key was pressed when the event fired.
+         * @see \`{@link https://api.jquery.com/event.metaKey/ }\`
+         * @since 1.0.4
+         * @example ​ ````Determine whether the META key was pressed when the event fired.
+```html
+<!doctype html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <title>event.metaKey demo</title>
+  <style>
+  body {
+    background-color: #eef;
+  }
+  div {
+    padding: 20px;
+  }
+  </style>
+  <script src="https://code.jquery.com/jquery-3.3.1.js"></script>
+</head>
+<body>
+​
+<button value="Test" name="Test" id="checkMetaKey">Click me!</button>
+<div id="display"></div>
+​
+<script>
+$( "#checkMetaKey" ).click(function( event ) {
+  $( "#display" ).text( event.metaKey );
+});
+</script>
+​
+</body>
+</html>
+```
+         */
+        metaKey: undefined;
+        shiftKey: undefined;
+
+        originalEvent?: _FocusEvent;
+    }
+
+    interface BlurEvent<
+        TDelegateTarget = any,
+        TData = any,
+        TCurrentTarget = any,
+        TTarget = any
+    > extends FocusEventBase<TDelegateTarget, TData, TCurrentTarget, TTarget> {
+        type: 'blur';
+    }
+
+    interface FocusEvent<
+        TDelegateTarget = any,
+        TData = any,
+        TCurrentTarget = any,
+        TTarget = any
+    > extends FocusEventBase<TDelegateTarget, TData, TCurrentTarget, TTarget> {
+        type: 'focus';
+    }
+
+    interface FocusInEvent<
+        TDelegateTarget = any,
+        TData = any,
+        TCurrentTarget = any,
+        TTarget = any
+    > extends FocusEventBase<TDelegateTarget, TData, TCurrentTarget, TTarget> {
+        type: 'focusin';
+    }
+
+    interface FocusOutEvent<
+        TDelegateTarget = any,
+        TData = any,
+        TCurrentTarget = any,
+        TTarget = any
+    > extends FocusEventBase<TDelegateTarget, TData, TCurrentTarget, TTarget> {
+        type: 'focusout';
+    }
+
+    // #endregion
+
+    // #endregion
+
     interface TypeToTriggeredEventMap<
         TDelegateTarget,
         TData,
         TCurrentTarget,
         TTarget
     > {
+        // Event
+
+        change: ChangeEvent<TDelegateTarget, TData, TCurrentTarget, TTarget>;
+        resize: ResizeEvent<TDelegateTarget, TData, TCurrentTarget, TTarget>;
+        scroll: ScrollEvent<TDelegateTarget, TData, TCurrentTarget, TTarget>;
+        select: SelectEvent<TDelegateTarget, TData, TCurrentTarget, TTarget>;
+        submit: SubmitEvent<TDelegateTarget, TData, TCurrentTarget, TTarget>;
+
+        // UIEvent
+
+        // MouseEvent
+
+        click: ClickEvent<TDelegateTarget, TData, TCurrentTarget, TTarget>;
+        contextmenu: ContextMenuEvent<TDelegateTarget, TData, TCurrentTarget, TTarget>;
+        dblclick: DoubleClickEvent<TDelegateTarget, TData, TCurrentTarget, TTarget>;
+        mousedown: MouseDownEvent<TDelegateTarget, TData, TCurrentTarget, TTarget>;
+        mouseenter: MouseEnterEvent<TDelegateTarget, TData, TCurrentTarget, TTarget>;
+        mouseleave: MouseLeaveEvent<TDelegateTarget, TData, TCurrentTarget, TTarget>;
+        mousemove: MouseMoveEvent<TDelegateTarget, TData, TCurrentTarget, TTarget>;
+        mouseout: MouseOutEvent<TDelegateTarget, TData, TCurrentTarget, TTarget>;
+        mouseover: MouseOverEvent<TDelegateTarget, TData, TCurrentTarget, TTarget>;
+        mouseup: MouseUpEvent<TDelegateTarget, TData, TCurrentTarget, TTarget>;
+
+        // KeyboardEvent
+
+        keydown: KeyDownEvent<TDelegateTarget, TData, TCurrentTarget, TTarget>;
+        keypress: KeyPressEvent<TDelegateTarget, TData, TCurrentTarget, TTarget>;
+        keyup: KeyUpEvent<TDelegateTarget, TData, TCurrentTarget, TTarget>;
+
+        // FocusEvent
+
+        blur: BlurEvent<TDelegateTarget, TData, TCurrentTarget, TTarget>;
+        focus: FocusEvent<TDelegateTarget, TData, TCurrentTarget, TTarget>;
+        focusin: FocusInEvent<TDelegateTarget, TData, TCurrentTarget, TTarget>;
+        focusout: FocusOutEvent<TDelegateTarget, TData, TCurrentTarget, TTarget>;
+
         [type: string]: TriggeredEvent<TDelegateTarget, TData, TCurrentTarget, TTarget>;
     }
 
@@ -4985,6 +6263,10 @@ declare const jQuery: JQueryStatic;
 declare const $: JQueryStatic;
 
 type _Event = Event;
+type _UIEvent = UIEvent;
+type _MouseEvent = MouseEvent;
+type _KeyboardEvent = KeyboardEvent;
+type _FocusEvent = FocusEvent;
 
 // region ES5 compatibility
 // #region ES5 compatibility

From acc34c5a2347ae1d58bda9dd72fe22c9f56ad959 Mon Sep 17 00:00:00 2001
From: Leonard Thieu <leonard.thieu@gmail.com>
Date: Sun, 28 Oct 2018 10:50:28 -0400
Subject: [PATCH 246/836] [angular] Update merging tests for jQuery Events API
 changes.

---
 types/angular/test/jquery3-merging-tests.ts | 210 +-------------------
 1 file changed, 10 insertions(+), 200 deletions(-)

diff --git a/types/angular/test/jquery3-merging-tests.ts b/types/angular/test/jquery3-merging-tests.ts
index 507c58b67e..da61a6f0bc 100644
--- a/types/angular/test/jquery3-merging-tests.ts
+++ b/types/angular/test/jquery3-merging-tests.ts
@@ -94,8 +94,6 @@ function JQuery() {
     }
 
     function bind() {
-        interface I1 { kind: 'I1'; }
-
         // $ExpectType JQuery<HTMLElement>
         $('p').bind('myEvent', 'myData', function(event) {
             // TODO: $ExpectType HTMLElement
@@ -104,14 +102,6 @@ function JQuery() {
             event;
         });
 
-        // $ExpectType JQuery<HTMLElement>
-        $('p').bind('myEvent', 'myData', function(this: I1, event) {
-            // $ExpectType I1
-            this;
-            // TODO: $ExpectType Event<HTMLElement, string>
-            event;
-        });
-
         // $ExpectType JQuery<HTMLElement>
         $('p').bind('myEvent', function(event) {
             // TODO: $ExpectType HTMLElement
@@ -120,14 +110,6 @@ function JQuery() {
             event;
         });
 
-        // $ExpectType JQuery<HTMLElement>
-        $('p').bind('myEvent', function(this: I1, event) {
-            // $ExpectType I1
-            this;
-            // TODO: $ExpectType Event<HTMLElement, null>
-            event;
-        });
-
         // $ExpectType JQuery<HTMLElement>
         $('p').bind('myEvent', false);
 
@@ -139,12 +121,6 @@ function JQuery() {
                 this;
                 // TODO: $ExpectType Event<HTMLElement, null>
                 event;
-            },
-            myEvent3(this: I1, event) {
-                // $ExpectType I1
-                this;
-                // TODO: $ExpectType Event<HTMLElement, null>
-                event;
             }
         });
 
@@ -164,27 +140,15 @@ function JQuery() {
     }
 
     function off() {
-        function defaultContext_defaultData(this: HTMLElement, event: JQueryEventObject) { }
+        function defaultData(this: HTMLElement, event: JQueryEventObject) { }
 
-        function defaultContext_customData(this: HTMLElement, event: JQueryEventObject) { }
-
-        function customContext_defaultData(this: I1, event: JQueryEventObject) { }
-
-        function customContext_customData(this: I1, event: JQueryEventObject) { }
-
-        interface I1 { kind: 'I1'; }
+        function customData(this: HTMLElement, event: JQueryEventObject) { }
 
         // $ExpectType JQuery<HTMLElement>
-        $('table').off('myEvent', 'td', defaultContext_defaultData);
+        $('table').off('myEvent', 'td', defaultData);
 
         // $ExpectType JQuery<HTMLElement>
-        $('table').off('myEvent', 'td', defaultContext_customData);
-
-        // $ExpectType JQuery<HTMLElement>
-        $('table').off('myEvent', 'td', customContext_defaultData);
-
-        // $ExpectType JQuery<HTMLElement>
-        $('table').off('myEvent', 'td', customContext_customData);
+        $('table').off('myEvent', 'td', customData);
 
         // $ExpectType JQuery<HTMLElement>
         $('table').off('myEvent', 'td', false);
@@ -193,16 +157,10 @@ function JQuery() {
         $('table').off('myEvent', 'td');
 
         // $ExpectType JQuery<HTMLElement>
-        $('table').off('myEvent', defaultContext_defaultData);
+        $('table').off('myEvent', defaultData);
 
         // $ExpectType JQuery<HTMLElement>
-        $('table').off('myEvent', defaultContext_customData);
-
-        // $ExpectType JQuery<HTMLElement>
-        $('table').off('myEvent', customContext_defaultData);
-
-        // $ExpectType JQuery<HTMLElement>
-        $('table').off('myEvent', customContext_customData);
+        $('table').off('myEvent', customData);
 
         // $ExpectType JQuery<HTMLElement>
         $('table').off('myEvent', false);
@@ -213,19 +171,15 @@ function JQuery() {
         // $ExpectType JQuery<HTMLElement>
         $('table').off({
             myEvent1: false,
-            defaultContext_defaultData,
-            defaultContext_customData,
-            customContext_defaultData,
-            customContext_customData
+            defaultData,
+            customData
         }, 'td');
 
         // $ExpectType JQuery<HTMLElement>
         $('table').off({
             myEvent1: false,
-            defaultContext_defaultData,
-            defaultContext_customData,
-            customContext_defaultData,
-            customContext_customData
+            defaultData,
+            customData
         });
 
         // $ExpectType JQuery<HTMLElement>
@@ -236,8 +190,6 @@ function JQuery() {
     }
 
     function on() {
-        interface I1 { kind: 'I1'; }
-
         // $ExpectType JQuery<HTMLElement>
         $('table').on('myEvent', 'td', 'myData', function(event) {
             // TODO: $ExpectType HTMLElement
@@ -246,14 +198,6 @@ function JQuery() {
             event;
         });
 
-        // $ExpectType JQuery<HTMLElement>
-        $('table').on('myEvent', 'td', 'myData', function(this: I1, event) {
-            // $ExpectType I1
-            this;
-            // TODO: $ExpectType Event<HTMLElement, string>
-            event;
-        });
-
         // $ExpectType JQuery<HTMLElement>
         $('table').on('myEvent', null, 'myData', function(event) {
             // TODO: $ExpectType HTMLElement
@@ -262,14 +206,6 @@ function JQuery() {
             event;
         });
 
-        // $ExpectType JQuery<HTMLElement>
-        $('table').on('myEvent', null, 'myData', function(this: I1, event) {
-            // $ExpectType I1
-            this;
-            // TODO: $ExpectType Event<HTMLElement, string>
-            event;
-        });
-
         // $ExpectType JQuery<HTMLElement>
         $('table').on('myEvent', 'td', function(event) {
             // TODO: $ExpectType HTMLElement
@@ -278,14 +214,6 @@ function JQuery() {
             event;
         });
 
-        // $ExpectType JQuery<HTMLElement>
-        $('table').on('myEvent', 'td', function(this: I1, event) {
-            // $ExpectType I1
-            this;
-            // TODO: $ExpectType Event<HTMLElement, null>
-            event;
-        });
-
         // $ExpectType JQuery<HTMLElement>
         $('table').on('myEvent', 'td', false);
 
@@ -297,14 +225,6 @@ function JQuery() {
             event;
         });
 
-        // $ExpectType JQuery<HTMLElement>
-        $('table').on('myEvent', 3, function(this: I1, event) {
-            // $ExpectType I1
-            this;
-            // TODO: $ExpectType Event<HTMLElement, number>
-            event;
-        });
-
         // $ExpectType JQuery<HTMLElement>
         $('table').on('myEvent', function(event) {
             // TODO: $ExpectType HTMLElement
@@ -313,14 +233,6 @@ function JQuery() {
             event;
         });
 
-        // $ExpectType JQuery<HTMLElement>
-        $('table').on('myEvent', function(this: I1, event) {
-            // $ExpectType I1
-            this;
-            // TODO: $ExpectType Event<HTMLElement, null>
-            event;
-        });
-
         // $ExpectType JQuery<HTMLElement>
         $('table').on('myEvent', false);
 
@@ -332,12 +244,6 @@ function JQuery() {
                 this;
                 // TODO: $ExpectType Event<HTMLElement, string>
                 event;
-            },
-            myEvent3(this: I1, event) {
-                // $ExpectType I1
-                this;
-                // TODO: $ExpectType Event<HTMLElement, string>
-                event;
             }
         }, 'td', 'myData');
 
@@ -349,12 +255,6 @@ function JQuery() {
                 this;
                 // TODO: $ExpectType Event<HTMLElement, string>
                 event;
-            },
-            myEvent3(this: I1, event) {
-                // $ExpectType I1
-                this;
-                // TODO: $ExpectType Event<HTMLElement, string>
-                event;
             }
         }, null, 'myData');
 
@@ -366,12 +266,6 @@ function JQuery() {
                 this;
                 // TODO: $ExpectType Event<HTMLElement, null>
                 event;
-            },
-            myEvent3(this: I1, event) {
-                // $ExpectType I1
-                this;
-                // TODO: $ExpectType Event<HTMLElement, null>
-                event;
             }
         }, 'td');
 
@@ -383,12 +277,6 @@ function JQuery() {
                 this;
                 // TODO: $ExpectType Event<HTMLElement, number>
                 event;
-            },
-            myEvent3(this: I1, event) {
-                // $ExpectType I1
-                this;
-                // TODO: $ExpectType Event<HTMLElement, number>
-                event;
             }
         }, 3);
 
@@ -400,19 +288,11 @@ function JQuery() {
                 this;
                 // TODO: $ExpectType Event<HTMLElement, null>
                 event;
-            },
-            myEvent3(this: I1, event) {
-                // $ExpectType I1
-                this;
-                // TODO: $ExpectType Event<HTMLElement, null>
-                event;
             }
         });
     }
 
     function one() {
-        interface I1 { kind: 'I1'; }
-
         // $ExpectType JQuery<HTMLElement>
         $('table').one('myEvent', 'td', 'myData', function(event) {
             // TODO: $ExpectType HTMLElement
@@ -421,14 +301,6 @@ function JQuery() {
             event;
         });
 
-        // $ExpectType JQuery<HTMLElement>
-        $('table').one('myEvent', 'td', 'myData', function(this: I1, event) {
-            // $ExpectType I1
-            this;
-            // TODO: $ExpectType Event<HTMLElement, string>
-            event;
-        });
-
         // $ExpectType JQuery<HTMLElement>
         $('table').one('myEvent', null, 'myData', function(event) {
             // TODO: $ExpectType HTMLElement
@@ -437,14 +309,6 @@ function JQuery() {
             event;
         });
 
-        // $ExpectType JQuery<HTMLElement>
-        $('table').one('myEvent', null, 'myData', function(this: I1, event) {
-            // $ExpectType I1
-            this;
-            // TODO: $ExpectType Event<HTMLElement, string>
-            event;
-        });
-
         // $ExpectType JQuery<HTMLElement>
         $('table').one('myEvent', 'td', function(event) {
             // TODO: $ExpectType HTMLElement
@@ -453,14 +317,6 @@ function JQuery() {
             event;
         });
 
-        // $ExpectType JQuery<HTMLElement>
-        $('table').one('myEvent', 'td', function(this: I1, event) {
-            // $ExpectType I1
-            this;
-            // TODO: $ExpectType Event<HTMLElement, null>
-            event;
-        });
-
         // $ExpectType JQuery<HTMLElement>
         $('table').one('myEvent', 'td', false);
 
@@ -472,14 +328,6 @@ function JQuery() {
             event;
         });
 
-        // $ExpectType JQuery<HTMLElement>
-        $('table').one('myEvent', 3, function(this: I1, event) {
-            // $ExpectType I1
-            this;
-            // TODO: $ExpectType Event<HTMLElement, number>
-            event;
-        });
-
         // $ExpectType JQuery<HTMLElement>
         $('table').one('myEvent', function(event) {
             // TODO: $ExpectType HTMLElement
@@ -488,14 +336,6 @@ function JQuery() {
             event;
         });
 
-        // $ExpectType JQuery<HTMLElement>
-        $('table').one('myEvent', function(this: I1, event) {
-            // $ExpectType I1
-            this;
-            // TODO: $ExpectType Event<HTMLElement, null>
-            event;
-        });
-
         // $ExpectType JQuery<HTMLElement>
         $('table').one('myEvent', false);
 
@@ -507,12 +347,6 @@ function JQuery() {
                 this;
                 // TODO: $ExpectType Event<HTMLElement, string>
                 event;
-            },
-            myEvent3(this: I1, event) {
-                // $ExpectType I1
-                this;
-                // TODO: $ExpectType Event<HTMLElement, string>
-                event;
             }
         }, 'td', 'myData');
 
@@ -524,12 +358,6 @@ function JQuery() {
                 this;
                 // TODO: $ExpectType Event<HTMLElement, string>
                 event;
-            },
-            myEvent3(this: I1, event) {
-                // $ExpectType I1
-                this;
-                // TODO: $ExpectType Event<HTMLElement, string>
-                event;
             }
         }, null, 'myData');
 
@@ -541,12 +369,6 @@ function JQuery() {
                 this;
                 // TODO: $ExpectType Event<HTMLElement, null>
                 event;
-            },
-            myEvent3(this: I1, event) {
-                // $ExpectType I1
-                this;
-                // TODO: $ExpectType Event<HTMLElement, null>
-                event;
             }
         }, 'td');
 
@@ -558,12 +380,6 @@ function JQuery() {
                 this;
                 // TODO: $ExpectType Event<HTMLElement, number>
                 event;
-            },
-            myEvent3(this: I1, event) {
-                // $ExpectType I1
-                this;
-                // TODO: $ExpectType Event<HTMLElement, number>
-                event;
             }
         }, 3);
 
@@ -575,12 +391,6 @@ function JQuery() {
                 this;
                 // TODO: $ExpectType Event<HTMLElement, null>
                 event;
-            },
-            myEvent3(this: I1, event) {
-                // $ExpectType I1
-                this;
-                // TODO: $ExpectType Event<HTMLElement, null>
-                event;
             }
         });
     }

From 68c38a850c846788505bc8fd34398e19136983e0 Mon Sep 17 00:00:00 2001
From: Leonard Thieu <leonard.thieu@gmail.com>
Date: Sun, 28 Oct 2018 11:45:11 -0400
Subject: [PATCH 247/836] [backbone] Fix test failure in `backbone.marionette`
 due to changes in jQuery Events API.

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

diff --git a/types/backbone/index.d.ts b/types/backbone/index.d.ts
index ca36541735..a881284c8f 100644
--- a/types/backbone/index.d.ts
+++ b/types/backbone/index.d.ts
@@ -92,7 +92,7 @@ declare namespace Backbone {
     }
 
     interface EventsHash {
-        [selector: string]: string | {(eventObject: JQueryEventObject): void};
+        [selector: string]: string | {(eventObject: JQuery.TriggeredEvent): void};
     }
 
     export const Events: Events;

From b6bb6a64fd214d0f25711c6e79572cf35ad1f07c Mon Sep 17 00:00:00 2001
From: Leonard Thieu <leonard.thieu@gmail.com>
Date: Sun, 28 Oct 2018 11:01:29 -0400
Subject: [PATCH 248/836] [bootstrap] Update API for jQuery Events API changes.

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

diff --git a/types/bootstrap/index.d.ts b/types/bootstrap/index.d.ts
index 8a815bccd5..9744731237 100755
--- a/types/bootstrap/index.d.ts
+++ b/types/bootstrap/index.d.ts
@@ -322,7 +322,7 @@ export interface TooltipOption {
 // Events
 // --------------------------------------------------------------------------------------
 
-export interface CarouselEventHandler<TElement> extends JQuery.Event<TElement, undefined> {
+export interface CarouselEventHandler<TElement> extends JQuery.TriggeredEvent<TElement, undefined> {
     /**
      * The direction in which the carousel is sliding.
      */
@@ -339,6 +339,10 @@ export interface CarouselEventHandler<TElement> extends JQuery.Event<TElement, u
     to: number;
 }
 
+export interface TapEventHandler<TElement> extends JQuery.TriggeredEvent<TElement, undefined> {
+    relatedTarget: HTMLElement;
+}
+
 export type AlertEvent = "close.bs.alert" | "closed.bs.alert";
 export type CarouselEvent = "slide.bs.carousel" | "slid.bs.carousel";
 export type CollapseEvent = "show.bs.collapse" | "shown.bs.collapse" | "hide.bs.collapse" | "hidden.bs.collapse";
@@ -383,9 +387,10 @@ declare global {
         tooltip(options?: TooltipOption): this;
 
         on(events: CarouselEvent, handler: JQuery.EventHandlerBase<TElement, CarouselEventHandler<TElement>>): this;
+        on(events: TapEvent, handler: JQuery.EventHandlerBase<TElement, TapEventHandler<TElement>>): this;
         on(events:
             AlertEvent | CollapseEvent | DropdownEvent | ModalEvent |
-            PopoverEvent | ScrollspyEvent | TapEvent | TooltipEvent,
+            PopoverEvent | ScrollspyEvent | TooltipEvent,
             handler: JQuery.EventHandler<TElement>): this;
     }
 }

From 5f6b28023b302f089330ef5bb86ac8d805df5b75 Mon Sep 17 00:00:00 2001
From: Leonard Thieu <leonard.thieu@gmail.com>
Date: Sun, 28 Oct 2018 11:03:13 -0400
Subject: [PATCH 249/836] [bootstrap-slider] Fix test failure due to jQuery
 Events API changes.

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

diff --git a/types/bootstrap-slider/bootstrap-slider-tests.ts b/types/bootstrap-slider/bootstrap-slider-tests.ts
index 9b2a1a2014..d3ffdeedeb 100644
--- a/types/bootstrap-slider/bootstrap-slider-tests.ts
+++ b/types/bootstrap-slider/bootstrap-slider-tests.ts
@@ -42,7 +42,7 @@ $(() => {
 
     $('#ex7').slider();
 
-    $('#ex7-enabled').click(function(this: HTMLInputElement) {
+    $<HTMLInputElement>('#ex7-enabled').click(function() {
         if (this.checked) {
             // With JQuery
             $('#ex7').slider('enable');

From c1ce5ef2c241a4fdcfc4b181428a1f6500dcaa0d Mon Sep 17 00:00:00 2001
From: Leonard Thieu <leonard.thieu@gmail.com>
Date: Sun, 28 Oct 2018 11:04:44 -0400
Subject: [PATCH 250/836] [jquery-focus-exit] Update API for jQuery Events API
 changes.

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

diff --git a/types/jquery-focus-exit/index.d.ts b/types/jquery-focus-exit/index.d.ts
index 8787136a4e..d4da0a1f18 100644
--- a/types/jquery-focus-exit/index.d.ts
+++ b/types/jquery-focus-exit/index.d.ts
@@ -14,7 +14,7 @@ export interface FocusElements {
 declare global {
     interface JQuery {
         focusExit(options?: { debug: boolean }): JQuery;
-        on(event: 'focusExit', handler: ((event: JQuery.Event<HTMLElement>, data: FocusElements) => void)): JQuery;
-        one(event: 'focusin', handler: ((event: JQuery.Event<HTMLElement>) => void)): JQuery;
+        on(event: 'focusExit', handler: ((event: JQuery.TriggeredEvent<HTMLElement>, data: FocusElements) => void)): JQuery;
+        one(event: 'focusin', handler: ((event: JQuery.TriggeredEvent<HTMLElement>) => void)): JQuery;
     }
 }

From 8914a468a462141bd3817bbbccaa2f0ecb947436 Mon Sep 17 00:00:00 2001
From: Leonard Thieu <leonard.thieu@gmail.com>
Date: Sun, 28 Oct 2018 11:05:22 -0400
Subject: [PATCH 251/836] [jquery-mouse-exit] Update API for jQuery Events API
 changes.

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

diff --git a/types/jquery-mouse-exit/index.d.ts b/types/jquery-mouse-exit/index.d.ts
index f0ba17996e..651a7b3f85 100644
--- a/types/jquery-mouse-exit/index.d.ts
+++ b/types/jquery-mouse-exit/index.d.ts
@@ -18,6 +18,6 @@ export type FocusElements = Partial<{
 declare global {
     interface JQuery {
         mouseExit(options?: Options): JQuery;
-        on(event: 'mouseExit', handler: ((event: JQuery.Event<HTMLElement>, data: FocusElements) => void)): JQuery;
+        on(event: 'mouseExit', handler: ((event: JQuery.TriggeredEvent<HTMLElement>, data: FocusElements) => void)): JQuery;
     }
 }

From e1d3c4aba92261ee7d9090f713524243fa5433b6 Mon Sep 17 00:00:00 2001
From: Leonard Thieu <leonard.thieu@gmail.com>
Date: Sun, 28 Oct 2018 11:07:58 -0400
Subject: [PATCH 252/836] [semantic-ui-form] Update API for jQuery Events API
 changes.

---
 types/semantic-ui-form/global.d.ts               | 2 +-
 types/semantic-ui-form/semantic-ui-form-tests.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/types/semantic-ui-form/global.d.ts b/types/semantic-ui-form/global.d.ts
index 8e5b2c20b8..1f3294c8d6 100644
--- a/types/semantic-ui-form/global.d.ts
+++ b/types/semantic-ui-form/global.d.ts
@@ -212,7 +212,7 @@ declare namespace SemanticUI {
             /**
              * Callback if a form is all valid
              */
-            onSuccess(this: JQuery, event: JQuery.Event<HTMLElement>, fields: any): void;
+            onSuccess(this: JQuery, event: JQuery.TriggeredEvent<HTMLElement>, fields: any): void;
             /**
              * Callback if any form field is invalid
              */
diff --git a/types/semantic-ui-form/semantic-ui-form-tests.ts b/types/semantic-ui-form/semantic-ui-form-tests.ts
index f17ca33112..d481cb00ad 100644
--- a/types/semantic-ui-form/semantic-ui-form-tests.ts
+++ b/types/semantic-ui-form/semantic-ui-form-tests.ts
@@ -144,7 +144,7 @@ function test_form() {
         },
         onSuccess(event, fields) {
             this; // $ExpectType JQuery<HTMLElement>
-            event; // $ExpectType Event<HTMLElement, null>
+            event; // $ExpectType TriggeredEvent<HTMLElement, any, any, any>
             fields; // $ExpectType any
         },
         onFailure(formErrors, fields) {

From 8f46997efa62f7e42f8c87a3efde06e7ec69ec7e Mon Sep 17 00:00:00 2001
From: Leonard Thieu <leonard.thieu@gmail.com>
Date: Sun, 28 Oct 2018 11:28:43 -0400
Subject: [PATCH 253/836] [sharepoint] Fix test failure due to jQuery Events
 API changes.

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

diff --git a/types/sharepoint/sharepoint-tests.ts b/types/sharepoint/sharepoint-tests.ts
index e76536cd18..d3bbe1f808 100644
--- a/types/sharepoint/sharepoint-tests.ts
+++ b/types/sharepoint/sharepoint-tests.ts
@@ -2038,7 +2038,7 @@ namespace _ {
     // do is retrieve a reference to the term set with the same ID as the div, and
     // then add the term  that belong to that term set under the div that was clicked.
 
-    function showTerms(event: JQuery.Event, groupID: SP.Guid, termSetID: SP.Guid) {
+    function showTerms(event: JQuery.ClickEvent, groupID: SP.Guid, termSetID: SP.Guid) {
         // First, cancel the bubble so that the group div click handler does not also fire
         // because that removes all term set divs and we don't want that here.
         event.originalEvent.cancelBubble = true;

From 3a54bad0684cc88f91cfeac115d57554fc494c62 Mon Sep 17 00:00:00 2001
From: Leonard Thieu <leonard.thieu@gmail.com>
Date: Sun, 28 Oct 2018 11:26:51 -0400
Subject: [PATCH 254/836] [jquery] Add support for touch events.

Fixes test failures in `viewporter` due to changes in jQuery Events API.
---
 types/jquery/misc.d.ts | 271 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 271 insertions(+)

diff --git a/types/jquery/misc.d.ts b/types/jquery/misc.d.ts
index 24979fb620..dd05435043 100644
--- a/types/jquery/misc.d.ts
+++ b/types/jquery/misc.d.ts
@@ -5716,6 +5716,269 @@ $( "#checkMetaKey" ).click(function( event ) {
 
     // #endregion
 
+    // region TouchEvent
+    // #region TouchEvent
+
+    interface TouchEventBase<
+        TDelegateTarget = any,
+        TData = any,
+        TCurrentTarget = any
+    > extends UIEventBase<TDelegateTarget, TData, TCurrentTarget> {
+        /**
+         * The other DOM element involved in the event, if any.
+         * @see \`{@link https://api.jquery.com/event.relatedTarget/ }\`
+         * @since 1.1.4
+         * @example ​ ````On mouseout of anchors, alert the element type being entered.
+```javascript
+$( "a" ).mouseout(function( event ) {
+  alert( event.relatedTarget.nodeName ); // "DIV"
+});
+```
+        */
+        relatedTarget?: undefined;
+
+        // MouseEvent
+
+        button: undefined;
+        buttons: undefined;
+        clientX: undefined;
+        clientY: undefined;
+        offsetX: undefined;
+        offsetY: undefined;
+        /**
+         * The mouse position relative to the left edge of the document.
+         * @see \`{@link https://api.jquery.com/event.pageX/ }\`
+         * @since 1.0.4
+         * @example ​ ````Show the mouse position relative to the left and top edges of the document (within this iframe).
+```html
+<!doctype html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <title>event.pageX demo</title>
+  <style>
+  body {
+    background-color: #eef;
+  }
+  div {
+    padding: 20px;
+  }
+  </style>
+  <script src="https://code.jquery.com/jquery-3.3.1.js"></script>
+</head>
+<body>
+​
+<div id="log"></div>
+​
+<script>
+$( document ).on( "mousemove", function( event ) {
+  $( "#log" ).text( "pageX: " + event.pageX + ", pageY: " + event.pageY );
+});
+</script>
+​
+</body>
+</html>
+```
+         */
+        pageX: undefined;
+        /**
+         * The mouse position relative to the top edge of the document.
+         * @see \`{@link https://api.jquery.com/event.pageY/ }\`
+         * @since 1.0.4
+         * @example ​ ````Show the mouse position relative to the left and top edges of the document (within this iframe).
+```html
+<!doctype html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <title>event.pageY demo</title>
+  <style>
+  body {
+    background-color: #eef;
+  }
+  div {
+    padding: 20px;
+  }
+  </style>
+  <script src="https://code.jquery.com/jquery-3.3.1.js"></script>
+</head>
+<body>
+​
+<div id="log"></div>
+​
+<script>
+$( document ).on( "mousemove", function( event ) {
+  $( "#log" ).text( "pageX: " + event.pageX + ", pageY: " + event.pageY );
+});
+</script>
+​
+</body>
+</html>
+```
+         */
+        pageY: undefined;
+        screenX: undefined;
+        screenY: undefined;
+        /** @deprecated */
+        toElement: undefined;
+
+        // PointerEvent
+
+        pointerId: undefined;
+        pointerType: undefined;
+
+        // KeyboardEvent
+
+        /** @deprecated */
+        char: undefined;
+        /** @deprecated */
+        charCode: undefined;
+        key: undefined;
+        /** @deprecated */
+        keyCode: undefined;
+
+        // TouchEvent
+
+        changedTouches: TouchList;
+        targetTouches: TouchList;
+        touches: TouchList;
+
+        // MouseEvent, KeyboardEvent
+
+        /**
+         * For key or mouse events, this property indicates the specific key or button that was pressed.
+         * @see \`{@link https://api.jquery.com/event.which/ }\`
+         * @since 1.1.3
+         * @deprecated ​ Deprecated since 3.3. See \`{@link https://github.com/jquery/api.jquery.com/issues/821 }\`.
+         * @example ​ ````Log which key was depressed.
+```html
+<!doctype html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <title>event.which demo</title>
+  <script src="https://code.jquery.com/jquery-3.3.1.js"></script>
+</head>
+<body>
+​
+<input id="whichkey" value="type something">
+<div id="log"></div>
+​
+<script>
+$( "#whichkey" ).on( "keydown", function( event ) {
+  $( "#log" ).html( event.type + ": " +  event.which );
+});
+</script>
+​
+</body>
+</html>
+```
+         * @example ​ ````Log which mouse button was depressed.
+```html
+<!doctype html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <title>event.which demo</title>
+  <script src="https://code.jquery.com/jquery-3.3.1.js"></script>
+</head>
+<body>
+​
+<input id="whichkey" value="click here">
+<div id="log"></div>
+​
+<script>
+$( "#whichkey" ).on( "mousedown", function( event ) {
+  $( "#log" ).html( event.type + ": " +  event.which );
+});
+</script>
+​
+</body>
+</html>
+```
+         */
+        which: undefined;
+
+        // MouseEvent, KeyboardEvent, TouchEvent
+
+        altKey: boolean;
+        ctrlKey: boolean;
+        /**
+         * Indicates whether the META key was pressed when the event fired.
+         * @see \`{@link https://api.jquery.com/event.metaKey/ }\`
+         * @since 1.0.4
+         * @example ​ ````Determine whether the META key was pressed when the event fired.
+```html
+<!doctype html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <title>event.metaKey demo</title>
+  <style>
+  body {
+    background-color: #eef;
+  }
+  div {
+    padding: 20px;
+  }
+  </style>
+  <script src="https://code.jquery.com/jquery-3.3.1.js"></script>
+</head>
+<body>
+​
+<button value="Test" name="Test" id="checkMetaKey">Click me!</button>
+<div id="display"></div>
+​
+<script>
+$( "#checkMetaKey" ).click(function( event ) {
+  $( "#display" ).text( event.metaKey );
+});
+</script>
+​
+</body>
+</html>
+```
+         */
+        metaKey: boolean;
+        shiftKey: boolean;
+
+        originalEvent?: _TouchEvent;
+    }
+
+    interface TouchCancelEvent<
+        TDelegateTarget = any,
+        TData = any,
+        TCurrentTarget = any
+    > extends TouchEventBase<TDelegateTarget, TData, TCurrentTarget> {
+        type: 'touchcancel';
+    }
+
+    interface TouchEndEvent<
+        TDelegateTarget = any,
+        TData = any,
+        TCurrentTarget = any
+    > extends TouchEventBase<TDelegateTarget, TData, TCurrentTarget> {
+        type: 'touchend';
+    }
+
+    interface TouchMoveEvent<
+        TDelegateTarget = any,
+        TData = any,
+        TCurrentTarget = any
+    > extends TouchEventBase<TDelegateTarget, TData, TCurrentTarget> {
+        type: 'touchmove';
+    }
+
+    interface TouchStartEvent<
+        TDelegateTarget = any,
+        TData = any,
+        TCurrentTarget = any
+    > extends TouchEventBase<TDelegateTarget, TData, TCurrentTarget> {
+        type: 'touchstart';
+    }
+
+    // #endregion
+
     // region FocusEvent
     // #region FocusEvent
 
@@ -6021,6 +6284,13 @@ $( "#checkMetaKey" ).click(function( event ) {
         keypress: KeyPressEvent<TDelegateTarget, TData, TCurrentTarget, TTarget>;
         keyup: KeyUpEvent<TDelegateTarget, TData, TCurrentTarget, TTarget>;
 
+        // TouchEvent
+
+        touchcancel: TouchCancelEvent<TDelegateTarget, TData, TCurrentTarget>;
+        touchend: TouchEndEvent<TDelegateTarget, TData, TCurrentTarget>;
+        touchmove: TouchMoveEvent<TDelegateTarget, TData, TCurrentTarget>;
+        touchstart: TouchStartEvent<TDelegateTarget, TData, TCurrentTarget>;
+
         // FocusEvent
 
         blur: BlurEvent<TDelegateTarget, TData, TCurrentTarget, TTarget>;
@@ -6266,6 +6536,7 @@ type _Event = Event;
 type _UIEvent = UIEvent;
 type _MouseEvent = MouseEvent;
 type _KeyboardEvent = KeyboardEvent;
+type _TouchEvent = TouchEvent;
 type _FocusEvent = FocusEvent;
 
 // region ES5 compatibility

From db83bc720086e202f8b24e37a71cab14a65db456 Mon Sep 17 00:00:00 2001
From: Leonard Thieu <leonard.thieu@gmail.com>
Date: Wed, 31 Oct 2018 11:38:35 -0400
Subject: [PATCH 255/836] [jquery] Don't use a separate type parameter for the
 type of `this` in event handlers.

A separate type parameter is unnecessary as `this` and `currentTarget` reference the same object.
---
 types/jquery/JQuery.d.ts            | 158 ++++++++++++++--------------
 types/jquery/misc.d.ts              |  15 ++-
 types/jquery/test/longdesc-tests.ts |   2 +-
 3 files changed, 86 insertions(+), 89 deletions(-)

diff --git a/types/jquery/JQuery.d.ts b/types/jquery/JQuery.d.ts
index 83e27c6754..123fad3b34 100644
--- a/types/jquery/JQuery.d.ts
+++ b/types/jquery/JQuery.d.ts
@@ -1347,7 +1347,7 @@ $( "p" ).before( $( "b" ) );
          TData>(
         eventType: TType,
         eventData: TData,
-        handler: JQuery.TypeEventHandler<TElement, TData, TElement, TElement, TElement, TType>
+        handler: JQuery.TypeEventHandler<TElement, TData, TElement, TElement, TType>
     ): this;
     /**
      * Attach a handler to an event for the elements.
@@ -1477,7 +1477,7 @@ $( "button" ).click(function() {
      */
     bind<TType extends string>(
         eventType: TType,
-        handler_preventBubble: JQuery.TypeEventHandler<TElement, undefined, TElement, TElement, TElement, TType> |
+        handler_preventBubble: JQuery.TypeEventHandler<TElement, undefined, TElement, TElement, TType> |
                                false |
                                null |
                                undefined
@@ -1507,7 +1507,7 @@ $( "div.test" ).bind({
 });
 ```
      */
-    bind(events: JQuery.TypeEventHandlers<TElement, undefined, TElement, TElement, TElement>): this;
+    bind(events: JQuery.TypeEventHandlers<TElement, undefined, TElement, TElement>): this;
     /**
      * Bind an event handler to the "blur" JavaScript event, or trigger that event on an element.
      * @param eventData An object containing data that will be passed to the event handler.
@@ -1521,7 +1521,7 @@ $( "div.test" ).bind({
      * **Solution**: Instead of `.click(fn)` use `.on("click", fn)`. Instead of `.click()` use `.trigger("click")`.
      */
     blur<TData>(eventData: TData,
-                handler: JQuery.TypeEventHandler<TElement, TData, TElement, TElement, TElement, 'blur'>): this;
+                handler: JQuery.TypeEventHandler<TElement, TData, TElement, TElement, 'blur'>): this;
     /**
      * Bind an event handler to the "blur" JavaScript event, or trigger that event on an element.
      * @param handler A function to execute each time the event is triggered.
@@ -1537,7 +1537,7 @@ $( "div.test" ).bind({
 $( "p" ).blur();
 ```
      */
-    blur(handler?: JQuery.TypeEventHandler<TElement, null, TElement, TElement, TElement, 'blur'> |
+    blur(handler?: JQuery.TypeEventHandler<TElement, null, TElement, TElement, 'blur'> |
                    false): this;
     /**
      * Bind an event handler to the "change" JavaScript event, or trigger that event on an element.
@@ -1552,7 +1552,7 @@ $( "p" ).blur();
      * **Solution**: Instead of `.click(fn)` use `.on("click", fn)`. Instead of `.click()` use `.trigger("click")`.
      */
     change<TData>(eventData: TData,
-                  handler: JQuery.TypeEventHandler<TElement, TData, TElement, TElement, TElement, 'change'>): this;
+                  handler: JQuery.TypeEventHandler<TElement, TData, TElement, TElement, 'change'>): this;
     /**
      * Bind an event handler to the "change" JavaScript event, or trigger that event on an element.
      * @param handler A function to execute each time the event is triggered.
@@ -1611,7 +1611,7 @@ $( "input[type='text']" ).change(function() {
 });
 ```
      */
-    change(handler?: JQuery.TypeEventHandler<TElement, null, TElement, TElement, TElement, 'change'> |
+    change(handler?: JQuery.TypeEventHandler<TElement, null, TElement, TElement, 'change'> |
                      false): this;
     /**
      * Get the children of each element in the set of matched elements, optionally filtered by a selector.
@@ -1865,7 +1865,7 @@ $( "#stop" ).click(function() {
      * **Solution**: Instead of `.click(fn)` use `.on("click", fn)`. Instead of `.click()` use `.trigger("click")`.
      */
     click<TData>(eventData: TData,
-                 handler: JQuery.TypeEventHandler<TElement, TData, TElement, TElement, TElement, 'click'>): this;
+                 handler: JQuery.TypeEventHandler<TElement, TData, TElement, TElement, 'click'>): this;
     /**
      * Bind an event handler to the "click" JavaScript event, or trigger that event on an element.
      * @param handler A function to execute each time the event is triggered.
@@ -1915,7 +1915,7 @@ $( "p" ).click(function() {
 $( "p" ).click();
 ```
      */
-    click(handler?: JQuery.TypeEventHandler<TElement, null, TElement, TElement, TElement, 'click'> |
+    click(handler?: JQuery.TypeEventHandler<TElement, null, TElement, TElement, 'click'> |
                     false): this;
     /**
      * Create a deep copy of the set of matched elements.
@@ -2104,7 +2104,7 @@ $( "#frameDemo" ).contents().find( "a" ).css( "background-color", "#BADA55" );
      * **Solution**: Instead of `.click(fn)` use `.on("click", fn)`. Instead of `.click()` use `.trigger("click")`.
      */
     contextmenu<TData>(eventData: TData,
-                       handler: JQuery.TypeEventHandler<TElement, TData, TElement, TElement, TElement, 'contextmenu'>): this;
+                       handler: JQuery.TypeEventHandler<TElement, TData, TElement, TElement, 'contextmenu'>): this;
     /**
      * Bind an event handler to the "contextmenu" JavaScript event, or trigger that event on an element.
      * @param handler A function to execute each time the event is triggered.
@@ -2158,7 +2158,7 @@ div.contextmenu(function() {
 </html>
 ```
      */
-    contextmenu(handler?: JQuery.TypeEventHandler<TElement, null, TElement, TElement, TElement, 'contextmenu'> |
+    contextmenu(handler?: JQuery.TypeEventHandler<TElement, null, TElement, TElement, 'contextmenu'> |
                           false): this;
     /**
      * Set one or more CSS properties for the set of matched elements.
@@ -2620,7 +2620,7 @@ $( "button" ).click(function() {
      * **Solution**: Instead of `.click(fn)` use `.on("click", fn)`. Instead of `.click()` use `.trigger("click")`.
      */
     dblclick<TData>(eventData: TData,
-                    handler: JQuery.TypeEventHandler<TElement, TData, TElement, TElement, TElement, 'dblclick'>): this;
+                    handler: JQuery.TypeEventHandler<TElement, TData, TElement, TElement, 'dblclick'>): this;
     /**
      * Bind an event handler to the "dblclick" JavaScript event, or trigger that event on an element.
      * @param handler A function to execute each time the event is triggered.
@@ -2674,7 +2674,7 @@ divdbl.dblclick(function() {
 </html>
 ```
      */
-    dblclick(handler?: JQuery.TypeEventHandler<TElement, null, TElement, TElement, TElement, 'dblclick'> |
+    dblclick(handler?: JQuery.TypeEventHandler<TElement, null, TElement, TElement, 'dblclick'> |
                        false): this;
     /**
      * Set a timer to delay execution of subsequent items in the queue.
@@ -2745,7 +2745,7 @@ $( "button" ).click(function() {
         selector: JQuery.Selector,
         eventType: TType,
         eventData: TData,
-        handler: JQuery.TypeEventHandler<TElement, TData, any, any, any, TType>
+        handler: JQuery.TypeEventHandler<TElement, TData, any, any, TType>
     ): this;
     /**
      * Attach a handler to one or more events for all elements that match the selector, now or in the future, based on a specific set of root elements.
@@ -2861,7 +2861,7 @@ $( "button" ).click(function() {
     delegate<TType extends string>(
         selector: JQuery.Selector,
         eventType: TType,
-        handler: JQuery.TypeEventHandler<TElement, undefined, any, any, any, TType> |
+        handler: JQuery.TypeEventHandler<TElement, undefined, any, any, TType> |
                  false
     ): this;
     /**
@@ -2877,7 +2877,7 @@ $( "button" ).click(function() {
      * **Solution**: Change the method call to use `.on()` or `.off()`, the documentation for the old methods include specific instructions. In general, the `.bind()` and `.unbind()` methods can be renamed directly to `.on()` and `.off()` respectively since the argument orders are identical.
      */
     delegate(selector: JQuery.Selector,
-             events: JQuery.TypeEventHandlers<TElement, undefined, any, any, any>
+             events: JQuery.TypeEventHandlers<TElement, undefined, any, any>
     ): this;
     /**
      * Execute the next function on the queue for the matched elements.
@@ -4298,7 +4298,7 @@ $( "p span" ).first().addClass( "highlight" );
      * **Solution**: Instead of `.click(fn)` use `.on("click", fn)`. Instead of `.click()` use `.trigger("click")`.
      */
     focus<TData>(eventData: TData,
-                 handler: JQuery.TypeEventHandler<TElement, TData, TElement, TElement, TElement, 'focus'>): this;
+                 handler: JQuery.TypeEventHandler<TElement, TData, TElement, TElement, 'focus'>): this;
     /**
      * Bind an event handler to the "focus" JavaScript event, or trigger that event on an element.
      * @param handler A function to execute each time the event is triggered.
@@ -4350,7 +4350,7 @@ $( document ).ready(function() {
 });
 ```
      */
-    focus(handler?: JQuery.TypeEventHandler<TElement, null, TElement, TElement, TElement, 'focus'> |
+    focus(handler?: JQuery.TypeEventHandler<TElement, null, TElement, TElement, 'focus'> |
                     false): this;
     /**
      * Bind an event handler to the "focusin" event.
@@ -4365,7 +4365,7 @@ $( document ).ready(function() {
      * **Solution**: Instead of `.click(fn)` use `.on("click", fn)`. Instead of `.click()` use `.trigger("click")`.
      */
     focusin<TData>(eventData: TData,
-                   handler: JQuery.TypeEventHandler<TElement, TData, TElement, TElement, TElement, 'focusin'>): this;
+                   handler: JQuery.TypeEventHandler<TElement, TData, TElement, TElement, 'focusin'>): this;
     /**
      * Bind an event handler to the "focusin" event.
      * @param handler A function to execute each time the event is triggered.
@@ -4405,7 +4405,7 @@ $( "p" ).focusin(function() {
 </html>
 ```
      */
-    focusin(handler?: JQuery.TypeEventHandler<TElement, null, TElement, TElement, TElement, 'focusin'> |
+    focusin(handler?: JQuery.TypeEventHandler<TElement, null, TElement, TElement, 'focusin'> |
                       false): this;
     /**
      * Bind an event handler to the "focusout" JavaScript event.
@@ -4420,7 +4420,7 @@ $( "p" ).focusin(function() {
      * **Solution**: Instead of `.click(fn)` use `.on("click", fn)`. Instead of `.click()` use `.trigger("click")`.
      */
     focusout<TData>(eventData: TData,
-                    handler: JQuery.TypeEventHandler<TElement, TData, TElement, TElement, TElement, 'focusout'>): this;
+                    handler: JQuery.TypeEventHandler<TElement, TData, TElement, TElement, 'focusout'>): this;
     /**
      * Bind an event handler to the "focusout" JavaScript event.
      * @param handler A function to execute each time the event is triggered.
@@ -4481,7 +4481,7 @@ $( "p" )
 </html>
 ```
      */
-    focusout(handler?: JQuery.TypeEventHandler<TElement, null, TElement, TElement, TElement, 'focusout'> |
+    focusout(handler?: JQuery.TypeEventHandler<TElement, null, TElement, TElement, 'focusout'> |
                        false): this;
     /**
      * Retrieve one of the elements matched by the jQuery object.
@@ -4998,9 +4998,9 @@ $( "td" ).hover(
 $( "td" ).off( "mouseenter mouseleave" );
 ```
      */
-    hover(handlerIn: JQuery.TypeEventHandler<TElement, null, TElement, TElement, TElement, 'mouseenter'> |
+    hover(handlerIn: JQuery.TypeEventHandler<TElement, null, TElement, TElement, 'mouseenter'> |
                      false,
-          handlerOut: JQuery.TypeEventHandler<TElement, null, TElement, TElement, TElement, 'mouseleave'> |
+          handlerOut: JQuery.TypeEventHandler<TElement, null, TElement, TElement, 'mouseleave'> |
                       false): this;
     /**
      * Bind a single handler to the matched elements, to be executed when the mouse pointer enters or leaves the elements.
@@ -5067,7 +5067,7 @@ $( "li" )
 </html>
 ```
      */
-    hover(handlerInOut: JQuery.TypeEventHandler<TElement, null, TElement, TElement, TElement, 'mouseenter' | 'mouseleave'> |
+    hover(handlerInOut: JQuery.TypeEventHandler<TElement, null, TElement, TElement, 'mouseenter' | 'mouseleave'> |
                         false): this;
     /**
      * Set the HTML contents of each element in the set of matched elements.
@@ -5882,7 +5882,7 @@ $( "li" ).click(function() {
      * **Solution**: Instead of `.click(fn)` use `.on("click", fn)`. Instead of `.click()` use `.trigger("click")`.
      */
     keydown<TData>(eventData: TData,
-                   handler: JQuery.TypeEventHandler<TElement, TData, TElement, TElement, TElement, 'keydown'>): this;
+                   handler: JQuery.TypeEventHandler<TElement, TData, TElement, TElement, 'keydown'>): this;
     /**
      * Bind an event handler to the "keydown" JavaScript event, or trigger that event on an element.
      * @param handler A function to execute each time the event is triggered.
@@ -5954,7 +5954,7 @@ $( "#other" ).click(function() {
 </html>
 ```
      */
-    keydown(handler?: JQuery.TypeEventHandler<TElement, null, TElement, TElement, TElement, 'keydown'> |
+    keydown(handler?: JQuery.TypeEventHandler<TElement, null, TElement, TElement, 'keydown'> |
                       false): this;
     /**
      * Bind an event handler to the "keypress" JavaScript event, or trigger that event on an element.
@@ -5969,7 +5969,7 @@ $( "#other" ).click(function() {
      * **Solution**: Instead of `.click(fn)` use `.on("click", fn)`. Instead of `.click()` use `.trigger("click")`.
      */
     keypress<TData>(eventData: TData,
-                    handler: JQuery.TypeEventHandler<TElement, TData, TElement, TElement, TElement, 'keypress'>): this;
+                    handler: JQuery.TypeEventHandler<TElement, TData, TElement, TElement, 'keypress'>): this;
     /**
      * Bind an event handler to the "keypress" JavaScript event, or trigger that event on an element.
      * @param handler A function to execute each time the event is triggered.
@@ -6041,7 +6041,7 @@ $( "#other" ).click(function() {
 </html>
 ```
      */
-    keypress(handler?: JQuery.TypeEventHandler<TElement, null, TElement, TElement, TElement, 'keypress'> |
+    keypress(handler?: JQuery.TypeEventHandler<TElement, null, TElement, TElement, 'keypress'> |
                        false): this;
     /**
      * Bind an event handler to the "keyup" JavaScript event, or trigger that event on an element.
@@ -6056,7 +6056,7 @@ $( "#other" ).click(function() {
      * **Solution**: Instead of `.click(fn)` use `.on("click", fn)`. Instead of `.click()` use `.trigger("click")`.
      */
     keyup<TData>(eventData: TData,
-                 handler: JQuery.TypeEventHandler<TElement, TData, TElement, TElement, TElement, 'keyup'>): this;
+                 handler: JQuery.TypeEventHandler<TElement, TData, TElement, TElement, 'keyup'>): this;
     /**
      * Bind an event handler to the "keyup" JavaScript event, or trigger that event on an element.
      * @param handler A function to execute each time the event is triggered.
@@ -6129,7 +6129,7 @@ $( "#other").click(function() {
 </html>
 ```
      */
-    keyup(handler?: JQuery.TypeEventHandler<TElement, null, TElement, TElement, TElement, 'keyup'> |
+    keyup(handler?: JQuery.TypeEventHandler<TElement, null, TElement, TElement, 'keyup'> |
                     false): this;
     /**
      * Reduce the set of matched elements to the final one in the set.
@@ -6419,7 +6419,7 @@ $( "input" ).click(function() {
      * **Solution**: Instead of `.click(fn)` use `.on("click", fn)`. Instead of `.click()` use `.trigger("click")`.
      */
     mousedown<TData>(eventData: TData,
-                     handler: JQuery.TypeEventHandler<TElement, TData, TElement, TElement, TElement, 'mousedown'>): this;
+                     handler: JQuery.TypeEventHandler<TElement, TData, TElement, TElement, 'mousedown'>): this;
     /**
      * Bind an event handler to the "mousedown" JavaScript event, or trigger that event on an element.
      * @param handler A function to execute each time the event is triggered.
@@ -6457,7 +6457,7 @@ $( "p" )
 </html>
 ```
      */
-    mousedown(handler?: JQuery.TypeEventHandler<TElement, null, TElement, TElement, TElement, 'mousedown'> |
+    mousedown(handler?: JQuery.TypeEventHandler<TElement, null, TElement, TElement, 'mousedown'> |
                         false): this;
     /**
      * Bind an event handler to be fired when the mouse enters an element, or trigger that handler on an element.
@@ -6472,7 +6472,7 @@ $( "p" )
      * **Solution**: Instead of `.click(fn)` use `.on("click", fn)`. Instead of `.click()` use `.trigger("click")`.
      */
     mouseenter<TData>(eventData: TData,
-                      handler: JQuery.TypeEventHandler<TElement, TData, TElement, TElement, TElement, 'mouseenter'>): this;
+                      handler: JQuery.TypeEventHandler<TElement, TData, TElement, TElement, 'mouseenter'>): this;
     /**
      * Bind an event handler to be fired when the mouse enters an element, or trigger that handler on an element.
      * @param handler A function to execute each time the event is triggered.
@@ -6553,7 +6553,7 @@ $( "div.enterleave" )
 </html>
 ```
      */
-    mouseenter(handler?: JQuery.TypeEventHandler<TElement, null, TElement, TElement, TElement, 'mouseenter'> |
+    mouseenter(handler?: JQuery.TypeEventHandler<TElement, null, TElement, TElement, 'mouseenter'> |
                          false): this;
     /**
      * Bind an event handler to be fired when the mouse leaves an element, or trigger that handler on an element.
@@ -6568,7 +6568,7 @@ $( "div.enterleave" )
      * **Solution**: Instead of `.click(fn)` use `.on("click", fn)`. Instead of `.click()` use `.trigger("click")`.
      */
     mouseleave<TData>(eventData: TData,
-                      handler: JQuery.TypeEventHandler<TElement, TData, TElement, TElement, TElement, 'mouseleave'>): this;
+                      handler: JQuery.TypeEventHandler<TElement, TData, TElement, TElement, 'mouseleave'>): this;
     /**
      * Bind an event handler to be fired when the mouse leaves an element, or trigger that handler on an element.
      * @param handler A function to execute each time the event is triggered.
@@ -6647,7 +6647,7 @@ $( "div.enterleave" )
 </html>
 ```
      */
-    mouseleave(handler?: JQuery.TypeEventHandler<TElement, null, TElement, TElement, TElement, 'mouseleave'> |
+    mouseleave(handler?: JQuery.TypeEventHandler<TElement, null, TElement, TElement, 'mouseleave'> |
                          false): this;
     /**
      * Bind an event handler to the "mousemove" JavaScript event, or trigger that event on an element.
@@ -6662,7 +6662,7 @@ $( "div.enterleave" )
      * **Solution**: Instead of `.click(fn)` use `.on("click", fn)`. Instead of `.click()` use `.trigger("click")`.
      */
     mousemove<TData>(eventData: TData,
-                     handler: JQuery.TypeEventHandler<TElement, TData, TElement, TElement, TElement, 'mousemove'>): this;
+                     handler: JQuery.TypeEventHandler<TElement, TData, TElement, TElement, 'mousemove'>): this;
     /**
      * Bind an event handler to the "mousemove" JavaScript event, or trigger that event on an element.
      * @param handler A function to execute each time the event is triggered.
@@ -6726,7 +6726,7 @@ $( "div" ).mousemove(function( event ) {
 </html>
 ```
      */
-    mousemove(handler?: JQuery.TypeEventHandler<TElement, null, TElement, TElement, TElement, 'mousemove'> |
+    mousemove(handler?: JQuery.TypeEventHandler<TElement, null, TElement, TElement, 'mousemove'> |
                         false): this;
     /**
      * Bind an event handler to the "mouseout" JavaScript event, or trigger that event on an element.
@@ -6741,7 +6741,7 @@ $( "div" ).mousemove(function( event ) {
      * **Solution**: Instead of `.click(fn)` use `.on("click", fn)`. Instead of `.click()` use `.trigger("click")`.
      */
     mouseout<TData>(eventData: TData,
-                    handler: JQuery.TypeEventHandler<TElement, TData, TElement, TElement, TElement, 'mouseout'>): this;
+                    handler: JQuery.TypeEventHandler<TElement, TData, TElement, TElement, 'mouseout'>): this;
     /**
      * Bind an event handler to the "mouseout" JavaScript event, or trigger that event on an element.
      * @param handler A function to execute each time the event is triggered.
@@ -6822,7 +6822,7 @@ $( "div.enterleave" )
 </html>
 ```
      */
-    mouseout(handler?: JQuery.TypeEventHandler<TElement, null, TElement, TElement, TElement, 'mouseout'> |
+    mouseout(handler?: JQuery.TypeEventHandler<TElement, null, TElement, TElement, 'mouseout'> |
                        false): this;
     /**
      * Bind an event handler to the "mouseover" JavaScript event, or trigger that event on an element.
@@ -6837,7 +6837,7 @@ $( "div.enterleave" )
      * **Solution**: Instead of `.click(fn)` use `.on("click", fn)`. Instead of `.click()` use `.trigger("click")`.
      */
     mouseover<TData>(eventData: TData,
-                     handler: JQuery.TypeEventHandler<TElement, TData, TElement, TElement, TElement, 'mouseover'>): this;
+                     handler: JQuery.TypeEventHandler<TElement, TData, TElement, TElement, 'mouseover'>): this;
     /**
      * Bind an event handler to the "mouseover" JavaScript event, or trigger that event on an element.
      * @param handler A function to execute each time the event is triggered.
@@ -6918,7 +6918,7 @@ $( "div.enterleave" )
 </html>
 ```
      */
-    mouseover(handler?: JQuery.TypeEventHandler<TElement, null, TElement, TElement, TElement, 'mouseover'> |
+    mouseover(handler?: JQuery.TypeEventHandler<TElement, null, TElement, TElement, 'mouseover'> |
                         false): this;
     /**
      * Bind an event handler to the "mouseup" JavaScript event, or trigger that event on an element.
@@ -6933,7 +6933,7 @@ $( "div.enterleave" )
      * **Solution**: Instead of `.click(fn)` use `.on("click", fn)`. Instead of `.click()` use `.trigger("click")`.
      */
     mouseup<TData>(eventData: TData,
-                   handler: JQuery.TypeEventHandler<TElement, TData, TElement, TElement, TElement, 'mouseup'>): this;
+                   handler: JQuery.TypeEventHandler<TElement, TData, TElement, TElement, 'mouseup'>): this;
     /**
      * Bind an event handler to the "mouseup" JavaScript event, or trigger that event on an element.
      * @param handler A function to execute each time the event is triggered.
@@ -6971,7 +6971,7 @@ $( "p" )
 </html>
 ```
      */
-    mouseup(handler?: JQuery.TypeEventHandler<TElement, null, TElement, TElement, TElement, 'mouseup'> |
+    mouseup(handler?: JQuery.TypeEventHandler<TElement, null, TElement, TElement, 'mouseup'> |
                       false): this;
     /**
      * Get the immediately following sibling of each element in the set of matched elements. If a selector is provided, it retrieves the next sibling only if it matches that selector.
@@ -7306,7 +7306,7 @@ $( "body" ).off( "click", "p", foo );
      */
     off(events: string,
         selector: JQuery.Selector,
-        handler: JQuery.TypeEventHandler<TElement, any, any, any, any, string> |
+        handler: JQuery.TypeEventHandler<TElement, any, any, any, string> |
                  false): this;
     /**
      * Remove an event handler.
@@ -7339,7 +7339,7 @@ $( "form" ).off( ".validator" );
      */
     off(events: string,
         selector_handler?: JQuery.Selector |
-                           JQuery.TypeEventHandler<TElement, any, any, any, any, string> |
+                           JQuery.TypeEventHandler<TElement, any, any, any, string> |
                            false): this;
     /**
      * Remove an event handler.
@@ -7349,7 +7349,7 @@ $( "form" ).off( ".validator" );
      * @see \`{@link https://api.jquery.com/off/ }\`
      * @since 1.7
      */
-    off(events: JQuery.TypeEventHandlers<TElement, any, any, any, any>,
+    off(events: JQuery.TypeEventHandlers<TElement, any, any, any>,
         selector?: JQuery.Selector): this;
     /**
      * Remove an event handler.
@@ -7539,7 +7539,7 @@ $( "*", document.body ).click(function( event ) {
         events: TType,
         selector: JQuery.Selector,
         data: TData,
-        handler: JQuery.TypeEventHandler<TElement, TData, any, any, any, TType>
+        handler: JQuery.TypeEventHandler<TElement, TData, any, any, TType>
     ): this;
     /**
      * Attach an event handler function for one or more events to the selected elements.
@@ -7556,7 +7556,7 @@ $( "*", document.body ).click(function( event ) {
         events: TType,
         selector: null | undefined,
         data: TData,
-        handler: JQuery.TypeEventHandler<TElement, TData, TElement, TElement, TElement, TType>
+        handler: JQuery.TypeEventHandler<TElement, TData, TElement, TElement, TType>
     ): this;
     /**
      * Attach an event handler function for one or more events to the selected elements.
@@ -7636,7 +7636,7 @@ $( "body" ).on( "click", "a", function( event ) {
     on<TType extends string>(
         events: TType,
         selector: JQuery.Selector,
-        handler: JQuery.TypeEventHandler<TElement, undefined, any, any, any, TType> |
+        handler: JQuery.TypeEventHandler<TElement, undefined, any, any, TType> |
                  false
     ): this;
     /**
@@ -7658,7 +7658,7 @@ $( "p" ).on( "click", { foo: "bar" }, myHandler );
        TData>(
         events: TType,
         data: TData,
-        handler: JQuery.TypeEventHandler<TElement, TData, TElement, TElement, TElement, TType>
+        handler: JQuery.TypeEventHandler<TElement, TData, TElement, TElement, TType>
     ): this;
     /**
      * Attach an event handler function for one or more events to the selected elements.
@@ -7826,7 +7826,7 @@ $( "#cart" ).on( "mouseenter mouseleave", function( event ) {
      */
     on<TType extends string>(
         events: TType,
-        handler: JQuery.TypeEventHandler<TElement, undefined, TElement, TElement, TElement, TType> |
+        handler: JQuery.TypeEventHandler<TElement, undefined, TElement, TElement, TType> |
                  false
     ): this;
     /**
@@ -7933,7 +7933,7 @@ $( "#cart" ).on( "mouseenter mouseleave", function( event ) {
      * @since 1.7
      */
     on<TData>(
-        events: JQuery.TypeEventHandlers<TElement, TData, any, any, any>,
+        events: JQuery.TypeEventHandlers<TElement, TData, any, any>,
         selector: JQuery.Selector,
         data: TData
     ): this;
@@ -7948,7 +7948,7 @@ $( "#cart" ).on( "mouseenter mouseleave", function( event ) {
      * @since 1.7
      */
     on<TData>(
-        events: JQuery.TypeEventHandlers<TElement, TData, TElement, TElement, TElement>,
+        events: JQuery.TypeEventHandlers<TElement, TData, TElement, TElement>,
         selector: null | undefined,
         data: TData
     ): this;
@@ -7961,7 +7961,7 @@ $( "#cart" ).on( "mouseenter mouseleave", function( event ) {
      * @see \`{@link https://api.jquery.com/on/ }\`
      * @since 1.7
      */
-    on(events: JQuery.TypeEventHandlers<TElement, undefined, any, any, any>,
+    on(events: JQuery.TypeEventHandlers<TElement, undefined, any, any>,
        selector: JQuery.Selector
     ): this;
     /**
@@ -7973,7 +7973,7 @@ $( "#cart" ).on( "mouseenter mouseleave", function( event ) {
      * @since 1.7
      */
     on<TData>(
-        events: JQuery.TypeEventHandlers<TElement, TData, TElement, TElement, TElement>,
+        events: JQuery.TypeEventHandlers<TElement, TData, TElement, TElement>,
         data: TData
     ): this;
     /**
@@ -8024,7 +8024,7 @@ $( "div.test" ).on({
 </html>
 ```
      */
-    on(events: JQuery.TypeEventHandlers<TElement, undefined, TElement, TElement, TElement>): this;
+    on(events: JQuery.TypeEventHandlers<TElement, undefined, TElement, TElement>): this;
     /**
      * Attach a handler to an event for the elements. The handler is executed at most once per element per event type.
      * @param events One or more space-separated event types and optional namespaces, such as "click" or "keydown.myPlugin".
@@ -8040,7 +8040,7 @@ $( "div.test" ).on({
         events: TType,
         selector: JQuery.Selector,
         data: TData,
-        handler: JQuery.TypeEventHandler<TElement, TData, any, any, any, TType>
+        handler: JQuery.TypeEventHandler<TElement, TData, any, any, TType>
     ): this;
     /**
      * Attach a handler to an event for the elements. The handler is executed at most once per element per event type.
@@ -8057,7 +8057,7 @@ $( "div.test" ).on({
         events: TType,
         selector: null | undefined,
         data: TData,
-        handler: JQuery.TypeEventHandler<TElement, TData, TElement, TElement, TElement, TType>
+        handler: JQuery.TypeEventHandler<TElement, TData, TElement, TElement, TType>
     ): this;
     /**
      * Attach a handler to an event for the elements. The handler is executed at most once per element per event type.
@@ -8072,7 +8072,7 @@ $( "div.test" ).on({
     one<TType extends string>(
         events: TType,
         selector: JQuery.Selector,
-        handler: JQuery.TypeEventHandler<TElement, undefined, any, any, any, TType> |
+        handler: JQuery.TypeEventHandler<TElement, undefined, any, any, TType> |
                  false
     ): this;
     /**
@@ -8087,7 +8087,7 @@ $( "div.test" ).on({
         TData>(
         events: TType,
         data: TData,
-        handler: JQuery.TypeEventHandler<TElement, TData, TElement, TElement, TElement, TType>
+        handler: JQuery.TypeEventHandler<TElement, TData, TElement, TElement, TType>
     ): this;
     /**
      * Attach a handler to an event for the elements. The handler is executed at most once per element per event type.
@@ -8179,7 +8179,7 @@ $(".target").one("click mouseenter", function() {
      */
     one<TType extends string>(
         events: TType,
-        handler: JQuery.TypeEventHandler<TElement, undefined, TElement, TElement, TElement, TType>|
+        handler: JQuery.TypeEventHandler<TElement, undefined, TElement, TElement, TType>|
                  false
     ): this;
     /**
@@ -8193,7 +8193,7 @@ $(".target").one("click mouseenter", function() {
      * @since 1.7
      */
     one<TData>(
-        events: JQuery.TypeEventHandlers<TElement, TData, any, any, any>,
+        events: JQuery.TypeEventHandlers<TElement, TData, any, any>,
         selector: JQuery.Selector,
         data: TData
     ): this;
@@ -8208,7 +8208,7 @@ $(".target").one("click mouseenter", function() {
      * @since 1.7
      */
     one<TData>(
-        events: JQuery.TypeEventHandlers<TElement, TData, TElement, TElement, TElement>,
+        events: JQuery.TypeEventHandlers<TElement, TData, TElement, TElement>,
         selector: null | undefined,
         data: TData
     ): this;
@@ -8221,7 +8221,7 @@ $(".target").one("click mouseenter", function() {
      * @see \`{@link https://api.jquery.com/one/ }\`
      * @since 1.7
      */
-    one(events: JQuery.TypeEventHandlers<TElement, undefined, any, any, any>,
+    one(events: JQuery.TypeEventHandlers<TElement, undefined, any, any>,
         selector: JQuery.Selector): this;
     /**
      * Attach a handler to an event for the elements. The handler is executed at most once per element per event type.
@@ -8232,7 +8232,7 @@ $(".target").one("click mouseenter", function() {
      * @since 1.7
      */
     one<TData>(
-        events: JQuery.TypeEventHandlers<TElement, TData, TElement, TElement, TElement>,
+        events: JQuery.TypeEventHandlers<TElement, TData, TElement, TElement>,
         data: TData
     ): this;
     /**
@@ -8242,7 +8242,7 @@ $(".target").one("click mouseenter", function() {
      * @see \`{@link https://api.jquery.com/one/ }\`
      * @since 1.7
      */
-    one(events: JQuery.TypeEventHandlers<TElement, undefined, TElement, TElement, TElement>): this;
+    one(events: JQuery.TypeEventHandlers<TElement, undefined, TElement, TElement>): this;
     /**
      * Set the CSS outer height of each element in the set of matched elements.
      * @param value_function _&#x40;param_ `value_function`
@@ -10000,7 +10000,7 @@ $( "button" ).on( "click", function() {
      * **Solution**: Instead of `.click(fn)` use `.on("click", fn)`. Instead of `.click()` use `.trigger("click")`.
      */
     resize<TData>(eventData: TData,
-                  handler: JQuery.TypeEventHandler<TElement, TData, TElement, TElement, TElement, 'resize'>): this;
+                  handler: JQuery.TypeEventHandler<TElement, TData, TElement, TElement, 'resize'>): this;
     /**
      * Bind an event handler to the "resize" JavaScript event, or trigger that event on an element.
      * @param handler A function to execute each time the event is triggered.
@@ -10018,7 +10018,7 @@ $( window ).resize(function() {
 });
 ```
      */
-    resize(handler?: JQuery.TypeEventHandler<TElement, null, TElement, TElement, TElement, 'resize'> |
+    resize(handler?: JQuery.TypeEventHandler<TElement, null, TElement, TElement, 'resize'> |
                      false): this;
     /**
      * Bind an event handler to the "scroll" JavaScript event, or trigger that event on an element.
@@ -10033,7 +10033,7 @@ $( window ).resize(function() {
      * **Solution**: Instead of `.click(fn)` use `.on("click", fn)`. Instead of `.click()` use `.trigger("click")`.
      */
     scroll<TData>(eventData: TData,
-                  handler: JQuery.TypeEventHandler<TElement, TData, TElement, TElement, TElement, 'scroll'>): this;
+                  handler: JQuery.TypeEventHandler<TElement, TData, TElement, TElement, 'scroll'>): this;
     /**
      * Bind an event handler to the "scroll" JavaScript event, or trigger that event on an element.
      * @param handler A function to execute each time the event is triggered.
@@ -10083,7 +10083,7 @@ $( window ).scroll(function() {
 </html>
 ```
      */
-    scroll(handler?: JQuery.TypeEventHandler<TElement, null, TElement, TElement, TElement, 'scroll'> |
+    scroll(handler?: JQuery.TypeEventHandler<TElement, null, TElement, TElement, 'scroll'> |
                      false): this;
     /**
      * Set the current horizontal position of the scroll bar for each of the set of matched elements.
@@ -10258,7 +10258,7 @@ $( "p:last" ).text( "scrollTop:" + p.scrollTop() );
      * **Solution**: Instead of `.click(fn)` use `.on("click", fn)`. Instead of `.click()` use `.trigger("click")`.
      */
     select<TData>(eventData: TData,
-                  handler: JQuery.TypeEventHandler<TElement, TData, TElement, TElement, TElement, 'select'>): this;
+                  handler: JQuery.TypeEventHandler<TElement, TData, TElement, TElement, 'select'>): this;
     /**
      * Bind an event handler to the "select" JavaScript event, or trigger that event on an element.
      * @param handler A function to execute each time the event is triggered.
@@ -10307,7 +10307,7 @@ $( ":input" ).select(function() {
 $( "input" ).select();
 ```
      */
-    select(handler?: JQuery.TypeEventHandler<TElement, null, TElement, TElement, TElement, 'select'> |
+    select(handler?: JQuery.TypeEventHandler<TElement, null, TElement, TElement, 'select'> |
                      false): this;
     /**
      * Encode a set of form elements as a string for submission.
@@ -11279,7 +11279,7 @@ $( "#toggle" ).on( "click", function() {
      * **Solution**: Instead of `.click(fn)` use `.on("click", fn)`. Instead of `.click()` use `.trigger("click")`.
      */
     submit<TData>(eventData: TData,
-                  handler: JQuery.TypeEventHandler<TElement, TData, TElement, TElement, TElement, 'submit'>): this;
+                  handler: JQuery.TypeEventHandler<TElement, TData, TElement, TElement, 'submit'>): this;
     /**
      * Bind an event handler to the "submit" JavaScript event, or trigger that event on an element.
      * @param handler A function to execute each time the event is triggered.
@@ -11348,7 +11348,7 @@ $( "form" ).submit(function() {
 $( "form:first" ).submit();
 ```
      */
-    submit(handler?: JQuery.TypeEventHandler<TElement, null, TElement, TElement, TElement, 'submit'> |
+    submit(handler?: JQuery.TypeEventHandler<TElement, null, TElement, TElement, 'submit'> |
                      false): this;
     /**
      * Set the content of each element in the set of matched elements to the specified text.
@@ -11969,7 +11969,7 @@ $( "p" ).unbind( "click", foo ); // ... foo will no longer be called.
 ```
      */
     unbind(event: string,
-           handler: JQuery.TypeEventHandler<TElement, any, TElement, TElement, TElement, string> |
+           handler: JQuery.TypeEventHandler<TElement, any, TElement, TElement, string> |
                     false
     ): this;
     /**
@@ -12064,7 +12064,7 @@ $( "body" ).undelegate( "p", "click", foo );
      */
     undelegate(selector: JQuery.Selector,
                eventType: string,
-               handler: JQuery.TypeEventHandler<TElement, any, any, any, any, string> |
+               handler: JQuery.TypeEventHandler<TElement, any, any, any, string> |
                         false
     ): this;
     /**
@@ -12085,7 +12085,7 @@ $( "body" ).undelegate( "p", "click", foo );
      */
     undelegate(selector: JQuery.Selector,
                eventType_events: string |
-                                 JQuery.TypeEventHandlers<TElement, any, any, any, any>): this;
+                                 JQuery.TypeEventHandlers<TElement, any, any, any>): this;
     /**
      * Remove a handler from the event for all elements which match the current selector, based upon a specific set of root elements.
      * @param namespace A selector which will be used to filter the event results.
diff --git a/types/jquery/misc.d.ts b/types/jquery/misc.d.ts
index dd05435043..553f3a58ed 100644
--- a/types/jquery/misc.d.ts
+++ b/types/jquery/misc.d.ts
@@ -6314,20 +6314,18 @@ $( "#checkMetaKey" ).click(function( event ) {
         TData,
         TCurrentTarget,
         TTarget,
-        TContext,
         TType extends keyof TypeToTriggeredEventMap<TDelegateTarget, TData, TCurrentTarget, TTarget>
-    > = EventHandlerBase<TContext, TypeToTriggeredEventMap<TDelegateTarget, TData, TCurrentTarget, TTarget>[TType]>;
+    > = EventHandlerBase<TCurrentTarget, TypeToTriggeredEventMap<TDelegateTarget, TData, TCurrentTarget, TTarget>[TType]>;
 
     interface TypeEventHandlers<
         TDelegateTarget,
         TData,
         TCurrentTarget,
-        TTarget,
-        TContext
-    > extends _TypeEventHandlers<TDelegateTarget, TData, TCurrentTarget, TTarget, TContext> {
+        TTarget
+    > extends _TypeEventHandlers<TDelegateTarget, TData, TCurrentTarget, TTarget> {
         // No idea why it's necessary to include `object` in the union but otherwise TypeScript complains that
         // derived types of Event are not assignable to Event.
-        [type: string]: TypeEventHandler<TDelegateTarget, TData, TCurrentTarget, TTarget, TContext, string> |
+        [type: string]: TypeEventHandler<TDelegateTarget, TData, TCurrentTarget, TTarget, string> |
                         false |
                         undefined |
                         object;
@@ -6337,11 +6335,10 @@ $( "#checkMetaKey" ).click(function( event ) {
         TDelegateTarget,
         TData,
         TCurrentTarget,
-        TTarget,
-        TContext
+        TTarget
     > = {
         [TType in keyof TypeToTriggeredEventMap<TDelegateTarget, TData, TCurrentTarget, TTarget>]?:
-            TypeEventHandler<TDelegateTarget, TData, TCurrentTarget, TTarget, TContext, TType> |
+            TypeEventHandler<TDelegateTarget, TData, TCurrentTarget, TTarget, TType> |
             false |
             object;
     };
diff --git a/types/jquery/test/longdesc-tests.ts b/types/jquery/test/longdesc-tests.ts
index f3cf559638..8c5382f904 100644
--- a/types/jquery/test/longdesc-tests.ts
+++ b/types/jquery/test/longdesc-tests.ts
@@ -538,7 +538,7 @@ function longdesc() {
         $('#foo').slideUp(300).delay(800).fadeIn(400);
     }
 
-    function delegate_0(elements: HTMLElement[], selector: string, events: string, data: any, handler: JQuery.TypeEventHandler<HTMLElement, any, any, any, any, string>) {
+    function delegate_0(elements: HTMLElement[], selector: string, events: string, data: any, handler: JQuery.TypeEventHandler<HTMLElement, any, any, any, string>) {
         // jQuery 1.4.3+
         $(elements).delegate(selector, events, data, handler);
         // jQuery 1.7+

From 33c6e58f6e3d5d1bcc9d02710d7f7d634645337e Mon Sep 17 00:00:00 2001
From: Leonard Thieu <leonard.thieu@gmail.com>
Date: Thu, 1 Nov 2018 10:01:29 -0400
Subject: [PATCH 256/836] [jquery] Add missing `TTarget` type parameter to
 touch events.

---
 types/jquery/misc.d.ts | 33 +++++++++++++++++++--------------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/types/jquery/misc.d.ts b/types/jquery/misc.d.ts
index 553f3a58ed..481b79e037 100644
--- a/types/jquery/misc.d.ts
+++ b/types/jquery/misc.d.ts
@@ -5722,8 +5722,9 @@ $( "#checkMetaKey" ).click(function( event ) {
     interface TouchEventBase<
         TDelegateTarget = any,
         TData = any,
-        TCurrentTarget = any
-    > extends UIEventBase<TDelegateTarget, TData, TCurrentTarget> {
+        TCurrentTarget = any,
+        TTarget = any
+    > extends UIEventBase<TDelegateTarget, TData, TCurrentTarget, TTarget> {
         /**
          * The other DOM element involved in the event, if any.
          * @see \`{@link https://api.jquery.com/event.relatedTarget/ }\`
@@ -5948,32 +5949,36 @@ $( "#checkMetaKey" ).click(function( event ) {
     interface TouchCancelEvent<
         TDelegateTarget = any,
         TData = any,
-        TCurrentTarget = any
-    > extends TouchEventBase<TDelegateTarget, TData, TCurrentTarget> {
+        TCurrentTarget = any,
+        TTarget = any
+    > extends TouchEventBase<TDelegateTarget, TData, TCurrentTarget, TTarget> {
         type: 'touchcancel';
     }
 
     interface TouchEndEvent<
         TDelegateTarget = any,
         TData = any,
-        TCurrentTarget = any
-    > extends TouchEventBase<TDelegateTarget, TData, TCurrentTarget> {
+        TCurrentTarget = any,
+        TTarget = any
+    > extends TouchEventBase<TDelegateTarget, TData, TCurrentTarget, TTarget> {
         type: 'touchend';
     }
 
     interface TouchMoveEvent<
         TDelegateTarget = any,
         TData = any,
-        TCurrentTarget = any
-    > extends TouchEventBase<TDelegateTarget, TData, TCurrentTarget> {
+        TCurrentTarget = any,
+        TTarget = any
+    > extends TouchEventBase<TDelegateTarget, TData, TCurrentTarget, TTarget> {
         type: 'touchmove';
     }
 
     interface TouchStartEvent<
         TDelegateTarget = any,
         TData = any,
-        TCurrentTarget = any
-    > extends TouchEventBase<TDelegateTarget, TData, TCurrentTarget> {
+        TCurrentTarget = any,
+        TTarget = any
+    > extends TouchEventBase<TDelegateTarget, TData, TCurrentTarget, TTarget> {
         type: 'touchstart';
     }
 
@@ -6286,10 +6291,10 @@ $( "#checkMetaKey" ).click(function( event ) {
 
         // TouchEvent
 
-        touchcancel: TouchCancelEvent<TDelegateTarget, TData, TCurrentTarget>;
-        touchend: TouchEndEvent<TDelegateTarget, TData, TCurrentTarget>;
-        touchmove: TouchMoveEvent<TDelegateTarget, TData, TCurrentTarget>;
-        touchstart: TouchStartEvent<TDelegateTarget, TData, TCurrentTarget>;
+        touchcancel: TouchCancelEvent<TDelegateTarget, TData, TCurrentTarget, TTarget>;
+        touchend: TouchEndEvent<TDelegateTarget, TData, TCurrentTarget, TTarget>;
+        touchmove: TouchMoveEvent<TDelegateTarget, TData, TCurrentTarget, TTarget>;
+        touchstart: TouchStartEvent<TDelegateTarget, TData, TCurrentTarget, TTarget>;
 
         // FocusEvent
 

From e573d98516efcf5da8773cc97d337475405dc291 Mon Sep 17 00:00:00 2001
From: Leonard Thieu <leonard.thieu@gmail.com>
Date: Thu, 1 Nov 2018 10:39:42 -0400
Subject: [PATCH 257/836] [jquery] Add tests for `JQuery.TypeEventHandlers`.

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

diff --git a/types/jquery/jquery-tests.ts b/types/jquery/jquery-tests.ts
index 069e8613d6..c533f1b235 100644
--- a/types/jquery/jquery-tests.ts
+++ b/types/jquery/jquery-tests.ts
@@ -7862,6 +7862,167 @@ function JQuery_Event() {
     }
 }
 
+function JQuery_TypeEventHandlers() {
+    const events: JQuery.TypeEventHandlers<HTMLElement, undefined, HTMLElement, HTMLElement> = {
+        change(event) {
+            // $ExpectType HTMLElement
+            this;
+            // $ExpectType ChangeEvent<HTMLElement, undefined, HTMLElement, HTMLElement>
+            event;
+        },
+        resize(event) {
+            // $ExpectType HTMLElement
+            this;
+            // $ExpectType ResizeEvent<HTMLElement, undefined, HTMLElement, HTMLElement>
+            event;
+        },
+        scroll(event) {
+            // $ExpectType HTMLElement
+            this;
+            // $ExpectType ScrollEvent<HTMLElement, undefined, HTMLElement, HTMLElement>
+            event;
+        },
+        select(event) {
+            // $ExpectType HTMLElement
+            this;
+            // $ExpectType SelectEvent<HTMLElement, undefined, HTMLElement, HTMLElement>
+            event;
+        },
+        submit(event) {
+            // $ExpectType HTMLElement
+            this;
+            // $ExpectType SubmitEvent<HTMLElement, undefined, HTMLElement, HTMLElement>
+            event;
+        },
+        click(event) {
+            // $ExpectType HTMLElement
+            this;
+            // $ExpectType ClickEvent<HTMLElement, undefined, HTMLElement, HTMLElement>
+            event;
+        },
+        contextmenu(event) {
+            // $ExpectType HTMLElement
+            this;
+            // $ExpectType ContextMenuEvent<HTMLElement, undefined, HTMLElement, HTMLElement>
+            event;
+        },
+        dblclick(event) {
+            // $ExpectType HTMLElement
+            this;
+            // $ExpectType DoubleClickEvent<HTMLElement, undefined, HTMLElement, HTMLElement>
+            event;
+        },
+        mousedown(event) {
+            // $ExpectType HTMLElement
+            this;
+            // $ExpectType MouseDownEvent<HTMLElement, undefined, HTMLElement, HTMLElement>
+            event;
+        },
+        mouseenter(event) {
+            // $ExpectType HTMLElement
+            this;
+            // $ExpectType MouseEnterEvent<HTMLElement, undefined, HTMLElement, HTMLElement>
+            event;
+        },
+        mouseleave(event) {
+            // $ExpectType HTMLElement
+            this;
+            // $ExpectType MouseLeaveEvent<HTMLElement, undefined, HTMLElement, HTMLElement>
+            event;
+        },
+        mousemove(event) {
+            // $ExpectType HTMLElement
+            this;
+            // $ExpectType MouseMoveEvent<HTMLElement, undefined, HTMLElement, HTMLElement>
+            event;
+        },
+        mouseout(event) {
+            // $ExpectType HTMLElement
+            this;
+            // $ExpectType MouseOutEvent<HTMLElement, undefined, HTMLElement, HTMLElement>
+            event;
+        },
+        mouseover(event) {
+            // $ExpectType HTMLElement
+            this;
+            // $ExpectType MouseOverEvent<HTMLElement, undefined, HTMLElement, HTMLElement>
+            event;
+        },
+        mouseup(event) {
+            // $ExpectType HTMLElement
+            this;
+            // $ExpectType MouseUpEvent<HTMLElement, undefined, HTMLElement, HTMLElement>
+            event;
+        },
+        keydown(event) {
+            // $ExpectType HTMLElement
+            this;
+            // $ExpectType KeyDownEvent<HTMLElement, undefined, HTMLElement, HTMLElement>
+            event;
+        },
+        keypress(event) {
+            // $ExpectType HTMLElement
+            this;
+            // $ExpectType KeyPressEvent<HTMLElement, undefined, HTMLElement, HTMLElement>
+            event;
+        },
+        keyup(event) {
+            // $ExpectType HTMLElement
+            this;
+            // $ExpectType KeyUpEvent<HTMLElement, undefined, HTMLElement, HTMLElement>
+            event;
+        },
+        touchcancel(event) {
+            // $ExpectType HTMLElement
+            this;
+            // $ExpectType TouchCancelEvent<HTMLElement, undefined, HTMLElement, HTMLElement>
+            event;
+        },
+        touchend(event) {
+            // $ExpectType HTMLElement
+            this;
+            // $ExpectType TouchEndEvent<HTMLElement, undefined, HTMLElement, HTMLElement>
+            event;
+        },
+        touchmove(event) {
+            // $ExpectType HTMLElement
+            this;
+            // $ExpectType TouchMoveEvent<HTMLElement, undefined, HTMLElement, HTMLElement>
+            event;
+        },
+        touchstart(event) {
+            // $ExpectType HTMLElement
+            this;
+            // $ExpectType TouchStartEvent<HTMLElement, undefined, HTMLElement, HTMLElement>
+            event;
+        },
+        blur(event) {
+            // $ExpectType HTMLElement
+            this;
+            // $ExpectType BlurEvent<HTMLElement, undefined, HTMLElement, HTMLElement>
+            event;
+        },
+        focus(event) {
+            // $ExpectType HTMLElement
+            this;
+            // $ExpectType FocusEvent<HTMLElement, undefined, HTMLElement, HTMLElement>
+            event;
+        },
+        focusin(event) {
+            // $ExpectType HTMLElement
+            this;
+            // $ExpectType FocusInEvent<HTMLElement, undefined, HTMLElement, HTMLElement>
+            event;
+        },
+        focusout(event) {
+            // $ExpectType HTMLElement
+            this;
+            // $ExpectType FocusOutEvent<HTMLElement, undefined, HTMLElement, HTMLElement>
+            event;
+        }
+    };
+}
+
 function JQuery_EventExtensions() {
     function special() {
         jQuery.event.special.multiclick = {

From bf2beee34cc2b64128bbbde858a476fcaba976e2 Mon Sep 17 00:00:00 2001
From: Leonard Thieu <leonard.thieu@gmail.com>
Date: Sat, 24 Nov 2018 09:45:54 -0500
Subject: [PATCH 258/836] [jquery] Fix no-angle-bracket-type-assertion
 violations.

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

diff --git a/types/jquery/test/example-tests.ts b/types/jquery/test/example-tests.ts
index 673e549c31..77d412f8e1 100644
--- a/types/jquery/test/example-tests.ts
+++ b/types/jquery/test/example-tests.ts
@@ -1578,7 +1578,7 @@ function examples() {
 
     function event_related_target_0() {
         $('a').mouseout(function(event) {
-            alert((<HTMLElement> event.relatedTarget).nodeName); // "DIV"
+            alert((event.relatedTarget as HTMLElement).nodeName); // "DIV"
         });
     }
 
diff --git a/types/jquery/test/longdesc-tests.ts b/types/jquery/test/longdesc-tests.ts
index 8c5382f904..e1ee36a575 100644
--- a/types/jquery/test/longdesc-tests.ts
+++ b/types/jquery/test/longdesc-tests.ts
@@ -886,7 +886,7 @@ function longdesc() {
         var currentRequests: JQuery.PlainObject = {};
 
         $.ajaxPrefilter(function(options, originalOptions, jqXHR) {
-            if ((<any> options).abortOnRetry) {
+            if ((options as any).abortOnRetry) {
                 if (currentRequests[options.url!]) {
                     currentRequests[options.url!].abort();
                 }
@@ -1297,7 +1297,7 @@ function longdesc() {
                         return $.css(elem, borderRadius!);
                     },
                     set: function(elem, value) {
-                        (<any> elem.style)[borderRadius!] = value;
+                        (elem.style as any)[borderRadius!] = value;
                     },
                 };
             }

From e067afd74c6a54eb618b82b92f195b9a21b7f0d8 Mon Sep 17 00:00:00 2001
From: Leonard Thieu <leonard.thieu@gmail.com>
Date: Sat, 24 Nov 2018 10:22:29 -0500
Subject: [PATCH 259/836] Disable no-angle-bracket-type-assertion rule.

---
 types/angular-agility/tslint.json         | 3 ++-
 types/angular-locker/tslint.json          | 3 ++-
 types/angular-odata-resources/tslint.json | 3 ++-
 types/angular-ui-tree/tslint.json         | 3 ++-
 types/angularfire/tslint.json             | 3 ++-
 types/bootstrap-slider/tslint.json        | 5 ++++-
 types/datatables.net/tslint.json          | 7 ++++++-
 types/devexpress-web/v172/tslint.json     | 3 ++-
 types/devexpress-web/v181/tslint.json     | 3 ++-
 types/ej.web.all/tslint.json              | 3 ++-
 types/gridstack/tslint.json               | 3 ++-
 types/highcharts/tslint.json              | 3 ++-
 types/intl-tel-input/v13/tslint.json      | 3 ++-
 types/jquery.colorpicker/tslint.json      | 3 ++-
 types/jquery.fancytree/tslint.json        | 3 ++-
 types/jquery.pjax/tslint.json             | 3 ++-
 types/kendo-ui/tslint.json                | 3 ++-
 types/ng-cordova/tslint.json              | 3 ++-
 types/ng-flow/tslint.json                 | 3 ++-
 types/ng-grid/tslint.json                 | 3 ++-
 types/openui5/tslint.json                 | 3 ++-
 types/q/tslint.json                       | 3 ++-
 types/q/v0/tslint.json                    | 3 ++-
 types/qtip2/tslint.json                   | 3 ++-
 types/sammy/tslint.json                   | 3 ++-
 types/segment-analytics/tslint.json       | 3 ++-
 types/selectize/tslint.json               | 3 ++-
 types/space-pen/tslint.json               | 3 ++-
 types/toastr/tslint.json                  | 3 ++-
 29 files changed, 64 insertions(+), 29 deletions(-)

diff --git a/types/angular-agility/tslint.json b/types/angular-agility/tslint.json
index a41bf5d19a..67293bd146 100644
--- a/types/angular-agility/tslint.json
+++ b/types/angular-agility/tslint.json
@@ -74,6 +74,7 @@
         "typedef-whitespace": false,
         "unified-signatures": false,
         "void-return": false,
-        "whitespace": false
+        "whitespace": false,
+        "no-angle-bracket-type-assertion": false
     }
 }
diff --git a/types/angular-locker/tslint.json b/types/angular-locker/tslint.json
index a41bf5d19a..67293bd146 100644
--- a/types/angular-locker/tslint.json
+++ b/types/angular-locker/tslint.json
@@ -74,6 +74,7 @@
         "typedef-whitespace": false,
         "unified-signatures": false,
         "void-return": false,
-        "whitespace": false
+        "whitespace": false,
+        "no-angle-bracket-type-assertion": false
     }
 }
diff --git a/types/angular-odata-resources/tslint.json b/types/angular-odata-resources/tslint.json
index a41bf5d19a..67293bd146 100644
--- a/types/angular-odata-resources/tslint.json
+++ b/types/angular-odata-resources/tslint.json
@@ -74,6 +74,7 @@
         "typedef-whitespace": false,
         "unified-signatures": false,
         "void-return": false,
-        "whitespace": false
+        "whitespace": false,
+        "no-angle-bracket-type-assertion": false
     }
 }
diff --git a/types/angular-ui-tree/tslint.json b/types/angular-ui-tree/tslint.json
index a41bf5d19a..67293bd146 100644
--- a/types/angular-ui-tree/tslint.json
+++ b/types/angular-ui-tree/tslint.json
@@ -74,6 +74,7 @@
         "typedef-whitespace": false,
         "unified-signatures": false,
         "void-return": false,
-        "whitespace": false
+        "whitespace": false,
+        "no-angle-bracket-type-assertion": false
     }
 }
diff --git a/types/angularfire/tslint.json b/types/angularfire/tslint.json
index a41bf5d19a..67293bd146 100644
--- a/types/angularfire/tslint.json
+++ b/types/angularfire/tslint.json
@@ -74,6 +74,7 @@
         "typedef-whitespace": false,
         "unified-signatures": false,
         "void-return": false,
-        "whitespace": false
+        "whitespace": false,
+        "no-angle-bracket-type-assertion": false
     }
 }
diff --git a/types/bootstrap-slider/tslint.json b/types/bootstrap-slider/tslint.json
index f93cf8562a..1c36270d47 100644
--- a/types/bootstrap-slider/tslint.json
+++ b/types/bootstrap-slider/tslint.json
@@ -1,3 +1,6 @@
 {
-    "extends": "dtslint/dt.json"
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "no-angle-bracket-type-assertion": false
+    }
 }
diff --git a/types/datatables.net/tslint.json b/types/datatables.net/tslint.json
index 3db14f85ea..2b6ccb9109 100644
--- a/types/datatables.net/tslint.json
+++ b/types/datatables.net/tslint.json
@@ -1 +1,6 @@
-{ "extends": "dtslint/dt.json" }
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "no-angle-bracket-type-assertion": false
+    }
+}
\ No newline at end of file
diff --git a/types/devexpress-web/v172/tslint.json b/types/devexpress-web/v172/tslint.json
index a41bf5d19a..67293bd146 100644
--- a/types/devexpress-web/v172/tslint.json
+++ b/types/devexpress-web/v172/tslint.json
@@ -74,6 +74,7 @@
         "typedef-whitespace": false,
         "unified-signatures": false,
         "void-return": false,
-        "whitespace": false
+        "whitespace": false,
+        "no-angle-bracket-type-assertion": false
     }
 }
diff --git a/types/devexpress-web/v181/tslint.json b/types/devexpress-web/v181/tslint.json
index a41bf5d19a..67293bd146 100644
--- a/types/devexpress-web/v181/tslint.json
+++ b/types/devexpress-web/v181/tslint.json
@@ -74,6 +74,7 @@
         "typedef-whitespace": false,
         "unified-signatures": false,
         "void-return": false,
-        "whitespace": false
+        "whitespace": false,
+        "no-angle-bracket-type-assertion": false
     }
 }
diff --git a/types/ej.web.all/tslint.json b/types/ej.web.all/tslint.json
index 35e3f27cc8..0615bdcb0e 100644
--- a/types/ej.web.all/tslint.json
+++ b/types/ej.web.all/tslint.json
@@ -37,6 +37,7 @@
     "radix": false,
     "prefer-for-of": false,
     "one-line": false,
-    "no-unnecessary-type-assertion": false
+    "no-unnecessary-type-assertion": false,
+    "no-angle-bracket-type-assertion": false
   }
 }
diff --git a/types/gridstack/tslint.json b/types/gridstack/tslint.json
index a41bf5d19a..67293bd146 100644
--- a/types/gridstack/tslint.json
+++ b/types/gridstack/tslint.json
@@ -74,6 +74,7 @@
         "typedef-whitespace": false,
         "unified-signatures": false,
         "void-return": false,
-        "whitespace": false
+        "whitespace": false,
+        "no-angle-bracket-type-assertion": false
     }
 }
diff --git a/types/highcharts/tslint.json b/types/highcharts/tslint.json
index cfc8218eab..c663b9324a 100644
--- a/types/highcharts/tslint.json
+++ b/types/highcharts/tslint.json
@@ -9,6 +9,7 @@
         "no-declare-current-package": false,
         "no-object-literal-type-assertion": false,
         "no-self-import": false,
-        "no-unnecessary-generics": false
+        "no-unnecessary-generics": false,
+        "no-angle-bracket-type-assertion": false
     }
 }
diff --git a/types/intl-tel-input/v13/tslint.json b/types/intl-tel-input/v13/tslint.json
index b6afb8acee..d2632b3e92 100644
--- a/types/intl-tel-input/v13/tslint.json
+++ b/types/intl-tel-input/v13/tslint.json
@@ -75,6 +75,7 @@
         "typedef-whitespace": false,
         "unified-signatures": false,
         "void-return": false,
-        "whitespace": false
+        "whitespace": false,
+        "no-angle-bracket-type-assertion": false
     }
 }
diff --git a/types/jquery.colorpicker/tslint.json b/types/jquery.colorpicker/tslint.json
index a41bf5d19a..67293bd146 100644
--- a/types/jquery.colorpicker/tslint.json
+++ b/types/jquery.colorpicker/tslint.json
@@ -74,6 +74,7 @@
         "typedef-whitespace": false,
         "unified-signatures": false,
         "void-return": false,
-        "whitespace": false
+        "whitespace": false,
+        "no-angle-bracket-type-assertion": false
     }
 }
diff --git a/types/jquery.fancytree/tslint.json b/types/jquery.fancytree/tslint.json
index a41bf5d19a..67293bd146 100644
--- a/types/jquery.fancytree/tslint.json
+++ b/types/jquery.fancytree/tslint.json
@@ -74,6 +74,7 @@
         "typedef-whitespace": false,
         "unified-signatures": false,
         "void-return": false,
-        "whitespace": false
+        "whitespace": false,
+        "no-angle-bracket-type-assertion": false
     }
 }
diff --git a/types/jquery.pjax/tslint.json b/types/jquery.pjax/tslint.json
index a41bf5d19a..67293bd146 100644
--- a/types/jquery.pjax/tslint.json
+++ b/types/jquery.pjax/tslint.json
@@ -74,6 +74,7 @@
         "typedef-whitespace": false,
         "unified-signatures": false,
         "void-return": false,
-        "whitespace": false
+        "whitespace": false,
+        "no-angle-bracket-type-assertion": false
     }
 }
diff --git a/types/kendo-ui/tslint.json b/types/kendo-ui/tslint.json
index a41bf5d19a..67293bd146 100644
--- a/types/kendo-ui/tslint.json
+++ b/types/kendo-ui/tslint.json
@@ -74,6 +74,7 @@
         "typedef-whitespace": false,
         "unified-signatures": false,
         "void-return": false,
-        "whitespace": false
+        "whitespace": false,
+        "no-angle-bracket-type-assertion": false
     }
 }
diff --git a/types/ng-cordova/tslint.json b/types/ng-cordova/tslint.json
index a41bf5d19a..67293bd146 100644
--- a/types/ng-cordova/tslint.json
+++ b/types/ng-cordova/tslint.json
@@ -74,6 +74,7 @@
         "typedef-whitespace": false,
         "unified-signatures": false,
         "void-return": false,
-        "whitespace": false
+        "whitespace": false,
+        "no-angle-bracket-type-assertion": false
     }
 }
diff --git a/types/ng-flow/tslint.json b/types/ng-flow/tslint.json
index a41bf5d19a..67293bd146 100644
--- a/types/ng-flow/tslint.json
+++ b/types/ng-flow/tslint.json
@@ -74,6 +74,7 @@
         "typedef-whitespace": false,
         "unified-signatures": false,
         "void-return": false,
-        "whitespace": false
+        "whitespace": false,
+        "no-angle-bracket-type-assertion": false
     }
 }
diff --git a/types/ng-grid/tslint.json b/types/ng-grid/tslint.json
index a41bf5d19a..67293bd146 100644
--- a/types/ng-grid/tslint.json
+++ b/types/ng-grid/tslint.json
@@ -74,6 +74,7 @@
         "typedef-whitespace": false,
         "unified-signatures": false,
         "void-return": false,
-        "whitespace": false
+        "whitespace": false,
+        "no-angle-bracket-type-assertion": false
     }
 }
diff --git a/types/openui5/tslint.json b/types/openui5/tslint.json
index a41bf5d19a..67293bd146 100644
--- a/types/openui5/tslint.json
+++ b/types/openui5/tslint.json
@@ -74,6 +74,7 @@
         "typedef-whitespace": false,
         "unified-signatures": false,
         "void-return": false,
-        "whitespace": false
+        "whitespace": false,
+        "no-angle-bracket-type-assertion": false
     }
 }
diff --git a/types/q/tslint.json b/types/q/tslint.json
index 0bded8e292..4af8abbc8d 100644
--- a/types/q/tslint.json
+++ b/types/q/tslint.json
@@ -7,6 +7,7 @@
     "no-unnecessary-type-assertion": false,
     "prefer-declare-function": false,
     "strict-export-declare-modifiers": false,
-    "unified-signatures": false
+    "unified-signatures": false,
+    "no-angle-bracket-type-assertion": false
   }
 }
diff --git a/types/q/v0/tslint.json b/types/q/v0/tslint.json
index a41bf5d19a..67293bd146 100644
--- a/types/q/v0/tslint.json
+++ b/types/q/v0/tslint.json
@@ -74,6 +74,7 @@
         "typedef-whitespace": false,
         "unified-signatures": false,
         "void-return": false,
-        "whitespace": false
+        "whitespace": false,
+        "no-angle-bracket-type-assertion": false
     }
 }
diff --git a/types/qtip2/tslint.json b/types/qtip2/tslint.json
index a41bf5d19a..67293bd146 100644
--- a/types/qtip2/tslint.json
+++ b/types/qtip2/tslint.json
@@ -74,6 +74,7 @@
         "typedef-whitespace": false,
         "unified-signatures": false,
         "void-return": false,
-        "whitespace": false
+        "whitespace": false,
+        "no-angle-bracket-type-assertion": false
     }
 }
diff --git a/types/sammy/tslint.json b/types/sammy/tslint.json
index a41bf5d19a..67293bd146 100644
--- a/types/sammy/tslint.json
+++ b/types/sammy/tslint.json
@@ -74,6 +74,7 @@
         "typedef-whitespace": false,
         "unified-signatures": false,
         "void-return": false,
-        "whitespace": false
+        "whitespace": false,
+        "no-angle-bracket-type-assertion": false
     }
 }
diff --git a/types/segment-analytics/tslint.json b/types/segment-analytics/tslint.json
index a41bf5d19a..67293bd146 100644
--- a/types/segment-analytics/tslint.json
+++ b/types/segment-analytics/tslint.json
@@ -74,6 +74,7 @@
         "typedef-whitespace": false,
         "unified-signatures": false,
         "void-return": false,
-        "whitespace": false
+        "whitespace": false,
+        "no-angle-bracket-type-assertion": false
     }
 }
diff --git a/types/selectize/tslint.json b/types/selectize/tslint.json
index a41bf5d19a..67293bd146 100644
--- a/types/selectize/tslint.json
+++ b/types/selectize/tslint.json
@@ -74,6 +74,7 @@
         "typedef-whitespace": false,
         "unified-signatures": false,
         "void-return": false,
-        "whitespace": false
+        "whitespace": false,
+        "no-angle-bracket-type-assertion": false
     }
 }
diff --git a/types/space-pen/tslint.json b/types/space-pen/tslint.json
index a41bf5d19a..67293bd146 100644
--- a/types/space-pen/tslint.json
+++ b/types/space-pen/tslint.json
@@ -74,6 +74,7 @@
         "typedef-whitespace": false,
         "unified-signatures": false,
         "void-return": false,
-        "whitespace": false
+        "whitespace": false,
+        "no-angle-bracket-type-assertion": false
     }
 }
diff --git a/types/toastr/tslint.json b/types/toastr/tslint.json
index a41bf5d19a..67293bd146 100644
--- a/types/toastr/tslint.json
+++ b/types/toastr/tslint.json
@@ -74,6 +74,7 @@
         "typedef-whitespace": false,
         "unified-signatures": false,
         "void-return": false,
-        "whitespace": false
+        "whitespace": false,
+        "no-angle-bracket-type-assertion": false
     }
 }

From 035abe6ab2d244ae4df8a01f9e0938a2283e9d06 Mon Sep 17 00:00:00 2001
From: Clark Stevenson <clark@drimlike.com>
Date: Sat, 24 Nov 2018 17:37:34 +0000
Subject: [PATCH 260/836] Minor Update to Pixi.js

- Fixes missing `animations` and incorrect type
- Renames Filter param `uniforms` to `uniformData`
---
 types/pixi.js/index.d.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/types/pixi.js/index.d.ts b/types/pixi.js/index.d.ts
index 7c05701e75..4d86533fed 100644
--- a/types/pixi.js/index.d.ts
+++ b/types/pixi.js/index.d.ts
@@ -1585,7 +1585,7 @@ declare namespace PIXI {
         constructor(
             vertexSrc?: string,
             fragmentSrc?: string,
-            uniforms?: UniformDataMap<U>
+            uniformData?: UniformDataMap<U>
         );
 
         protected _blendMode: number;
@@ -2312,7 +2312,7 @@ declare namespace PIXI {
         );
 
         baseTexture: BaseTexture;
-        animations: { [key: string]: Texture };
+        animations: { [key: string]: Texture[] };
         textures: { [key: string]: Texture };
         data: any;
         resolution: number;
@@ -3346,6 +3346,7 @@ declare namespace PIXI {
             spineAtlas: any;
             spineData: any;
             textures?: TextureDictionary;
+            spritesheet?: Spritesheet;
         }
         const shared: Loader;
     }

From 5b221ee794c64ee920db8e9b21b5c677faf1f715 Mon Sep 17 00:00:00 2001
From: Simon Schick <demwizzy@gmail.com>
Date: Sat, 24 Nov 2018 09:30:07 -0800
Subject: [PATCH 261/836] feat(hapi): 17.8

---
 types/hapi/index.d.ts                        | 56 +++++++++++++++++---
 types/hapi/test/server/server-auth-api.ts    | 12 +++--
 types/hapi/test/server/server-auth-test.ts   |  8 ++-
 types/hapi/test/server/server-auth-verify.ts | 26 +++++++++
 types/hapi/test/server/server-plugins.ts     | 17 ++++--
 types/hapi/tsconfig.json                     |  1 +
 6 files changed, 104 insertions(+), 16 deletions(-)
 create mode 100644 types/hapi/test/server/server-auth-verify.ts

diff --git a/types/hapi/index.d.ts b/types/hapi/index.d.ts
index 644c48c5d1..3e323f8c44 100644
--- a/types/hapi/index.d.ts
+++ b/types/hapi/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for hapi 17.6
+// Type definitions for hapi 17.8
 // Project: https://github.com/hapijs/hapi
 // Definitions by: Rafael Souza Fijalkowski <https://github.com/rafaelsouzaf>
 //                 Justin Simms <https://github.com/jhsimms>
@@ -42,6 +42,18 @@ import { PolicyOptionVariants, EnginePrototypeOrObject, PolicyOptions, EnginePro
  +                                                                           +
  + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
 
+/**
+ * one of
+ * a single plugin name string.
+ * an array of plugin name strings.
+ * an object where each key is a plugin name and each matching value is a
+ * {@link https://www.npmjs.com/package/semver version range string} which must match the registered
+ *  plugin version.
+ */
+export type Dependencies = string | string[] | {
+    [key: string]: string;
+};
+
 /**
  * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverregistrations)
  */
@@ -126,7 +138,16 @@ export interface PluginBase<T> {
     multiple?: boolean;
 
     /** (optional) a string or an array of strings indicating a plugin dependency. Same as setting dependencies via server.dependency(). */
-    dependencies?: string | string[];
+    dependencies?: Dependencies;
+
+    /**
+     * Allows defining semver requirements for node and hapi.
+     * @default Allows all.
+     */
+    requirements?: {
+        node?: string;
+        hapi?: string;
+    };
 
     /** once - (optional) if true, will only register the plugin once per server. If set, overrides the once option passed to server.register(). Defaults to no override. */
     once?: boolean;
@@ -2013,6 +2034,15 @@ export interface ServerAuthSchemeObject {
      */
     response?(request: Request, h: ResponseToolkit): Lifecycle.ReturnValue;
 
+    /**
+     * a method used to verify the authentication credentials provided
+     * are still valid (e.g. not expired or revoked after the initial authentication).
+     * the method throws an `Error` when the credentials passed are no longer valid (e.g. expired or
+     * revoked). Note that the method does not have access to the original request, only to the
+     * credentials and artifacts produced by the `authenticate()` method.
+     */
+    verify?(auth: RequestAuth): Promise<void>;
+
     /**
      * An object with the following keys:
      * * payload
@@ -2040,7 +2070,7 @@ export interface ServerAuth {
      * returned from its implementation function.
      * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverauthapi)
      */
-    api: Util.Dictionary<any>;
+    api: Util.Dictionary<ServerAuthSchemeObjectApi>;
 
     /**
      * Contains the default authentication configuration is a default strategy was set via
@@ -2100,7 +2130,19 @@ export interface ServerAuth {
      * include verifying scope, entity, or other route properties.
      * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-await-serverauthteststrategy-request)
      */
-    test(strategy: string, request: Request): Promise<any>;
+    test(strategy: string, request: Request): Promise<AuthCredentials>;
+
+    /**
+     * Verify a request's authentication credentials against an authentication strategy.
+     * Returns nothing if verification was successful, otherwise throws an error.
+     *
+     * Note that the `verify()` method does not take into account the route authentication configuration
+     * or any other information from the request other than the `request.auth` object. It also does not
+     * perform payload authentication. It is limited to verifying that the previously valid credentials
+     * are still valid (e.g. have not been revoked or expired). It does not include verifying scope,
+     * entity, or other route properties.
+     */
+    verify(request: Request): Promise<void>;
 }
 
 export type CachePolicyOptions<T> = PolicyOptionVariants<T> & {
@@ -3302,7 +3344,7 @@ export class Server {
     /**
      * Server Auth: properties and methods
      */
-    auth: ServerAuth;
+    readonly auth: ServerAuth;
 
     /**
      * Links another server to the initialize/start/stop state of the current server by calling the
@@ -3542,7 +3584,7 @@ export class Server {
 
     /**
      * Used within a plugin to declare a required dependency on other plugins where:
-     * @param dependencies - a single string or an array of plugin name strings which must be registered in order for this plugin to operate. Plugins listed must be registered before the server is
+     * @param dependencies - plugins which must be registered in order for this plugin to operate. Plugins listed must be registered before the server is
      *     initialized or started.
      * @param after - (optional) a function that is called after all the specified dependencies have been registered and before the server starts. The function is only called if the server is
      *     initialized or started. The function signature is async function(server) where: server - the server the dependency() method was called on.
@@ -3552,7 +3594,7 @@ export class Server {
      * The method does not provide version dependency which should be implemented using npm peer dependencies.
      * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverdependencydependencies-after)
      */
-    dependency(dependencies: string | string[], after?: ((server: Server) => Promise<void>)): void;
+    dependency(dependencies: Dependencies, after?: ((server: Server) => Promise<void>)): void;
 
     /**
      * Registers a custom content encoding compressor to extend the built-in support for 'gzip' and 'deflate' where:
diff --git a/types/hapi/test/server/server-auth-api.ts b/types/hapi/test/server/server-auth-api.ts
index f1b51bda8c..4508c641c9 100644
--- a/types/hapi/test/server/server-auth-api.ts
+++ b/types/hapi/test/server/server-auth-api.ts
@@ -1,14 +1,18 @@
 // https://github.com/hapijs/hapi/blob/master/API.md#-serverauthapi
 import {
-    Request,
-    ResponseToolkit,
     Server,
     ServerAuthScheme,
-    ServerAuthSchemeObject,
-    ServerAuthSchemeOptions
 } from "hapi";
 import * as Boom from "boom";
 
+declare module 'hapi' {
+    interface ServerAuthSchemeObjectApi {
+        settings: {
+            x: number;
+        };
+    }
+}
+
 const scheme: ServerAuthScheme = (server, options) => {
     return {
         api: {
diff --git a/types/hapi/test/server/server-auth-test.ts b/types/hapi/test/server/server-auth-test.ts
index 5103d11c7e..4e2a175e1a 100644
--- a/types/hapi/test/server/server-auth-test.ts
+++ b/types/hapi/test/server/server-auth-test.ts
@@ -3,6 +3,12 @@
 import { Request, ResponseToolkit, Server, ServerAuthScheme, ServerAuthSchemeOptions } from "hapi";
 import * as Boom from "boom";
 
+declare module 'hapi' {
+    interface AuthCredentials {
+        name?: string;
+    }
+}
+
 const server = new Server({
     port: 8000,
 });
@@ -15,7 +21,7 @@ const scheme: ServerAuthScheme = (server, options) => {
             if (!authorization) {
                 throw Boom.unauthorized(null, 'Custom');
             }
-            return h.authenticated({ credentials: { user: { a: 1} } });
+            return h.authenticated({ credentials: { name: 'john', } });
         }
     };
 };
diff --git a/types/hapi/test/server/server-auth-verify.ts b/types/hapi/test/server/server-auth-verify.ts
new file mode 100644
index 0000000000..ec788fcb59
--- /dev/null
+++ b/types/hapi/test/server/server-auth-verify.ts
@@ -0,0 +1,26 @@
+import { Request, Server, RequestAuth } from "hapi";
+import * as Boom from "boom";
+
+const server = new Server({
+    port: 8000,
+});
+
+server.auth.scheme('custom', () => ({
+    authenticate() {
+        throw Boom.unauthorized(null, 'hurr');
+    },
+    async verify(_auth: RequestAuth) {
+        throw Boom.unauthorized(null, 'durr');
+    }
+}));
+server.auth.strategy('default', 'custom');
+
+server.route({
+    method: 'GET',
+    path: '/',
+    async handler(request: Request) {
+        request.server.auth.verify(request);
+    }
+});
+
+server.start();
diff --git a/types/hapi/test/server/server-plugins.ts b/types/hapi/test/server/server-plugins.ts
index 8de3fdc24f..03a3c76907 100644
--- a/types/hapi/test/server/server-plugins.ts
+++ b/types/hapi/test/server/server-plugins.ts
@@ -33,22 +33,31 @@ const plugin1: Plugin<Plugin1> = {
         server.plugins.example.other = 'other';
         console.log(server.plugins.example.key);      // 'value'
         console.log(server.plugins.example.other);    // 'other'
-    }
+    },
 };
 
 const plugin2: Plugin<Plugin2> = {
 	name: 'plugin2',
-	register: async (server: Server, options: Plugin2) => {}
+    register: async (server: Server, options: Plugin2) => {},
+    dependencies: {
+        plugin1: '*',
+    },
+    requirements: {
+        node: '>=8',
+        hapi: '>=1337',
+    },
 };
 
 const plugin3: Plugin<Plugin3> = {
 	name: 'plugin3',
-	register: async (server: Server, options: Plugin3) => {}
+    register: async (server: Server, options: Plugin3) => {},
+    dependencies: ['plugin2'],
 };
 
 const plugin4: Plugin<Plugin4> = {
 	name: 'plugin4',
-	register: (server: Server, options: Plugin4) => {}
+    register: (server: Server, options: Plugin4) => {},
+    dependencies: 'plugin3',
 };
 
 const server = new Server({
diff --git a/types/hapi/tsconfig.json b/types/hapi/tsconfig.json
index 2804e84871..9df329c575 100644
--- a/types/hapi/tsconfig.json
+++ b/types/hapi/tsconfig.json
@@ -41,6 +41,7 @@
         "test/server/server-auth-api.ts",
         "test/server/server-auth-default.ts",
         "test/server/server-auth-test.ts",
+        "test/server/server-auth-verify.ts",
         "test/server/server-bind.ts",
         "test/server/server-cache-provision.ts",
         "test/server/server-cache.ts",

From 942d03b7421428db4d37aa6f3bdff683ebf1ba5f Mon Sep 17 00:00:00 2001
From: Clark Stevenson <clark@drimlike.com>
Date: Sat, 24 Nov 2018 17:53:33 +0000
Subject: [PATCH 262/836] Fixed TSLint Error

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

diff --git a/types/pixi.js/pixi.js-tests.ts b/types/pixi.js/pixi.js-tests.ts
index 48581e67fe..c311c1281b 100644
--- a/types/pixi.js/pixi.js-tests.ts
+++ b/types/pixi.js/pixi.js-tests.ts
@@ -1508,7 +1508,7 @@ function filters() {
 
                 maggot.scale.set(1 + Math.random() * 0.3);
                 //tslint:disable-next-line:whitespace
-                maggot.original = (<PIXI.Point>maggot.scale).clone();
+                maggot.original = (maggot.scale as PIXI.Point).clone();
                 this.maggots.push(maggot);
             }
 

From d4183853313482fea63ce3e2ef8c3157509d81a9 Mon Sep 17 00:00:00 2001
From: Christian Chown <christianchown@gmail.com>
Date: Sat, 24 Nov 2018 18:02:24 +0000
Subject: [PATCH 263/836] Extend typings to include the Enhanced Default
 Functionality

---
 types/react-infinite-calendar/index.d.ts      | 34 ++++++++++++++-----
 .../react-infinite-calendar-tests.tsx         | 13 ++++++-
 2 files changed, 38 insertions(+), 9 deletions(-)

diff --git a/types/react-infinite-calendar/index.d.ts b/types/react-infinite-calendar/index.d.ts
index 2110d4dbd0..3f0c827ed9 100644
--- a/types/react-infinite-calendar/index.d.ts
+++ b/types/react-infinite-calendar/index.d.ts
@@ -6,16 +6,18 @@
 
 import * as React from 'react';
 
+export type DateType = Date | string | number;
+
 export interface ReactInfiniteCalendarProps {
-    selected?: Date | boolean;
-    width?: number | 'auto';
+    selected?: DateType | false | { start: DateType; end: DateType };
+    width?: number | 'auto' | '100%';
     height?: number | 'auto';
-    min?: Date;
-    max?: Date;
-    minDate?: Date;
-    maxDate?: Date;
+    min?: DateType;
+    max?: DateType;
+    minDate?: DateType;
+    maxDate?: DateType;
     disabledDays?: Array<0 | 1 | 2 | 3 | 4 | 5 | 6>;
-    disabledDates?: Date[];
+    disabledDates?: DateType[];
     display?: 'days' | 'years';
     displayOptions?: {
         hideYearsOnSelect?: boolean;
@@ -55,12 +57,28 @@ export interface ReactInfiniteCalendarProps {
         weekdayColor?: string;
     };
     className?: string;
-    onSelect?: (date: string) => void;
+    onSelect?: (date: string | { eventType: EVENT_TYPE; start: Date; end: Date }) => void;
     onScroll?: (scrollTop: number) => void;
     onScrollEnd?: (scrollTop: number) => void;
     rowHeight?: number;
     autoFocus?: boolean;
     tabIndex?: number;
+    Component?: CalendarClass;
+}
+
+export class Calendar extends React.Component<ReactInfiniteCalendarProps> {}
+export type CalendarClass = React.ComponentClass<ReactInfiniteCalendarProps>;
+
+export function withRange(component: CalendarClass): CalendarClass;
+export function withDateSelection(component: CalendarClass): CalendarClass;
+export function withMultipleDates(component: CalendarClass): CalendarClass;
+export function withKeyboardSupport(component: CalendarClass): CalendarClass;
+export function defaultMultipleDateInterpolation(component: CalendarClass): CalendarClass;
+
+export enum EVENT_TYPE {
+    START = 1,
+    HOVER,
+    END
 }
 
 export default class ReactInfiniteCalendar extends React.Component<ReactInfiniteCalendarProps> {}
diff --git a/types/react-infinite-calendar/react-infinite-calendar-tests.tsx b/types/react-infinite-calendar/react-infinite-calendar-tests.tsx
index ff1918d539..ba4b6a0ec7 100644
--- a/types/react-infinite-calendar/react-infinite-calendar-tests.tsx
+++ b/types/react-infinite-calendar/react-infinite-calendar-tests.tsx
@@ -1,5 +1,11 @@
 import * as React from 'react';
-import ReactInfiniteCalendar from 'react-infinite-calendar';
+import ReactInfiniteCalendar, {
+    Calendar,
+    withRange,
+    withKeyboardSupport,
+    withMultipleDates,
+    withDateSelection
+} from 'react-infinite-calendar';
 
 const test: React.SFC = () => (
     <ReactInfiniteCalendar
@@ -59,3 +65,8 @@ const test: React.SFC = () => (
         tabIndex={1}
     />
 );
+
+const testWithRange = withRange(Calendar);
+const testWithDateSelection = withDateSelection(Calendar);
+const testWithKeyboardSupport = withKeyboardSupport(Calendar);
+const testWithMultipleDate = withMultipleDates(Calendar);

From 0f79f9e451ad86718cf3baaca65b5c229bab7593 Mon Sep 17 00:00:00 2001
From: Albert Kurniawan <kurniawan.albert19@gmail.com>
Date: Wed, 14 Nov 2018 21:16:39 +0000
Subject: [PATCH 264/836] Remove morcerf from codeowners

---
 .github/CODEOWNERS             | 6 +++---
 types/connect-redis/index.d.ts | 1 -
 types/react/index.d.ts         | 1 -
 types/react/v15/index.d.ts     | 1 -
 4 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index df45a8a9e7..0305e57c9b 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -644,7 +644,7 @@
 /types/connect-mongo/                               @Syati
 /types/connect-mongodb-session/                     @NattapongSiri
 /types/connect-pg-simple/                           @pasieronen
-/types/connect-redis/                               @xstoudi @morcerf
+/types/connect-redis/                               @xstoudi
 /types/connect-slashes/                             @samherrmann
 /types/connect-timeout/                             @cyrilschumacher
 /types/consola/                                     @Jungwoo-An
@@ -3691,8 +3691,8 @@
 /types/rdflib/                                      @cenotelie
 /types/re-base/                                     @jordandrako
 /types/reach__router/                               @kingdaro
-/types/react/v15/                                   @bbenezech @pzavolinsky @digiguru @ericanderson @morcerf @tkrotoff @DovydasNavickas @onigoetz
-/types/react/                                       @johnnyreilly @bbenezech @pzavolinsky @digiguru @ericanderson @morcerf @tkrotoff @DovydasNavickas @onigoetz @theruther4d @guilhermehubner @ferdaber @jrakotoharisoa @pascaloliv @hotell @franklixuefei
+/types/react/v15/                                   @bbenezech @pzavolinsky @digiguru @ericanderson @tkrotoff @DovydasNavickas @onigoetz
+/types/react/                                       @johnnyreilly @bbenezech @pzavolinsky @digiguru @ericanderson @tkrotoff @DovydasNavickas @onigoetz @theruther4d @guilhermehubner @ferdaber @jrakotoharisoa @pascaloliv @hotell @franklixuefei
 /types/react-adal/                                  @dkorolev1
 /types/react-albus/                                 @sseppola @conradreuter @kuirak
 /types/react-alert/v2/                              @ssyrell
diff --git a/types/connect-redis/index.d.ts b/types/connect-redis/index.d.ts
index 5675512795..c5a26de73a 100644
--- a/types/connect-redis/index.d.ts
+++ b/types/connect-redis/index.d.ts
@@ -1,7 +1,6 @@
 // Type definitions for connect-redis
 // Project: https://npmjs.com/package/connect-redis
 // Definitions by: Xavier Stouder <https://github.com/xstoudi>
-//                 Albert Kurniawan <https://github.com/morcerf>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
 
diff --git a/types/react/index.d.ts b/types/react/index.d.ts
index 25f3c710ae..ebcb097eda 100644
--- a/types/react/index.d.ts
+++ b/types/react/index.d.ts
@@ -8,7 +8,6 @@
 //                 Patricio Zavolinsky <https://github.com/pzavolinsky>
 //                 Digiguru <https://github.com/digiguru>
 //                 Eric Anderson <https://github.com/ericanderson>
-//                 Albert Kurniawan <https://github.com/morcerf>
 //                 Tanguy Krotoff <https://github.com/tkrotoff>
 //                 Dovydas Navickas <https://github.com/DovydasNavickas>
 //                 Stéphane Goetz <https://github.com/onigoetz>
diff --git a/types/react/v15/index.d.ts b/types/react/v15/index.d.ts
index 78ec7d8951..ce2a523123 100644
--- a/types/react/v15/index.d.ts
+++ b/types/react/v15/index.d.ts
@@ -8,7 +8,6 @@
 //                 Patricio Zavolinsky <https://github.com/pzavolinsky>
 //                 Digiguru <https://github.com/digiguru>
 //                 Eric Anderson <https://github.com/ericanderson>
-//                 Albert Kurniawan <https://github.com/morcerf>
 //                 Tanguy Krotoff <https://github.com/tkrotoff>
 //                 Dovydas Navickas <https://github.com/DovydasNavickas>
 //                 Stéphane Goetz <https://github.com/onigoetz>

From 55aca0b31c103ca32fed346e63532cee17b00834 Mon Sep 17 00:00:00 2001
From: Ehab Khaireldin <ehabkhaireldin@gmail.com>
Date: Sat, 24 Nov 2018 19:58:45 +0100
Subject: [PATCH 265/836] johnny-five LCD class types

---
 types/johnny-five/index.d.ts | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/types/johnny-five/index.d.ts b/types/johnny-five/index.d.ts
index 6a00952153..a770cd2126 100644
--- a/types/johnny-five/index.d.ts
+++ b/types/johnny-five/index.d.ts
@@ -365,22 +365,22 @@ export declare class LCD {
     rows: number;
     cols: number;
 
-    print(message: string): void;
-    useChar(char: string): void;
-    clear(): void;
-    cursor(row: number, col: number): void;
-    home(): void;
-    on(): void;
-    off(): void;
-    display(): void;
-    noDisplay(): void;
-    blink(): void;
-    noBlink(): void;
-    autoscroll(): void;
-    noAutoscroll(): void;
-    bgColor(color: any): void;
-    noBacklight(): void;
-    backlight(): void;
+    print(message: string): this;
+    useChar(char: string): this;
+    clear(): this;
+    cursor(row: number, col: number): this;
+    home(): this;
+    on(): this;
+    off(): this;
+    display(): this;
+    noDisplay(): this;
+    blink(): this;
+    noBlink(): this;
+    autoscroll(): this;
+    noAutoscroll(): this;
+    bgColor(color: any): this;
+    noBacklight(): this;
+    backlight(): this;
 }
 
 export interface LedOption {

From dcda399637f7d78d7a7dd1c6ed1f5ccf01693a28 Mon Sep 17 00:00:00 2001
From: BamButz <bambutz@cryptonica.de>
Date: Sun, 25 Nov 2018 12:25:56 +0100
Subject: [PATCH 266/836] Adding types for "hyper-aws4"

---
 types/hyper-aws4/hyper-aws4-tests.ts | 12 ++++++++++++
 types/hyper-aws4/index.d.ts          | 25 +++++++++++++++++++++++++
 types/hyper-aws4/tsconfig.json       | 23 +++++++++++++++++++++++
 types/hyper-aws4/tslint.json         |  1 +
 4 files changed, 61 insertions(+)
 create mode 100644 types/hyper-aws4/hyper-aws4-tests.ts
 create mode 100644 types/hyper-aws4/index.d.ts
 create mode 100644 types/hyper-aws4/tsconfig.json
 create mode 100644 types/hyper-aws4/tslint.json

diff --git a/types/hyper-aws4/hyper-aws4-tests.ts b/types/hyper-aws4/hyper-aws4-tests.ts
new file mode 100644
index 0000000000..14caa34a9f
--- /dev/null
+++ b/types/hyper-aws4/hyper-aws4-tests.ts
@@ -0,0 +1,12 @@
+import { sign, Request } from "hyper-aws4";
+
+const signOption: Request = {
+    url: "https://us-west-1.hyper.sh/version",
+    method: "GET",
+    credential: {
+        accessKey: "6DPLADBPWYXDUVXLX34EJXBL",
+        secretKey: "2ldD1Yz0nzATl9vvagBwYTjglXBjVOWU8gV8aMm5"
+    }
+};
+
+sign(signOption);
diff --git a/types/hyper-aws4/index.d.ts b/types/hyper-aws4/index.d.ts
new file mode 100644
index 0000000000..bf2a0fafa8
--- /dev/null
+++ b/types/hyper-aws4/index.d.ts
@@ -0,0 +1,25 @@
+// Type definitions for hyper-aws4 1.1
+// Project: https://github.com/Tim-Zhang/hyper-aws4#readme
+// Definitions by: BamButz <https://github.com/bambutz>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export interface Credentials {
+    accessKey: string;
+    secretKey: string;
+}
+
+export interface Header {
+    [header: string]: string;
+}
+
+export type HttpMethods = "GET" | "POST" | "PUT" | "DELETE" | "PATCH";
+
+export interface Request {
+    url: string;
+    method?: HttpMethods;
+    body?: string;
+    headers?: Header;
+    credential?: Credentials;
+}
+
+export function sign(request: Request, credential?: Credentials): Header;
diff --git a/types/hyper-aws4/tsconfig.json b/types/hyper-aws4/tsconfig.json
new file mode 100644
index 0000000000..6df2d811c1
--- /dev/null
+++ b/types/hyper-aws4/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "strictFunctionTypes": true
+    },
+    "files": [
+        "index.d.ts",
+        "hyper-aws4-tests.ts"
+    ]
+}
diff --git a/types/hyper-aws4/tslint.json b/types/hyper-aws4/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/hyper-aws4/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 02da4b8731282cb35ed274cc337fcc64fd53f619 Mon Sep 17 00:00:00 2001
From: izmhr <atsizumi@gmail.com>
Date: Sun, 25 Nov 2018 20:40:27 +0900
Subject: [PATCH 267/836] Completely new definitions for SkyWay@1.1.17 and
 TypeScript@3.0

---
 types/skyway/index.d.ts      | 327 ++++++++++++++++-------------------
 types/skyway/skyway-tests.ts |  51 +++---
 2 files changed, 171 insertions(+), 207 deletions(-)

diff --git a/types/skyway/index.d.ts b/types/skyway/index.d.ts
index eb73937178..8cdbec4a8e 100644
--- a/types/skyway/index.d.ts
+++ b/types/skyway/index.d.ts
@@ -1,185 +1,154 @@
-// Type definitions for SkyWay
-// Project: http://nttcom.github.io/skyway/
+// Type definitions for SkyWay@1.1.17
+// Project: https://github.com/skyway/skyway-js-sdk
+// Based on Documentation for skyway-js-doc: https://github.com/skyway/skyway-js-sdk-doc
 // Definitions by: Toshiya Nakakura <https://github.com/nakakura>
+//                 Atsushi Izumihara <https://github.com/izmhr>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 3.0
 
-/// <reference types="webrtc" />
-
-declare namespace PeerJs{
-    interface PeerJSOption{
-        key?: string;
-        host?: string;
-        port?: number;
-        path?: string;
-        secure?: boolean;
-        turn?: boolean;
-        config?: RTCPeerConnectionConfig;
-        debug?: number;
-    }
-
-    interface PeerConnectOption{
-        label?: string;
-        metadata?: any;
-        serialization?: string;
-        reliable?: boolean;
-    }
-
-    interface DataConnection{
-        send(data: any): void;
-        close(): void;
-        on(event: string, cb: ()=>void): void;
-        on(event: 'data', cb: (data: any)=>void): void;
-        on(event: 'open', cb: ()=>void): void;
-        on(event: 'close', cb: ()=>void): void;
-        on(event: 'error', cb: (err: any)=>void): void;
-        off(event: string, fn: Function, once?: boolean): void;
-        bufferSize: number;
-        dataChannel: RTCDataChannel;
-        label: string;
-        metadata: any;
-        open: boolean;
-        peerConnection: any;
-        peer: string;
-        reliable: boolean;
-        serialization: string;
-        type: string;
-    }
-
-    interface MediaConnection{
-        answer(stream?: any): void;
-        close(): void;
-        on(event: string, cb: ()=>void): void;
-        on(event: 'stream', cb: (stream: any)=>void): void;
-        on(event: 'close', cb: ()=>void): void;
-        on(event: 'error', cb: (err: any)=>void): void;
-        off(event: string, fn: Function, once?: boolean): void;
-        open: boolean;
-        metadata: any;
-        peer: string;
-        type: string;
-    }
-
-    interface utilSupportsObj {
-        audioVideo: boolean;
-        data: boolean;
-        binary: boolean;
-        reliable: boolean;
-    }
-
-    interface util{
-        browser: string;
-        supports: utilSupportsObj;
-    }
-
-    export interface Peer{
-        /**
-         *
-         * @param id The brokering ID of the remote peer (their peer.id).
-         * @param options for specifying details about Peer Connection
-         */
-        connect(id: string, options?: PeerJs.PeerConnectOption): PeerJs.DataConnection;
-        /**
-         * Connects to the remote peer specified by id and returns a data connection.
-         * @param id The brokering ID of the remote peer (their peer.id).
-         * @param stream The caller's media stream
-         */
-        call(id: string, stream: any): PeerJs.MediaConnection;
-        /**
-         * Calls the remote peer specified by id and returns a media connection.
-         * @param event Event name
-         * @param cb Callback Function
-         */
-        on(event: string, cb: ()=>void): void;
-        /**
-         * Emitted when a connection to the PeerServer is established.
-         * @param event Event name
-         * @param cb id is the brokering ID of the peer
-         */
-        on(event: 'open', cb: (id: string)=>void): void;
-        /**
-         * Emitted when a new data connection is established from a remote peer.
-         * @param event Event name
-         * @param cb Callback Function
-         */
-        on(event: 'connection', cb: (dataConnection: PeerJs.DataConnection)=>void): void;
-        /**
-         * Emitted when a remote peer attempts to call you.
-         * @param event Event name
-         * @param cb Callback Function
-         */
-        on(event: 'call', cb: (mediaConnection: PeerJs.MediaConnection)=>void): void;
-        /**
-         * Emitted when the peer is destroyed and can no longer accept or create any new connections.
-         * @param event Event name
-         * @param cb Callback Function
-         */
-        on(event: 'close', cb: ()=>void): void;
-        /**
-         * Emitted when the peer is disconnected from the signalling server
-         * @param event Event name
-         * @param cb Callback Function
-         */
-        on(event: 'disconnected', cb: ()=>void): void;
-        /**
-         * Errors on the peer are almost always fatal and will destroy the peer.
-         * @param event Event name
-         * @param cb Callback Function
-         */
-        on(event: 'error', cb: (err: any)=>void): void;
-        /**
-         * Remove event listeners.(EventEmitter3)
-         * @param {String} event The event we want to remove.
-         * @param {Function} fn The listener that we need to find.
-         * @param {Boolean} once Only remove once listeners.
-         */
-        off(event: string, fn: Function, once?: boolean): void;
-        /**
-         * Close the connection to the server, leaving all existing data and media connections intact.
-         */
-        disconnect(): void;
-        /**
-         * Close the connection to the server and terminate all existing connections.
-         */
-        destroy(): void;
-        /**
-         * Get a list of available peer IDs
-         * @param callback
-         */
-        listAllPeers(callback: (peerIds: Array<string>)=>void): void;
-
-        /**
-         * The brokering ID of this peer
-         */
-        id: string;
-        /**
-         * A hash of all connections associated with this peer, keyed by the remote peer's ID.
-         */
-        connections: any;
-        /**
-         * false if there is an active connection to the PeerServer.
-         */
-        disconnected: boolean;
-        /**
-         * true if this peer and all of its connections can no longer be used.
-         */
-        destroyed: boolean;
-    }
+interface Options {
+    key: string;
+    debug?: number;
+    turn?: boolean;
+    credential?: Credential;
+    config?: RTCConfiguration;
 }
 
-declare var Peer: {
-    prototype: RTCIceServer;
-    /**
-     * A peer can connect to other peers and listen for connections.
-     * @param id Other peers can connect to this peer using the provided ID.
-     *     If no ID is given, one will be generated by the brokering server.
-     * @param options for specifying details about PeerServer
-     */
-    new (id: string, options?: PeerJs.PeerJSOption): PeerJs.Peer;
+interface Credential {
+    timestamp?: number;
+    ttl?: number;
+    authToken?: string;
+}
 
-    /**
-     * A peer can connect to other peers and listen for connections.
-     * @param options for specifying details about PeerServer
-     */
-    new (options: PeerJs.PeerJSOption): PeerJs.Peer;
-};
+interface CallOptions {
+    metadata?: any;
+    videoBandWidth?: number;
+    audioBandwidth?: number;
+    videoCodec?: string;
+    audioCodec?: string;
+    videoReceiveEnabled?: boolean;
+    audioReceiveEnabled?: boolean;
+    label?: string;
+}
+
+interface ConnectOptions {
+    metadata?: any;
+    serialization?: string;
+    dcInit?: RTCDataChannelInit;
+    label?: string;
+}
+
+interface RoomOptions {
+    mode?: string;
+    stream?: MediaStream;
+    videoBandwidth?: number;
+    audioBandwidth?: number;
+    videoCodec?: string;
+    audioCodec?: string;
+    videoReceiveEnabled?: boolean;
+    audioReceiveEnabled?: boolean;
+}
+
+interface AnswerOptions {
+    videoBandwidth?: number;
+    audioBandwidth?: number;
+    videoCodec?: string;
+    audioCodec?: string;
+}
+
+declare class Peer {
+    constructor(id: string, options: Options);
+    constructor(options: Options);
+
+    connections: any;
+    id: string;
+    open: boolean;
+    rooms: any;
+
+    call(peerId: string, stream?: MediaStream, options?: CallOptions): MediaConnection | undefined;
+    connect(peerId: string, options?: ConnectOptions): DataConnection | undefined;
+    destroy(): undefined;
+    disconnect(): undefined;
+    joinRoom(roomName: string, roomOptions?: RoomOptions): SFURoom | MeshRoom | undefined | null;
+    listAllPeers(cb: (peerIds: Array<string>) => void): void;
+    updateCredential(newCredential: Credential): undefined;
+
+    on(event: string, cb: (ret: any) => void): void;
+    on(event: 'open', cb: (id: string) => void): void;
+    on(event: 'call', cb: (call: MediaConnection) => void): void;
+    on(event: 'close', cb: () => void): void;
+    on(event: 'connection', cb: (connection: DataConnection) => void): void;
+    on(event: 'disconnected', cb: (id: string) => void): void;
+    on(event: 'error', cb: (err: any) => void): void;
+}
+
+declare class MediaConnection {
+    metadata: any;
+    open: boolean;
+    remoteId: string;
+    peer: string;
+
+    answer(stream: MediaStream, options?: AnswerOptions): undefined;
+    close(): void | undefined;
+    replaceStream(stream: MediaStream): undefined;
+
+    on(event: string, cb: () => void): void;
+    on(event: 'stream', cb: (stream: MediaStream) => void): void;
+    on(event: 'close', cb: () => void): void;
+    on(event: 'removeStream', cb: (reamoteStream: MediaStream) => void): void;
+}
+
+declare class DataConnection {
+    metadata: any;
+    open: boolean;
+    remoteId: string;
+    peer: string;
+
+    send(data: any): void;
+    close(): void | undefined;
+
+    on(event: string, cb: () => void): void;
+    on(event: 'data', cb: (data: any) => void): void;
+    on(event: 'close', cb: () => void): void;
+}
+
+interface DataObject {
+    src: string;
+    data: any;
+}
+
+declare class MeshRoom {
+    close(): undefined;
+    getLog(): undefined;
+    replaceStream(stream: MediaSource): undefined;
+    send(data: any): undefined;
+
+    on(event: string, cb: () => void): void;
+    on(event: 'open', cb: () => void): void;
+    on(event: 'peerJoin', cb: (peerId: string) => void): void;
+    on(event: 'peerLeave', cb: (peerId: string) => void): void;
+    on(event: 'log', cb: (logs: Array<string>) => void): void;
+    once(event: 'log', cb: (logs: Array<string>) => void): void;
+    on(event: 'stream', cb: (stream: MediaStream) => void): void;
+    on(event: 'data', cb: (object: DataObject) => void): void;
+    on(event: 'close', cb: () => void): void;
+    on(event: 'removeStream', cb: (stream: MediaStream) => void): void;
+}
+
+declare class SFURoom {
+    close(): undefined;
+    getLog(): undefined;
+    replaceStream(stream: MediaSource): undefined;
+    send(data: any): undefined;
+
+    on(event: string, cb: () => void): void;
+    on(event: 'open', cb: () => void): void;
+    on(event: 'peerJoin', cb: (peerId: string) => void): void;
+    on(event: 'peerLeave', cb: (peerId: string) => void): void;
+    on(event: 'log', cb: (logs: Array<string>) => void): void;
+    once(event: 'log', cb: (logs: Array<string>) => void): void;
+    on(event: 'stream', cb: (stream: MediaStream) => void): void;
+    on(event: 'data', cb: (object: DataObject) => void): void;
+    on(event: 'close', cb: () => void): void;
+    on(event: 'removeStream', cb: (stream: MediaStream) => void): void;
+}
diff --git a/types/skyway/skyway-tests.ts b/types/skyway/skyway-tests.ts
index 2731192f75..46ee924bcb 100644
--- a/types/skyway/skyway-tests.ts
+++ b/types/skyway/skyway-tests.ts
@@ -1,44 +1,39 @@
-var peerByOption: PeerJs.Peer = new Peer({
+/// <reference types="skyway" />
+
+const peerByOption: Peer = new Peer({
     key: 'peerKey',
-    debug: 3,
+    debug: 3
 });
 
-peerByOption.listAllPeers(function(items){
-    for(var i in items){
-        console.log(decodeURI(items[i]));
+peerByOption.listAllPeers((items) => {
+    for (let item in items) {
+        console.log(decodeURI(items[item]));
     }
 });
 
-var peerById: PeerJs.Peer = new Peer("peerid");
+const peerByIdAndOption: Peer = new Peer('peerid', {
+    key: 'peerKey',
+    debug: 3
+});
 
-var peerByIdAndOption: PeerJs.Peer = new Peer(
-    "peerId",
-    {
-        key: 'peerKey',
-        debug: 3,
-    });
-
-var id = peerByOption.id;
-var connections = peerByOption.connections;
-var flag = peerByOption.disconnected;
-flag = peerByOption.destroyed;
+let id = peerByOption.id;
+let connections = peerByOption.connections;
 
 peerByOption.disconnect();
 peerByOption.destroy();
 
-var connection = peerById.connect("id", {
+let connection = peerByOption.connect("id", {
     label: 'chat',
     serialization: 'none',
-    metadata: {message: 'hi i want to chat with you!'}
+    metadata: { message: 'hi i want to chat with you!' }
 });
 
-var call = peerById.call('callto-id', (<any>window).localStream);
+let call = peerByOption.call('callto-id', (window as any).localStream);
 
-var openHandler=()=> console.log("open");
-peerById.on("open", openHandler);
-peerById.on("connection", (c)=> console.log("connection"));
-peerById.on("call", (media)=> console.log("call"));
-peerById.on("close", ()=> console.log("close"));
-peerById.on("disconnected", ()=> console.log("disconnected"));
-peerById.on("error", (err)=> console.log(err));
-peerById.off("open", openHandler);
+let openHandler = () => console.log("open");
+peerByOption.on("open", openHandler);
+peerByOption.on("connection", (c) => console.log("connection"));
+peerByOption.on("call", (media) => console.log("call"));
+peerByOption.on("close", () => console.log("close"));
+peerByOption.on("disconnected", () => console.log("disconnected"));
+peerByOption.on("error", (err) => console.log(err));

From 0577b97e084594414b2db82616c72e91f04793ea Mon Sep 17 00:00:00 2001
From: izmhr <atsizumi@gmail.com>
Date: Sun, 25 Nov 2018 21:04:01 +0900
Subject: [PATCH 268/836] checking npm test error

---
 types/skyway/index.d.ts      | 1 -
 types/skyway/skyway-tests.ts | 2 --
 2 files changed, 3 deletions(-)

diff --git a/types/skyway/index.d.ts b/types/skyway/index.d.ts
index 8cdbec4a8e..044768a08e 100644
--- a/types/skyway/index.d.ts
+++ b/types/skyway/index.d.ts
@@ -1,6 +1,5 @@
 // Type definitions for SkyWay@1.1.17
 // Project: https://github.com/skyway/skyway-js-sdk
-// Based on Documentation for skyway-js-doc: https://github.com/skyway/skyway-js-sdk-doc
 // Definitions by: Toshiya Nakakura <https://github.com/nakakura>
 //                 Atsushi Izumihara <https://github.com/izmhr>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/skyway/skyway-tests.ts b/types/skyway/skyway-tests.ts
index 46ee924bcb..702a05e709 100644
--- a/types/skyway/skyway-tests.ts
+++ b/types/skyway/skyway-tests.ts
@@ -1,5 +1,3 @@
-/// <reference types="skyway" />
-
 const peerByOption: Peer = new Peer({
     key: 'peerKey',
     debug: 3

From e8a26cf2519bdf874690b3324751c03a0e4a99d2 Mon Sep 17 00:00:00 2001
From: Al Calzone <d.griesel@gmx.net>
Date: Sun, 25 Nov 2018 13:16:41 +0100
Subject: [PATCH 269/836] Add definition for removeAllListeners to noble

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

diff --git a/types/noble/index.d.ts b/types/noble/index.d.ts
index 61ca1f2113..5b4af235e7 100644
--- a/types/noble/index.d.ts
+++ b/types/noble/index.d.ts
@@ -30,6 +30,8 @@ export declare function removeListener(event: "scanStop", listener: () => void):
 export declare function removeListener(event: "discover", listener: (peripheral: Peripheral) => void): events.EventEmitter;
 export declare function removeListener(event: string, listener: Function): events.EventEmitter;
 
+export declare function removeAllListeners(event?: string): events.EventEmitter;
+
 export declare var state:string;
 
 export declare class Peripheral extends events.EventEmitter {
diff --git a/types/noble/noble-tests.ts b/types/noble/noble-tests.ts
index 0c8dcf6c20..a4441eba6e 100644
--- a/types/noble/noble-tests.ts
+++ b/types/noble/noble-tests.ts
@@ -35,6 +35,12 @@ noble.removeListener("discover", (peripheral: noble.Peripheral): void => {
     peripheral.disconnect((): void => {});
 });
 
+noble.removeAllListeners("stateChange");
+noble.removeAllListeners("scanStart");
+noble.removeAllListeners("scanStop");
+noble.removeAllListeners("discover");
+noble.removeAllListeners();
+
 var peripheral: noble.Peripheral = new noble.Peripheral();
 peripheral.uuid = "12ad4e81";
 peripheral.advertisement = {

From 99f291773163b608b3a339961584f9638c907bbe Mon Sep 17 00:00:00 2001
From: Dominic Griesel <d.griesel@bigfootsoft.de>
Date: Wed, 14 Nov 2018 18:52:43 +0100
Subject: [PATCH 270/836] Add typings for ioBroker adapters

---
 types/iobroker/index.d.ts        | 1387 ++++++++++++++++++++++++++++++
 types/iobroker/iobroker-tests.ts |    0
 types/iobroker/tsconfig.json     |   22 +
 types/iobroker/tslint.json       |    1 +
 4 files changed, 1410 insertions(+)
 create mode 100644 types/iobroker/index.d.ts
 create mode 100644 types/iobroker/iobroker-tests.ts
 create mode 100644 types/iobroker/tsconfig.json
 create mode 100644 types/iobroker/tslint.json

diff --git a/types/iobroker/index.d.ts b/types/iobroker/index.d.ts
new file mode 100644
index 0000000000..fab5a5a107
--- /dev/null
+++ b/types/iobroker/index.d.ts
@@ -0,0 +1,1387 @@
+/// <reference types="node" />
+import fs = require("fs");
+
+// tslint:disable:no-namespace
+declare global {
+	namespace ioBroker {
+
+		enum StateQuality {
+			good = 0x00, // or undefined or null
+			bad = 0x01,
+			general_problem = 0x01,
+			general_device_problem = 0x41,
+			general_sensor_problem = 0x81,
+			device_not_connected = 0x42,
+			sensor_not_connected = 0x82,
+			device_reports_error = 0x44,
+			sensor_reports_error = 0x84,
+		}
+
+		interface State {
+			/** The value of the state. */
+			val: any;
+
+			/** Direction flag: false for desired value and true for actual value. Default: false. */
+			ack: boolean;
+
+			/** Unix timestamp. Default: current time */
+			ts: number;
+
+			/** Unix timestamp of the last time the value changed */
+			lc: number;
+
+			/** Name of the adapter instance which set the value, e.g. "system.adapter.web.0" */
+			from: string;
+
+			/** Optional time in seconds after which the state is reset to null */
+			expire?: number;
+
+			/** Optional quality of the state value */
+			q?: StateQuality;
+
+			/** Optional comment */
+			c?: string;
+		}
+
+		/** Provides low-level access to the ioBroker states DB */
+		interface States {
+
+			/**
+			 * Returns a list of states with the given ids
+			 * @param keys IDs of the states to be retrieved
+			 * @param callback Is called when the operation has finished (successfully or not)
+			 * @param dontModify unused
+			 */
+			getStates(keys: string[], callback: GetStatesCallback2, dontModify?: any): void;
+
+			/**
+			 * Returns the state with the given id
+			 * @param id ID of the state to be retrieved
+			 * @param callback Is called when the operation has finished (successfully or not)
+			 */
+			getState(id: string, callback: GetStateCallback): void;
+
+			/**
+			 * Stores a state in the db
+			 * @param id ID of the state to be stored
+			 * @param state The state to be stored in the db
+			 * @param callback Is called when the operation has finished (successfully or not)
+			 */
+			setState(id: string, state?: string | number | boolean | State | Partial<State>, callback?: SetStateCallback): void;
+
+			/**
+			 * Updates a state in memory without triggering a save
+			 * @param id ID of the state to be stored
+			 * @param state The state to be updated
+			 * @param callback Is called when the operation has finished (successfully or not)
+			 */
+			setRawState(id: string, state: State, callback?: SetStateCallback): void;
+
+			/**
+			 * Deletes a state
+			 * @param id ID of the state to be stored
+			 * @param callback Is called when the operation has finished (successfully or not)
+			 */
+			delState(id: string, callback: DeleteStateCallback): void;
+
+			/**
+			 * Retrieves all ids of states matching @link{pattern}
+			 * @param pattern The pattern to match against
+			 * @param callback Is called when the operation has finished (successfully or not)
+			 * @param dontModify unused
+			 */
+			getKeys(pattern: string, callback: GetConfigKeysCallback, dontModify?: any): void;
+
+			/**
+			 * Subscribe to changes of all states matching @link{pattern}
+			 * @param pattern The pattern to match against
+			 * @param callback Is called when the operation has finished (successfully or not)
+			 */
+			subscribe(pattern: string, cb: EmptyCallback): void;
+			/**
+			 * Unsubscribe from changes of all states matching @link{pattern}
+			 * @param pattern The pattern to match against
+			 * @param callback Is called when the operation has finished (successfully or not)
+			 */
+			unsubscribe(pattern: string, cb: EmptyCallback): void;
+
+			/**
+			 * Register an adapter instance as subscribable.
+			 * This means that the instance can read information about all subscriptions to its states
+			 * and will be notified of changes.
+			 * @param instance Adapter instance to register, e.g. "admin.0"
+			 * @param cb Is called when the operation has finished (successfully or not)
+			 */
+			registerAdapterSubs(instance: string, cb?: (error: null, success: boolean) => void): void;
+
+			/**
+			 * Unregister an adapter instance as subscribable.
+			 * @param instance Adapter instance to unregister, e.g. "admin.0"
+			 * @param cb Is called when the operation has finished (successfully or not)
+			 */
+			unregisterAdapterSubs(instance: string, cb?: (error: null, success: boolean) => void): void;
+
+			/**
+			 * EDUCATED GUESS: Notify all clients about changes to an object
+			 * @param type object type
+			 * @param id State/object id
+			 * @param obj The changed object
+			 */
+			publishAll(type: string, id: string, obj: Message): void;
+
+			// TODO: Documentation for these functions is missing
+			pushMessage(id: string, state: Message, callback: SetStateCallback): void;
+			lenMessage(id: string, callback: GenericCallback<number>): void;
+			getMessage(id: string, callback: GenericCallback<Message>): void;
+			delMessage(id: string, messageId: number, callback: ErrorCallback): void;
+			clearAllMessages(callback?: EmptyCallback): void;
+			subscribeMessage(id: string, cb: EmptyCallback): void;
+			unsubscribeMessage(id: string, cb: EmptyCallback): void;
+
+			pushLog(id: string, log: Log, callback: SetStateCallback): void;
+			lenLog(id: string, callback: GenericCallback<number>): void;
+			getLog(id: string, callback: GenericCallback<Log>): void;
+			delLog(id: string, logId: string, callback: ErrorCallback): void;
+			clearAllLogs(callback?: EmptyCallback): void;
+			subscribeLog(id: string, cb: EmptyCallback): void;
+			unsubscribeLog(id: string, cb: EmptyCallback): void;
+
+			getSession(id: string, callback: GetSessionCallback): void;
+			setSession(id: string, expire: number, callback?: EmptyCallback): void;
+			setSession(id: string, expire: number, obj: Session, callback?: EmptyCallback): void;
+			destroySession(id: string, callback?: EmptyCallback): void;
+
+			/**
+			 * Retrieves a copy of the object with the given ID
+			 * @param id Id of the object to find
+			 * @param callback Is called when the operation has finished (successfully or not)
+			 */
+			getConfig(id: string, callback: GetObjectCallback): void;
+
+			/**
+			 * Returns a list of config keys matching <pattern>
+			 * @param pattern Pattern to match against
+			 * @param callback Is called when the operation has finished (successfully or not)
+			 * @param dontModify unused
+			 */
+			getConfigKeys(pattern: string, callback: GetConfigKeysCallback, dontModify?: any): void;
+
+			/**
+			 * Returns a list of objects with the given ids
+			 * @param keys IDs of the objects to be retrieved
+			 * @param callback Is called when the operation has finished (successfully or not)
+			 * @param dontModify unused
+			 */
+			getConfigs(keys: string[], callback: GetObjectsCallback2, dontModify?: any): void;
+
+			/**
+			 * Creates or overwrites a config object in the object db
+			 * @param id ID of the object
+			 * @param obj Object to store
+			 * @param callback Is called when the operation has finished (successfully or not)
+			 */
+			setConfig(id: string, obj: ioBroker.Object, callback: SetObjectCallback): void;
+
+			/**
+			 * Deletes a config object in the object db
+			 * @param id ID of the object
+			 * @param callback Is called when the operation has finished (successfully or not)
+			 */
+			delConfig(id: string, callback: ErrorCallback): void;
+
+			/**
+			 * Subscribe to config object changes
+			 * @param pattern The pattern to match against
+			 */
+			subscribeConfig(pattern: string, callback: EmptyCallback): void;
+
+			/**
+			 * Unsubscribe from config object changes
+			 * @param pattern The pattern to match against
+			 */
+			unsubscribeConfig(pattern: string, callback: EmptyCallback): void;
+
+			/**
+			 * Writes a binary state into Redis
+			 * @param id The id of the state
+			 * @param data The data to be written
+			 * @param callback Is called when the operation has finished (successfully or not)
+			 */
+			setBinaryState(id: string, data: Buffer, callback: SetStateCallback): void;
+
+			/**
+			 * Reads a binary state from Redis
+			 * @param id The id of the state
+			 * @param callback Is called when the operation has finished (successfully or not)
+			 */
+			getBinaryState(id: string, callback: GetBinaryStateCallback): void;
+
+			/**
+			 * Deletes a binary state from Redis
+			 * @param id The id of the state to be deleted
+			 * @param callback Is called when the operation has finished (successfully or not)
+			 */
+			delBinaryState(id: string, callback: DeleteStateCallback): void;
+
+			/** Destructor of the class. Call this before shutting down */
+			destroy(): void;
+
+		} // end interface States
+
+		type Session = any; // TODO: implement
+
+		type ObjectType = "state" | "channel" | "device";
+		type CommonType = "number" | "string" | "boolean" | "array" | "object" | "mixed" | "file";
+
+		// Maybe this should extend Record<string, any>,
+		// but the extra properties aren't defined anywhere,
+		// so I'd rather force the user to explicitly state
+		// he knows what he's doing by casting to any
+		interface ObjectCommon {
+			/** name of this object */
+			name: string;
+
+			// Icon and role aren't defined in SCHEMA.md,
+			// but they are being used by some adapters
+			/** Icon for this object */
+			icon?: string;
+			/** role of the object */
+			role?: string;
+		}
+
+		interface StateCommon extends ObjectCommon {
+			/** Type of this state. See https://github.com/ioBroker/ioBroker/blob/master/doc/SCHEMA.md#state-commonrole for a detailed description */
+			type?: CommonType;
+			/** minimum value */
+			min?: number;
+			/** maximum value */
+			max?: number;
+			/** unit of the value */
+			unit?: string;
+			/** the default value */
+			def?: any;
+			/** description of this state */
+			desc?: string;
+
+			/** if this state is readable */
+			read: boolean;
+			/** if this state is writable */
+			write: boolean;
+			/** role of the state (used in user interfaces to indicate which widget to choose) */
+			role: string;
+
+			/**
+			 * Dictionary of possible values for this state in the form
+			 * <pre>
+			 * {
+			 *     "internal value 1": "displayed value 1",
+			 *     "internal value 2": "displayed value 2",
+			 *     ...
+			 * }
+			 * </pre>
+			 * In old ioBroker versions, this could also be a string of the form
+			 * "val1:text1;val2:text2" (now deprecated)
+			 */
+			states?: Record<string, string> | string;
+
+			/** ID of a helper state indicating if the handler of this state is working */
+			workingID?: string;
+
+			/** attached history information */
+			history?: any;
+		}
+		interface ChannelCommon extends ObjectCommon {
+			/** description of this channel */
+			desc?: string;
+		}
+		type OtherCommon = ObjectCommon & {
+			[propName: string]: any;
+		};
+
+		interface BaseObject {
+			/** The ID of this object */
+			_id?: string;
+			native: Record<string, any>;
+			enums?: Record<string, string>;
+			type: string; // specified in the derived interfaces
+			common: ObjectCommon;
+			acl?: ObjectACL;
+		}
+
+		interface StateObject extends BaseObject {
+			type: "state";
+			common: StateCommon;
+			acl?: StateACL;
+		}
+		interface PartialStateObject extends Partial<Pick<StateObject, "_id" | "native" | "enums" | "type">> {
+			common?: Partial<StateCommon>;
+			acl?: Partial<StateACL>;
+		}
+
+		interface ChannelObject extends BaseObject {
+			type: "channel";
+			common: ChannelCommon;
+		}
+		interface PartialChannelObject extends Partial<Pick<ChannelObject, "_id" | "native" | "enums" | "type" | "acl">> {
+			common?: Partial<ChannelCommon>;
+		}
+
+		interface DeviceObject extends BaseObject {
+			type: "device";
+			common: ObjectCommon; // TODO: any definition for device?
+		}
+		interface PartialDeviceObject extends Partial<Pick<DeviceObject, "_id" | "native" | "enums" | "type" | "acl">> {
+			common?: Partial<ObjectCommon>;
+		}
+
+		interface OtherObject extends BaseObject {
+			type: "adapter" | "config" | "enum" | "group" | "host" | "info" | "instance" | "meta" | "script" | "user";
+			common: OtherCommon;
+		}
+		interface PartialOtherObject extends Partial<Pick<OtherObject, "_id" | "native" | "enums" | "type" | "acl">> {
+			common?: Partial<ObjectCommon>;
+		}
+
+		type Object = StateObject | ChannelObject | DeviceObject | OtherObject;
+		type PartialObject = PartialStateObject | PartialChannelObject | PartialDeviceObject | PartialOtherObject;
+
+		/** Defines access rights for a single file */
+		interface FileACL {
+			/** Full name of the user who owns this file, e.g. "system.user.admin" */
+			owner: string;
+			/** Full name of the group who owns this file, e.g. "system.group.administrator" */
+			ownerGroup: string;
+			/** Linux-type permissions defining access to this file */
+			permissions: number;
+		}
+		/** Defines access rights for a single file, applied to a user or group */
+		interface EvaluatedFileACL extends FileACL {
+			/** Whether the user may read the file */
+			read: boolean;
+			/** Whether the user may write the file */
+			write: boolean;
+		}
+
+		/** Defines access rights for a single object */
+		interface ObjectACL {
+			/** Full name of the user who owns this object, e.g. "system.user.admin" */
+			owner: string;
+			/** Full name of the group who owns this object, e.g. "system.group.administrator" */
+			ownerGroup: string;
+			/** Linux-type permissions defining access to this object */
+			object: number;
+		}
+		/** Defines access rights for a single state object */
+		interface StateACL extends ObjectACL {
+			/** Linux-type permissions defining access to this state */
+			state: number;
+		}
+
+		/** Defines access rights for a single object type */
+		interface ObjectOperationPermissions {
+			/** Whether a user may enumerate objects of this type */
+			list: boolean;
+			/** Whether a user may read objects of this type */
+			read: boolean;
+			/** Whether a user may write objects of this type */
+			write: boolean;
+			/** Whether a user may create objects of this type */
+			create: boolean;
+			/** Whether a user may delete objects of this type */
+			"delete": boolean;
+		}
+
+		/** Defines the rights a user or group has to change objects */
+		interface ObjectPermissions {
+			/** The access rights for files */
+			file: ObjectOperationPermissions;
+			/** The access rights for objects */
+			object: ObjectOperationPermissions;
+			/** The access rights for users/groups */
+			users: ObjectOperationPermissions;
+			/** The access rights for states */
+			state?: ObjectOperationPermissions;
+		}
+		/** Defined the complete set of access rights a user has */
+		interface PermissionSet extends ObjectPermissions {
+			/** The name of the user this ACL is for */
+			user: string;
+			/** The name of the groups this ACL was merged from */
+			groups: string[];
+			/** The access rights for certain commands */
+			other: {
+				execute: boolean,
+				http: boolean,
+				sendto: boolean,
+			};
+		}
+
+		interface Permission {
+			/** The type of the permission */
+			type: string;
+			/** Which kind of operation is required */
+			operation: string;
+		}
+		interface ObjectOrStatePermission extends Permission {
+			type: "object" | "file" | "users" | "state";
+			operation: "list" | "read" | "write" | "create" | "delete";
+		}
+		interface OtherPermission extends Permission {
+			type: "other";
+			operation: "execute" | "http" | "sendto";
+		}
+		interface CommandsPermissions {
+			// TODO: Are all properties required or is a partial object ok?
+			getObject: ObjectOrStatePermission;
+			getObjects: ObjectOrStatePermission;
+			getObjectView: ObjectOrStatePermission;
+			setObject: ObjectOrStatePermission;
+			subscribeObjects: ObjectOrStatePermission;
+			unsubscribeObjects: ObjectOrStatePermission;
+			getStates: ObjectOrStatePermission;
+			getState: ObjectOrStatePermission;
+			setState: ObjectOrStatePermission;
+			getStateHistory: ObjectOrStatePermission;
+			subscribe: ObjectOrStatePermission;
+			unsubscribe: ObjectOrStatePermission;
+			getVersion: Permission;
+			httpGet: OtherPermission;
+			sendTo: OtherPermission;
+			sendToHost: OtherPermission;
+			readFile: ObjectOrStatePermission;
+			readFile64: ObjectOrStatePermission;
+			writeFile: ObjectOrStatePermission;
+			writeFile64: ObjectOrStatePermission;
+			unlink: ObjectOrStatePermission;
+			rename: ObjectOrStatePermission;
+			mkdir: ObjectOrStatePermission;
+			readDir: ObjectOrStatePermission;
+			chmodFile: ObjectOrStatePermission;
+			authEnabled: Permission;
+			disconnect: Permission;
+			listPermissions: Permission;
+			getUserPermissions: ObjectOrStatePermission;
+		}
+
+		type UserGroup = any; // TODO find out how this looks like
+		// interface UserGroup { }
+
+		/** Contains information about a user */
+		interface User {
+			/** Which groups this user belongs to */
+			groups: UserGroup[];
+			/** Access rights of this user */
+			acl: ObjectPermissions;
+		}
+
+		/** Parameters for @link{Objects.getObjectView} */
+		interface GetObjectViewParams {
+			/** First id to include in the return list */
+			startkey: string;
+			/** Last id to include in the return list */
+			endkey: string;
+		}
+
+		/** Parameters for @link{Objects.getObjectList} */
+		interface GetObjectListParams extends GetObjectViewParams {
+			/** Whether docs should be included in the return list */ // TODO: What are docs?
+			include_docs: boolean;
+		}
+
+		/** Provides low-level access to the ioBroker objects db */
+		interface Objects {
+			/**
+			 * For a given user, returns the groups he belongs to, and his access rights
+			 * @param user Name of the user. Has to start with "system.user."
+			 * @param callback The callback function to be invoked with the return values
+			 */
+			getUserGroup(user: string, callback: GetUserGroupCallback): void;
+
+			/**
+			 * Determines the mime type for a given file extension
+			 * @param ext File extension, including the leading dot, e.g. ".zip"
+			 */
+			getMimeType(ext: string): {mimeType: string, isBinary: boolean};
+
+			/**
+			 * Writes a file.
+			 * @param id Name of the root directory. This should be the adapter instance, e.g. "admin.0"
+			 * @param name File name
+			 * @param data Contents of the file
+			 * @param options (optional) MIME type of the file (string). Or some internal options.
+			 * @param callback Is called when the operation has finished (successfully or not)
+			 */
+			writeFile(id: string, name: string, data: Buffer | string, callback: ErrorCallback): void;
+			writeFile(id: string, name: string, data: Buffer | string, options: string | any, callback: ErrorCallback): void;
+
+			/**
+			 * Reads a file.
+			 * @param id Name of the root directory. This should be the adapter instance, e.g. "admin.0"
+			 * @param name File name
+			 * @param options (optional) Some internal options.
+			 * @param callback Is called when the operation has finished (successfully or not)
+			 */
+			readFile(id: string, name: string, callback: ReadFileCallback): void;
+			readFile(id: string, name: string, options: any, callback: ReadFileCallback): void;
+
+			/**
+			 * Deletes a file.
+			 * @param id Name of the root directory. This should be the adapter instance, e.g. "admin.0"
+			 * @param name File name
+			 * @param options (optional) Some internal options.
+			 * @param callback Is called when the operation has finished (successfully or not)
+			 */
+			unlink(id: string, name: string, callback: ErrorCallback): void;
+			unlink(id: string, name: string, options: any, callback: ErrorCallback): void;
+			/**
+			 * Deletes a file.
+			 * @param id Name of the root directory. This should be the adapter instance, e.g. "admin.0"
+			 * @param name File name
+			 * @param options (optional) Some internal options.
+			 * @param callback Is called when the operation has finished (successfully or not)
+			 */
+			delFile(id: string, name: string, callback: ErrorCallback): void;
+			delFile(id: string, name: string, options: any, callback: ErrorCallback): void;
+
+			/**
+			 * Finds all files and directories starting with <name>
+			 * @param id Name of the root directory. This should be the adapter instance, e.g. "admin.0"
+			 * @param name File or directory name
+			 * @param options (optional) Some internal options.
+			 * @param callback Is called when the operation has finished (successfully or not)
+			 */
+			readDir(id: string, name: string, callback: ReadDirCallback): void;
+			readDir(id: string, name: string, options: any, callback: ReadDirCallback): void;
+
+			/**
+			 * Renames a file or directory
+			 * @param id Name of the root directory. This should be the adapter instance, e.g. "admin.0"
+			 * @param oldName Old file or directory name
+			 * @param newName Name to rename to
+			 * @param options (optional) Some internal options.
+			 * @param callback Is called when the operation has finished (successfully or not)
+			 */
+			rename(id: string, oldName: string, newName: string, callback: ErrorCallback): void;
+			rename(id: string, oldName: string, newName: string, options: any, callback: ErrorCallback): void;
+
+			/**
+			 * Creates an empty file with the given name
+			 * @param id Name of the root directory. This should be the adapter instance, e.g. "admin.0"
+			 * @param name File name
+			 * @param options (optional) Some internal options.
+			 * @param callback Is called when the operation has finished (successfully or not)
+			 */
+			touch(id: string, name: string, callback: ErrorCallback): void;
+			touch(id: string, name: string, options: any, callback: ErrorCallback): void;
+
+			/**
+			 * Deletes all files in the root directory matching <name>
+			 * @param id Name of the root directory. This should be the adapter instance, e.g. "admin.0"
+			 * @param name Pattern to match against
+			 * @param options (optional) Some internal options.
+			 * @param callback Is called when the operation has finished (successfully or not)
+			 */
+			rm(id: string, name: string, callback: RmCallback): void;
+			rm(id: string, name: string, options: any, callback: RmCallback): void;
+
+			/**
+			 * Creates an empty directory with the given name
+			 * @param id Name of the root directory. This should be the adapter instance, e.g. "admin.0"
+			 * @param name Directory name
+			 * @param options (optional) Some internal options.
+			 * @param callback Is called when the operation has finished (successfully or not)
+			 */
+			mkDir(id: string, name: string, callback: ErrorCallback): void;
+			mkDir(id: string, name: string, options: any, callback: ErrorCallback): void;
+
+			/**
+			 * Takes possession all files in the root directory matching <name>
+			 * @param id Name of the root directory. This should be the adapter instance, e.g. "admin.0"
+			 * @param name Pattern to match against
+			 * @param options (optional) Some internal options.
+			 * @param callback Is called when the operation has finished (successfully or not)
+			 */
+			chownFile(id: string, name: string, callback: ChownFileCallback): void;
+			chownFile(id: string, name: string, options: any, callback: ChownFileCallback): void;
+
+			/**
+			 * Changes access rights of all files in the root directory matching <name>
+			 * @param id Name of the root directory. This should be the adapter instance, e.g. "admin.0"
+			 * @param name Pattern to match against
+			 * @param options Mode of the access change as a number or hexadecimal string
+			 * @param callback Is called when the operation has finished (successfully or not)
+			 */
+			chmodFile(id: string, name: string, options: {mode: number | string} | Record<string, any>, callback: ChownFileCallback): void;
+
+			// not documented. enabled = true seems to disable the cache
+			// enableFileCache(enabled, options, callback)
+
+			/**
+			 * Subscribe to object changes
+			 * @param pattern The pattern to match against
+			 */
+			subscribeConfig(pattern: string, callback: EmptyCallback): void;
+			subscribeConfig(pattern: string, options: any, callback: EmptyCallback): void;
+			/**
+			 * Subscribe to object changes
+			 * @param pattern The pattern to match against
+			 */
+			subscribe(pattern: string, callback: EmptyCallback): void;
+			subscribe(pattern: string, options: any, callback: EmptyCallback): void;
+
+			/**
+			 * Unsubscribe from object changes
+			 * @param pattern The pattern to match against
+			 */
+			unsubscribeConfig(pattern: string, callback: EmptyCallback): void;
+			unsubscribeConfig(pattern: string, options: any, callback: EmptyCallback): void;
+			/**
+			 * Unsubscribe from object changes
+			 * @param pattern The pattern to match against
+			 */
+			unsubscribe(pattern: string, callback: EmptyCallback): void;
+			unsubscribe(pattern: string, options: any, callback: EmptyCallback): void;
+
+			/**
+			 * Takes possession of all objects matching <pattern>
+			 * @param pattern Pattern to match against
+			 * @param options (optional) Some internal options.
+			 * @param callback Is called when the operation has finished (successfully or not)
+			 */
+			chownObject(pattern: string, callback: ChownObjectCallback): void;
+			chownObject(pattern: string, options: any, callback: ChownObjectCallback): void;
+
+			/**
+			 * Changes access rights of all objects matching <pattern>
+			 * @param pattern Pattern to match against
+			 * @param options Mode of the access change as a number or hexadecimal string
+			 * @param callback Is called when the operation has finished (successfully or not)
+			 */
+			chmodObject(pattern: string, callback: ChownObjectCallback): void;
+			chmodObject(pattern: string, options: any, callback: ChownObjectCallback): void;
+
+			/**
+			 * Retrieves a copy of the object with the given ID
+			 * @param id Id of the object to find
+			 * @param options (optional) Some internal options.
+			 * @param callback Is called when the operation has finished (successfully or not)
+			 */
+			getObject(id: string, callback: GetObjectCallback): void;
+			getObject(id: string, options: any, callback: GetObjectCallback): void;
+			/**
+			 * Retrieves a copy of the object with the given ID
+			 * @param id Id of the object to find
+			 * @param options (optional) Some internal options.
+			 * @param callback Is called when the operation has finished (successfully or not)
+			 */
+			getConfig(id: string, callback: GetObjectCallback): void;
+			getConfig(id: string, options: any, callback: GetObjectCallback): void;
+
+			/**
+			 * Returns a list of config keys matching <pattern>
+			 * @param pattern Pattern to match against
+			 * @param options (optional) Some internal options.
+			 * @param callback Is called when the operation has finished (successfully or not)
+			 * @param dontModify unused
+			 */
+			getConfigKeys(pattern: string, callback: GetConfigKeysCallback, dontModify?: any): void;
+			getConfigKeys(pattern: string, options: any, callback: GetConfigKeysCallback, dontModify?: any): void;
+
+			/**
+			 * Returns a list of objects with the given ids
+			 * @param keys IDs of the objects to be retrieved
+			 * @param options (optional) Some internal options.
+			 * @param callback Is called when the operation has finished (successfully or not)
+			 * @param dontModify unused
+			 */
+			getObjects(keys: string[], callback: GetObjectsCallback2, dontModify?: any): void;
+			getObjects(keys: string[], options: any, callback: GetObjectsCallback2, dontModify?: any): void;
+			/**
+			 * Returns a list of objects with the given ids
+			 * @param keys IDs of the objects to be retrieved
+			 * @param options (optional) Some internal options.
+			 * @param callback Is called when the operation has finished (successfully or not)
+			 * @param dontModify unused
+			 */
+			getConfigs(keys: string[], callback: GetObjectsCallback2, dontModify?: any): void;
+			getConfigs(keys: string[], options: any, callback: GetObjectsCallback2, dontModify?: any): void;
+
+			/**
+			 * Creates or overwrites an object in the object db
+			 * @param id ID of the object
+			 * @param obj Object to store
+			 * @param options (optional) Some internal options.
+			 * @param callback Is called when the operation has finished (successfully or not)
+			 */
+			setObject(id: string, obj: ioBroker.Object, callback: SetObjectCallback): void;
+			setObject(id: string, obj: ioBroker.Object, options: any, callback: SetObjectCallback): void;
+			/**
+			 * Creates or overwrites an object in the object db
+			 * @param id ID of the object
+			 * @param obj Object to store
+			 * @param options (optional) Some internal options.
+			 * @param callback Is called when the operation has finished (successfully or not)
+			 */
+			setConfig(id: string, obj: ioBroker.Object, callback: SetObjectCallback): void;
+			setConfig(id: string, obj: ioBroker.Object, options: any, callback: SetObjectCallback): void;
+
+			/**
+			 * Deletes an object in the object db
+			 * @param id ID of the object
+			 * @param options (optional) Some internal options.
+			 * @param callback Is called when the operation has finished (successfully or not)
+			 */
+			delObject(id: string, callback: ErrorCallback): void;
+			delObject(id: string, options: any, callback: ErrorCallback): void;
+			/**
+			 * Deletes an object in the object db
+			 * @param id ID of the object
+			 * @param options (optional) Some internal options.
+			 * @param callback Is called when the operation has finished (successfully or not)
+			 */
+			delConfig(id: string, callback: ErrorCallback): void;
+			delConfig(id: string, options: any, callback: ErrorCallback): void;
+
+			/**
+			 * Returns a list of objects with id between params.startkey and params.endkey
+			 * @param params Parameters determining the objects included in the return list. Null to include all objects
+			 * @param options (optional) If the returned list should be sorted. And some internal options.
+			 * @param callback Is called when the operation has finished (successfully or not)
+			 */
+			getObjectList(params: GetObjectListParams | null, callback: GetObjectListCallback): void;
+			getObjectList(params: GetObjectListParams | null, options: { sorted?: boolean } | Record<string, any>, callback: GetObjectListCallback): void;
+
+			/**
+			 * Query a predefined object view (similar to SQL stored procedures) and return the results
+			 * For a detailed description refer to https://github.com/ioBroker/ioBroker/wiki/Adapter-Development-Documentation#object-fields
+			 * or http://guide.couchdb.org/editions/1/en/views.html
+			 * @param design The namespace of the object view, as defined in io-package.json. Usually the adapter name, e.g. "hm-rpc"
+			 * @param search The name of the object view.
+			 * @param params Parameters to additionally filter out objects from the return list. Null to include all objects
+			 * @param options (optional) Some internal options.
+			 * @param callback Is called when the operation has finished (successfully or not)
+			 */
+			getObjectView(design: string, search: string, params: GetObjectViewParams | null, callback: GetObjectViewCallback): void;
+			getObjectView(design: string, search: string, params: GetObjectViewParams | null, options: any, callback: GetObjectViewCallback): void;
+
+			/**
+			 * Extends an object in the object db with new properties
+			 * @param id ID of the object
+			 * @param obj Object to extend the original one with. May be just parts of an object.
+			 * @param options (optional) Some internal options.
+			 * @param callback Is called when the operation has finished (successfully or not)
+			 */
+			extendObject(id: string, obj: PartialObject, callback: ExtendObjectCallback): void;
+			extendObject(id: string, obj: PartialObject, options: any, callback: ExtendObjectCallback): void;
+
+			/**
+			 * Finds an object by ID or name. If multiple objects were found, return the first one
+			 * @param idOrName ID or name of the object
+			 * @param type If != null, only return an object with a common.type equal to this
+			 * @param options (optional) Some internal options.
+			 * @param callback Is called when the operation has finished (successfully or not)
+			 */
+			findObject(idOrName: string, type: CommonType | null, callback: FindObjectCallback): void;
+			findObject(idOrName: string, type: CommonType | null, options: any, callback: FindObjectCallback): void;
+
+			// I'd rather not document a function with the name "destroyDB"
+
+			/** Destructor of the class. Call this before shutting down. */
+			destroy(): void;
+
+		} // end interface Objects
+
+		type LogLevel = "silly" | "debug" | "info" | "warn" | "error";
+		interface Logger {
+			/** log message with silly level */
+			silly(message: string): void;
+			/** log message with debug level */
+			debug(message: string): void;
+			/** log message with info level (default output level for all adapters) */
+			info(message: string): void;
+			/** log message with warning severity */
+			warn(message: string): void;
+			/** log message with error severity */
+			error(message: string): void;
+
+			/** Verbosity of the log output */
+			level: LogLevel;
+		}
+
+		interface Certificates {
+			/** private key file */
+			key: string | Buffer;
+			/** public certificate */
+			cert: string | Buffer;
+			/** chained CA certificates */
+			ca: (string | Buffer)[];
+		}
+
+		/** Callback information for a passed message */
+		interface MessageCallbackInfo {
+			/** The original message payload */
+			message: string | object;
+			/** ID of this callback */
+			id: number;
+			// ???
+			ack: boolean;
+			/** Timestamp of this message */
+			time: number;
+		}
+		type MessageCallback = (result?: any) => void;
+
+		/** A message being passed between adapter instances */
+		interface Message {
+			/** The command to be executed */
+			command: string;
+			/** The message payload */
+			message: string | object;
+			/** The source of this message */
+			from: string;
+			/** ID of this message */
+			_id: number;
+			/** Callback information. This is set when the source expects a response */
+			callback: MessageCallbackInfo;
+		}
+
+		type Log = any; // TODO: define this https://github.com/ioBroker/ioBroker.js-controller/blob/master/lib/states/statesInMemServer.js#L873
+
+		type EnumList = string | string[];
+
+		type Enum = any; // TODO: implement this
+
+		interface DirectoryEntry {
+			file: string;
+			stats: fs.Stats;
+			isDir: boolean;
+			acl: any; // access control list object
+			modifiedAt: number;
+			createdAt: number;
+		}
+
+		interface GetHistoryOptions {
+			instance?: string;
+			start?: number;
+			end?: number;
+			step?: number;
+			count?: number;
+			from?: boolean;
+			ack?: boolean;
+			q?: boolean;
+			addID?: boolean;
+			limit?: number;
+			ignoreNull: boolean;
+			sessionId?: any;
+			aggregate?: "minmax" | "min" | "max" | "average" | "total" | "count" | "none";
+		}
+
+		interface AdapterOptions {
+			/** The name of the adapter */
+			name: string;
+
+			/** path to adapter */
+			dirname?: string;
+
+			/** if the global system config should be included in the created object. Default: false */
+			systemConfig?: boolean;
+
+			/** provide alternative global configuration for the adapter. Default: null */
+			config?: any;
+
+			/** instance of the created adapter. Default: null */
+			instance?: number;
+
+			/** If the adapter needs access to the formatDate function to format dates according to the global settings. Default: false */
+			useFormatDate?: boolean;
+
+			/** If the adapter collects logs from all adapters (experts only). Default: false */
+			logTransporter?: boolean;
+
+			/** Handler for changes of subscribed objects */
+			objectChange?: ObjectChangeHandler;
+			/** Handler for received adapter messages. Can only be used if messagebox in io-package.json is set to true. */
+			message?: MessageHandler;
+			/** Handler for changes of subscribed states */
+			stateChange?: StateChangeHandler;
+			/** Will be called when the adapter is intialized */
+			ready?: () => void;
+			/** Will be called on adapter termination */
+			unload?: (callback: EmptyCallback) => void;
+
+			/** if true, stateChange will be called with an id that has no namespace, e.g. "state" instead of "adapter.0.state". Default: false */
+			noNamespace?: boolean;
+		} // end interface AdapterOptions
+
+		// tslint:disable-next-line:no-empty-interface
+		interface AdapterConfig {
+			// This is a stub to be augmented in every adapter
+		}
+
+		interface Adapter {
+			/** The name of the adapter */
+			name: string;
+			/** The name of the host where the adapter is running */
+			host: string;
+			/** instance number of this adapter instance */
+			instance: number;
+			/** Namespace of adapter objects: "<name>.<instance>" */
+			readonly namespace: string;
+			/** native part of the adapter settings */
+			config: AdapterConfig;
+			/** common part of the adapter settings */
+			common: any;
+			/** system part of the adapter settings */
+			systemConfig?: any;
+			/** path to the adapter folder */
+			adapterDir: string;
+			/** content of io-package.json */
+			ioPack: any;
+			/** content of package.json */
+			pack: any;
+			/** access to the logging functions */
+			log: Logger;
+			/** adapter version */
+			version: any;
+			states: States;
+			objects: Objects;
+			/** if the adapter is connected to the host */
+			connected: boolean;
+
+			/*	===============================
+				Functions defined in adapter.js
+				=============================== */
+
+			/**
+			 * Helper function that looks for first free TCP port starting with the given one.
+			 * @param port - The port to start with
+			 * @param callback - gets called when a free port is found
+			 */
+			getPort(port: number, callback: (port: number) => void): void;
+
+			/** Stops the adapter. Note: Is not always defined. */
+			stop?: () => void;
+
+			// ==============================
+			// GENERAL
+
+			/** Validates username and password */
+			checkPassword(user: string, password: string, callback: (result: boolean) => void): void;
+			checkPassword(user: string, password: string, options: any, callback: (result: boolean) => void): void;
+			/** Sets a new password for the given user */
+			setPassword(user: string, password: string, options?: any, callback?: (err?: any) => void): void;
+			/** <INTERNAL> Checks if a user exists and is in the given group. */
+			checkGroup(user: string, group: string, callback: (result: boolean) => void): void;
+			checkGroup(user: string, group: string, options: any, callback: (result: boolean) => void): void;
+			/** <INTERNAL> Determines the users permissions */
+			calculatePermissions(user: string, commandsPermissions: CommandsPermissions, callback: (result: PermissionSet) => void): void;
+			calculatePermissions(user: string, commandsPermissions: CommandsPermissions, options: any, callback: (result: PermissionSet) => void): void;
+			/** Returns SSL certificates by name (private key, public cert and chained certificate) for creation of HTTPS servers */
+			getCertificates(publicName: string, privateName: string, chainedName: string, callback: (err: string | null, certs?: Certificates, useLetsEncryptCert?: boolean) => void): void;
+
+			/**
+			 * Sends a message to a specific instance or all instances of some specific adapter.
+			 * @param instanceName The instance to send this message to.
+			 * If the ID of an instance is given (e.g. "admin.0"), only this instance will receive the message.
+			 * If the name of an adapter is given (e.g. "admin"), all instances of this adapter will receive it.
+			 * @param command (optional) Command name of the target instance. Default: "send"
+			 * @param message The message (e.g. params) to send.
+			 */
+			sendTo(instanceName: string, message: string | object, callback?: MessageCallback | MessageCallbackInfo): void;
+			sendTo(instanceName: string, command: string, message: string | object, callback?: MessageCallback | MessageCallbackInfo): void;
+
+			/**
+			 * Sends a message to a specific host or all hosts.
+			 */
+			sendToHost(hostName: string, message: string | object, callback?: MessageCallback | MessageCallbackInfo): void;
+			sendToHost(hostName: string, command: string, message: string | object, callback?: MessageCallback | MessageCallbackInfo): void;
+
+			/** Convert ID to {device: D, channel: C, state: S} */
+			idToDCS(id: string): {
+				device: string;
+				channel: string;
+				state: string;
+			};
+
+			// ==============================
+			// own objects
+
+			/** Reads an object from the object db */
+			getObject(id: string, callback: GetObjectCallback): void;
+			getObject(id: string, options: any, callback: GetObjectCallback): void;
+			/** Creates or overwrites an object in the object db */
+			setObject(id: string, obj: ioBroker.Object, options?: any, callback?: SetObjectCallback): void;
+			/** Creates an object in the object db. Existing objects are not overwritten. */
+			setObjectNotExists(id: string, obj: ioBroker.Object, options?: any, callback?: SetObjectCallback): void;
+			/** Get all states, channels and devices of this adapter */
+			getAdapterObjects(callback: (objects: Record<string, ioBroker.Object>) => void): void;
+			/** Extend an object and create it if it might not exist */
+			extendObject(id: string, objPart: PartialObject, options?: any, callback?: SetObjectCallback): void;
+			/**
+			 * Deletes an object from the object db
+			 * @param id - The id of the object without namespace
+			 */
+			delObject(id: string, options?: any, callback?: ErrorCallback): void;
+
+			// ==============================
+			// foreign objects
+
+			// tslint:disable:unified-signatures
+			/** Reads an object (which might not belong to this adapter) from the object db */
+			getForeignObject(id: string, callback: GetObjectCallback): void;
+			getForeignObject(id: string, options: any, callback: GetObjectCallback): void;
+			/** Get foreign objects by pattern, by specific type and resolve their enums. */
+			getForeignObjects(pattern: string, callback: GetObjectsCallback): void;
+			getForeignObjects(pattern: string, options: any, callback: GetObjectsCallback): void;
+			getForeignObjects(pattern: string, type: ObjectType, callback: GetObjectsCallback): void;
+			getForeignObjects(pattern: string, type: ObjectType, enums: EnumList, callback: GetObjectsCallback): void;
+			getForeignObjects(pattern: string, type: ObjectType, options: any, callback: GetObjectsCallback): void;
+			getForeignObjects(pattern: string, type: ObjectType, enums: EnumList, options: any, callback: GetObjectsCallback): void;
+			/** Creates or overwrites an object (which might not belong to this adapter) in the object db */
+			setForeignObject(id: string, obj: ioBroker.Object, options?: any, callback?: SetObjectCallback): void;
+			/** Creates an object (which might not belong to this adapter) in the object db. Existing objects are not overwritten. */
+			setForeignObjectNotExists(id: string, obj: ioBroker.Object, options?: any, callback?: SetObjectCallback): void;
+			/** Extend an object (which might not belong to this adapter) and create it if it might not exist */
+			extendForeignObject(id: string, objPart: PartialObject, options?: any, callback?: SetObjectCallback): void;
+			// tslint:enable:unified-signatures
+			/**
+			 * Finds an object by its ID or name
+			 * @param type - common.type of the state
+			 */
+			findForeignObject(idOrName: string, type: string, callback: FindObjectCallback): void;
+			findForeignObject(idOrName: string, type: string, options: any, callback: FindObjectCallback): void;
+			/**
+			 * Deletes an object (which might not belong to this adapter) from the object db
+			 * @param id - The id of the object including namespace
+			 */
+			delForeignObject(id: string, options?: any, callback?: ErrorCallback): void;
+
+			// ==============================
+			// states
+			/** Writes a value into the states DB. */
+			setState(id: string, state: string | number | boolean | State | Partial<State>, ack?: boolean, options?: any, callback?: SetStateCallback): void;
+			/** Writes a value into the states DB only if it has changed. */
+			setStateChanged(id: string, state: string | number | boolean | State | Partial<State>, ack?: boolean, options?: any, callback?: SetStateChangedCallback): void;
+			/** Writes a value (which might not belong to this adapter) into the states DB. */
+			setForeignState(id: string, state: string | number | boolean | State | Partial<State>, ack?: boolean, options?: any, callback?: SetStateCallback): void;
+			/** Writes a value (which might not belong to this adapter) into the states DB only if it has changed. */
+			setForeignStateChanged(id: string, state: string | number | boolean | State | Partial<State>, ack?: boolean, options?: any, callback?: SetStateChangedCallback): void;
+
+			/** Read a value from the states DB. */
+			getState(id: string, callback: GetStateCallback): void;
+			getState(id: string, options: any, callback: GetStateCallback): void;
+			/** Read a value (which might not belong to this adapter) from the states DB. */
+			getForeignState(id: string, callback: GetStateCallback): void;
+			getForeignState(id: string, options: any, callback: GetStateCallback): void;
+			/** Read all states of this adapter which match the given pattern */
+			getStates(pattern: string, callback: GetStatesCallback): void;
+			getStates(pattern: string, options: any, callback: GetStatesCallback): void;
+			/** Read all states (which might not belong to this adapter) which match the given pattern */
+			getForeignStates(pattern: string, callback: GetStatesCallback): void;
+			getForeignStates(pattern: string, options: any, callback: GetStatesCallback): void;
+
+			/** Deletes a state from the states DB, but not the associated object. Consider using @link{deleteState} instead */
+			delState(id: string, options?: any, callback?: ErrorCallback): void;
+			/** Deletes a state from the states DB, but not the associated object */
+			delForeignState(id: string, options?: any, callback?: ErrorCallback): void;
+
+			getHistory(id: string, options: GetHistoryOptions, callback: GetHistoryCallback): void;
+
+			// MISSING:
+			// pushFifo and similar https://github.com/ioBroker/ioBroker.js-controller/blob/master/lib/adapter.js#L4105
+			// logRedirect https://github.com/ioBroker/ioBroker.js-controller/blob/master/lib/adapter.js#L4294
+			// requireLog https://github.com/ioBroker/ioBroker.js-controller/blob/master/lib/adapter.js#L4336
+			// processLog https://github.com/ioBroker/ioBroker.js-controller/blob/master/lib/adapter.js#L4360
+
+			/**
+			 * Writes a binary state into Redis
+			 * @param id The id of the state
+			 * @param binary The data to be written
+			 * @param options (optional) Some internal options.
+			 * @param callback Is called when the operation has finished (successfully or not)
+			 */
+			setBinaryState(id: string, binary: Buffer, callback: SetStateCallback): void;
+			setBinaryState(id: string, binary: Buffer, options: any, callback: SetStateCallback): void;
+			/**
+			 * Reads a binary state from Redis
+			 * @param id The id of the state
+			 * @param options (optional) Some internal options.
+			 * @param callback Is called when the operation has finished (successfully or not)
+			 */
+			getBinaryState(id: string, callback: GetBinaryStateCallback): void;
+			getBinaryState(id: string, options: any, callback: GetBinaryStateCallback): void;
+
+			// ==============================
+			// enums
+
+			/** Returns the enum tree, filtered by the optional enum name */
+			getEnum(callback: GetEnumCallback): void;
+			getEnum(name: string, callback: GetEnumCallback): void;
+			getEnum(name: string, options: any, callback: GetEnumCallback): void;
+			getEnums(callback: GetEnumsCallback): void;
+			getEnums(enumList: EnumList, callback: GetEnumsCallback): void;
+			getEnums(enumList: EnumList, options: any, callback: GetEnumsCallback): void;
+
+			addChannelToEnum(enumName: string, addTo: string, parentDevice: string, channelName: string, options?: any, callback?: ErrorCallback): void;
+			deleteChannelFromEnum(enumName: string, parentDevice: string, channelName: string, options?: any, callback?: ErrorCallback): void;
+
+			addStateToEnum(enumName: string, addTo: string, parentDevice: string, parentChannel: string, stateName: string, options?: any, callback?: ErrorCallback): void;
+			deleteStateFromEnum(enumName: string, parentDevice: string, parentChannel: string, stateName: string, options?: any, callback?: ErrorCallback): void;
+
+			// ==============================
+			// subscriptions
+
+			/** Subscribe to changes of objects in this instance */
+			subscribeObjects(pattern: string, options?: any): void;
+			/** Subscribe to changes of objects (which might not belong to this adapter) */
+			subscribeForeignObjects(pattern: string, options?: any): void;
+			/** Unsubscribe from changes of objects in this instance */
+			unsubscribeObjects(pattern: string, options?: any): void;
+			/** Unsubscribe from changes of objects (which might not belong to this adapter) */
+			unsubscribeForeignObjects(pattern: string, options?: any): void;
+
+			/** Subscribe to changes of states in this instance */
+			subscribeStates(pattern: string, options?: any, callback?: ErrorCallback): void;
+			/** Subscribe to changes of states (which might not belong to this adapter) */
+			subscribeForeignStates(pattern: string, options?: any, callback?: ErrorCallback): void;
+			/**
+			 * Subscribe from changes of states in this instance
+			 * @param pattern - Must match the pattern used to subscribe
+			 */
+			unsubscribeStates(pattern: string, options?: any, callback?: ErrorCallback): void;
+			/**
+			 * Subscribe from changes of states (which might not belong to this adapter)
+			 * @param pattern - Must match the pattern used to subscribe
+			 */
+			unsubscribeForeignStates(pattern: string, options?: any, callback?: ErrorCallback): void;
+
+			// ==============================
+			// devices and channels
+
+			/** creates an object with type device */
+			createDevice(deviceName: string, common?: any, native?: any, options?: any, callback?: SetObjectCallback): void;
+			/** deletes a device, its channels and states */
+			deleteDevice(deviceName: string, options?: any, callback?: ErrorCallback): void;
+			/** gets the devices of this instance */
+
+			/** creates an object with type channel */
+			createChannel(parentDevice: string, channelName: string, roleOrCommon?: string | object, native?: any, options?: any, callback?: SetObjectCallback): void;
+			/** deletes a channel and its states */
+			deleteChannel(channelName: string, options?: any, callback?: ErrorCallback): void;
+			deleteChannel(parentDevice: string, channelName: string, options?: any, callback?: ErrorCallback): void;
+
+			/** creates a state and the corresponding object */
+			createState(parentDevice: string, parentChannel: string, stateName: string, roleOrCommon?: string | object, native?: any, options?: any, callback?: SetObjectCallback): void;
+			/** deletes a state */
+			deleteState(stateName: string, options?: any, callback?: ErrorCallback): void;
+			deleteState(parentChannel: string, stateName: string, options?: any, callback?: ErrorCallback): void;
+			deleteState(parentDevice: string, parentChannel: string, stateName: string, options?: any, callback?: ErrorCallback): void;
+
+			/**
+			 * Returns a list of all devices in this adapter instance
+			 * @param options (optional) Some internal options.
+			 * @param callback Is called when the operation has finished (successfully or not)
+			 */
+			getDevices(callback: GetObjectsCallback3<DeviceObject>): void;
+			getDevices(options: any, callback: GetObjectsCallback3<DeviceObject>): void;
+
+			/**
+			 * Returns a list of all channels in this adapter instance
+			 * @param parentDevice (optional) Name of the parent device to filter the channels by
+			 * @param options (optional) Some internal options.
+			 * @param callback Is called when the operation has finished (successfully or not)
+			 */
+			getChannels(callback: GetObjectsCallback3<ChannelObject>): void;
+			getChannels(parentDevice: string | null, callback: GetObjectsCallback3<ChannelObject>): void;
+			getChannels(parentDevice: string | null, options: any, callback: GetObjectsCallback3<ChannelObject>): void;
+			/**
+			 * Returns a list of all channels in this adapter instance
+			 * @param parentDevice (optional) Name of the parent device to filter the channels by
+			 * @param options (optional) Some internal options.
+			 * @param callback Is called when the operation has finished (successfully or not)
+			 */
+			getChannelsOf(callback: GetObjectsCallback3<ChannelObject>): void;
+			getChannelsOf(parentDevice: string | null, callback: GetObjectsCallback3<ChannelObject>): void;
+			getChannelsOf(parentDevice: string | null, options: any, callback: GetObjectsCallback3<ChannelObject>): void;
+
+			/**
+			 * Returns a list of all states in this adapter instance
+			 * @param parentDevice (optional) Name of the parent device to filter the channels by
+			 * @param parentChannel (optional) Name of the parent channel to filter the channels by
+			 * @param options (optional) Some internal options.
+			 * @param callback Is called when the operation has finished (successfully or not)
+			 */
+			getStatesOf(callback: GetObjectsCallback3<StateObject>): void;
+			getStatesOf(parentDevice: string | null, callback: GetObjectsCallback3<StateObject>): void;
+			getStatesOf(parentDevice: string | null, parentChannel: string | null, callback: GetObjectsCallback3<StateObject>): void;
+			getStatesOf(parentDevice: string | null, parentChannel: string | null, options: any, callback: GetObjectsCallback3<StateObject>): void;
+
+			// ==============================
+			// filesystem
+
+			/**
+			 * reads the content of directory from DB for given adapter and path
+			 * @param adapter - adapter name. If adapter name is null, default will be the name of the current adapter.
+			 * @param path - path to direcory without adapter name. E.g. If you want to read "/vis.0/main/views.json", here must be "/main/views.json" and _adapter must be equal to "vis.0".
+			 */
+			readDir(adapterName: string, path: string, callback: ReadDirCallback): void;
+			readDir(adapterName: string, path: string, options: any, callback: ReadDirCallback): void;
+			mkDir(adapterName: string, path: string, callback: ErrorCallback): void;
+			mkDir(adapterName: string, path: string, options: any, callback: ErrorCallback): void;
+
+			readFile(adapterName: string, path: string, callback: ReadFileCallback): void;
+			readFile(adapterName: string, path: string, options: any, callback: ReadFileCallback): void;
+			writeFile(adapterName: string, path: string, data: Buffer | string, callback: ErrorCallback): void;
+			writeFile(adapterName: string, path: string, data: Buffer | string, options: any, callback: ErrorCallback): void; // options see https://github.com/ioBroker/ioBroker.js-controller/blob/master/lib/objects/objectsInMemServer.js#L599
+
+			delFile(adapterName: string, path: string, callback: ErrorCallback): void;
+			delFile(adapterName: string, path: string, options: any, callback: ErrorCallback): void;
+			unlink(adapterName: string, path: string, callback: ErrorCallback): void;
+			unlink(adapterName: string, path: string, options: any, callback: ErrorCallback): void;
+
+			rename(adapterName: string, oldName: string, newName: string, callback: ErrorCallback): void;
+			rename(adapterName: string, oldName: string, newName: string, options: any, callback: ErrorCallback): void;
+
+			/**
+			 * Changes access rights of all files in the adapter directory
+			 * @param adapter Name of the adapter instance, e.g. "admin.0". Defaults to the namespace of this adapter.
+			 * @param path Pattern to match the file path against
+			 * @param options Mode of the access change as a number or hexadecimal string
+			 * @param callback Is called when the operation has finished (successfully or not)
+			 */
+			chmodFile(adapter: string | null, path: string, options: {mode: number | string} | Record<string, any>, callback: ChownFileCallback): void;
+
+			// ==============================
+			// formatting
+
+			formatValue(value: number | string, format: any): string;
+			formatValue(value: number | string, decimals: number, format: any): string;
+			formatDate(dateObj: string | Date | number, format: string): string;
+			formatDate(dateObj: string | Date | number, isDuration: boolean | string, format: string): string;
+		} // end interface Adapter
+
+		type ObjectChangeHandler = (id: string, obj: ioBroker.Object) => void;
+		type StateChangeHandler = (id: string, obj: State) => void;
+		type MessageHandler = (obj: Message) => void;
+
+		type EmptyCallback = () => void;
+		type ErrorCallback = (err?: string) => void;
+		// TODO: Redefine callbacks as subclass of GenericCallback
+		type GenericCallback<T> = (err: string | null, result?: T) => void;
+
+		type SetObjectCallback = (err: string | null, obj: { id: string }) => void;
+		type GetObjectCallback = (err: string | null, obj: ioBroker.Object) => void;
+		type GetEnumCallback = (err: string | null, enums: Record<string, Enum>, requestedEnum: string) => void;
+		type GetEnumsCallback = (
+			err: string | null,
+			result: {
+				[groupName: string]: Record<string, Enum>,
+			},
+		) => void;
+		type GetObjectsCallback = (err: string | null, objects: Record<string, ioBroker.Object>) => void;
+
+		type FindObjectCallback = (
+			/** If an error happened, this contains the message */
+			err: string | null,
+			/** If an object was found, this contains the ID */
+			id?: string,
+			/** If an object was found, this contains the common.name */
+			name?: string,
+		) => void;
+
+		interface GetObjectsItem<T extends BaseObject> {
+			/** The ID of this object */
+			id: string;
+			/** A copy of the object from the DB */
+			value: T;
+		}
+		// This is a version used by GetDevices/GetChannelsOf/GetStatesOf
+		type GetObjectsCallback3<T extends BaseObject> = (err: string | null, result?: GetObjectsItem<T>[]) => void;
+
+		type GetStateCallback = (err: string | null, state: State) => void;
+		type GetStatesCallback = (err: string | null, states: Record<string, State>) => void;
+		/** Version of the callback used by States.getStates */
+		type GetStatesCallback2 = (err: string | null, states: State[]) => void;
+		type GetBinaryStateCallback = (err: string | null, state?: Buffer) => void;
+		type SetStateCallback = (err: string | null, id?: string) => void;
+		type SetStateChangedCallback = (err: string | null, id: string, notChanged: boolean) => void;
+		type DeleteStateCallback = (err: string | null, id?: string) => void;
+		type GetHistoryCallback = (err: string | null, result: (State & { id?: string })[], step: number, sessionId?: string) => void;
+
+		/** Contains the return values of readDir */
+		interface ReadDirResult {
+			/** Name of the file or directory */
+			file: string;
+			/** File system stats */
+			stats: fs.Stats;
+			/** Whether this is a directory or a file */
+			isDir: boolean;
+			/** Access rights */
+			acl: EvaluatedFileACL;
+			/** Date of last modification */
+			modifiedAt: number;
+			/** Date of creation */
+			createdAt: number;
+		}
+		type ReadDirCallback = (err: string | null, entries?: ReadDirResult[]) => void;
+		type ReadFileCallback = (err: string | null, file?: Buffer | string, mimeType?: string) => void;
+
+		/** Contains the return values of chownFile */
+		interface ChownFileResult {
+			/** The parent directory of the processed file or directory */
+			path: string;
+			/** Name of the file or directory */
+			file: string;
+			/** File system stats */
+			stats: fs.Stats;
+			/** Whether this is a directory or a file */
+			isDir: boolean;
+			/** Access rights */
+			acl: FileACL;
+			/** Date of last modification */
+			modifiedAt: number;
+			/** Date of creation */
+			createdAt: number;
+		}
+		type ChownFileCallback = (err: string | null, entries?: ChownFileResult[], id?: string) => void;
+
+		/** Contains the return values of rm */
+		interface RmResult {
+			/** The parent directory of the deleted file or directory */
+			path: string;
+			/** The name of the deleted file or directory */
+			file: string;
+			/** Whether the deleted object was a directory or a file */
+			isDir: boolean;
+		}
+		type RmCallback = (err: string | null, entries?: RmResult[]) => void;
+
+		type GetUserGroupCallback = (objectsInstance: Objects, user: User, groups: UserGroup[], acl: ObjectPermissions) => void;
+
+		type ChownObjectCallback = (err: string | null, list?: ioBroker.Object[]) => void;
+
+		type GetConfigKeysCallback = (err: string | null, list?: string[]) => void;
+		// this is a version of the callback used by Objects.getObjects
+		type GetObjectsCallback2 = (err: string | null, objects?: (ioBroker.Object | { err: string })[]) => void;
+
+		interface GetObjectViewItem {
+			/** The ID of this object */
+			id: string;
+			/** A copy of the object from the DB or some aggregation result */
+			value: ioBroker.Object | any;
+		}
+		type GetObjectViewCallback = (err: string | null, result?: { rows: GetObjectViewItem[] }) => void;
+
+		interface GetObjectListItem extends GetObjectViewItem {
+			/** A copy of the object */
+			value: ioBroker.Object;
+			/** The same as @link{value} */
+			doc: ioBroker.Object;
+		}
+		type GetObjectListCallback = (err: string | null, result?: { rows: GetObjectListItem[] }) => void;
+
+		type ExtendObjectCallback = (err: string | null, result?: {id: string, value: ioBroker.Object}, id?: string ) => void;
+
+		type GetSessionCallback = (session: Session) => void;
+
+	} // end namespace ioBroker
+} // end declare global
diff --git a/types/iobroker/iobroker-tests.ts b/types/iobroker/iobroker-tests.ts
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/types/iobroker/tsconfig.json b/types/iobroker/tsconfig.json
new file mode 100644
index 0000000000..3388e650ec
--- /dev/null
+++ b/types/iobroker/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",
+        "iobroker-tests.ts"
+    ]
+}
diff --git a/types/iobroker/tslint.json b/types/iobroker/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/iobroker/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From ef89cb895e589686e2f6f0efee1fdf7ed73f034b Mon Sep 17 00:00:00 2001
From: "dominic.griesel" <d.griesel@gmx.net>
Date: Thu, 15 Nov 2018 10:58:26 +0100
Subject: [PATCH 271/836] Fix lint errors

---
 types/iobroker/index.d.ts        | 2769 +++++++++++++++---------------
 types/iobroker/iobroker-tests.ts |    5 +
 types/iobroker/tsconfig.json     |    1 +
 types/iobroker/tslint.json       |    9 +-
 4 files changed, 1401 insertions(+), 1383 deletions(-)

diff --git a/types/iobroker/index.d.ts b/types/iobroker/index.d.ts
index fab5a5a107..baa8424d9b 100644
--- a/types/iobroker/index.d.ts
+++ b/types/iobroker/index.d.ts
@@ -1,1387 +1,1392 @@
+// Ambient type definitions for adapters for ioBroker
+// Note: This is not the definition for the package `iobroker`,
+// which is just an installer, not a library.
+// The definitions are based on ioBroker.js-controller v1.4.2
+// Project: https://github.com/ioBroker/ioBroker
+// Definitions by: AlCalzone <https://github.com/AlCalzone>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
 /// <reference types="node" />
-import fs = require("fs");
+import * as fs from "fs";
 
 // tslint:disable:no-namespace
 declare global {
-	namespace ioBroker {
-
-		enum StateQuality {
-			good = 0x00, // or undefined or null
-			bad = 0x01,
-			general_problem = 0x01,
-			general_device_problem = 0x41,
-			general_sensor_problem = 0x81,
-			device_not_connected = 0x42,
-			sensor_not_connected = 0x82,
-			device_reports_error = 0x44,
-			sensor_reports_error = 0x84,
-		}
-
-		interface State {
-			/** The value of the state. */
-			val: any;
-
-			/** Direction flag: false for desired value and true for actual value. Default: false. */
-			ack: boolean;
-
-			/** Unix timestamp. Default: current time */
-			ts: number;
-
-			/** Unix timestamp of the last time the value changed */
-			lc: number;
-
-			/** Name of the adapter instance which set the value, e.g. "system.adapter.web.0" */
-			from: string;
-
-			/** Optional time in seconds after which the state is reset to null */
-			expire?: number;
-
-			/** Optional quality of the state value */
-			q?: StateQuality;
-
-			/** Optional comment */
-			c?: string;
-		}
-
-		/** Provides low-level access to the ioBroker states DB */
-		interface States {
-
-			/**
-			 * Returns a list of states with the given ids
-			 * @param keys IDs of the states to be retrieved
-			 * @param callback Is called when the operation has finished (successfully or not)
-			 * @param dontModify unused
-			 */
-			getStates(keys: string[], callback: GetStatesCallback2, dontModify?: any): void;
-
-			/**
-			 * Returns the state with the given id
-			 * @param id ID of the state to be retrieved
-			 * @param callback Is called when the operation has finished (successfully or not)
-			 */
-			getState(id: string, callback: GetStateCallback): void;
-
-			/**
-			 * Stores a state in the db
-			 * @param id ID of the state to be stored
-			 * @param state The state to be stored in the db
-			 * @param callback Is called when the operation has finished (successfully or not)
-			 */
-			setState(id: string, state?: string | number | boolean | State | Partial<State>, callback?: SetStateCallback): void;
-
-			/**
-			 * Updates a state in memory without triggering a save
-			 * @param id ID of the state to be stored
-			 * @param state The state to be updated
-			 * @param callback Is called when the operation has finished (successfully or not)
-			 */
-			setRawState(id: string, state: State, callback?: SetStateCallback): void;
-
-			/**
-			 * Deletes a state
-			 * @param id ID of the state to be stored
-			 * @param callback Is called when the operation has finished (successfully or not)
-			 */
-			delState(id: string, callback: DeleteStateCallback): void;
-
-			/**
-			 * Retrieves all ids of states matching @link{pattern}
-			 * @param pattern The pattern to match against
-			 * @param callback Is called when the operation has finished (successfully or not)
-			 * @param dontModify unused
-			 */
-			getKeys(pattern: string, callback: GetConfigKeysCallback, dontModify?: any): void;
-
-			/**
-			 * Subscribe to changes of all states matching @link{pattern}
-			 * @param pattern The pattern to match against
-			 * @param callback Is called when the operation has finished (successfully or not)
-			 */
-			subscribe(pattern: string, cb: EmptyCallback): void;
-			/**
-			 * Unsubscribe from changes of all states matching @link{pattern}
-			 * @param pattern The pattern to match against
-			 * @param callback Is called when the operation has finished (successfully or not)
-			 */
-			unsubscribe(pattern: string, cb: EmptyCallback): void;
-
-			/**
-			 * Register an adapter instance as subscribable.
-			 * This means that the instance can read information about all subscriptions to its states
-			 * and will be notified of changes.
-			 * @param instance Adapter instance to register, e.g. "admin.0"
-			 * @param cb Is called when the operation has finished (successfully or not)
-			 */
-			registerAdapterSubs(instance: string, cb?: (error: null, success: boolean) => void): void;
-
-			/**
-			 * Unregister an adapter instance as subscribable.
-			 * @param instance Adapter instance to unregister, e.g. "admin.0"
-			 * @param cb Is called when the operation has finished (successfully or not)
-			 */
-			unregisterAdapterSubs(instance: string, cb?: (error: null, success: boolean) => void): void;
-
-			/**
-			 * EDUCATED GUESS: Notify all clients about changes to an object
-			 * @param type object type
-			 * @param id State/object id
-			 * @param obj The changed object
-			 */
-			publishAll(type: string, id: string, obj: Message): void;
-
-			// TODO: Documentation for these functions is missing
-			pushMessage(id: string, state: Message, callback: SetStateCallback): void;
-			lenMessage(id: string, callback: GenericCallback<number>): void;
-			getMessage(id: string, callback: GenericCallback<Message>): void;
-			delMessage(id: string, messageId: number, callback: ErrorCallback): void;
-			clearAllMessages(callback?: EmptyCallback): void;
-			subscribeMessage(id: string, cb: EmptyCallback): void;
-			unsubscribeMessage(id: string, cb: EmptyCallback): void;
-
-			pushLog(id: string, log: Log, callback: SetStateCallback): void;
-			lenLog(id: string, callback: GenericCallback<number>): void;
-			getLog(id: string, callback: GenericCallback<Log>): void;
-			delLog(id: string, logId: string, callback: ErrorCallback): void;
-			clearAllLogs(callback?: EmptyCallback): void;
-			subscribeLog(id: string, cb: EmptyCallback): void;
-			unsubscribeLog(id: string, cb: EmptyCallback): void;
-
-			getSession(id: string, callback: GetSessionCallback): void;
-			setSession(id: string, expire: number, callback?: EmptyCallback): void;
-			setSession(id: string, expire: number, obj: Session, callback?: EmptyCallback): void;
-			destroySession(id: string, callback?: EmptyCallback): void;
-
-			/**
-			 * Retrieves a copy of the object with the given ID
-			 * @param id Id of the object to find
-			 * @param callback Is called when the operation has finished (successfully or not)
-			 */
-			getConfig(id: string, callback: GetObjectCallback): void;
-
-			/**
-			 * Returns a list of config keys matching <pattern>
-			 * @param pattern Pattern to match against
-			 * @param callback Is called when the operation has finished (successfully or not)
-			 * @param dontModify unused
-			 */
-			getConfigKeys(pattern: string, callback: GetConfigKeysCallback, dontModify?: any): void;
-
-			/**
-			 * Returns a list of objects with the given ids
-			 * @param keys IDs of the objects to be retrieved
-			 * @param callback Is called when the operation has finished (successfully or not)
-			 * @param dontModify unused
-			 */
-			getConfigs(keys: string[], callback: GetObjectsCallback2, dontModify?: any): void;
-
-			/**
-			 * Creates or overwrites a config object in the object db
-			 * @param id ID of the object
-			 * @param obj Object to store
-			 * @param callback Is called when the operation has finished (successfully or not)
-			 */
-			setConfig(id: string, obj: ioBroker.Object, callback: SetObjectCallback): void;
-
-			/**
-			 * Deletes a config object in the object db
-			 * @param id ID of the object
-			 * @param callback Is called when the operation has finished (successfully or not)
-			 */
-			delConfig(id: string, callback: ErrorCallback): void;
-
-			/**
-			 * Subscribe to config object changes
-			 * @param pattern The pattern to match against
-			 */
-			subscribeConfig(pattern: string, callback: EmptyCallback): void;
-
-			/**
-			 * Unsubscribe from config object changes
-			 * @param pattern The pattern to match against
-			 */
-			unsubscribeConfig(pattern: string, callback: EmptyCallback): void;
-
-			/**
-			 * Writes a binary state into Redis
-			 * @param id The id of the state
-			 * @param data The data to be written
-			 * @param callback Is called when the operation has finished (successfully or not)
-			 */
-			setBinaryState(id: string, data: Buffer, callback: SetStateCallback): void;
-
-			/**
-			 * Reads a binary state from Redis
-			 * @param id The id of the state
-			 * @param callback Is called when the operation has finished (successfully or not)
-			 */
-			getBinaryState(id: string, callback: GetBinaryStateCallback): void;
-
-			/**
-			 * Deletes a binary state from Redis
-			 * @param id The id of the state to be deleted
-			 * @param callback Is called when the operation has finished (successfully or not)
-			 */
-			delBinaryState(id: string, callback: DeleteStateCallback): void;
-
-			/** Destructor of the class. Call this before shutting down */
-			destroy(): void;
-
-		} // end interface States
-
-		type Session = any; // TODO: implement
-
-		type ObjectType = "state" | "channel" | "device";
-		type CommonType = "number" | "string" | "boolean" | "array" | "object" | "mixed" | "file";
-
-		// Maybe this should extend Record<string, any>,
-		// but the extra properties aren't defined anywhere,
-		// so I'd rather force the user to explicitly state
-		// he knows what he's doing by casting to any
-		interface ObjectCommon {
-			/** name of this object */
-			name: string;
-
-			// Icon and role aren't defined in SCHEMA.md,
-			// but they are being used by some adapters
-			/** Icon for this object */
-			icon?: string;
-			/** role of the object */
-			role?: string;
-		}
-
-		interface StateCommon extends ObjectCommon {
-			/** Type of this state. See https://github.com/ioBroker/ioBroker/blob/master/doc/SCHEMA.md#state-commonrole for a detailed description */
-			type?: CommonType;
-			/** minimum value */
-			min?: number;
-			/** maximum value */
-			max?: number;
-			/** unit of the value */
-			unit?: string;
-			/** the default value */
-			def?: any;
-			/** description of this state */
-			desc?: string;
-
-			/** if this state is readable */
-			read: boolean;
-			/** if this state is writable */
-			write: boolean;
-			/** role of the state (used in user interfaces to indicate which widget to choose) */
-			role: string;
-
-			/**
-			 * Dictionary of possible values for this state in the form
-			 * <pre>
-			 * {
-			 *     "internal value 1": "displayed value 1",
-			 *     "internal value 2": "displayed value 2",
-			 *     ...
-			 * }
-			 * </pre>
-			 * In old ioBroker versions, this could also be a string of the form
-			 * "val1:text1;val2:text2" (now deprecated)
-			 */
-			states?: Record<string, string> | string;
-
-			/** ID of a helper state indicating if the handler of this state is working */
-			workingID?: string;
-
-			/** attached history information */
-			history?: any;
-		}
-		interface ChannelCommon extends ObjectCommon {
-			/** description of this channel */
-			desc?: string;
-		}
-		type OtherCommon = ObjectCommon & {
-			[propName: string]: any;
-		};
-
-		interface BaseObject {
-			/** The ID of this object */
-			_id?: string;
-			native: Record<string, any>;
-			enums?: Record<string, string>;
-			type: string; // specified in the derived interfaces
-			common: ObjectCommon;
-			acl?: ObjectACL;
-		}
-
-		interface StateObject extends BaseObject {
-			type: "state";
-			common: StateCommon;
-			acl?: StateACL;
-		}
-		interface PartialStateObject extends Partial<Pick<StateObject, "_id" | "native" | "enums" | "type">> {
-			common?: Partial<StateCommon>;
-			acl?: Partial<StateACL>;
-		}
-
-		interface ChannelObject extends BaseObject {
-			type: "channel";
-			common: ChannelCommon;
-		}
-		interface PartialChannelObject extends Partial<Pick<ChannelObject, "_id" | "native" | "enums" | "type" | "acl">> {
-			common?: Partial<ChannelCommon>;
-		}
-
-		interface DeviceObject extends BaseObject {
-			type: "device";
-			common: ObjectCommon; // TODO: any definition for device?
-		}
-		interface PartialDeviceObject extends Partial<Pick<DeviceObject, "_id" | "native" | "enums" | "type" | "acl">> {
-			common?: Partial<ObjectCommon>;
-		}
-
-		interface OtherObject extends BaseObject {
-			type: "adapter" | "config" | "enum" | "group" | "host" | "info" | "instance" | "meta" | "script" | "user";
-			common: OtherCommon;
-		}
-		interface PartialOtherObject extends Partial<Pick<OtherObject, "_id" | "native" | "enums" | "type" | "acl">> {
-			common?: Partial<ObjectCommon>;
-		}
-
-		type Object = StateObject | ChannelObject | DeviceObject | OtherObject;
-		type PartialObject = PartialStateObject | PartialChannelObject | PartialDeviceObject | PartialOtherObject;
-
-		/** Defines access rights for a single file */
-		interface FileACL {
-			/** Full name of the user who owns this file, e.g. "system.user.admin" */
-			owner: string;
-			/** Full name of the group who owns this file, e.g. "system.group.administrator" */
-			ownerGroup: string;
-			/** Linux-type permissions defining access to this file */
-			permissions: number;
-		}
-		/** Defines access rights for a single file, applied to a user or group */
-		interface EvaluatedFileACL extends FileACL {
-			/** Whether the user may read the file */
-			read: boolean;
-			/** Whether the user may write the file */
-			write: boolean;
-		}
-
-		/** Defines access rights for a single object */
-		interface ObjectACL {
-			/** Full name of the user who owns this object, e.g. "system.user.admin" */
-			owner: string;
-			/** Full name of the group who owns this object, e.g. "system.group.administrator" */
-			ownerGroup: string;
-			/** Linux-type permissions defining access to this object */
-			object: number;
-		}
-		/** Defines access rights for a single state object */
-		interface StateACL extends ObjectACL {
-			/** Linux-type permissions defining access to this state */
-			state: number;
-		}
-
-		/** Defines access rights for a single object type */
-		interface ObjectOperationPermissions {
-			/** Whether a user may enumerate objects of this type */
-			list: boolean;
-			/** Whether a user may read objects of this type */
-			read: boolean;
-			/** Whether a user may write objects of this type */
-			write: boolean;
-			/** Whether a user may create objects of this type */
-			create: boolean;
-			/** Whether a user may delete objects of this type */
-			"delete": boolean;
-		}
-
-		/** Defines the rights a user or group has to change objects */
-		interface ObjectPermissions {
-			/** The access rights for files */
-			file: ObjectOperationPermissions;
-			/** The access rights for objects */
-			object: ObjectOperationPermissions;
-			/** The access rights for users/groups */
-			users: ObjectOperationPermissions;
-			/** The access rights for states */
-			state?: ObjectOperationPermissions;
-		}
-		/** Defined the complete set of access rights a user has */
-		interface PermissionSet extends ObjectPermissions {
-			/** The name of the user this ACL is for */
-			user: string;
-			/** The name of the groups this ACL was merged from */
-			groups: string[];
-			/** The access rights for certain commands */
-			other: {
-				execute: boolean,
-				http: boolean,
-				sendto: boolean,
-			};
-		}
-
-		interface Permission {
-			/** The type of the permission */
-			type: string;
-			/** Which kind of operation is required */
-			operation: string;
-		}
-		interface ObjectOrStatePermission extends Permission {
-			type: "object" | "file" | "users" | "state";
-			operation: "list" | "read" | "write" | "create" | "delete";
-		}
-		interface OtherPermission extends Permission {
-			type: "other";
-			operation: "execute" | "http" | "sendto";
-		}
-		interface CommandsPermissions {
-			// TODO: Are all properties required or is a partial object ok?
-			getObject: ObjectOrStatePermission;
-			getObjects: ObjectOrStatePermission;
-			getObjectView: ObjectOrStatePermission;
-			setObject: ObjectOrStatePermission;
-			subscribeObjects: ObjectOrStatePermission;
-			unsubscribeObjects: ObjectOrStatePermission;
-			getStates: ObjectOrStatePermission;
-			getState: ObjectOrStatePermission;
-			setState: ObjectOrStatePermission;
-			getStateHistory: ObjectOrStatePermission;
-			subscribe: ObjectOrStatePermission;
-			unsubscribe: ObjectOrStatePermission;
-			getVersion: Permission;
-			httpGet: OtherPermission;
-			sendTo: OtherPermission;
-			sendToHost: OtherPermission;
-			readFile: ObjectOrStatePermission;
-			readFile64: ObjectOrStatePermission;
-			writeFile: ObjectOrStatePermission;
-			writeFile64: ObjectOrStatePermission;
-			unlink: ObjectOrStatePermission;
-			rename: ObjectOrStatePermission;
-			mkdir: ObjectOrStatePermission;
-			readDir: ObjectOrStatePermission;
-			chmodFile: ObjectOrStatePermission;
-			authEnabled: Permission;
-			disconnect: Permission;
-			listPermissions: Permission;
-			getUserPermissions: ObjectOrStatePermission;
-		}
-
-		type UserGroup = any; // TODO find out how this looks like
-		// interface UserGroup { }
-
-		/** Contains information about a user */
-		interface User {
-			/** Which groups this user belongs to */
-			groups: UserGroup[];
-			/** Access rights of this user */
-			acl: ObjectPermissions;
-		}
-
-		/** Parameters for @link{Objects.getObjectView} */
-		interface GetObjectViewParams {
-			/** First id to include in the return list */
-			startkey: string;
-			/** Last id to include in the return list */
-			endkey: string;
-		}
-
-		/** Parameters for @link{Objects.getObjectList} */
-		interface GetObjectListParams extends GetObjectViewParams {
-			/** Whether docs should be included in the return list */ // TODO: What are docs?
-			include_docs: boolean;
-		}
-
-		/** Provides low-level access to the ioBroker objects db */
-		interface Objects {
-			/**
-			 * For a given user, returns the groups he belongs to, and his access rights
-			 * @param user Name of the user. Has to start with "system.user."
-			 * @param callback The callback function to be invoked with the return values
-			 */
-			getUserGroup(user: string, callback: GetUserGroupCallback): void;
-
-			/**
-			 * Determines the mime type for a given file extension
-			 * @param ext File extension, including the leading dot, e.g. ".zip"
-			 */
-			getMimeType(ext: string): {mimeType: string, isBinary: boolean};
-
-			/**
-			 * Writes a file.
-			 * @param id Name of the root directory. This should be the adapter instance, e.g. "admin.0"
-			 * @param name File name
-			 * @param data Contents of the file
-			 * @param options (optional) MIME type of the file (string). Or some internal options.
-			 * @param callback Is called when the operation has finished (successfully or not)
-			 */
-			writeFile(id: string, name: string, data: Buffer | string, callback: ErrorCallback): void;
-			writeFile(id: string, name: string, data: Buffer | string, options: string | any, callback: ErrorCallback): void;
-
-			/**
-			 * Reads a file.
-			 * @param id Name of the root directory. This should be the adapter instance, e.g. "admin.0"
-			 * @param name File name
-			 * @param options (optional) Some internal options.
-			 * @param callback Is called when the operation has finished (successfully or not)
-			 */
-			readFile(id: string, name: string, callback: ReadFileCallback): void;
-			readFile(id: string, name: string, options: any, callback: ReadFileCallback): void;
-
-			/**
-			 * Deletes a file.
-			 * @param id Name of the root directory. This should be the adapter instance, e.g. "admin.0"
-			 * @param name File name
-			 * @param options (optional) Some internal options.
-			 * @param callback Is called when the operation has finished (successfully or not)
-			 */
-			unlink(id: string, name: string, callback: ErrorCallback): void;
-			unlink(id: string, name: string, options: any, callback: ErrorCallback): void;
-			/**
-			 * Deletes a file.
-			 * @param id Name of the root directory. This should be the adapter instance, e.g. "admin.0"
-			 * @param name File name
-			 * @param options (optional) Some internal options.
-			 * @param callback Is called when the operation has finished (successfully or not)
-			 */
-			delFile(id: string, name: string, callback: ErrorCallback): void;
-			delFile(id: string, name: string, options: any, callback: ErrorCallback): void;
-
-			/**
-			 * Finds all files and directories starting with <name>
-			 * @param id Name of the root directory. This should be the adapter instance, e.g. "admin.0"
-			 * @param name File or directory name
-			 * @param options (optional) Some internal options.
-			 * @param callback Is called when the operation has finished (successfully or not)
-			 */
-			readDir(id: string, name: string, callback: ReadDirCallback): void;
-			readDir(id: string, name: string, options: any, callback: ReadDirCallback): void;
-
-			/**
-			 * Renames a file or directory
-			 * @param id Name of the root directory. This should be the adapter instance, e.g. "admin.0"
-			 * @param oldName Old file or directory name
-			 * @param newName Name to rename to
-			 * @param options (optional) Some internal options.
-			 * @param callback Is called when the operation has finished (successfully or not)
-			 */
-			rename(id: string, oldName: string, newName: string, callback: ErrorCallback): void;
-			rename(id: string, oldName: string, newName: string, options: any, callback: ErrorCallback): void;
-
-			/**
-			 * Creates an empty file with the given name
-			 * @param id Name of the root directory. This should be the adapter instance, e.g. "admin.0"
-			 * @param name File name
-			 * @param options (optional) Some internal options.
-			 * @param callback Is called when the operation has finished (successfully or not)
-			 */
-			touch(id: string, name: string, callback: ErrorCallback): void;
-			touch(id: string, name: string, options: any, callback: ErrorCallback): void;
-
-			/**
-			 * Deletes all files in the root directory matching <name>
-			 * @param id Name of the root directory. This should be the adapter instance, e.g. "admin.0"
-			 * @param name Pattern to match against
-			 * @param options (optional) Some internal options.
-			 * @param callback Is called when the operation has finished (successfully or not)
-			 */
-			rm(id: string, name: string, callback: RmCallback): void;
-			rm(id: string, name: string, options: any, callback: RmCallback): void;
-
-			/**
-			 * Creates an empty directory with the given name
-			 * @param id Name of the root directory. This should be the adapter instance, e.g. "admin.0"
-			 * @param name Directory name
-			 * @param options (optional) Some internal options.
-			 * @param callback Is called when the operation has finished (successfully or not)
-			 */
-			mkDir(id: string, name: string, callback: ErrorCallback): void;
-			mkDir(id: string, name: string, options: any, callback: ErrorCallback): void;
-
-			/**
-			 * Takes possession all files in the root directory matching <name>
-			 * @param id Name of the root directory. This should be the adapter instance, e.g. "admin.0"
-			 * @param name Pattern to match against
-			 * @param options (optional) Some internal options.
-			 * @param callback Is called when the operation has finished (successfully or not)
-			 */
-			chownFile(id: string, name: string, callback: ChownFileCallback): void;
-			chownFile(id: string, name: string, options: any, callback: ChownFileCallback): void;
-
-			/**
-			 * Changes access rights of all files in the root directory matching <name>
-			 * @param id Name of the root directory. This should be the adapter instance, e.g. "admin.0"
-			 * @param name Pattern to match against
-			 * @param options Mode of the access change as a number or hexadecimal string
-			 * @param callback Is called when the operation has finished (successfully or not)
-			 */
-			chmodFile(id: string, name: string, options: {mode: number | string} | Record<string, any>, callback: ChownFileCallback): void;
-
-			// not documented. enabled = true seems to disable the cache
-			// enableFileCache(enabled, options, callback)
-
-			/**
-			 * Subscribe to object changes
-			 * @param pattern The pattern to match against
-			 */
-			subscribeConfig(pattern: string, callback: EmptyCallback): void;
-			subscribeConfig(pattern: string, options: any, callback: EmptyCallback): void;
-			/**
-			 * Subscribe to object changes
-			 * @param pattern The pattern to match against
-			 */
-			subscribe(pattern: string, callback: EmptyCallback): void;
-			subscribe(pattern: string, options: any, callback: EmptyCallback): void;
-
-			/**
-			 * Unsubscribe from object changes
-			 * @param pattern The pattern to match against
-			 */
-			unsubscribeConfig(pattern: string, callback: EmptyCallback): void;
-			unsubscribeConfig(pattern: string, options: any, callback: EmptyCallback): void;
-			/**
-			 * Unsubscribe from object changes
-			 * @param pattern The pattern to match against
-			 */
-			unsubscribe(pattern: string, callback: EmptyCallback): void;
-			unsubscribe(pattern: string, options: any, callback: EmptyCallback): void;
-
-			/**
-			 * Takes possession of all objects matching <pattern>
-			 * @param pattern Pattern to match against
-			 * @param options (optional) Some internal options.
-			 * @param callback Is called when the operation has finished (successfully or not)
-			 */
-			chownObject(pattern: string, callback: ChownObjectCallback): void;
-			chownObject(pattern: string, options: any, callback: ChownObjectCallback): void;
-
-			/**
-			 * Changes access rights of all objects matching <pattern>
-			 * @param pattern Pattern to match against
-			 * @param options Mode of the access change as a number or hexadecimal string
-			 * @param callback Is called when the operation has finished (successfully or not)
-			 */
-			chmodObject(pattern: string, callback: ChownObjectCallback): void;
-			chmodObject(pattern: string, options: any, callback: ChownObjectCallback): void;
-
-			/**
-			 * Retrieves a copy of the object with the given ID
-			 * @param id Id of the object to find
-			 * @param options (optional) Some internal options.
-			 * @param callback Is called when the operation has finished (successfully or not)
-			 */
-			getObject(id: string, callback: GetObjectCallback): void;
-			getObject(id: string, options: any, callback: GetObjectCallback): void;
-			/**
-			 * Retrieves a copy of the object with the given ID
-			 * @param id Id of the object to find
-			 * @param options (optional) Some internal options.
-			 * @param callback Is called when the operation has finished (successfully or not)
-			 */
-			getConfig(id: string, callback: GetObjectCallback): void;
-			getConfig(id: string, options: any, callback: GetObjectCallback): void;
-
-			/**
-			 * Returns a list of config keys matching <pattern>
-			 * @param pattern Pattern to match against
-			 * @param options (optional) Some internal options.
-			 * @param callback Is called when the operation has finished (successfully or not)
-			 * @param dontModify unused
-			 */
-			getConfigKeys(pattern: string, callback: GetConfigKeysCallback, dontModify?: any): void;
-			getConfigKeys(pattern: string, options: any, callback: GetConfigKeysCallback, dontModify?: any): void;
-
-			/**
-			 * Returns a list of objects with the given ids
-			 * @param keys IDs of the objects to be retrieved
-			 * @param options (optional) Some internal options.
-			 * @param callback Is called when the operation has finished (successfully or not)
-			 * @param dontModify unused
-			 */
-			getObjects(keys: string[], callback: GetObjectsCallback2, dontModify?: any): void;
-			getObjects(keys: string[], options: any, callback: GetObjectsCallback2, dontModify?: any): void;
-			/**
-			 * Returns a list of objects with the given ids
-			 * @param keys IDs of the objects to be retrieved
-			 * @param options (optional) Some internal options.
-			 * @param callback Is called when the operation has finished (successfully or not)
-			 * @param dontModify unused
-			 */
-			getConfigs(keys: string[], callback: GetObjectsCallback2, dontModify?: any): void;
-			getConfigs(keys: string[], options: any, callback: GetObjectsCallback2, dontModify?: any): void;
-
-			/**
-			 * Creates or overwrites an object in the object db
-			 * @param id ID of the object
-			 * @param obj Object to store
-			 * @param options (optional) Some internal options.
-			 * @param callback Is called when the operation has finished (successfully or not)
-			 */
-			setObject(id: string, obj: ioBroker.Object, callback: SetObjectCallback): void;
-			setObject(id: string, obj: ioBroker.Object, options: any, callback: SetObjectCallback): void;
-			/**
-			 * Creates or overwrites an object in the object db
-			 * @param id ID of the object
-			 * @param obj Object to store
-			 * @param options (optional) Some internal options.
-			 * @param callback Is called when the operation has finished (successfully or not)
-			 */
-			setConfig(id: string, obj: ioBroker.Object, callback: SetObjectCallback): void;
-			setConfig(id: string, obj: ioBroker.Object, options: any, callback: SetObjectCallback): void;
-
-			/**
-			 * Deletes an object in the object db
-			 * @param id ID of the object
-			 * @param options (optional) Some internal options.
-			 * @param callback Is called when the operation has finished (successfully or not)
-			 */
-			delObject(id: string, callback: ErrorCallback): void;
-			delObject(id: string, options: any, callback: ErrorCallback): void;
-			/**
-			 * Deletes an object in the object db
-			 * @param id ID of the object
-			 * @param options (optional) Some internal options.
-			 * @param callback Is called when the operation has finished (successfully or not)
-			 */
-			delConfig(id: string, callback: ErrorCallback): void;
-			delConfig(id: string, options: any, callback: ErrorCallback): void;
-
-			/**
-			 * Returns a list of objects with id between params.startkey and params.endkey
-			 * @param params Parameters determining the objects included in the return list. Null to include all objects
-			 * @param options (optional) If the returned list should be sorted. And some internal options.
-			 * @param callback Is called when the operation has finished (successfully or not)
-			 */
-			getObjectList(params: GetObjectListParams | null, callback: GetObjectListCallback): void;
-			getObjectList(params: GetObjectListParams | null, options: { sorted?: boolean } | Record<string, any>, callback: GetObjectListCallback): void;
-
-			/**
-			 * Query a predefined object view (similar to SQL stored procedures) and return the results
-			 * For a detailed description refer to https://github.com/ioBroker/ioBroker/wiki/Adapter-Development-Documentation#object-fields
-			 * or http://guide.couchdb.org/editions/1/en/views.html
-			 * @param design The namespace of the object view, as defined in io-package.json. Usually the adapter name, e.g. "hm-rpc"
-			 * @param search The name of the object view.
-			 * @param params Parameters to additionally filter out objects from the return list. Null to include all objects
-			 * @param options (optional) Some internal options.
-			 * @param callback Is called when the operation has finished (successfully or not)
-			 */
-			getObjectView(design: string, search: string, params: GetObjectViewParams | null, callback: GetObjectViewCallback): void;
-			getObjectView(design: string, search: string, params: GetObjectViewParams | null, options: any, callback: GetObjectViewCallback): void;
-
-			/**
-			 * Extends an object in the object db with new properties
-			 * @param id ID of the object
-			 * @param obj Object to extend the original one with. May be just parts of an object.
-			 * @param options (optional) Some internal options.
-			 * @param callback Is called when the operation has finished (successfully or not)
-			 */
-			extendObject(id: string, obj: PartialObject, callback: ExtendObjectCallback): void;
-			extendObject(id: string, obj: PartialObject, options: any, callback: ExtendObjectCallback): void;
-
-			/**
-			 * Finds an object by ID or name. If multiple objects were found, return the first one
-			 * @param idOrName ID or name of the object
-			 * @param type If != null, only return an object with a common.type equal to this
-			 * @param options (optional) Some internal options.
-			 * @param callback Is called when the operation has finished (successfully or not)
-			 */
-			findObject(idOrName: string, type: CommonType | null, callback: FindObjectCallback): void;
-			findObject(idOrName: string, type: CommonType | null, options: any, callback: FindObjectCallback): void;
-
-			// I'd rather not document a function with the name "destroyDB"
-
-			/** Destructor of the class. Call this before shutting down. */
-			destroy(): void;
-
-		} // end interface Objects
-
-		type LogLevel = "silly" | "debug" | "info" | "warn" | "error";
-		interface Logger {
-			/** log message with silly level */
-			silly(message: string): void;
-			/** log message with debug level */
-			debug(message: string): void;
-			/** log message with info level (default output level for all adapters) */
-			info(message: string): void;
-			/** log message with warning severity */
-			warn(message: string): void;
-			/** log message with error severity */
-			error(message: string): void;
-
-			/** Verbosity of the log output */
-			level: LogLevel;
-		}
-
-		interface Certificates {
-			/** private key file */
-			key: string | Buffer;
-			/** public certificate */
-			cert: string | Buffer;
-			/** chained CA certificates */
-			ca: (string | Buffer)[];
-		}
-
-		/** Callback information for a passed message */
-		interface MessageCallbackInfo {
-			/** The original message payload */
-			message: string | object;
-			/** ID of this callback */
-			id: number;
-			// ???
-			ack: boolean;
-			/** Timestamp of this message */
-			time: number;
-		}
-		type MessageCallback = (result?: any) => void;
-
-		/** A message being passed between adapter instances */
-		interface Message {
-			/** The command to be executed */
-			command: string;
-			/** The message payload */
-			message: string | object;
-			/** The source of this message */
-			from: string;
-			/** ID of this message */
-			_id: number;
-			/** Callback information. This is set when the source expects a response */
-			callback: MessageCallbackInfo;
-		}
-
-		type Log = any; // TODO: define this https://github.com/ioBroker/ioBroker.js-controller/blob/master/lib/states/statesInMemServer.js#L873
-
-		type EnumList = string | string[];
-
-		type Enum = any; // TODO: implement this
-
-		interface DirectoryEntry {
-			file: string;
-			stats: fs.Stats;
-			isDir: boolean;
-			acl: any; // access control list object
-			modifiedAt: number;
-			createdAt: number;
-		}
-
-		interface GetHistoryOptions {
-			instance?: string;
-			start?: number;
-			end?: number;
-			step?: number;
-			count?: number;
-			from?: boolean;
-			ack?: boolean;
-			q?: boolean;
-			addID?: boolean;
-			limit?: number;
-			ignoreNull: boolean;
-			sessionId?: any;
-			aggregate?: "minmax" | "min" | "max" | "average" | "total" | "count" | "none";
-		}
-
-		interface AdapterOptions {
-			/** The name of the adapter */
-			name: string;
-
-			/** path to adapter */
-			dirname?: string;
-
-			/** if the global system config should be included in the created object. Default: false */
-			systemConfig?: boolean;
-
-			/** provide alternative global configuration for the adapter. Default: null */
-			config?: any;
-
-			/** instance of the created adapter. Default: null */
-			instance?: number;
-
-			/** If the adapter needs access to the formatDate function to format dates according to the global settings. Default: false */
-			useFormatDate?: boolean;
-
-			/** If the adapter collects logs from all adapters (experts only). Default: false */
-			logTransporter?: boolean;
-
-			/** Handler for changes of subscribed objects */
-			objectChange?: ObjectChangeHandler;
-			/** Handler for received adapter messages. Can only be used if messagebox in io-package.json is set to true. */
-			message?: MessageHandler;
-			/** Handler for changes of subscribed states */
-			stateChange?: StateChangeHandler;
-			/** Will be called when the adapter is intialized */
-			ready?: () => void;
-			/** Will be called on adapter termination */
-			unload?: (callback: EmptyCallback) => void;
-
-			/** if true, stateChange will be called with an id that has no namespace, e.g. "state" instead of "adapter.0.state". Default: false */
-			noNamespace?: boolean;
-		} // end interface AdapterOptions
-
-		// tslint:disable-next-line:no-empty-interface
-		interface AdapterConfig {
-			// This is a stub to be augmented in every adapter
-		}
-
-		interface Adapter {
-			/** The name of the adapter */
-			name: string;
-			/** The name of the host where the adapter is running */
-			host: string;
-			/** instance number of this adapter instance */
-			instance: number;
-			/** Namespace of adapter objects: "<name>.<instance>" */
-			readonly namespace: string;
-			/** native part of the adapter settings */
-			config: AdapterConfig;
-			/** common part of the adapter settings */
-			common: any;
-			/** system part of the adapter settings */
-			systemConfig?: any;
-			/** path to the adapter folder */
-			adapterDir: string;
-			/** content of io-package.json */
-			ioPack: any;
-			/** content of package.json */
-			pack: any;
-			/** access to the logging functions */
-			log: Logger;
-			/** adapter version */
-			version: any;
-			states: States;
-			objects: Objects;
-			/** if the adapter is connected to the host */
-			connected: boolean;
-
-			/*	===============================
-				Functions defined in adapter.js
-				=============================== */
-
-			/**
-			 * Helper function that looks for first free TCP port starting with the given one.
-			 * @param port - The port to start with
-			 * @param callback - gets called when a free port is found
-			 */
-			getPort(port: number, callback: (port: number) => void): void;
-
-			/** Stops the adapter. Note: Is not always defined. */
-			stop?: () => void;
-
-			// ==============================
-			// GENERAL
-
-			/** Validates username and password */
-			checkPassword(user: string, password: string, callback: (result: boolean) => void): void;
-			checkPassword(user: string, password: string, options: any, callback: (result: boolean) => void): void;
-			/** Sets a new password for the given user */
-			setPassword(user: string, password: string, options?: any, callback?: (err?: any) => void): void;
-			/** <INTERNAL> Checks if a user exists and is in the given group. */
-			checkGroup(user: string, group: string, callback: (result: boolean) => void): void;
-			checkGroup(user: string, group: string, options: any, callback: (result: boolean) => void): void;
-			/** <INTERNAL> Determines the users permissions */
-			calculatePermissions(user: string, commandsPermissions: CommandsPermissions, callback: (result: PermissionSet) => void): void;
-			calculatePermissions(user: string, commandsPermissions: CommandsPermissions, options: any, callback: (result: PermissionSet) => void): void;
-			/** Returns SSL certificates by name (private key, public cert and chained certificate) for creation of HTTPS servers */
-			getCertificates(publicName: string, privateName: string, chainedName: string, callback: (err: string | null, certs?: Certificates, useLetsEncryptCert?: boolean) => void): void;
-
-			/**
-			 * Sends a message to a specific instance or all instances of some specific adapter.
-			 * @param instanceName The instance to send this message to.
-			 * If the ID of an instance is given (e.g. "admin.0"), only this instance will receive the message.
-			 * If the name of an adapter is given (e.g. "admin"), all instances of this adapter will receive it.
-			 * @param command (optional) Command name of the target instance. Default: "send"
-			 * @param message The message (e.g. params) to send.
-			 */
-			sendTo(instanceName: string, message: string | object, callback?: MessageCallback | MessageCallbackInfo): void;
-			sendTo(instanceName: string, command: string, message: string | object, callback?: MessageCallback | MessageCallbackInfo): void;
-
-			/**
-			 * Sends a message to a specific host or all hosts.
-			 */
-			sendToHost(hostName: string, message: string | object, callback?: MessageCallback | MessageCallbackInfo): void;
-			sendToHost(hostName: string, command: string, message: string | object, callback?: MessageCallback | MessageCallbackInfo): void;
-
-			/** Convert ID to {device: D, channel: C, state: S} */
-			idToDCS(id: string): {
-				device: string;
-				channel: string;
-				state: string;
-			};
-
-			// ==============================
-			// own objects
-
-			/** Reads an object from the object db */
-			getObject(id: string, callback: GetObjectCallback): void;
-			getObject(id: string, options: any, callback: GetObjectCallback): void;
-			/** Creates or overwrites an object in the object db */
-			setObject(id: string, obj: ioBroker.Object, options?: any, callback?: SetObjectCallback): void;
-			/** Creates an object in the object db. Existing objects are not overwritten. */
-			setObjectNotExists(id: string, obj: ioBroker.Object, options?: any, callback?: SetObjectCallback): void;
-			/** Get all states, channels and devices of this adapter */
-			getAdapterObjects(callback: (objects: Record<string, ioBroker.Object>) => void): void;
-			/** Extend an object and create it if it might not exist */
-			extendObject(id: string, objPart: PartialObject, options?: any, callback?: SetObjectCallback): void;
-			/**
-			 * Deletes an object from the object db
-			 * @param id - The id of the object without namespace
-			 */
-			delObject(id: string, options?: any, callback?: ErrorCallback): void;
-
-			// ==============================
-			// foreign objects
-
-			// tslint:disable:unified-signatures
-			/** Reads an object (which might not belong to this adapter) from the object db */
-			getForeignObject(id: string, callback: GetObjectCallback): void;
-			getForeignObject(id: string, options: any, callback: GetObjectCallback): void;
-			/** Get foreign objects by pattern, by specific type and resolve their enums. */
-			getForeignObjects(pattern: string, callback: GetObjectsCallback): void;
-			getForeignObjects(pattern: string, options: any, callback: GetObjectsCallback): void;
-			getForeignObjects(pattern: string, type: ObjectType, callback: GetObjectsCallback): void;
-			getForeignObjects(pattern: string, type: ObjectType, enums: EnumList, callback: GetObjectsCallback): void;
-			getForeignObjects(pattern: string, type: ObjectType, options: any, callback: GetObjectsCallback): void;
-			getForeignObjects(pattern: string, type: ObjectType, enums: EnumList, options: any, callback: GetObjectsCallback): void;
-			/** Creates or overwrites an object (which might not belong to this adapter) in the object db */
-			setForeignObject(id: string, obj: ioBroker.Object, options?: any, callback?: SetObjectCallback): void;
-			/** Creates an object (which might not belong to this adapter) in the object db. Existing objects are not overwritten. */
-			setForeignObjectNotExists(id: string, obj: ioBroker.Object, options?: any, callback?: SetObjectCallback): void;
-			/** Extend an object (which might not belong to this adapter) and create it if it might not exist */
-			extendForeignObject(id: string, objPart: PartialObject, options?: any, callback?: SetObjectCallback): void;
-			// tslint:enable:unified-signatures
-			/**
-			 * Finds an object by its ID or name
-			 * @param type - common.type of the state
-			 */
-			findForeignObject(idOrName: string, type: string, callback: FindObjectCallback): void;
-			findForeignObject(idOrName: string, type: string, options: any, callback: FindObjectCallback): void;
-			/**
-			 * Deletes an object (which might not belong to this adapter) from the object db
-			 * @param id - The id of the object including namespace
-			 */
-			delForeignObject(id: string, options?: any, callback?: ErrorCallback): void;
-
-			// ==============================
-			// states
-			/** Writes a value into the states DB. */
-			setState(id: string, state: string | number | boolean | State | Partial<State>, ack?: boolean, options?: any, callback?: SetStateCallback): void;
-			/** Writes a value into the states DB only if it has changed. */
-			setStateChanged(id: string, state: string | number | boolean | State | Partial<State>, ack?: boolean, options?: any, callback?: SetStateChangedCallback): void;
-			/** Writes a value (which might not belong to this adapter) into the states DB. */
-			setForeignState(id: string, state: string | number | boolean | State | Partial<State>, ack?: boolean, options?: any, callback?: SetStateCallback): void;
-			/** Writes a value (which might not belong to this adapter) into the states DB only if it has changed. */
-			setForeignStateChanged(id: string, state: string | number | boolean | State | Partial<State>, ack?: boolean, options?: any, callback?: SetStateChangedCallback): void;
-
-			/** Read a value from the states DB. */
-			getState(id: string, callback: GetStateCallback): void;
-			getState(id: string, options: any, callback: GetStateCallback): void;
-			/** Read a value (which might not belong to this adapter) from the states DB. */
-			getForeignState(id: string, callback: GetStateCallback): void;
-			getForeignState(id: string, options: any, callback: GetStateCallback): void;
-			/** Read all states of this adapter which match the given pattern */
-			getStates(pattern: string, callback: GetStatesCallback): void;
-			getStates(pattern: string, options: any, callback: GetStatesCallback): void;
-			/** Read all states (which might not belong to this adapter) which match the given pattern */
-			getForeignStates(pattern: string, callback: GetStatesCallback): void;
-			getForeignStates(pattern: string, options: any, callback: GetStatesCallback): void;
-
-			/** Deletes a state from the states DB, but not the associated object. Consider using @link{deleteState} instead */
-			delState(id: string, options?: any, callback?: ErrorCallback): void;
-			/** Deletes a state from the states DB, but not the associated object */
-			delForeignState(id: string, options?: any, callback?: ErrorCallback): void;
-
-			getHistory(id: string, options: GetHistoryOptions, callback: GetHistoryCallback): void;
-
-			// MISSING:
-			// pushFifo and similar https://github.com/ioBroker/ioBroker.js-controller/blob/master/lib/adapter.js#L4105
-			// logRedirect https://github.com/ioBroker/ioBroker.js-controller/blob/master/lib/adapter.js#L4294
-			// requireLog https://github.com/ioBroker/ioBroker.js-controller/blob/master/lib/adapter.js#L4336
-			// processLog https://github.com/ioBroker/ioBroker.js-controller/blob/master/lib/adapter.js#L4360
-
-			/**
-			 * Writes a binary state into Redis
-			 * @param id The id of the state
-			 * @param binary The data to be written
-			 * @param options (optional) Some internal options.
-			 * @param callback Is called when the operation has finished (successfully or not)
-			 */
-			setBinaryState(id: string, binary: Buffer, callback: SetStateCallback): void;
-			setBinaryState(id: string, binary: Buffer, options: any, callback: SetStateCallback): void;
-			/**
-			 * Reads a binary state from Redis
-			 * @param id The id of the state
-			 * @param options (optional) Some internal options.
-			 * @param callback Is called when the operation has finished (successfully or not)
-			 */
-			getBinaryState(id: string, callback: GetBinaryStateCallback): void;
-			getBinaryState(id: string, options: any, callback: GetBinaryStateCallback): void;
-
-			// ==============================
-			// enums
-
-			/** Returns the enum tree, filtered by the optional enum name */
-			getEnum(callback: GetEnumCallback): void;
-			getEnum(name: string, callback: GetEnumCallback): void;
-			getEnum(name: string, options: any, callback: GetEnumCallback): void;
-			getEnums(callback: GetEnumsCallback): void;
-			getEnums(enumList: EnumList, callback: GetEnumsCallback): void;
-			getEnums(enumList: EnumList, options: any, callback: GetEnumsCallback): void;
-
-			addChannelToEnum(enumName: string, addTo: string, parentDevice: string, channelName: string, options?: any, callback?: ErrorCallback): void;
-			deleteChannelFromEnum(enumName: string, parentDevice: string, channelName: string, options?: any, callback?: ErrorCallback): void;
-
-			addStateToEnum(enumName: string, addTo: string, parentDevice: string, parentChannel: string, stateName: string, options?: any, callback?: ErrorCallback): void;
-			deleteStateFromEnum(enumName: string, parentDevice: string, parentChannel: string, stateName: string, options?: any, callback?: ErrorCallback): void;
-
-			// ==============================
-			// subscriptions
-
-			/** Subscribe to changes of objects in this instance */
-			subscribeObjects(pattern: string, options?: any): void;
-			/** Subscribe to changes of objects (which might not belong to this adapter) */
-			subscribeForeignObjects(pattern: string, options?: any): void;
-			/** Unsubscribe from changes of objects in this instance */
-			unsubscribeObjects(pattern: string, options?: any): void;
-			/** Unsubscribe from changes of objects (which might not belong to this adapter) */
-			unsubscribeForeignObjects(pattern: string, options?: any): void;
-
-			/** Subscribe to changes of states in this instance */
-			subscribeStates(pattern: string, options?: any, callback?: ErrorCallback): void;
-			/** Subscribe to changes of states (which might not belong to this adapter) */
-			subscribeForeignStates(pattern: string, options?: any, callback?: ErrorCallback): void;
-			/**
-			 * Subscribe from changes of states in this instance
-			 * @param pattern - Must match the pattern used to subscribe
-			 */
-			unsubscribeStates(pattern: string, options?: any, callback?: ErrorCallback): void;
-			/**
-			 * Subscribe from changes of states (which might not belong to this adapter)
-			 * @param pattern - Must match the pattern used to subscribe
-			 */
-			unsubscribeForeignStates(pattern: string, options?: any, callback?: ErrorCallback): void;
-
-			// ==============================
-			// devices and channels
-
-			/** creates an object with type device */
-			createDevice(deviceName: string, common?: any, native?: any, options?: any, callback?: SetObjectCallback): void;
-			/** deletes a device, its channels and states */
-			deleteDevice(deviceName: string, options?: any, callback?: ErrorCallback): void;
-			/** gets the devices of this instance */
-
-			/** creates an object with type channel */
-			createChannel(parentDevice: string, channelName: string, roleOrCommon?: string | object, native?: any, options?: any, callback?: SetObjectCallback): void;
-			/** deletes a channel and its states */
-			deleteChannel(channelName: string, options?: any, callback?: ErrorCallback): void;
-			deleteChannel(parentDevice: string, channelName: string, options?: any, callback?: ErrorCallback): void;
-
-			/** creates a state and the corresponding object */
-			createState(parentDevice: string, parentChannel: string, stateName: string, roleOrCommon?: string | object, native?: any, options?: any, callback?: SetObjectCallback): void;
-			/** deletes a state */
-			deleteState(stateName: string, options?: any, callback?: ErrorCallback): void;
-			deleteState(parentChannel: string, stateName: string, options?: any, callback?: ErrorCallback): void;
-			deleteState(parentDevice: string, parentChannel: string, stateName: string, options?: any, callback?: ErrorCallback): void;
-
-			/**
-			 * Returns a list of all devices in this adapter instance
-			 * @param options (optional) Some internal options.
-			 * @param callback Is called when the operation has finished (successfully or not)
-			 */
-			getDevices(callback: GetObjectsCallback3<DeviceObject>): void;
-			getDevices(options: any, callback: GetObjectsCallback3<DeviceObject>): void;
-
-			/**
-			 * Returns a list of all channels in this adapter instance
-			 * @param parentDevice (optional) Name of the parent device to filter the channels by
-			 * @param options (optional) Some internal options.
-			 * @param callback Is called when the operation has finished (successfully or not)
-			 */
-			getChannels(callback: GetObjectsCallback3<ChannelObject>): void;
-			getChannels(parentDevice: string | null, callback: GetObjectsCallback3<ChannelObject>): void;
-			getChannels(parentDevice: string | null, options: any, callback: GetObjectsCallback3<ChannelObject>): void;
-			/**
-			 * Returns a list of all channels in this adapter instance
-			 * @param parentDevice (optional) Name of the parent device to filter the channels by
-			 * @param options (optional) Some internal options.
-			 * @param callback Is called when the operation has finished (successfully or not)
-			 */
-			getChannelsOf(callback: GetObjectsCallback3<ChannelObject>): void;
-			getChannelsOf(parentDevice: string | null, callback: GetObjectsCallback3<ChannelObject>): void;
-			getChannelsOf(parentDevice: string | null, options: any, callback: GetObjectsCallback3<ChannelObject>): void;
-
-			/**
-			 * Returns a list of all states in this adapter instance
-			 * @param parentDevice (optional) Name of the parent device to filter the channels by
-			 * @param parentChannel (optional) Name of the parent channel to filter the channels by
-			 * @param options (optional) Some internal options.
-			 * @param callback Is called when the operation has finished (successfully or not)
-			 */
-			getStatesOf(callback: GetObjectsCallback3<StateObject>): void;
-			getStatesOf(parentDevice: string | null, callback: GetObjectsCallback3<StateObject>): void;
-			getStatesOf(parentDevice: string | null, parentChannel: string | null, callback: GetObjectsCallback3<StateObject>): void;
-			getStatesOf(parentDevice: string | null, parentChannel: string | null, options: any, callback: GetObjectsCallback3<StateObject>): void;
-
-			// ==============================
-			// filesystem
-
-			/**
-			 * reads the content of directory from DB for given adapter and path
-			 * @param adapter - adapter name. If adapter name is null, default will be the name of the current adapter.
-			 * @param path - path to direcory without adapter name. E.g. If you want to read "/vis.0/main/views.json", here must be "/main/views.json" and _adapter must be equal to "vis.0".
-			 */
-			readDir(adapterName: string, path: string, callback: ReadDirCallback): void;
-			readDir(adapterName: string, path: string, options: any, callback: ReadDirCallback): void;
-			mkDir(adapterName: string, path: string, callback: ErrorCallback): void;
-			mkDir(adapterName: string, path: string, options: any, callback: ErrorCallback): void;
-
-			readFile(adapterName: string, path: string, callback: ReadFileCallback): void;
-			readFile(adapterName: string, path: string, options: any, callback: ReadFileCallback): void;
-			writeFile(adapterName: string, path: string, data: Buffer | string, callback: ErrorCallback): void;
-			writeFile(adapterName: string, path: string, data: Buffer | string, options: any, callback: ErrorCallback): void; // options see https://github.com/ioBroker/ioBroker.js-controller/blob/master/lib/objects/objectsInMemServer.js#L599
-
-			delFile(adapterName: string, path: string, callback: ErrorCallback): void;
-			delFile(adapterName: string, path: string, options: any, callback: ErrorCallback): void;
-			unlink(adapterName: string, path: string, callback: ErrorCallback): void;
-			unlink(adapterName: string, path: string, options: any, callback: ErrorCallback): void;
-
-			rename(adapterName: string, oldName: string, newName: string, callback: ErrorCallback): void;
-			rename(adapterName: string, oldName: string, newName: string, options: any, callback: ErrorCallback): void;
-
-			/**
-			 * Changes access rights of all files in the adapter directory
-			 * @param adapter Name of the adapter instance, e.g. "admin.0". Defaults to the namespace of this adapter.
-			 * @param path Pattern to match the file path against
-			 * @param options Mode of the access change as a number or hexadecimal string
-			 * @param callback Is called when the operation has finished (successfully or not)
-			 */
-			chmodFile(adapter: string | null, path: string, options: {mode: number | string} | Record<string, any>, callback: ChownFileCallback): void;
-
-			// ==============================
-			// formatting
-
-			formatValue(value: number | string, format: any): string;
-			formatValue(value: number | string, decimals: number, format: any): string;
-			formatDate(dateObj: string | Date | number, format: string): string;
-			formatDate(dateObj: string | Date | number, isDuration: boolean | string, format: string): string;
-		} // end interface Adapter
-
-		type ObjectChangeHandler = (id: string, obj: ioBroker.Object) => void;
-		type StateChangeHandler = (id: string, obj: State) => void;
-		type MessageHandler = (obj: Message) => void;
-
-		type EmptyCallback = () => void;
-		type ErrorCallback = (err?: string) => void;
-		// TODO: Redefine callbacks as subclass of GenericCallback
-		type GenericCallback<T> = (err: string | null, result?: T) => void;
-
-		type SetObjectCallback = (err: string | null, obj: { id: string }) => void;
-		type GetObjectCallback = (err: string | null, obj: ioBroker.Object) => void;
-		type GetEnumCallback = (err: string | null, enums: Record<string, Enum>, requestedEnum: string) => void;
-		type GetEnumsCallback = (
-			err: string | null,
-			result: {
-				[groupName: string]: Record<string, Enum>,
-			},
-		) => void;
-		type GetObjectsCallback = (err: string | null, objects: Record<string, ioBroker.Object>) => void;
-
-		type FindObjectCallback = (
-			/** If an error happened, this contains the message */
-			err: string | null,
-			/** If an object was found, this contains the ID */
-			id?: string,
-			/** If an object was found, this contains the common.name */
-			name?: string,
-		) => void;
-
-		interface GetObjectsItem<T extends BaseObject> {
-			/** The ID of this object */
-			id: string;
-			/** A copy of the object from the DB */
-			value: T;
-		}
-		// This is a version used by GetDevices/GetChannelsOf/GetStatesOf
-		type GetObjectsCallback3<T extends BaseObject> = (err: string | null, result?: GetObjectsItem<T>[]) => void;
-
-		type GetStateCallback = (err: string | null, state: State) => void;
-		type GetStatesCallback = (err: string | null, states: Record<string, State>) => void;
-		/** Version of the callback used by States.getStates */
-		type GetStatesCallback2 = (err: string | null, states: State[]) => void;
-		type GetBinaryStateCallback = (err: string | null, state?: Buffer) => void;
-		type SetStateCallback = (err: string | null, id?: string) => void;
-		type SetStateChangedCallback = (err: string | null, id: string, notChanged: boolean) => void;
-		type DeleteStateCallback = (err: string | null, id?: string) => void;
-		type GetHistoryCallback = (err: string | null, result: (State & { id?: string })[], step: number, sessionId?: string) => void;
-
-		/** Contains the return values of readDir */
-		interface ReadDirResult {
-			/** Name of the file or directory */
-			file: string;
-			/** File system stats */
-			stats: fs.Stats;
-			/** Whether this is a directory or a file */
-			isDir: boolean;
-			/** Access rights */
-			acl: EvaluatedFileACL;
-			/** Date of last modification */
-			modifiedAt: number;
-			/** Date of creation */
-			createdAt: number;
-		}
-		type ReadDirCallback = (err: string | null, entries?: ReadDirResult[]) => void;
-		type ReadFileCallback = (err: string | null, file?: Buffer | string, mimeType?: string) => void;
-
-		/** Contains the return values of chownFile */
-		interface ChownFileResult {
-			/** The parent directory of the processed file or directory */
-			path: string;
-			/** Name of the file or directory */
-			file: string;
-			/** File system stats */
-			stats: fs.Stats;
-			/** Whether this is a directory or a file */
-			isDir: boolean;
-			/** Access rights */
-			acl: FileACL;
-			/** Date of last modification */
-			modifiedAt: number;
-			/** Date of creation */
-			createdAt: number;
-		}
-		type ChownFileCallback = (err: string | null, entries?: ChownFileResult[], id?: string) => void;
-
-		/** Contains the return values of rm */
-		interface RmResult {
-			/** The parent directory of the deleted file or directory */
-			path: string;
-			/** The name of the deleted file or directory */
-			file: string;
-			/** Whether the deleted object was a directory or a file */
-			isDir: boolean;
-		}
-		type RmCallback = (err: string | null, entries?: RmResult[]) => void;
-
-		type GetUserGroupCallback = (objectsInstance: Objects, user: User, groups: UserGroup[], acl: ObjectPermissions) => void;
-
-		type ChownObjectCallback = (err: string | null, list?: ioBroker.Object[]) => void;
-
-		type GetConfigKeysCallback = (err: string | null, list?: string[]) => void;
-		// this is a version of the callback used by Objects.getObjects
-		type GetObjectsCallback2 = (err: string | null, objects?: (ioBroker.Object | { err: string })[]) => void;
-
-		interface GetObjectViewItem {
-			/** The ID of this object */
-			id: string;
-			/** A copy of the object from the DB or some aggregation result */
-			value: ioBroker.Object | any;
-		}
-		type GetObjectViewCallback = (err: string | null, result?: { rows: GetObjectViewItem[] }) => void;
-
-		interface GetObjectListItem extends GetObjectViewItem {
-			/** A copy of the object */
-			value: ioBroker.Object;
-			/** The same as @link{value} */
-			doc: ioBroker.Object;
-		}
-		type GetObjectListCallback = (err: string | null, result?: { rows: GetObjectListItem[] }) => void;
-
-		type ExtendObjectCallback = (err: string | null, result?: {id: string, value: ioBroker.Object}, id?: string ) => void;
-
-		type GetSessionCallback = (session: Session) => void;
-
-	} // end namespace ioBroker
+    namespace ioBroker {
+        enum StateQuality {
+            good = 0x00, // or undefined or null
+            bad = 0x01,
+            general_problem = 0x01,
+            general_device_problem = 0x41,
+            general_sensor_problem = 0x81,
+            device_not_connected = 0x42,
+            sensor_not_connected = 0x82,
+            device_reports_error = 0x44,
+            sensor_reports_error = 0x84,
+        }
+
+        interface State {
+            /** The value of the state. */
+            val: any;
+
+            /** Direction flag: false for desired value and true for actual value. Default: false. */
+            ack: boolean;
+
+            /** Unix timestamp. Default: current time */
+            ts: number;
+
+            /** Unix timestamp of the last time the value changed */
+            lc: number;
+
+            /** Name of the adapter instance which set the value, e.g. "system.adapter.web.0" */
+            from: string;
+
+            /** Optional time in seconds after which the state is reset to null */
+            expire?: number;
+
+            /** Optional quality of the state value */
+            q?: StateQuality;
+
+            /** Optional comment */
+            c?: string;
+        }
+
+        /** Provides low-level access to the ioBroker states DB */
+        interface States {
+            /**
+             * Returns a list of states with the given ids
+             * @param keys IDs of the states to be retrieved
+             * @param callback Is called when the operation has finished (successfully or not)
+             * @param dontModify unused
+             */
+            getStates(keys: string[], callback: GetStatesCallback2, dontModify?: any): void;
+
+            /**
+             * Returns the state with the given id
+             * @param id ID of the state to be retrieved
+             * @param callback Is called when the operation has finished (successfully or not)
+             */
+            getState(id: string, callback: GetStateCallback): void;
+
+            /**
+             * Stores a state in the db
+             * @param id ID of the state to be stored
+             * @param state The state to be stored in the db
+             * @param callback Is called when the operation has finished (successfully or not)
+             */
+            setState(id: string, state?: string | number | boolean | State | Partial<State>, callback?: SetStateCallback): void;
+
+            /**
+             * Updates a state in memory without triggering a save
+             * @param id ID of the state to be stored
+             * @param state The state to be updated
+             * @param callback Is called when the operation has finished (successfully or not)
+             */
+            setRawState(id: string, state: State, callback?: SetStateCallback): void;
+
+            /**
+             * Deletes a state
+             * @param id ID of the state to be stored
+             * @param callback Is called when the operation has finished (successfully or not)
+             */
+            delState(id: string, callback: DeleteStateCallback): void;
+
+            /**
+             * Retrieves all ids of states matching @link{pattern}
+             * @param pattern The pattern to match against
+             * @param callback Is called when the operation has finished (successfully or not)
+             * @param dontModify unused
+             */
+            getKeys(pattern: string, callback: GetConfigKeysCallback, dontModify?: any): void;
+
+            /**
+             * Subscribe to changes of all states matching @link{pattern}
+             * @param pattern The pattern to match against
+             * @param callback Is called when the operation has finished (successfully or not)
+             */
+            subscribe(pattern: string, cb: EmptyCallback): void;
+            /**
+             * Unsubscribe from changes of all states matching @link{pattern}
+             * @param pattern The pattern to match against
+             * @param callback Is called when the operation has finished (successfully or not)
+             */
+            unsubscribe(pattern: string, cb: EmptyCallback): void;
+
+            /**
+             * Register an adapter instance as subscribable.
+             * This means that the instance can read information about all subscriptions to its states
+             * and will be notified of changes.
+             * @param instance Adapter instance to register, e.g. "admin.0"
+             * @param cb Is called when the operation has finished (successfully or not)
+             */
+            registerAdapterSubs(instance: string, cb?: (error: null, success: boolean) => void): void;
+
+            /**
+             * Unregister an adapter instance as subscribable.
+             * @param instance Adapter instance to unregister, e.g. "admin.0"
+             * @param cb Is called when the operation has finished (successfully or not)
+             */
+            unregisterAdapterSubs(instance: string, cb?: (error: null, success: boolean) => void): void;
+
+            /**
+             * EDUCATED GUESS: Notify all clients about changes to an object
+             * @param type object type
+             * @param id State/object id
+             * @param obj The changed object
+             */
+            publishAll(type: string, id: string, obj: Message): void;
+
+            // TODO: Documentation for these functions is missing
+            pushMessage(id: string, state: Message, callback: SetStateCallback): void;
+            lenMessage(id: string, callback: GenericCallback<number>): void;
+            getMessage(id: string, callback: GenericCallback<Message>): void;
+            delMessage(id: string, messageId: number, callback: ErrorCallback): void;
+            clearAllMessages(callback?: EmptyCallback): void;
+            subscribeMessage(id: string, cb: EmptyCallback): void;
+            unsubscribeMessage(id: string, cb: EmptyCallback): void;
+
+            pushLog(id: string, log: Log, callback: SetStateCallback): void;
+            lenLog(id: string, callback: GenericCallback<number>): void;
+            getLog(id: string, callback: GenericCallback<Log>): void;
+            delLog(id: string, logId: string, callback: ErrorCallback): void;
+            clearAllLogs(callback?: EmptyCallback): void;
+            subscribeLog(id: string, cb: EmptyCallback): void;
+            unsubscribeLog(id: string, cb: EmptyCallback): void;
+
+            getSession(id: string, callback: GetSessionCallback): void;
+            setSession(id: string, expire: number, callback?: EmptyCallback): void;
+            setSession(id: string, expire: number, obj: Session, callback?: EmptyCallback): void;
+            destroySession(id: string, callback?: EmptyCallback): void;
+
+            /**
+             * Retrieves a copy of the object with the given ID
+             * @param id Id of the object to find
+             * @param callback Is called when the operation has finished (successfully or not)
+             */
+            getConfig(id: string, callback: GetObjectCallback): void;
+
+            /**
+             * Returns a list of config keys matching <pattern>
+             * @param pattern Pattern to match against
+             * @param callback Is called when the operation has finished (successfully or not)
+             * @param dontModify unused
+             */
+            getConfigKeys(pattern: string, callback: GetConfigKeysCallback, dontModify?: any): void;
+
+            /**
+             * Returns a list of objects with the given ids
+             * @param keys IDs of the objects to be retrieved
+             * @param callback Is called when the operation has finished (successfully or not)
+             * @param dontModify unused
+             */
+            getConfigs(keys: string[], callback: GetObjectsCallback2, dontModify?: any): void;
+
+            /**
+             * Creates or overwrites a config object in the object db
+             * @param id ID of the object
+             * @param obj Object to store
+             * @param callback Is called when the operation has finished (successfully or not)
+             */
+            setConfig(id: string, obj: ioBroker.Object, callback: SetObjectCallback): void;
+
+            /**
+             * Deletes a config object in the object db
+             * @param id ID of the object
+             * @param callback Is called when the operation has finished (successfully or not)
+             */
+            delConfig(id: string, callback: ErrorCallback): void;
+
+            /**
+             * Subscribe to config object changes
+             * @param pattern The pattern to match against
+             */
+            subscribeConfig(pattern: string, callback: EmptyCallback): void;
+
+            /**
+             * Unsubscribe from config object changes
+             * @param pattern The pattern to match against
+             */
+            unsubscribeConfig(pattern: string, callback: EmptyCallback): void;
+
+            /**
+             * Writes a binary state into Redis
+             * @param id The id of the state
+             * @param data The data to be written
+             * @param callback Is called when the operation has finished (successfully or not)
+             */
+            setBinaryState(id: string, data: Buffer, callback: SetStateCallback): void;
+
+            /**
+             * Reads a binary state from Redis
+             * @param id The id of the state
+             * @param callback Is called when the operation has finished (successfully or not)
+             */
+            getBinaryState(id: string, callback: GetBinaryStateCallback): void;
+
+            /**
+             * Deletes a binary state from Redis
+             * @param id The id of the state to be deleted
+             * @param callback Is called when the operation has finished (successfully or not)
+             */
+            delBinaryState(id: string, callback: DeleteStateCallback): void;
+
+            /** Destructor of the class. Call this before shutting down */
+            destroy(): void;
+        } // end interface States
+
+        type Session = any; // TODO: implement
+
+        type ObjectType = "state" | "channel" | "device";
+        type CommonType = "number" | "string" | "boolean" | "array" | "object" | "mixed" | "file";
+
+        // Maybe this should extend Record<string, any>,
+        // but the extra properties aren't defined anywhere,
+        // so I'd rather force the user to explicitly state
+        // he knows what he's doing by casting to any
+        interface ObjectCommon {
+            /** name of this object */
+            name: string;
+
+            // Icon and role aren't defined in SCHEMA.md,
+            // but they are being used by some adapters
+            /** Icon for this object */
+            icon?: string;
+            /** role of the object */
+            role?: string;
+        }
+
+        interface StateCommon extends ObjectCommon {
+            /** Type of this state. See https://github.com/ioBroker/ioBroker/blob/master/doc/SCHEMA.md#state-commonrole for a detailed description */
+            type?: CommonType;
+            /** minimum value */
+            min?: number;
+            /** maximum value */
+            max?: number;
+            /** unit of the value */
+            unit?: string;
+            /** the default value */
+            def?: any;
+            /** description of this state */
+            desc?: string;
+
+            /** if this state is readable */
+            read: boolean;
+            /** if this state is writable */
+            write: boolean;
+            /** role of the state (used in user interfaces to indicate which widget to choose) */
+            role: string;
+
+            /**
+             * Dictionary of possible values for this state in the form
+             * <pre>
+             * {
+             *     "internal value 1": "displayed value 1",
+             *     "internal value 2": "displayed value 2",
+             *     ...
+             * }
+             * </pre>
+             * In old ioBroker versions, this could also be a string of the form
+             * "val1:text1;val2:text2" (now deprecated)
+             */
+            states?: Record<string, string> | string;
+
+            /** ID of a helper state indicating if the handler of this state is working */
+            workingID?: string;
+
+            /** attached history information */
+            history?: any;
+        }
+        interface ChannelCommon extends ObjectCommon {
+            /** description of this channel */
+            desc?: string;
+        }
+        type OtherCommon = ObjectCommon & {
+            [propName: string]: any;
+        };
+
+        interface BaseObject {
+            /** The ID of this object */
+            _id?: string;
+            native: Record<string, any>;
+            enums?: Record<string, string>;
+            type: string; // specified in the derived interfaces
+            common: ObjectCommon;
+            acl?: ObjectACL;
+        }
+
+        interface StateObject extends BaseObject {
+            type: "state";
+            common: StateCommon;
+            acl?: StateACL;
+        }
+        interface PartialStateObject extends Partial<Pick<StateObject, "_id" | "native" | "enums" | "type">> {
+            common?: Partial<StateCommon>;
+            acl?: Partial<StateACL>;
+        }
+
+        interface ChannelObject extends BaseObject {
+            type: "channel";
+            common: ChannelCommon;
+        }
+        interface PartialChannelObject extends Partial<Pick<ChannelObject, "_id" | "native" | "enums" | "type" | "acl">> {
+            common?: Partial<ChannelCommon>;
+        }
+
+        interface DeviceObject extends BaseObject {
+            type: "device";
+            common: ObjectCommon; // TODO: any definition for device?
+        }
+        interface PartialDeviceObject extends Partial<Pick<DeviceObject, "_id" | "native" | "enums" | "type" | "acl">> {
+            common?: Partial<ObjectCommon>;
+        }
+
+        interface OtherObject extends BaseObject {
+            type: "adapter" | "config" | "enum" | "group" | "host" | "info" | "instance" | "meta" | "script" | "user";
+            common: OtherCommon;
+        }
+        interface PartialOtherObject extends Partial<Pick<OtherObject, "_id" | "native" | "enums" | "type" | "acl">> {
+            common?: Partial<ObjectCommon>;
+        }
+
+        type Object = StateObject | ChannelObject | DeviceObject | OtherObject;
+        type PartialObject = PartialStateObject | PartialChannelObject | PartialDeviceObject | PartialOtherObject;
+
+        /** Defines access rights for a single file */
+        interface FileACL {
+            /** Full name of the user who owns this file, e.g. "system.user.admin" */
+            owner: string;
+            /** Full name of the group who owns this file, e.g. "system.group.administrator" */
+            ownerGroup: string;
+            /** Linux-type permissions defining access to this file */
+            permissions: number;
+        }
+        /** Defines access rights for a single file, applied to a user or group */
+        interface EvaluatedFileACL extends FileACL {
+            /** Whether the user may read the file */
+            read: boolean;
+            /** Whether the user may write the file */
+            write: boolean;
+        }
+
+        /** Defines access rights for a single object */
+        interface ObjectACL {
+            /** Full name of the user who owns this object, e.g. "system.user.admin" */
+            owner: string;
+            /** Full name of the group who owns this object, e.g. "system.group.administrator" */
+            ownerGroup: string;
+            /** Linux-type permissions defining access to this object */
+            object: number;
+        }
+        /** Defines access rights for a single state object */
+        interface StateACL extends ObjectACL {
+            /** Linux-type permissions defining access to this state */
+            state: number;
+        }
+
+        /** Defines access rights for a single object type */
+        interface ObjectOperationPermissions {
+            /** Whether a user may enumerate objects of this type */
+            list: boolean;
+            /** Whether a user may read objects of this type */
+            read: boolean;
+            /** Whether a user may write objects of this type */
+            write: boolean;
+            /** Whether a user may create objects of this type */
+            create: boolean;
+            /** Whether a user may delete objects of this type */
+            "delete": boolean;
+        }
+
+        /** Defines the rights a user or group has to change objects */
+        interface ObjectPermissions {
+            /** The access rights for files */
+            file: ObjectOperationPermissions;
+            /** The access rights for objects */
+            object: ObjectOperationPermissions;
+            /** The access rights for users/groups */
+            users: ObjectOperationPermissions;
+            /** The access rights for states */
+            state?: ObjectOperationPermissions;
+        }
+        /** Defined the complete set of access rights a user has */
+        interface PermissionSet extends ObjectPermissions {
+            /** The name of the user this ACL is for */
+            user: string;
+            /** The name of the groups this ACL was merged from */
+            groups: string[];
+            /** The access rights for certain commands */
+            other: {
+                execute: boolean,
+                http: boolean,
+                sendto: boolean,
+            };
+        }
+
+        interface Permission {
+            /** The type of the permission */
+            type: string;
+            /** Which kind of operation is required */
+            operation: string;
+        }
+        interface ObjectOrStatePermission extends Permission {
+            type: "object" | "file" | "users" | "state";
+            operation: "list" | "read" | "write" | "create" | "delete";
+        }
+        interface OtherPermission extends Permission {
+            type: "other";
+            operation: "execute" | "http" | "sendto";
+        }
+        interface CommandsPermissions {
+            // TODO: Are all properties required or is a partial object ok?
+            getObject: ObjectOrStatePermission;
+            getObjects: ObjectOrStatePermission;
+            getObjectView: ObjectOrStatePermission;
+            setObject: ObjectOrStatePermission;
+            subscribeObjects: ObjectOrStatePermission;
+            unsubscribeObjects: ObjectOrStatePermission;
+            getStates: ObjectOrStatePermission;
+            getState: ObjectOrStatePermission;
+            setState: ObjectOrStatePermission;
+            getStateHistory: ObjectOrStatePermission;
+            subscribe: ObjectOrStatePermission;
+            unsubscribe: ObjectOrStatePermission;
+            getVersion: Permission;
+            httpGet: OtherPermission;
+            sendTo: OtherPermission;
+            sendToHost: OtherPermission;
+            readFile: ObjectOrStatePermission;
+            readFile64: ObjectOrStatePermission;
+            writeFile: ObjectOrStatePermission;
+            writeFile64: ObjectOrStatePermission;
+            unlink: ObjectOrStatePermission;
+            rename: ObjectOrStatePermission;
+            mkdir: ObjectOrStatePermission;
+            readDir: ObjectOrStatePermission;
+            chmodFile: ObjectOrStatePermission;
+            authEnabled: Permission;
+            disconnect: Permission;
+            listPermissions: Permission;
+            getUserPermissions: ObjectOrStatePermission;
+        }
+
+        type UserGroup = any; // TODO find out how this looks like
+        // interface UserGroup { }
+
+        /** Contains information about a user */
+        interface User {
+            /** Which groups this user belongs to */
+            groups: UserGroup[];
+            /** Access rights of this user */
+            acl: ObjectPermissions;
+        }
+
+        /** Parameters for @link{Objects.getObjectView} */
+        interface GetObjectViewParams {
+            /** First id to include in the return list */
+            startkey: string;
+            /** Last id to include in the return list */
+            endkey: string;
+        }
+
+        /** Parameters for @link{Objects.getObjectList} */
+        interface GetObjectListParams extends GetObjectViewParams {
+            /** Whether docs should be included in the return list */ // TODO: What are docs?
+            include_docs: boolean;
+        }
+
+        /** Provides low-level access to the ioBroker objects db */
+        interface Objects {
+            /**
+             * For a given user, returns the groups he belongs to, and his access rights
+             * @param user Name of the user. Has to start with "system.user."
+             * @param callback The callback function to be invoked with the return values
+             */
+            getUserGroup(user: string, callback: GetUserGroupCallback): void;
+
+            /**
+             * Determines the mime type for a given file extension
+             * @param ext File extension, including the leading dot, e.g. ".zip"
+             */
+            getMimeType(ext: string): { mimeType: string, isBinary: boolean };
+
+            /**
+             * Writes a file.
+             * @param id Name of the root directory. This should be the adapter instance, e.g. "admin.0"
+             * @param name File name
+             * @param data Contents of the file
+             * @param options (optional) MIME type of the file (string). Or some internal options.
+             * @param callback Is called when the operation has finished (successfully or not)
+             */
+            writeFile(id: string, name: string, data: Buffer | string, callback: ErrorCallback): void;
+            writeFile(id: string, name: string, data: Buffer | string, options: string | {}, callback: ErrorCallback): void;
+
+            /**
+             * Reads a file.
+             * @param id Name of the root directory. This should be the adapter instance, e.g. "admin.0"
+             * @param name File name
+             * @param options (optional) Some internal options.
+             * @param callback Is called when the operation has finished (successfully or not)
+             */
+            readFile(id: string, name: string, callback: ReadFileCallback): void;
+            readFile(id: string, name: string, options: any, callback: ReadFileCallback): void;
+
+            /**
+             * Deletes a file.
+             * @param id Name of the root directory. This should be the adapter instance, e.g. "admin.0"
+             * @param name File name
+             * @param options (optional) Some internal options.
+             * @param callback Is called when the operation has finished (successfully or not)
+             */
+            unlink(id: string, name: string, callback: ErrorCallback): void;
+            unlink(id: string, name: string, options: any, callback: ErrorCallback): void;
+            /**
+             * Deletes a file.
+             * @param id Name of the root directory. This should be the adapter instance, e.g. "admin.0"
+             * @param name File name
+             * @param options (optional) Some internal options.
+             * @param callback Is called when the operation has finished (successfully or not)
+             */
+            delFile(id: string, name: string, callback: ErrorCallback): void;
+            delFile(id: string, name: string, options: any, callback: ErrorCallback): void;
+
+            /**
+             * Finds all files and directories starting with <name>
+             * @param id Name of the root directory. This should be the adapter instance, e.g. "admin.0"
+             * @param name File or directory name
+             * @param options (optional) Some internal options.
+             * @param callback Is called when the operation has finished (successfully or not)
+             */
+            readDir(id: string, name: string, callback: ReadDirCallback): void;
+            readDir(id: string, name: string, options: any, callback: ReadDirCallback): void;
+
+            /**
+             * Renames a file or directory
+             * @param id Name of the root directory. This should be the adapter instance, e.g. "admin.0"
+             * @param oldName Old file or directory name
+             * @param newName Name to rename to
+             * @param options (optional) Some internal options.
+             * @param callback Is called when the operation has finished (successfully or not)
+             */
+            rename(id: string, oldName: string, newName: string, callback: ErrorCallback): void;
+            rename(id: string, oldName: string, newName: string, options: any, callback: ErrorCallback): void;
+
+            /**
+             * Creates an empty file with the given name
+             * @param id Name of the root directory. This should be the adapter instance, e.g. "admin.0"
+             * @param name File name
+             * @param options (optional) Some internal options.
+             * @param callback Is called when the operation has finished (successfully or not)
+             */
+            touch(id: string, name: string, callback: ErrorCallback): void;
+            touch(id: string, name: string, options: any, callback: ErrorCallback): void;
+
+            /**
+             * Deletes all files in the root directory matching <name>
+             * @param id Name of the root directory. This should be the adapter instance, e.g. "admin.0"
+             * @param name Pattern to match against
+             * @param options (optional) Some internal options.
+             * @param callback Is called when the operation has finished (successfully or not)
+             */
+            rm(id: string, name: string, callback: RmCallback): void;
+            rm(id: string, name: string, options: any, callback: RmCallback): void;
+
+            /**
+             * Creates an empty directory with the given name
+             * @param id Name of the root directory. This should be the adapter instance, e.g. "admin.0"
+             * @param name Directory name
+             * @param options (optional) Some internal options.
+             * @param callback Is called when the operation has finished (successfully or not)
+             */
+            mkDir(id: string, name: string, callback: ErrorCallback): void;
+            mkDir(id: string, name: string, options: any, callback: ErrorCallback): void;
+
+            /**
+             * Takes possession all files in the root directory matching <name>
+             * @param id Name of the root directory. This should be the adapter instance, e.g. "admin.0"
+             * @param name Pattern to match against
+             * @param options (optional) Some internal options.
+             * @param callback Is called when the operation has finished (successfully or not)
+             */
+            chownFile(id: string, name: string, callback: ChownFileCallback): void;
+            chownFile(id: string, name: string, options: any, callback: ChownFileCallback): void;
+
+            /**
+             * Changes access rights of all files in the root directory matching <name>
+             * @param id Name of the root directory. This should be the adapter instance, e.g. "admin.0"
+             * @param name Pattern to match against
+             * @param options Mode of the access change as a number or hexadecimal string
+             * @param callback Is called when the operation has finished (successfully or not)
+             */
+            chmodFile(id: string, name: string, options: { mode: number | string } | Record<string, any>, callback: ChownFileCallback): void;
+
+            // not documented. enabled = true seems to disable the cache
+            // enableFileCache(enabled, options, callback)
+
+            /**
+             * Subscribe to object changes
+             * @param pattern The pattern to match against
+             */
+            subscribeConfig(pattern: string, callback: EmptyCallback): void;
+            subscribeConfig(pattern: string, options: any, callback: EmptyCallback): void;
+            /**
+             * Subscribe to object changes
+             * @param pattern The pattern to match against
+             */
+            subscribe(pattern: string, callback: EmptyCallback): void;
+            subscribe(pattern: string, options: any, callback: EmptyCallback): void;
+
+            /**
+             * Unsubscribe from object changes
+             * @param pattern The pattern to match against
+             */
+            unsubscribeConfig(pattern: string, callback: EmptyCallback): void;
+            unsubscribeConfig(pattern: string, options: any, callback: EmptyCallback): void;
+            /**
+             * Unsubscribe from object changes
+             * @param pattern The pattern to match against
+             */
+            unsubscribe(pattern: string, callback: EmptyCallback): void;
+            unsubscribe(pattern: string, options: any, callback: EmptyCallback): void;
+
+            /**
+             * Takes possession of all objects matching <pattern>
+             * @param pattern Pattern to match against
+             * @param options (optional) Some internal options.
+             * @param callback Is called when the operation has finished (successfully or not)
+             */
+            chownObject(pattern: string, callback: ChownObjectCallback): void;
+            chownObject(pattern: string, options: any, callback: ChownObjectCallback): void;
+
+            /**
+             * Changes access rights of all objects matching <pattern>
+             * @param pattern Pattern to match against
+             * @param options Mode of the access change as a number or hexadecimal string
+             * @param callback Is called when the operation has finished (successfully or not)
+             */
+            chmodObject(pattern: string, callback: ChownObjectCallback): void;
+            chmodObject(pattern: string, options: any, callback: ChownObjectCallback): void;
+
+            /**
+             * Retrieves a copy of the object with the given ID
+             * @param id Id of the object to find
+             * @param options (optional) Some internal options.
+             * @param callback Is called when the operation has finished (successfully or not)
+             */
+            getObject(id: string, callback: GetObjectCallback): void;
+            getObject(id: string, options: any, callback: GetObjectCallback): void;
+            /**
+             * Retrieves a copy of the object with the given ID
+             * @param id Id of the object to find
+             * @param options (optional) Some internal options.
+             * @param callback Is called when the operation has finished (successfully or not)
+             */
+            getConfig(id: string, callback: GetObjectCallback): void;
+            getConfig(id: string, options: any, callback: GetObjectCallback): void;
+
+            /**
+             * Returns a list of config keys matching <pattern>
+             * @param pattern Pattern to match against
+             * @param options (optional) Some internal options.
+             * @param callback Is called when the operation has finished (successfully or not)
+             * @param dontModify unused
+             */
+            getConfigKeys(pattern: string, callback: GetConfigKeysCallback, dontModify?: any): void;
+            getConfigKeys(pattern: string, options: any, callback: GetConfigKeysCallback, dontModify?: any): void;
+
+            /**
+             * Returns a list of objects with the given ids
+             * @param keys IDs of the objects to be retrieved
+             * @param options (optional) Some internal options.
+             * @param callback Is called when the operation has finished (successfully or not)
+             * @param dontModify unused
+             */
+            getObjects(keys: string[], callback: GetObjectsCallback2, dontModify?: any): void;
+            getObjects(keys: string[], options: any, callback: GetObjectsCallback2, dontModify?: any): void;
+            /**
+             * Returns a list of objects with the given ids
+             * @param keys IDs of the objects to be retrieved
+             * @param options (optional) Some internal options.
+             * @param callback Is called when the operation has finished (successfully or not)
+             * @param dontModify unused
+             */
+            getConfigs(keys: string[], callback: GetObjectsCallback2, dontModify?: any): void;
+            getConfigs(keys: string[], options: any, callback: GetObjectsCallback2, dontModify?: any): void;
+
+            /**
+             * Creates or overwrites an object in the object db
+             * @param id ID of the object
+             * @param obj Object to store
+             * @param options (optional) Some internal options.
+             * @param callback Is called when the operation has finished (successfully or not)
+             */
+            setObject(id: string, obj: ioBroker.Object, callback: SetObjectCallback): void;
+            setObject(id: string, obj: ioBroker.Object, options: any, callback: SetObjectCallback): void;
+            /**
+             * Creates or overwrites an object in the object db
+             * @param id ID of the object
+             * @param obj Object to store
+             * @param options (optional) Some internal options.
+             * @param callback Is called when the operation has finished (successfully or not)
+             */
+            setConfig(id: string, obj: ioBroker.Object, callback: SetObjectCallback): void;
+            setConfig(id: string, obj: ioBroker.Object, options: any, callback: SetObjectCallback): void;
+
+            /**
+             * Deletes an object in the object db
+             * @param id ID of the object
+             * @param options (optional) Some internal options.
+             * @param callback Is called when the operation has finished (successfully or not)
+             */
+            delObject(id: string, callback: ErrorCallback): void;
+            delObject(id: string, options: any, callback: ErrorCallback): void;
+            /**
+             * Deletes an object in the object db
+             * @param id ID of the object
+             * @param options (optional) Some internal options.
+             * @param callback Is called when the operation has finished (successfully or not)
+             */
+            delConfig(id: string, callback: ErrorCallback): void;
+            delConfig(id: string, options: any, callback: ErrorCallback): void;
+
+            /**
+             * Returns a list of objects with id between params.startkey and params.endkey
+             * @param params Parameters determining the objects included in the return list. Null to include all objects
+             * @param options (optional) If the returned list should be sorted. And some internal options.
+             * @param callback Is called when the operation has finished (successfully or not)
+             */
+            getObjectList(params: GetObjectListParams | null, callback: GetObjectListCallback): void;
+            getObjectList(params: GetObjectListParams | null, options: { sorted?: boolean } | Record<string, any>, callback: GetObjectListCallback): void;
+
+            /**
+             * Query a predefined object view (similar to SQL stored procedures) and return the results
+             * For a detailed description refer to https://github.com/ioBroker/ioBroker/wiki/Adapter-Development-Documentation#object-fields
+             * or http://guide.couchdb.org/editions/1/en/views.html
+             * @param design The namespace of the object view, as defined in io-package.json. Usually the adapter name, e.g. "hm-rpc"
+             * @param search The name of the object view.
+             * @param params Parameters to additionally filter out objects from the return list. Null to include all objects
+             * @param options (optional) Some internal options.
+             * @param callback Is called when the operation has finished (successfully or not)
+             */
+            getObjectView(design: string, search: string, params: GetObjectViewParams | null, callback: GetObjectViewCallback): void;
+            getObjectView(design: string, search: string, params: GetObjectViewParams | null, options: any, callback: GetObjectViewCallback): void;
+
+            /**
+             * Extends an object in the object db with new properties
+             * @param id ID of the object
+             * @param obj Object to extend the original one with. May be just parts of an object.
+             * @param options (optional) Some internal options.
+             * @param callback Is called when the operation has finished (successfully or not)
+             */
+            extendObject(id: string, obj: PartialObject, callback: ExtendObjectCallback): void;
+            extendObject(id: string, obj: PartialObject, options: any, callback: ExtendObjectCallback): void;
+
+            /**
+             * Finds an object by ID or name. If multiple objects were found, return the first one
+             * @param idOrName ID or name of the object
+             * @param type If != null, only return an object with a common.type equal to this
+             * @param options (optional) Some internal options.
+             * @param callback Is called when the operation has finished (successfully or not)
+             */
+            findObject(idOrName: string, type: CommonType | null, callback: FindObjectCallback): void;
+            findObject(idOrName: string, type: CommonType | null, options: any, callback: FindObjectCallback): void;
+
+            // I'd rather not document a function with the name "destroyDB"
+
+            /** Destructor of the class. Call this before shutting down. */
+            destroy(): void;
+        } // end interface Objects
+
+        type LogLevel = "silly" | "debug" | "info" | "warn" | "error";
+        interface Logger {
+            /** log message with silly level */
+            silly(message: string): void;
+            /** log message with debug level */
+            debug(message: string): void;
+            /** log message with info level (default output level for all adapters) */
+            info(message: string): void;
+            /** log message with warning severity */
+            warn(message: string): void;
+            /** log message with error severity */
+            error(message: string): void;
+
+            /** Verbosity of the log output */
+            level: LogLevel;
+        }
+
+        interface Certificates {
+            /** private key file */
+            key: string | Buffer;
+            /** public certificate */
+            cert: string | Buffer;
+            /** chained CA certificates */
+            ca: Array<string | Buffer>;
+        }
+
+        /** Callback information for a passed message */
+        interface MessageCallbackInfo {
+            /** The original message payload */
+            message: string | object;
+            /** ID of this callback */
+            id: number;
+            // ???
+            ack: boolean;
+            /** Timestamp of this message */
+            time: number;
+        }
+        type MessageCallback = (result?: any) => void;
+
+        /** A message being passed between adapter instances */
+        interface Message {
+            /** The command to be executed */
+            command: string;
+            /** The message payload */
+            message: string | object;
+            /** The source of this message */
+            from: string;
+            /** ID of this message */
+            _id: number;
+            /** Callback information. This is set when the source expects a response */
+            callback: MessageCallbackInfo;
+        }
+
+        type Log = any; // TODO: define this https://github.com/ioBroker/ioBroker.js-controller/blob/master/lib/states/statesInMemServer.js#L873
+
+        type EnumList = string | string[];
+
+        type Enum = any; // TODO: implement this
+
+        interface DirectoryEntry {
+            file: string;
+            stats: fs.Stats;
+            isDir: boolean;
+            acl: any; // access control list object
+            modifiedAt: number;
+            createdAt: number;
+        }
+
+        interface GetHistoryOptions {
+            instance?: string;
+            start?: number;
+            end?: number;
+            step?: number;
+            count?: number;
+            from?: boolean;
+            ack?: boolean;
+            q?: boolean;
+            addID?: boolean;
+            limit?: number;
+            ignoreNull: boolean;
+            sessionId?: any;
+            aggregate?: "minmax" | "min" | "max" | "average" | "total" | "count" | "none";
+        }
+
+        interface AdapterOptions {
+            /** The name of the adapter */
+            name: string;
+
+            /** path to adapter */
+            dirname?: string;
+
+            /** if the global system config should be included in the created object. Default: false */
+            systemConfig?: boolean;
+
+            /** provide alternative global configuration for the adapter. Default: null */
+            config?: any;
+
+            /** instance of the created adapter. Default: null */
+            instance?: number;
+
+            /** If the adapter needs access to the formatDate function to format dates according to the global settings. Default: false */
+            useFormatDate?: boolean;
+
+            /** If the adapter collects logs from all adapters (experts only). Default: false */
+            logTransporter?: boolean;
+
+            /** Handler for changes of subscribed objects */
+            objectChange?: ObjectChangeHandler;
+            /** Handler for received adapter messages. Can only be used if messagebox in io-package.json is set to true. */
+            message?: MessageHandler;
+            /** Handler for changes of subscribed states */
+            stateChange?: StateChangeHandler;
+            /** Will be called when the adapter is intialized */
+            ready?: () => void;
+            /** Will be called on adapter termination */
+            unload?: (callback: EmptyCallback) => void;
+
+            /** if true, stateChange will be called with an id that has no namespace, e.g. "state" instead of "adapter.0.state". Default: false */
+            noNamespace?: boolean;
+        } // end interface AdapterOptions
+
+        // tslint:disable-next-line:no-empty-interface
+        interface AdapterConfig {
+            // This is a stub to be augmented in every adapter
+        }
+
+        interface Adapter {
+            /** The name of the adapter */
+            name: string;
+            /** The name of the host where the adapter is running */
+            host: string;
+            /** instance number of this adapter instance */
+            instance: number;
+            /** Namespace of adapter objects: "<name>.<instance>" */
+            readonly namespace: string;
+            /** native part of the adapter settings */
+            config: AdapterConfig;
+            /** common part of the adapter settings */
+            common: any;
+            /** system part of the adapter settings */
+            systemConfig?: any;
+            /** path to the adapter folder */
+            adapterDir: string;
+            /** content of io-package.json */
+            ioPack: any;
+            /** content of package.json */
+            pack: any;
+            /** access to the logging functions */
+            log: Logger;
+            /** adapter version */
+            version: any;
+            states: States;
+            objects: Objects;
+            /** if the adapter is connected to the host */
+            connected: boolean;
+
+            /*	===============================
+                Functions defined in adapter.js
+                =============================== */
+
+            /**
+             * Helper function that looks for first free TCP port starting with the given one.
+             * @param port - The port to start with
+             * @param callback - gets called when a free port is found
+             */
+            getPort(port: number, callback: (port: number) => void): void;
+
+            /** Stops the adapter. Note: Is not always defined. */
+            stop?: () => void;
+
+            // ==============================
+            // GENERAL
+
+            /** Validates username and password */
+            checkPassword(user: string, password: string, callback: (result: boolean) => void): void;
+            checkPassword(user: string, password: string, options: any, callback: (result: boolean) => void): void;
+            /** Sets a new password for the given user */
+            setPassword(user: string, password: string, options?: any, callback?: (err?: any) => void): void;
+            /** <INTERNAL> Checks if a user exists and is in the given group. */
+            checkGroup(user: string, group: string, callback: (result: boolean) => void): void;
+            checkGroup(user: string, group: string, options: any, callback: (result: boolean) => void): void;
+            /** <INTERNAL> Determines the users permissions */
+            calculatePermissions(user: string, commandsPermissions: CommandsPermissions, callback: (result: PermissionSet) => void): void;
+            calculatePermissions(user: string, commandsPermissions: CommandsPermissions, options: any, callback: (result: PermissionSet) => void): void;
+            /** Returns SSL certificates by name (private key, public cert and chained certificate) for creation of HTTPS servers */
+            getCertificates(publicName: string, privateName: string, chainedName: string, callback: (err: string | null, certs?: Certificates, useLetsEncryptCert?: boolean) => void): void;
+
+            /**
+             * Sends a message to a specific instance or all instances of some specific adapter.
+             * @param instanceName The instance to send this message to.
+             * If the ID of an instance is given (e.g. "admin.0"), only this instance will receive the message.
+             * If the name of an adapter is given (e.g. "admin"), all instances of this adapter will receive it.
+             * @param command (optional) Command name of the target instance. Default: "send"
+             * @param message The message (e.g. params) to send.
+             */
+            sendTo(instanceName: string, message: string | object, callback?: MessageCallback | MessageCallbackInfo): void;
+            sendTo(instanceName: string, command: string, message: string | object, callback?: MessageCallback | MessageCallbackInfo): void;
+
+            /**
+             * Sends a message to a specific host or all hosts.
+             */
+            sendToHost(hostName: string, message: string | object, callback?: MessageCallback | MessageCallbackInfo): void;
+            sendToHost(hostName: string, command: string, message: string | object, callback?: MessageCallback | MessageCallbackInfo): void;
+
+            /** Convert ID to {device: D, channel: C, state: S} */
+            idToDCS(id: string): {
+                device: string;
+                channel: string;
+                state: string;
+            };
+
+            // ==============================
+            // own objects
+
+            /** Reads an object from the object db */
+            getObject(id: string, callback: GetObjectCallback): void;
+            getObject(id: string, options: any, callback: GetObjectCallback): void;
+            /** Creates or overwrites an object in the object db */
+            setObject(id: string, obj: ioBroker.Object, options?: any, callback?: SetObjectCallback): void;
+            /** Creates an object in the object db. Existing objects are not overwritten. */
+            setObjectNotExists(id: string, obj: ioBroker.Object, options?: any, callback?: SetObjectCallback): void;
+            /** Get all states, channels and devices of this adapter */
+            getAdapterObjects(callback: (objects: Record<string, ioBroker.Object>) => void): void;
+            /** Extend an object and create it if it might not exist */
+            extendObject(id: string, objPart: PartialObject, options?: any, callback?: SetObjectCallback): void;
+            /**
+             * Deletes an object from the object db
+             * @param id - The id of the object without namespace
+             */
+            delObject(id: string, options?: any, callback?: ErrorCallback): void;
+
+            // ==============================
+            // foreign objects
+
+            // tslint:disable:unified-signatures
+            /** Reads an object (which might not belong to this adapter) from the object db */
+            getForeignObject(id: string, callback: GetObjectCallback): void;
+            getForeignObject(id: string, options: any, callback: GetObjectCallback): void;
+            /** Get foreign objects by pattern, by specific type and resolve their enums. */
+            getForeignObjects(pattern: string, callback: GetObjectsCallback): void;
+            getForeignObjects(pattern: string, options: any, callback: GetObjectsCallback): void;
+            getForeignObjects(pattern: string, type: ObjectType, callback: GetObjectsCallback): void;
+            getForeignObjects(pattern: string, type: ObjectType, enums: EnumList, callback: GetObjectsCallback): void;
+            getForeignObjects(pattern: string, type: ObjectType, options: any, callback: GetObjectsCallback): void;
+            getForeignObjects(pattern: string, type: ObjectType, enums: EnumList, options: any, callback: GetObjectsCallback): void;
+            /** Creates or overwrites an object (which might not belong to this adapter) in the object db */
+            setForeignObject(id: string, obj: ioBroker.Object, options?: any, callback?: SetObjectCallback): void;
+            /** Creates an object (which might not belong to this adapter) in the object db. Existing objects are not overwritten. */
+            setForeignObjectNotExists(id: string, obj: ioBroker.Object, options?: any, callback?: SetObjectCallback): void;
+            /** Extend an object (which might not belong to this adapter) and create it if it might not exist */
+            extendForeignObject(id: string, objPart: PartialObject, options?: any, callback?: SetObjectCallback): void;
+            // tslint:enable:unified-signatures
+            /**
+             * Finds an object by its ID or name
+             * @param type - common.type of the state
+             */
+            findForeignObject(idOrName: string, type: string, callback: FindObjectCallback): void;
+            findForeignObject(idOrName: string, type: string, options: any, callback: FindObjectCallback): void;
+            /**
+             * Deletes an object (which might not belong to this adapter) from the object db
+             * @param id - The id of the object including namespace
+             */
+            delForeignObject(id: string, options?: any, callback?: ErrorCallback): void;
+
+            // ==============================
+            // states
+            /** Writes a value into the states DB. */
+            setState(id: string, state: string | number | boolean | State | Partial<State>, ack?: boolean, options?: any, callback?: SetStateCallback): void;
+            /** Writes a value into the states DB only if it has changed. */
+            setStateChanged(id: string, state: string | number | boolean | State | Partial<State>, ack?: boolean, options?: any, callback?: SetStateChangedCallback): void;
+            /** Writes a value (which might not belong to this adapter) into the states DB. */
+            setForeignState(id: string, state: string | number | boolean | State | Partial<State>, ack?: boolean, options?: any, callback?: SetStateCallback): void;
+            /** Writes a value (which might not belong to this adapter) into the states DB only if it has changed. */
+            setForeignStateChanged(id: string, state: string | number | boolean | State | Partial<State>, ack?: boolean, options?: any, callback?: SetStateChangedCallback): void;
+
+            /** Read a value from the states DB. */
+            getState(id: string, callback: GetStateCallback): void;
+            getState(id: string, options: any, callback: GetStateCallback): void;
+            /** Read a value (which might not belong to this adapter) from the states DB. */
+            getForeignState(id: string, callback: GetStateCallback): void;
+            getForeignState(id: string, options: any, callback: GetStateCallback): void;
+            /** Read all states of this adapter which match the given pattern */
+            getStates(pattern: string, callback: GetStatesCallback): void;
+            getStates(pattern: string, options: any, callback: GetStatesCallback): void;
+            /** Read all states (which might not belong to this adapter) which match the given pattern */
+            getForeignStates(pattern: string, callback: GetStatesCallback): void;
+            getForeignStates(pattern: string, options: any, callback: GetStatesCallback): void;
+
+            /** Deletes a state from the states DB, but not the associated object. Consider using @link{deleteState} instead */
+            delState(id: string, options?: any, callback?: ErrorCallback): void;
+            /** Deletes a state from the states DB, but not the associated object */
+            delForeignState(id: string, options?: any, callback?: ErrorCallback): void;
+
+            getHistory(id: string, options: GetHistoryOptions, callback: GetHistoryCallback): void;
+
+            // MISSING:
+            // pushFifo and similar https://github.com/ioBroker/ioBroker.js-controller/blob/master/lib/adapter.js#L4105
+            // logRedirect https://github.com/ioBroker/ioBroker.js-controller/blob/master/lib/adapter.js#L4294
+            // requireLog https://github.com/ioBroker/ioBroker.js-controller/blob/master/lib/adapter.js#L4336
+            // processLog https://github.com/ioBroker/ioBroker.js-controller/blob/master/lib/adapter.js#L4360
+
+            /**
+             * Writes a binary state into Redis
+             * @param id The id of the state
+             * @param binary The data to be written
+             * @param options (optional) Some internal options.
+             * @param callback Is called when the operation has finished (successfully or not)
+             */
+            setBinaryState(id: string, binary: Buffer, callback: SetStateCallback): void;
+            setBinaryState(id: string, binary: Buffer, options: any, callback: SetStateCallback): void;
+            /**
+             * Reads a binary state from Redis
+             * @param id The id of the state
+             * @param options (optional) Some internal options.
+             * @param callback Is called when the operation has finished (successfully or not)
+             */
+            getBinaryState(id: string, callback: GetBinaryStateCallback): void;
+            getBinaryState(id: string, options: any, callback: GetBinaryStateCallback): void;
+
+            // ==============================
+            // enums
+
+            /** Returns the enum tree, filtered by the optional enum name */
+            getEnum(callback: GetEnumCallback): void;
+            getEnum(name: string, callback: GetEnumCallback): void;
+            getEnum(name: string, options: any, callback: GetEnumCallback): void;
+            getEnums(callback: GetEnumsCallback): void;
+            getEnums(enumList: EnumList, callback: GetEnumsCallback): void;
+            getEnums(enumList: EnumList, options: any, callback: GetEnumsCallback): void;
+
+            addChannelToEnum(enumName: string, addTo: string, parentDevice: string, channelName: string, options?: any, callback?: ErrorCallback): void;
+            deleteChannelFromEnum(enumName: string, parentDevice: string, channelName: string, options?: any, callback?: ErrorCallback): void;
+
+            addStateToEnum(enumName: string, addTo: string, parentDevice: string, parentChannel: string, stateName: string, options?: any, callback?: ErrorCallback): void;
+            deleteStateFromEnum(enumName: string, parentDevice: string, parentChannel: string, stateName: string, options?: any, callback?: ErrorCallback): void;
+
+            // ==============================
+            // subscriptions
+
+            /** Subscribe to changes of objects in this instance */
+            subscribeObjects(pattern: string, options?: any): void;
+            /** Subscribe to changes of objects (which might not belong to this adapter) */
+            subscribeForeignObjects(pattern: string, options?: any): void;
+            /** Unsubscribe from changes of objects in this instance */
+            unsubscribeObjects(pattern: string, options?: any): void;
+            /** Unsubscribe from changes of objects (which might not belong to this adapter) */
+            unsubscribeForeignObjects(pattern: string, options?: any): void;
+
+            /** Subscribe to changes of states in this instance */
+            subscribeStates(pattern: string, options?: any, callback?: ErrorCallback): void;
+            /** Subscribe to changes of states (which might not belong to this adapter) */
+            subscribeForeignStates(pattern: string, options?: any, callback?: ErrorCallback): void;
+            /**
+             * Subscribe from changes of states in this instance
+             * @param pattern - Must match the pattern used to subscribe
+             */
+            unsubscribeStates(pattern: string, options?: any, callback?: ErrorCallback): void;
+            /**
+             * Subscribe from changes of states (which might not belong to this adapter)
+             * @param pattern - Must match the pattern used to subscribe
+             */
+            unsubscribeForeignStates(pattern: string, options?: any, callback?: ErrorCallback): void;
+
+            // ==============================
+            // devices and channels
+
+            /** creates an object with type device */
+            createDevice(deviceName: string, common?: any, native?: any, options?: any, callback?: SetObjectCallback): void;
+            /** deletes a device, its channels and states */
+            deleteDevice(deviceName: string, options?: any, callback?: ErrorCallback): void;
+            /** gets the devices of this instance */
+
+            /** creates an object with type channel */
+            createChannel(parentDevice: string, channelName: string, roleOrCommon?: string | object, native?: any, options?: any, callback?: SetObjectCallback): void;
+            /** deletes a channel and its states */
+            deleteChannel(channelName: string, options?: any, callback?: ErrorCallback): void;
+            deleteChannel(parentDevice: string, channelName: string, options?: any, callback?: ErrorCallback): void;
+
+            /** creates a state and the corresponding object */
+            createState(parentDevice: string, parentChannel: string, stateName: string, roleOrCommon?: string | object, native?: any, options?: any, callback?: SetObjectCallback): void;
+            /** deletes a state */
+            deleteState(stateName: string, options?: any, callback?: ErrorCallback): void;
+            deleteState(parentChannel: string, stateName: string, options?: any, callback?: ErrorCallback): void;
+            deleteState(parentDevice: string, parentChannel: string, stateName: string, options?: any, callback?: ErrorCallback): void;
+
+            /**
+             * Returns a list of all devices in this adapter instance
+             * @param options (optional) Some internal options.
+             * @param callback Is called when the operation has finished (successfully or not)
+             */
+            getDevices(callback: GetObjectsCallback3<DeviceObject>): void;
+            getDevices(options: any, callback: GetObjectsCallback3<DeviceObject>): void;
+
+            /**
+             * Returns a list of all channels in this adapter instance
+             * @param parentDevice (optional) Name of the parent device to filter the channels by
+             * @param options (optional) Some internal options.
+             * @param callback Is called when the operation has finished (successfully or not)
+             */
+            getChannels(callback: GetObjectsCallback3<ChannelObject>): void;
+            getChannels(parentDevice: string | null, callback: GetObjectsCallback3<ChannelObject>): void;
+            getChannels(parentDevice: string | null, options: any, callback: GetObjectsCallback3<ChannelObject>): void;
+            /**
+             * Returns a list of all channels in this adapter instance
+             * @param parentDevice (optional) Name of the parent device to filter the channels by
+             * @param options (optional) Some internal options.
+             * @param callback Is called when the operation has finished (successfully or not)
+             */
+            getChannelsOf(callback: GetObjectsCallback3<ChannelObject>): void;
+            getChannelsOf(parentDevice: string | null, callback: GetObjectsCallback3<ChannelObject>): void;
+            getChannelsOf(parentDevice: string | null, options: any, callback: GetObjectsCallback3<ChannelObject>): void;
+
+            /**
+             * Returns a list of all states in this adapter instance
+             * @param parentDevice (optional) Name of the parent device to filter the channels by
+             * @param parentChannel (optional) Name of the parent channel to filter the channels by
+             * @param options (optional) Some internal options.
+             * @param callback Is called when the operation has finished (successfully or not)
+             */
+            getStatesOf(callback: GetObjectsCallback3<StateObject>): void;
+            getStatesOf(parentDevice: string | null, callback: GetObjectsCallback3<StateObject>): void;
+            getStatesOf(parentDevice: string | null, parentChannel: string | null, callback: GetObjectsCallback3<StateObject>): void;
+            getStatesOf(parentDevice: string | null, parentChannel: string | null, options: any, callback: GetObjectsCallback3<StateObject>): void;
+
+            // ==============================
+            // filesystem
+
+            /**
+             * reads the content of directory from DB for given adapter and path
+             * @param adapter - adapter name. If adapter name is null, default will be the name of the current adapter.
+             * @param path - path to direcory without adapter name. E.g. If you want to read "/vis.0/main/views.json", here must be "/main/views.json" and _adapter must be equal to "vis.0".
+             */
+            readDir(adapterName: string, path: string, callback: ReadDirCallback): void;
+            readDir(adapterName: string, path: string, options: any, callback: ReadDirCallback): void;
+            mkDir(adapterName: string, path: string, callback: ErrorCallback): void;
+            mkDir(adapterName: string, path: string, options: any, callback: ErrorCallback): void;
+
+            readFile(adapterName: string, path: string, callback: ReadFileCallback): void;
+            readFile(adapterName: string, path: string, options: any, callback: ReadFileCallback): void;
+            writeFile(adapterName: string, path: string, data: Buffer | string, callback: ErrorCallback): void;
+            // options see https://github.com/ioBroker/ioBroker.js-controller/blob/master/lib/objects/objectsInMemServer.js#L599
+            writeFile(adapterName: string, path: string, data: Buffer | string, options: any, callback: ErrorCallback): void;
+
+            delFile(adapterName: string, path: string, callback: ErrorCallback): void;
+            delFile(adapterName: string, path: string, options: any, callback: ErrorCallback): void;
+            unlink(adapterName: string, path: string, callback: ErrorCallback): void;
+            unlink(adapterName: string, path: string, options: any, callback: ErrorCallback): void;
+
+            rename(adapterName: string, oldName: string, newName: string, callback: ErrorCallback): void;
+            rename(adapterName: string, oldName: string, newName: string, options: any, callback: ErrorCallback): void;
+
+            /**
+             * Changes access rights of all files in the adapter directory
+             * @param adapter Name of the adapter instance, e.g. "admin.0". Defaults to the namespace of this adapter.
+             * @param path Pattern to match the file path against
+             * @param options Mode of the access change as a number or hexadecimal string
+             * @param callback Is called when the operation has finished (successfully or not)
+             */
+            chmodFile(adapter: string | null, path: string, options: { mode: number | string } | Record<string, any>, callback: ChownFileCallback): void;
+
+            // ==============================
+            // formatting
+
+            formatValue(value: number | string, format: any): string;
+            formatValue(value: number | string, decimals: number, format: any): string;
+            formatDate(dateObj: string | Date | number, format: string): string;
+            formatDate(dateObj: string | Date | number, isDuration: boolean | string, format: string): string;
+        } // end interface Adapter
+
+        type ObjectChangeHandler = (id: string, obj: ioBroker.Object) => void;
+        type StateChangeHandler = (id: string, obj: State) => void;
+        type MessageHandler = (obj: Message) => void;
+
+        type EmptyCallback = () => void;
+        type ErrorCallback = (err?: string) => void;
+        // TODO: Redefine callbacks as subclass of GenericCallback
+        type GenericCallback<T> = (err: string | null, result?: T) => void;
+
+        type SetObjectCallback = (err: string | null, obj: { id: string }) => void;
+        type GetObjectCallback = (err: string | null, obj: ioBroker.Object) => void;
+        type GetEnumCallback = (err: string | null, enums: Record<string, Enum>, requestedEnum: string) => void;
+        type GetEnumsCallback = (
+            err: string | null,
+            result: {
+                [groupName: string]: Record<string, Enum>,
+            },
+        ) => void;
+        type GetObjectsCallback = (err: string | null, objects: Record<string, ioBroker.Object>) => void;
+
+        type FindObjectCallback = (
+            /** If an error happened, this contains the message */
+            err: string | null,
+            /** If an object was found, this contains the ID */
+            id?: string,
+            /** If an object was found, this contains the common.name */
+            name?: string,
+        ) => void;
+
+        interface GetObjectsItem<T extends BaseObject> {
+            /** The ID of this object */
+            id: string;
+            /** A copy of the object from the DB */
+            value: T;
+        }
+        // This is a version used by GetDevices/GetChannelsOf/GetStatesOf
+        type GetObjectsCallback3<T extends BaseObject> = (err: string | null, result?: Array<GetObjectsItem<T>>) => void;
+
+        type GetStateCallback = (err: string | null, state: State) => void;
+        type GetStatesCallback = (err: string | null, states: Record<string, State>) => void;
+        /** Version of the callback used by States.getStates */
+        type GetStatesCallback2 = (err: string | null, states: State[]) => void;
+        type GetBinaryStateCallback = (err: string | null, state?: Buffer) => void;
+        type SetStateCallback = (err: string | null, id?: string) => void;
+        type SetStateChangedCallback = (err: string | null, id: string, notChanged: boolean) => void;
+        type DeleteStateCallback = (err: string | null, id?: string) => void;
+        type GetHistoryCallback = (err: string | null, result: Array<(State & { id?: string })>, step: number, sessionId?: string) => void;
+
+        /** Contains the return values of readDir */
+        interface ReadDirResult {
+            /** Name of the file or directory */
+            file: string;
+            /** File system stats */
+            stats: fs.Stats;
+            /** Whether this is a directory or a file */
+            isDir: boolean;
+            /** Access rights */
+            acl: EvaluatedFileACL;
+            /** Date of last modification */
+            modifiedAt: number;
+            /** Date of creation */
+            createdAt: number;
+        }
+        type ReadDirCallback = (err: string | null, entries?: ReadDirResult[]) => void;
+        type ReadFileCallback = (err: string | null, file?: Buffer | string, mimeType?: string) => void;
+
+        /** Contains the return values of chownFile */
+        interface ChownFileResult {
+            /** The parent directory of the processed file or directory */
+            path: string;
+            /** Name of the file or directory */
+            file: string;
+            /** File system stats */
+            stats: fs.Stats;
+            /** Whether this is a directory or a file */
+            isDir: boolean;
+            /** Access rights */
+            acl: FileACL;
+            /** Date of last modification */
+            modifiedAt: number;
+            /** Date of creation */
+            createdAt: number;
+        }
+        type ChownFileCallback = (err: string | null, entries?: ChownFileResult[], id?: string) => void;
+
+        /** Contains the return values of rm */
+        interface RmResult {
+            /** The parent directory of the deleted file or directory */
+            path: string;
+            /** The name of the deleted file or directory */
+            file: string;
+            /** Whether the deleted object was a directory or a file */
+            isDir: boolean;
+        }
+        type RmCallback = (err: string | null, entries?: RmResult[]) => void;
+
+        type GetUserGroupCallback = (objectsInstance: Objects, user: User, groups: UserGroup[], acl: ObjectPermissions) => void;
+
+        type ChownObjectCallback = (err: string | null, list?: ioBroker.Object[]) => void;
+
+        type GetConfigKeysCallback = (err: string | null, list?: string[]) => void;
+        // this is a version of the callback used by Objects.getObjects
+        type GetObjectsCallback2 = (err: string | null, objects?: Array<(ioBroker.Object | { err: string })>) => void;
+
+        interface GetObjectViewItem {
+            /** The ID of this object */
+            id: string;
+            /** A copy of the object from the DB or some aggregation result */
+            value: ioBroker.Object | {}; // TODO: find out how the non-Object return result looks like
+        }
+        type GetObjectViewCallback = (err: string | null, result?: { rows: GetObjectViewItem[] }) => void;
+
+        interface GetObjectListItem extends GetObjectViewItem {
+            /** A copy of the object */
+            value: ioBroker.Object;
+            /** The same as @link{value} */
+            doc: ioBroker.Object;
+        }
+        type GetObjectListCallback = (err: string | null, result?: { rows: GetObjectListItem[] }) => void;
+
+        type ExtendObjectCallback = (err: string | null, result?: { id: string, value: ioBroker.Object }, id?: string) => void;
+
+        type GetSessionCallback = (session: Session) => void;
+    } // end namespace ioBroker
 } // end declare global
diff --git a/types/iobroker/iobroker-tests.ts b/types/iobroker/iobroker-tests.ts
index e69de29bb2..c8b9f0d43e 100644
--- a/types/iobroker/iobroker-tests.ts
+++ b/types/iobroker/iobroker-tests.ts
@@ -0,0 +1,5 @@
+// Help! what to test here?
+
+declare const adapter: ioBroker.Adapter;
+
+adapter.setState("not.a.state", true);
diff --git a/types/iobroker/tsconfig.json b/types/iobroker/tsconfig.json
index 3388e650ec..5d7e32bdb6 100644
--- a/types/iobroker/tsconfig.json
+++ b/types/iobroker/tsconfig.json
@@ -7,6 +7,7 @@
         "noImplicitAny": true,
         "noImplicitThis": true,
         "strictNullChecks": true,
+        "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [
             "../"
diff --git a/types/iobroker/tslint.json b/types/iobroker/tslint.json
index 3db14f85ea..9a4b76fd9c 100644
--- a/types/iobroker/tslint.json
+++ b/types/iobroker/tslint.json
@@ -1 +1,8 @@
-{ "extends": "dtslint/dt.json" }
+{
+    "extends": "dtslint/dtslint.json",
+    "rules": {
+        // This package has its own type `Object` which is not equal to the global `Object` type
+        // To avoid any confusion, it is referenced as `ioBroker.Object` instead of just `Object`
+        "no-unnecessary-qualifier": false
+    }
+}

From 19d8ec03ecc29e6a6159156cb7868876b42593c2 Mon Sep 17 00:00:00 2001
From: "dominic.griesel" <d.griesel@gmx.net>
Date: Thu, 15 Nov 2018 12:05:20 +0100
Subject: [PATCH 272/836] Try fix tests

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

diff --git a/types/iobroker/index.d.ts b/types/iobroker/index.d.ts
index baa8424d9b..8e6976a991 100644
--- a/types/iobroker/index.d.ts
+++ b/types/iobroker/index.d.ts
@@ -1,12 +1,13 @@
-// Ambient type definitions for adapters for ioBroker
-// Note: This is not the definition for the package `iobroker`,
-// which is just an installer, not a library.
-// The definitions are based on ioBroker.js-controller v1.4.2
+// Type definitions for ioBroker adapters
 // Project: https://github.com/ioBroker/ioBroker
 // Definitions by: AlCalzone <https://github.com/AlCalzone>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
 
+// Note: This is not the definition for the package `iobroker`,
+// which is just an installer, not a library.
+// The definitions are based on ioBroker.js-controller v1.4.2
+
 /// <reference types="node" />
 import * as fs from "fs";
 

From 47bd9f8a70cfa53da16b6dbdb236ac508c0483e1 Mon Sep 17 00:00:00 2001
From: "dominic.griesel" <d.griesel@gmx.net>
Date: Thu, 15 Nov 2018 12:11:45 +0100
Subject: [PATCH 273/836] Try to fix tests again

---
 types/iobroker/index.d.ts  | 4 ++--
 types/iobroker/tslint.json | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/types/iobroker/index.d.ts b/types/iobroker/index.d.ts
index 8e6976a991..313d7e9718 100644
--- a/types/iobroker/index.d.ts
+++ b/types/iobroker/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for ioBroker adapters
+// Type definitions for ioBroker 1.4
 // Project: https://github.com/ioBroker/ioBroker
 // Definitions by: AlCalzone <https://github.com/AlCalzone>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -6,7 +6,7 @@
 
 // Note: This is not the definition for the package `iobroker`,
 // which is just an installer, not a library.
-// The definitions are based on ioBroker.js-controller v1.4.2
+// The definitions may change with updates to ioBroker.js-controller
 
 /// <reference types="node" />
 import * as fs from "fs";
diff --git a/types/iobroker/tslint.json b/types/iobroker/tslint.json
index 9a4b76fd9c..bdafdd99b4 100644
--- a/types/iobroker/tslint.json
+++ b/types/iobroker/tslint.json
@@ -1,5 +1,5 @@
 {
-    "extends": "dtslint/dtslint.json",
+    "extends": "dtslint/dt.json",
     "rules": {
         // This package has its own type `Object` which is not equal to the global `Object` type
         // To avoid any confusion, it is referenced as `ioBroker.Object` instead of just `Object`

From adace47dc209c52a74da1641206e7fbcea7023f7 Mon Sep 17 00:00:00 2001
From: Julian Strecker <julianstrecker@gmail.com>
Date: Sun, 25 Nov 2018 13:38:13 +0100
Subject: [PATCH 274/836] [three,physijs] fix tests to fullfill travis needs.

---
 types/physijs/test/collisions.ts              | 4 ++--
 types/physijs/test/vehicle.ts                 | 4 ++--
 types/three/test/css3d/css3d_periodictable.ts | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/types/physijs/test/collisions.ts b/types/physijs/test/collisions.ts
index 20493189e0..41f09e351d 100644
--- a/types/physijs/test/collisions.ts
+++ b/types/physijs/test/collisions.ts
@@ -90,7 +90,7 @@ spawnBox = (function() {
 
     var box_geometry = new THREE.BoxGeometry( 4, 4, 4 ),
         handleCollision = function( collided_with ) {
-            var target = <any>this;
+            var target = this as any;
             target.collisions = 0;
             switch (++target.collisions) {
 
@@ -168,4 +168,4 @@ render = function() {
     render_stats.update();
 };
 
-window.onload = initScene;
\ No newline at end of file
+window.onload = initScene;
diff --git a/types/physijs/test/vehicle.ts b/types/physijs/test/vehicle.ts
index b8643de3b0..37f32279a8 100644
--- a/types/physijs/test/vehicle.ts
+++ b/types/physijs/test/vehicle.ts
@@ -186,11 +186,11 @@ initScene = function() {
                 );
             }
 
-            input = <any>{
+            input = {
                 power: null,
                 direction: null,
                 steering: 0
-            };
+            } as any;
             document.addEventListener('keydown', function( ev ) {
                 switch ( ev.keyCode ) {
                     case 37: // left
diff --git a/types/three/test/css3d/css3d_periodictable.ts b/types/three/test/css3d/css3d_periodictable.ts
index 5c8cb68614..40a29a1ea5 100644
--- a/types/three/test/css3d/css3d_periodictable.ts
+++ b/types/three/test/css3d/css3d_periodictable.ts
@@ -181,8 +181,8 @@
             //
 
             var object = new THREE.Object3D();
-            object.position.x = (<number>table[i + 3] * 140) - 1330;
-            object.position.y = - (<number>table[i + 4] * 180) + 990;
+            object.position.x = ((table[i + 3] as number) * 140) - 1330;
+            object.position.y = - ((table[i + 4] as number) * 180) + 990;
 
             targets.table.push(object);
 
@@ -354,4 +354,4 @@
         renderer.render(scene, camera);
 
     }
-}
\ No newline at end of file
+}

From 3a4659d36dc86a41af8dfeb17a6d87ad890404b8 Mon Sep 17 00:00:00 2001
From: Kamontat Chantrachirathumrong <kamontat.c@hotmail.com>
Date: Sun, 25 Nov 2018 14:31:37 +0100
Subject: [PATCH 275/836] Update to version 3.0.2

---
 types/tabtab/index.d.ts | 152 +++++++++++++++++++++++++++-------------
 1 file changed, 103 insertions(+), 49 deletions(-)

diff --git a/types/tabtab/index.d.ts b/types/tabtab/index.d.ts
index eba5a58c3a..05291613b2 100644
--- a/types/tabtab/index.d.ts
+++ b/types/tabtab/index.d.ts
@@ -1,89 +1,143 @@
-// Type definitions for tabtab 0.0.4
+// Type definitions for tabtab 3.0.2
 // Project: https://github.com/mklabs/node-tabtab
 // Definitions by: Vojtěch Habarta <https://github.com/vojtechhabarta>
+//                 Kamontat Chantrachirathumrong <https://github.com/kamontat>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-
+// TypeScript Version: 2.0
 
 /**
- * Main completion method, has support for installation and actual completion.
- * @param name Name of the command to complete.
- * @param cb Get called when a tab-completion command happens.
+ * Install option
+ *
+ * @param name is a name of the cli command
+ * @param completer Somethings, you want to complete another program that's where the `completer` option might come handy.
  */
-export declare function complete(name: string, cb: CallBack): void;
+export type InstallOption = {
+    name: string;
+    completer: string;
+};
 
 /**
- * Main completion method, has support for installation and actual completion.
- * @param name Name of the command to complete.
- * @param completer Name of the command to call on completion.
- * @param cb Get called when a tab-completion command happens.
+ * Uninstall option
+ *
+ * @param name is a name of the cli command
  */
-export declare function complete(name: string, completer: string, cb: CallBack): void;
+export type UninstallOption = {
+    name: string;
+};
 
 /**
- * Simple helper function to know if the script is run in the context of a completion command.
+ * This type represent object (Json object)
  */
-export declare function isComplete(): boolean;
+export type Json = {
+    [key: string]: string;
+};
 
 /**
- * Helper to return the list of short and long options, parsed from the usual --help output of a command (cake/rake -H, vagrant, commander -h, optimist.help(), ...).
+ * Tabtab environment data that return from {@link parseEnv} method
+ *
+ *   @param complete    A Boolean indicating whether we act in "plumbing mode" or not
+ *   @param words       The Number of words in the completed line
+ *   @param point       A Number indicating cursor position
+ *   @param line        The String input line
+ *   @param partial     The String part of line preceding cursor position
+ *   @param last        The last String word of the line
+ *   @param lastPartial The last word String of partial
+ *   @param prev        The String word preceding last
  */
-export declare function parseOut(str: string): { shorts: string[]; longs: string[] };
-
-/**
- * Same purpose as parseOut, but for parsing tasks from an help command (cake/rake -T, vagrant, etc.).
- */
-export declare function parseTasks(str: string, prefix: string, reg?: RegExp | string): string[];
-
-/**
- * Helper to return completion output and log to standard output.
- * @param values Array of values to complete against.
- * @param data The data object returned by the complete callback, used mainly to filter results accordingly upon the text that is supplied by the user.
- * @param prefix A prefix to add to the completion results, useful for options to add dashes (eg. - or --).
- */
-export declare function log(values: string[], data: Data, prefix?: string): void;
-
-interface CallBack {
-    (error?: Error, data?: Data, text?: string): any;
-}
-
-/**
- * Holds interesting values to drive the output of the completion.
- */
-interface Data {
-
+export type TabtabEnv = {
     /**
-     * full command being completed
+     * A Boolean indicating whether we act in "plumbing mode" or not
      */
-    line: string;
+    complete: boolean;
 
     /**
-     * number of words
+     * The Number of words in the completed line
      */
     words: number;
 
     /**
-     * cursor position
+     * A Number indicating cursor position
      */
     point: number;
 
     /**
-     * tabing in the middle of a word: foo bar baz bar foobarrrrrrr
+     * The String input line
+     */
+    line: string;
+
+    /**
+     * The String part of line preceding cursor position
      */
     partial: string;
 
     /**
-     * last word of the line
+     * The last String word of the line
      */
     last: string;
 
     /**
-     * last partial of the line
+     * The last word String of partial
      */
     lastPartial: string;
-
     /**
-     * the previous word
+     * The String word preceding last
      */
     prev: string;
-}
+};
+
+/**
+ * this is a item to show when completion enable,
+ *
+ * @param name usually is a subcommand name or option name
+ * @param description this is a optional description of the completion
+ */
+export type CompleteItem = {
+    name: string;
+    description?: string;
+};
+
+export type CompleteItemOrString = string | CompleteItem;
+
+/**
+ * Install and enable completion on user system.
+ *
+ * @param option install option
+ *
+ */
+export function install(option: InstallOption): Promise<void>;
+
+/**
+ * Uninstall and remove all completion on user system
+ *
+ * @param option uninstall option
+ */
+export function uninstall(option: UninstallOption): Promise<void>;
+
+/**
+ * Public: Main utility to extract information from command line arguments and
+ * Environment variables, namely COMP args in "plumbing" mode.
+ *
+ * @param env environment (usually will be process.env)
+ * @returns env is a object of completion environment
+ *
+ * @example
+ * const env = tabtab.parseEnv(process.env);
+ */
+export function parseEnv(env: Json): TabtabEnv;
+
+/**
+ * Helper to normalize String and Objects when logging out.
+ */
+export function completionItem(item: CompleteItemOrString): CompleteItem;
+
+/**
+ * Main logging utility to pass completion items.
+ * This is simply an helper to log to stdout with each item separated by a new
+ * line.
+ *
+ * Bash needs in addition to filter out the args for the completion to work
+ * (zsh, fish don't need this).
+ *
+ * @param args Strings or Objects with name and description property.
+ */
+export function log(args: string[] | CompleteItem[] | CompleteItemOrString[]): void;

From 8b982e49c565d136473bd3f794837e2374b2136a Mon Sep 17 00:00:00 2001
From: Kamontat Chantrachirathumrong <kamontat.c@hotmail.com>
Date: Sun, 25 Nov 2018 14:33:34 +0100
Subject: [PATCH 276/836] Update test define file

---
 types/tabtab/tabtab-tests.ts | 99 +++++++++++++++++++++++++++---------
 1 file changed, 76 insertions(+), 23 deletions(-)

diff --git a/types/tabtab/tabtab-tests.ts b/types/tabtab/tabtab-tests.ts
index e0187662ff..7f8e5b4b9c 100644
--- a/types/tabtab/tabtab-tests.ts
+++ b/types/tabtab/tabtab-tests.ts
@@ -1,30 +1,83 @@
-
 /// <reference types="node" />
 
-import tabtab = require('tabtab');
-import child_process = require('child_process');
-import string_decoder = require('string_decoder');
+import { install, log, TabtabEnv, uninstall, parseEnv } from "tabtab";
 
-if (process.argv.slice(2)[0] === 'completion') {
-    tabtab.complete('pkgname', function(err, data) {
-        if (err || !data) return;
-        if (/^--\w?/.test(data.last)) return tabtab.log(['help', 'version'], data, '--');
-        if (/^-\w?/.test(data.last)) return tabtab.log(['n', 'o', 'd', 'e'], data, '-');
-        tabtab.log(['list', 'of', 'commands'], data);
+const opts = require("minimist")(process.argv.slice(2), {
+    string: ["foo", "bar"],
+    boolean: ["help", "version", "loglevel"]
+});
 
-        child_process.exec('rake -H', {encoding: null}, function(err, stdout, stderr) {
-            if (err) return;
-            var decoder = new string_decoder.StringDecoder('utf8');
-            var parsed = tabtab.parseOut(decoder.write(stdout));
-            if (/^--\w?/.test(data.last)) return tabtab.log(parsed.longs, data, '--');
-            if (/^-\w?/.test(data.last)) return tabtab.log(parsed.shorts, data, '-');
+const args = opts._;
+
+const completion = (env: TabtabEnv) => {
+    if (!env.complete) return;
+
+    // Write your completions there
+
+    if (env.prev === "foo") {
+        return log(["is", "this", "the", "real", "life"]);
+    }
+
+    if (env.prev === "bar") {
+        return log(["is", "this", "just", "fantasy"]);
+    }
+
+    if (env.prev === "--loglevel") {
+        return log(["error", "warn", "info", "notice", "verbose"]);
+    }
+
+    return log([
+        "--help",
+        "--version",
+        "--loglevel",
+        "foo",
+        "bar",
+        "install-completion",
+        "completion",
+        "someCommand:someCommand is some kind of command with a description",
+        {
+            name: "someOtherCommand:hey",
+            description: 'You must add a description for items with ":" in them'
+        },
+        "anotherOne"
+    ]);
+};
+
+const run = (): Promise<void> => {
+    const cmd = args[0];
+
+    // Write your CLI there
+
+    // Here we install for the program `tabtab-test` (this file), with
+    // completer being the same program. Sometimes, you want to complete
+    // another program that's where the `completer` option might come handy.
+    if (cmd === "install-completion") {
+        return install({
+            name: "tabtab-test",
+            completer: "tabtab-test"
         });
+    }
 
-        child_process.exec('cake', {encoding: null}, function(err, stdout, stderr) {
-            if (err) return;
-            var decoder = new string_decoder.StringDecoder('utf8');
-            var tasks = tabtab.parseTasks(decoder.write(stdout), 'cake');
-            tabtab.log(tasks, data);
+    if (cmd === "uninstall-completion") {
+        // Here we uninstall for the program `tabtab-test` (this file).
+        return uninstall({
+            name: "tabtab-test"
         });
-    });
-}
+    }
+
+    // The completion command is added automatically by tabtab when the program
+    // is completed.
+    if (cmd === "completion") {
+        return new Promise<void>(res => {
+            const env = parseEnv(process.env);
+            completion(env);
+            res();
+        });
+    }
+
+    return new Promise<void>((_, rej) => rej());
+};
+
+run().catch(e => {
+    console.error(e);
+});

From 28cec6d7e832384d8e93596e6b723ea179d8d84f Mon Sep 17 00:00:00 2001
From: Dimitri Benin <dimitri.benin@gmail.com>
Date: Sun, 25 Nov 2018 15:02:24 +0100
Subject: [PATCH 277/836] Add types for iri

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

diff --git a/types/iri/index.d.ts b/types/iri/index.d.ts
new file mode 100644
index 0000000000..93183bcfad
--- /dev/null
+++ b/types/iri/index.d.ts
@@ -0,0 +1,89 @@
+// Type definitions for iri 1.3
+// Project: https://github.com/awwright/node-iri
+// Definitions by: BendingBender <https://github.com/BendingBender>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export class IRI {
+    /**
+     * The constructor takes a single argument, a URI or IRI string:
+     */
+    constructor(iri: string);
+    /**
+     * Returns UTF-16 IRI
+     */
+    toString(): string;
+    /**
+     * Returns the IRI without the fragment component. Useful for dereferencing URLs on a network.
+     */
+    defrag(): IRI;
+    /**
+     * IRIs with a fragment are not absolute.
+     */
+    isAbsolute(): boolean;
+    /**
+     * Resolves the IRI against itself, having the effect of stripping the fragment and checking that the supplied IRI is valid (absolute).
+     */
+    toAbsolute(): IRI;
+    /**
+     * Resolves the IRI against itself, having the effect of stripping the fragment and checking that the supplied IRI is valid (absolute).
+     */
+    authority(): string | null;
+    /**
+     * Returns the fragment component of the IRI.
+     */
+    fragment(): string | null;
+    /**
+     * Returns the hier-part of the IRI, the hierarchial component: Everything between the scheme and query, including leading `//` for the host, if it exists.
+     */
+    hierpart(): string;
+    /**
+     * Returns the host component of the URI, either a domain name or string-formatted IP address. Excludes port number and username/password.
+     */
+    host(): string;
+    /**
+     * Returns the path component of the hier-part. Does not include the authority/host, query, or fragment.
+     */
+    path(): string;
+    /**
+     * Returns the port component of the authority as a string, or `null` if there is no port.
+     */
+    port(): string | null;
+    /**
+     * Returns the query component of the IRI including leading "?", or `null` if there is no query component.
+     */
+    query(): string | null;
+    /**
+     * Resolve the provided URI/IRI reference against this IRI.
+     */
+    resolveReference(ref: string | IRI): IRI;
+    /**
+     * Returns the scheme of the IRI, e.g. "https", "file", or "urn".
+     */
+    scheme(): string | null;
+    /**
+     * Returns the username/password component of the IRI.
+     */
+    userinfo(): string | null;
+    /**
+     * Returns a URI formatted string with only 7-bit characters.
+     */
+    toURIString(): string;
+    /**
+     * Decodes URI-encoded UTF-8 characters and returns a unicode string (Strings in ECMAScript/JavaScript are UTF-16).
+     */
+    toIRIString(): string;
+    /**
+     * Returns a new IRI object with URI-encoded UTF-8 characters decoded.
+     */
+    toIRI(): IRI;
+}
+
+/**
+ * Returns an iri.IRI object with UTF-8 escaped characterd decoded.
+ */
+export function fromURI(uri: string): IRI;
+
+/**
+ * Returns an IRI string decoded from the given URI.
+ */
+export function toIRIString(uri: string): string;
diff --git a/types/iri/iri-tests.ts b/types/iri/iri-tests.ts
new file mode 100644
index 0000000000..97a460e02c
--- /dev/null
+++ b/types/iri/iri-tests.ts
@@ -0,0 +1,43 @@
+import { IRI, fromURI, toIRIString } from 'iri';
+
+const iri = new IRI('iri');
+// $ExpectType string
+iri.toString();
+// $ExpectType IRI
+iri.defrag();
+// $ExpectType boolean
+iri.isAbsolute();
+// $ExpectType IRI
+iri.toAbsolute();
+// $ExpectType string | null
+iri.authority();
+// $ExpectType string | null
+iri.fragment();
+// $ExpectType string
+iri.hierpart();
+// $ExpectType string
+iri.host();
+// $ExpectType string
+iri.path();
+// $ExpectType string | null
+iri.port();
+// $ExpectType string | null
+iri.query();
+// $ExpectType IRI
+iri.resolveReference('ref');
+iri.resolveReference(iri);
+// $ExpectType string | null
+iri.scheme();
+// $ExpectType string | null
+iri.userinfo();
+// $ExpectType string
+iri.toURIString();
+// $ExpectType string
+iri.toIRIString();
+// $ExpectType IRI
+iri.toIRI();
+
+// $ExpectType IRI
+fromURI('u');
+// $ExpectType string
+toIRIString('u');
diff --git a/types/iri/tsconfig.json b/types/iri/tsconfig.json
new file mode 100644
index 0000000000..09b1e0069e
--- /dev/null
+++ b/types/iri/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "iri-tests.ts"
+    ]
+}
diff --git a/types/iri/tslint.json b/types/iri/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/iri/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From e80e44b0f032fc4a70d6e4d05354a6e53fb9089b Mon Sep 17 00:00:00 2001
From: Dimitri Benin <dimitri.benin@gmail.com>
Date: Wed, 21 Nov 2018 01:06:14 +0100
Subject: [PATCH 278/836] Update types for @xmpp/jid

---
 types/xmpp__jid/index.d.ts         | 84 ++++++++++++++++--------------
 types/xmpp__jid/xmpp__jid-tests.ts | 55 ++++++++++---------
 2 files changed, 73 insertions(+), 66 deletions(-)

diff --git a/types/xmpp__jid/index.d.ts b/types/xmpp__jid/index.d.ts
index f3f5bcc485..51b19051f1 100644
--- a/types/xmpp__jid/index.d.ts
+++ b/types/xmpp__jid/index.d.ts
@@ -1,55 +1,63 @@
-// Type definitions for @xmpp/jid 0.0
+// Type definitions for @xmpp/jid 0.6
 // Project: https://github.com/node-xmpp/node-xmpp/
 // Definitions by: PJakcson <https://github.com/PJakcson>
+//                 BendingBender <https://github.com/BendingBender>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
 
-export function createJID(local: string, domain: string, resource: string): JID;
-export function equal(a: JID, b: JID): boolean;
-export function is(a: any): boolean;
+export = jid;
 
-/**
- * Created by marcneumann on 17.02.17.
- */
-export class JID {
-    local: string;
-    domain: string;
-    resource: string;
+declare function jid(address: string): jid.JID;
+declare function jid(local: string | undefined, domain: string, resource?: string): jid.JID;
 
-    constructor(local: string, domain?: string, resource?: string);
+declare namespace jid {
+    function jid(address: string): JID;
+    function jid(local: string | undefined, domain: string, resource?: string): JID;
 
-    parseJID(jid: string): void;
+    function createJID(local: string | undefined, domain: string, resource?: string): JID;
+    function equal(a: JID, b: JID): boolean;
+    function detectEscape(local?: string): boolean;
+    function escapeLocal(local: string): string;
+    function unescapeLocal(local: string): string;
+    function parse(s: string): JID;
 
-    toString(unescape?: any): string;
+    class JID {
+        local: string;
+        domain: string;
+        resource: string;
 
-    /**
-     * Convenience method to distinguish users
-     */
-    bare(): JID;
+        constructor(local: string | undefined, domain: string, resource?: string);
 
-    /**
-     * Comparison function
-     */
-    equals(other: JID): boolean;
+        toString(unescape?: boolean): string;
 
-    /**
-     * http://xmpp.org/rfcs/rfc6122.html#addressing-localpart
-     */
-    setLocal(local: string, escape?: any): void;
+        /**
+         * Convenience method to distinguish users
+         */
+        bare(): JID;
 
-    getLocal(unescape?: any): string;
+        /**
+         * Comparison function
+         */
+        equals(other: JID): boolean;
 
-    /**
-     * http://xmpp.org/rfcs/rfc6122.html#addressing-domain
-     */
-    setDomain(value: string): void;
+        /**
+         * http://xmpp.org/rfcs/rfc6122.html#addressing-localpart
+         */
+        setLocal(local: string, escape?: boolean): void;
 
-    getDomain(): string;
+        getLocal(unescape?: boolean): string;
 
-    /**
-     * http://xmpp.org/rfcs/rfc6122.html#addressing-resourcepart
-     */
-    setResource(value: string): void;
+        /**
+         * http://xmpp.org/rfcs/rfc6122.html#addressing-domain
+         */
+        setDomain(value: string): void;
 
-    getResource(): string;
+        getDomain(): string;
+
+        /**
+         * http://xmpp.org/rfcs/rfc6122.html#addressing-resourcepart
+         */
+        setResource(value: string): void;
+
+        getResource(): string;
+    }
 }
diff --git a/types/xmpp__jid/xmpp__jid-tests.ts b/types/xmpp__jid/xmpp__jid-tests.ts
index d26ede9a15..4a79d5849f 100644
--- a/types/xmpp__jid/xmpp__jid-tests.ts
+++ b/types/xmpp__jid/xmpp__jid-tests.ts
@@ -1,40 +1,39 @@
-import { JID } from '@xmpp/jid';
+import jid = require('@xmpp/jid');
 
-/*
- * All return an instance of JID.JID, the new operator is optional.
- */
-let addr = new JID('alice@wonderland.net/rabbithole');          // OK
-addr = new JID('alice', 'wonderland.net', 'rabbithole');    // BEST; see section on escaping below
+let addr: jid.JID;
+let str: string;
+let bool: boolean;
+
+addr = jid('alice@wonderland.net/rabbithole');
+addr = jid('alice', 'wonderland.net', 'rabbithole');
 
-/*
- * local
- */
 addr.local = 'alice';
-addr.local;      // alice
-// same as
+str = addr.local;
 addr.setLocal('alice');
-addr.getLocal(); // alice
+addr.setLocal('alice', true);
+str = addr.getLocal();
 
-/*
- * domain
- */
 addr.domain = 'wonderland.net';
-addr.domain;      // wonderland.net
-// same as
+str = addr.domain;
 addr.setDomain('wonderland.net');
-addr.getDomain(); // wonderland.net
+str = addr.getDomain();
 
-/*
- * resource
- */
 addr.resource = 'rabbithole';
-addr.resource;      // rabbithole
-// same as
+str = addr.resource;
 addr.setResource('rabbithole');
-addr.getResource(); // rabbithole
+str = addr.getResource();
 
-addr.toString(); // alice@wonderland.net/rabbithole
-addr.bare();     // returns a JID without resource
+str = addr.toString();
+str = addr.toString(true);
+addr = addr.bare();
 
-const some_jid = new JID('is', 'a', 'test');
-addr.equals(some_jid); // returns true if the two JIDs are equal, false otherwise
+bool = addr.equals(addr);
+
+bool = jid.equal(addr, addr);
+
+addr = jid.createJID('my', 'homies');
+bool = jid.equal(addr, addr);
+bool = jid.detectEscape('homies');
+str = jid.escapeLocal('homies');
+str = jid.unescapeLocal('homies');
+addr = jid.parse('homies');

From 26b7fc9609d7edea4b1b50f9cc1a9f28f22bc1ef Mon Sep 17 00:00:00 2001
From: Al Calzone <d.griesel@gmx.net>
Date: Sun, 25 Nov 2018 16:00:57 +0100
Subject: [PATCH 279/836] Update ioBroker typings and tests

* Replace any with unknown in many places
* Add several overloads
* Add tests
---
 types/iobroker/index.d.ts        | 256 ++++++++++++++++++-------------
 types/iobroker/iobroker-tests.ts | 200 +++++++++++++++++++++++-
 2 files changed, 350 insertions(+), 106 deletions(-)

diff --git a/types/iobroker/index.d.ts b/types/iobroker/index.d.ts
index 313d7e9718..cee6ce75a6 100644
--- a/types/iobroker/index.d.ts
+++ b/types/iobroker/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/ioBroker/ioBroker
 // Definitions by: AlCalzone <https://github.com/AlCalzone>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 3.0
 
 // Note: This is not the definition for the package `iobroker`,
 // which is just an installer, not a library.
@@ -307,7 +307,7 @@ declare global {
 
         interface BaseObject {
             /** The ID of this object */
-            _id?: string;
+            _id: string;
             native: Record<string, any>;
             enums?: Record<string, string>;
             type: string; // specified in the derived interfaces
@@ -350,6 +350,11 @@ declare global {
         }
 
         type Object = StateObject | ChannelObject | DeviceObject | OtherObject;
+        // In set[Foreign]Object[NotExists] methods, the ID and acl of the object is optional
+        interface SettableObject extends Pick<ioBroker.Object, Exclude<keyof ioBroker.Object, "_id" | "acl">> {
+            _id?: ioBroker.Object["_id"];
+            acl?: ioBroker.Object["acl"];
+        }
         type PartialObject = PartialStateObject | PartialChannelObject | PartialDeviceObject | PartialOtherObject;
 
         /** Defines access rights for a single file */
@@ -519,7 +524,7 @@ declare global {
              * @param callback Is called when the operation has finished (successfully or not)
              */
             writeFile(id: string, name: string, data: Buffer | string, callback: ErrorCallback): void;
-            writeFile(id: string, name: string, data: Buffer | string, options: string | {}, callback: ErrorCallback): void;
+            writeFile(id: string, name: string, data: Buffer | string, options: string | unknown, callback: ErrorCallback): void;
 
             /**
              * Reads a file.
@@ -529,7 +534,7 @@ declare global {
              * @param callback Is called when the operation has finished (successfully or not)
              */
             readFile(id: string, name: string, callback: ReadFileCallback): void;
-            readFile(id: string, name: string, options: any, callback: ReadFileCallback): void;
+            readFile(id: string, name: string, options: unknown, callback: ReadFileCallback): void;
 
             /**
              * Deletes a file.
@@ -539,7 +544,7 @@ declare global {
              * @param callback Is called when the operation has finished (successfully or not)
              */
             unlink(id: string, name: string, callback: ErrorCallback): void;
-            unlink(id: string, name: string, options: any, callback: ErrorCallback): void;
+            unlink(id: string, name: string, options: unknown, callback: ErrorCallback): void;
             /**
              * Deletes a file.
              * @param id Name of the root directory. This should be the adapter instance, e.g. "admin.0"
@@ -548,7 +553,7 @@ declare global {
              * @param callback Is called when the operation has finished (successfully or not)
              */
             delFile(id: string, name: string, callback: ErrorCallback): void;
-            delFile(id: string, name: string, options: any, callback: ErrorCallback): void;
+            delFile(id: string, name: string, options: unknown, callback: ErrorCallback): void;
 
             /**
              * Finds all files and directories starting with <name>
@@ -558,7 +563,7 @@ declare global {
              * @param callback Is called when the operation has finished (successfully or not)
              */
             readDir(id: string, name: string, callback: ReadDirCallback): void;
-            readDir(id: string, name: string, options: any, callback: ReadDirCallback): void;
+            readDir(id: string, name: string, options: unknown, callback: ReadDirCallback): void;
 
             /**
              * Renames a file or directory
@@ -569,7 +574,7 @@ declare global {
              * @param callback Is called when the operation has finished (successfully or not)
              */
             rename(id: string, oldName: string, newName: string, callback: ErrorCallback): void;
-            rename(id: string, oldName: string, newName: string, options: any, callback: ErrorCallback): void;
+            rename(id: string, oldName: string, newName: string, options: unknown, callback: ErrorCallback): void;
 
             /**
              * Creates an empty file with the given name
@@ -579,7 +584,7 @@ declare global {
              * @param callback Is called when the operation has finished (successfully or not)
              */
             touch(id: string, name: string, callback: ErrorCallback): void;
-            touch(id: string, name: string, options: any, callback: ErrorCallback): void;
+            touch(id: string, name: string, options: unknown, callback: ErrorCallback): void;
 
             /**
              * Deletes all files in the root directory matching <name>
@@ -589,7 +594,7 @@ declare global {
              * @param callback Is called when the operation has finished (successfully or not)
              */
             rm(id: string, name: string, callback: RmCallback): void;
-            rm(id: string, name: string, options: any, callback: RmCallback): void;
+            rm(id: string, name: string, options: unknown, callback: RmCallback): void;
 
             /**
              * Creates an empty directory with the given name
@@ -599,7 +604,7 @@ declare global {
              * @param callback Is called when the operation has finished (successfully or not)
              */
             mkDir(id: string, name: string, callback: ErrorCallback): void;
-            mkDir(id: string, name: string, options: any, callback: ErrorCallback): void;
+            mkDir(id: string, name: string, options: unknown, callback: ErrorCallback): void;
 
             /**
              * Takes possession all files in the root directory matching <name>
@@ -609,7 +614,7 @@ declare global {
              * @param callback Is called when the operation has finished (successfully or not)
              */
             chownFile(id: string, name: string, callback: ChownFileCallback): void;
-            chownFile(id: string, name: string, options: any, callback: ChownFileCallback): void;
+            chownFile(id: string, name: string, options: unknown, callback: ChownFileCallback): void;
 
             /**
              * Changes access rights of all files in the root directory matching <name>
@@ -628,26 +633,26 @@ declare global {
              * @param pattern The pattern to match against
              */
             subscribeConfig(pattern: string, callback: EmptyCallback): void;
-            subscribeConfig(pattern: string, options: any, callback: EmptyCallback): void;
+            subscribeConfig(pattern: string, options: unknown, callback: EmptyCallback): void;
             /**
              * Subscribe to object changes
              * @param pattern The pattern to match against
              */
             subscribe(pattern: string, callback: EmptyCallback): void;
-            subscribe(pattern: string, options: any, callback: EmptyCallback): void;
+            subscribe(pattern: string, options: unknown, callback: EmptyCallback): void;
 
             /**
              * Unsubscribe from object changes
              * @param pattern The pattern to match against
              */
             unsubscribeConfig(pattern: string, callback: EmptyCallback): void;
-            unsubscribeConfig(pattern: string, options: any, callback: EmptyCallback): void;
+            unsubscribeConfig(pattern: string, options: unknown, callback: EmptyCallback): void;
             /**
              * Unsubscribe from object changes
              * @param pattern The pattern to match against
              */
             unsubscribe(pattern: string, callback: EmptyCallback): void;
-            unsubscribe(pattern: string, options: any, callback: EmptyCallback): void;
+            unsubscribe(pattern: string, options: unknown, callback: EmptyCallback): void;
 
             /**
              * Takes possession of all objects matching <pattern>
@@ -656,7 +661,7 @@ declare global {
              * @param callback Is called when the operation has finished (successfully or not)
              */
             chownObject(pattern: string, callback: ChownObjectCallback): void;
-            chownObject(pattern: string, options: any, callback: ChownObjectCallback): void;
+            chownObject(pattern: string, options: unknown, callback: ChownObjectCallback): void;
 
             /**
              * Changes access rights of all objects matching <pattern>
@@ -665,7 +670,7 @@ declare global {
              * @param callback Is called when the operation has finished (successfully or not)
              */
             chmodObject(pattern: string, callback: ChownObjectCallback): void;
-            chmodObject(pattern: string, options: any, callback: ChownObjectCallback): void;
+            chmodObject(pattern: string, options: unknown, callback: ChownObjectCallback): void;
 
             /**
              * Retrieves a copy of the object with the given ID
@@ -674,7 +679,7 @@ declare global {
              * @param callback Is called when the operation has finished (successfully or not)
              */
             getObject(id: string, callback: GetObjectCallback): void;
-            getObject(id: string, options: any, callback: GetObjectCallback): void;
+            getObject(id: string, options: unknown, callback: GetObjectCallback): void;
             /**
              * Retrieves a copy of the object with the given ID
              * @param id Id of the object to find
@@ -682,7 +687,7 @@ declare global {
              * @param callback Is called when the operation has finished (successfully or not)
              */
             getConfig(id: string, callback: GetObjectCallback): void;
-            getConfig(id: string, options: any, callback: GetObjectCallback): void;
+            getConfig(id: string, options: unknown, callback: GetObjectCallback): void;
 
             /**
              * Returns a list of config keys matching <pattern>
@@ -692,7 +697,7 @@ declare global {
              * @param dontModify unused
              */
             getConfigKeys(pattern: string, callback: GetConfigKeysCallback, dontModify?: any): void;
-            getConfigKeys(pattern: string, options: any, callback: GetConfigKeysCallback, dontModify?: any): void;
+            getConfigKeys(pattern: string, options: unknown, callback: GetConfigKeysCallback, dontModify?: any): void;
 
             /**
              * Returns a list of objects with the given ids
@@ -702,7 +707,7 @@ declare global {
              * @param dontModify unused
              */
             getObjects(keys: string[], callback: GetObjectsCallback2, dontModify?: any): void;
-            getObjects(keys: string[], options: any, callback: GetObjectsCallback2, dontModify?: any): void;
+            getObjects(keys: string[], options: unknown, callback: GetObjectsCallback2, dontModify?: any): void;
             /**
              * Returns a list of objects with the given ids
              * @param keys IDs of the objects to be retrieved
@@ -711,7 +716,7 @@ declare global {
              * @param dontModify unused
              */
             getConfigs(keys: string[], callback: GetObjectsCallback2, dontModify?: any): void;
-            getConfigs(keys: string[], options: any, callback: GetObjectsCallback2, dontModify?: any): void;
+            getConfigs(keys: string[], options: unknown, callback: GetObjectsCallback2, dontModify?: any): void;
 
             /**
              * Creates or overwrites an object in the object db
@@ -720,8 +725,8 @@ declare global {
              * @param options (optional) Some internal options.
              * @param callback Is called when the operation has finished (successfully or not)
              */
-            setObject(id: string, obj: ioBroker.Object, callback: SetObjectCallback): void;
-            setObject(id: string, obj: ioBroker.Object, options: any, callback: SetObjectCallback): void;
+            setObject(id: string, obj: ioBroker.SettableObject, callback: SetObjectCallback): void;
+            setObject(id: string, obj: ioBroker.SettableObject, options: unknown, callback: SetObjectCallback): void;
             /**
              * Creates or overwrites an object in the object db
              * @param id ID of the object
@@ -729,8 +734,8 @@ declare global {
              * @param options (optional) Some internal options.
              * @param callback Is called when the operation has finished (successfully or not)
              */
-            setConfig(id: string, obj: ioBroker.Object, callback: SetObjectCallback): void;
-            setConfig(id: string, obj: ioBroker.Object, options: any, callback: SetObjectCallback): void;
+            setConfig(id: string, obj: ioBroker.SettableObject, callback: SetObjectCallback): void;
+            setConfig(id: string, obj: ioBroker.SettableObject, options: unknown, callback: SetObjectCallback): void;
 
             /**
              * Deletes an object in the object db
@@ -739,7 +744,7 @@ declare global {
              * @param callback Is called when the operation has finished (successfully or not)
              */
             delObject(id: string, callback: ErrorCallback): void;
-            delObject(id: string, options: any, callback: ErrorCallback): void;
+            delObject(id: string, options: unknown, callback: ErrorCallback): void;
             /**
              * Deletes an object in the object db
              * @param id ID of the object
@@ -747,7 +752,7 @@ declare global {
              * @param callback Is called when the operation has finished (successfully or not)
              */
             delConfig(id: string, callback: ErrorCallback): void;
-            delConfig(id: string, options: any, callback: ErrorCallback): void;
+            delConfig(id: string, options: unknown, callback: ErrorCallback): void;
 
             /**
              * Returns a list of objects with id between params.startkey and params.endkey
@@ -769,7 +774,7 @@ declare global {
              * @param callback Is called when the operation has finished (successfully or not)
              */
             getObjectView(design: string, search: string, params: GetObjectViewParams | null, callback: GetObjectViewCallback): void;
-            getObjectView(design: string, search: string, params: GetObjectViewParams | null, options: any, callback: GetObjectViewCallback): void;
+            getObjectView(design: string, search: string, params: GetObjectViewParams | null, options: unknown, callback: GetObjectViewCallback): void;
 
             /**
              * Extends an object in the object db with new properties
@@ -779,7 +784,7 @@ declare global {
              * @param callback Is called when the operation has finished (successfully or not)
              */
             extendObject(id: string, obj: PartialObject, callback: ExtendObjectCallback): void;
-            extendObject(id: string, obj: PartialObject, options: any, callback: ExtendObjectCallback): void;
+            extendObject(id: string, obj: PartialObject, options: unknown, callback: ExtendObjectCallback): void;
 
             /**
              * Finds an object by ID or name. If multiple objects were found, return the first one
@@ -789,7 +794,7 @@ declare global {
              * @param callback Is called when the operation has finished (successfully or not)
              */
             findObject(idOrName: string, type: CommonType | null, callback: FindObjectCallback): void;
-            findObject(idOrName: string, type: CommonType | null, options: any, callback: FindObjectCallback): void;
+            findObject(idOrName: string, type: CommonType | null, options: unknown, callback: FindObjectCallback): void;
 
             // I'd rather not document a function with the name "destroyDB"
 
@@ -910,9 +915,9 @@ declare global {
             /** Handler for changes of subscribed states */
             stateChange?: StateChangeHandler;
             /** Will be called when the adapter is intialized */
-            ready?: () => void;
+            ready?: ReadyHandler;
             /** Will be called on adapter termination */
-            unload?: (callback: EmptyCallback) => void;
+            unload?: UnloadHandler;
 
             /** if true, stateChange will be called with an id that has no namespace, e.g. "state" instead of "adapter.0.state". Default: false */
             noNamespace?: boolean;
@@ -972,15 +977,15 @@ declare global {
 
             /** Validates username and password */
             checkPassword(user: string, password: string, callback: (result: boolean) => void): void;
-            checkPassword(user: string, password: string, options: any, callback: (result: boolean) => void): void;
+            checkPassword(user: string, password: string, options: unknown, callback: (result: boolean) => void): void;
             /** Sets a new password for the given user */
-            setPassword(user: string, password: string, options?: any, callback?: (err?: any) => void): void;
+            setPassword(user: string, password: string, options?: unknown, callback?: (err?: any) => void): void;
             /** <INTERNAL> Checks if a user exists and is in the given group. */
             checkGroup(user: string, group: string, callback: (result: boolean) => void): void;
-            checkGroup(user: string, group: string, options: any, callback: (result: boolean) => void): void;
+            checkGroup(user: string, group: string, options: unknown, callback: (result: boolean) => void): void;
             /** <INTERNAL> Determines the users permissions */
             calculatePermissions(user: string, commandsPermissions: CommandsPermissions, callback: (result: PermissionSet) => void): void;
-            calculatePermissions(user: string, commandsPermissions: CommandsPermissions, options: any, callback: (result: PermissionSet) => void): void;
+            calculatePermissions(user: string, commandsPermissions: CommandsPermissions, options: unknown, callback: (result: PermissionSet) => void): void;
             /** Returns SSL certificates by name (private key, public cert and chained certificate) for creation of HTTPS servers */
             getCertificates(publicName: string, privateName: string, chainedName: string, callback: (err: string | null, certs?: Certificates, useLetsEncryptCert?: boolean) => void): void;
 
@@ -1013,20 +1018,24 @@ declare global {
 
             /** Reads an object from the object db */
             getObject(id: string, callback: GetObjectCallback): void;
-            getObject(id: string, options: any, callback: GetObjectCallback): void;
+            getObject(id: string, options: unknown, callback: GetObjectCallback): void;
             /** Creates or overwrites an object in the object db */
-            setObject(id: string, obj: ioBroker.Object, options?: any, callback?: SetObjectCallback): void;
+            setObject(id: string, obj: ioBroker.SettableObject, callback?: SetObjectCallback): void;
+            setObject(id: string, obj: ioBroker.SettableObject, options: unknown, callback?: SetObjectCallback): void;
             /** Creates an object in the object db. Existing objects are not overwritten. */
-            setObjectNotExists(id: string, obj: ioBroker.Object, options?: any, callback?: SetObjectCallback): void;
+            setObjectNotExists(id: string, obj: ioBroker.SettableObject, callback?: SetObjectCallback): void;
+            setObjectNotExists(id: string, obj: ioBroker.SettableObject, options: unknown, callback?: SetObjectCallback): void;
             /** Get all states, channels and devices of this adapter */
             getAdapterObjects(callback: (objects: Record<string, ioBroker.Object>) => void): void;
             /** Extend an object and create it if it might not exist */
-            extendObject(id: string, objPart: PartialObject, options?: any, callback?: SetObjectCallback): void;
+            extendObject(id: string, objPart: PartialObject, callback?: SetObjectCallback): void;
+            extendObject(id: string, objPart: PartialObject, options: unknown, callback?: SetObjectCallback): void;
             /**
              * Deletes an object from the object db
              * @param id - The id of the object without namespace
              */
-            delObject(id: string, options?: any, callback?: ErrorCallback): void;
+            delObject(id: string, callback?: ErrorCallback): void;
+            delObject(id: string, options: unknown, callback?: ErrorCallback): void;
 
             // ==============================
             // foreign objects
@@ -1034,61 +1043,83 @@ declare global {
             // tslint:disable:unified-signatures
             /** Reads an object (which might not belong to this adapter) from the object db */
             getForeignObject(id: string, callback: GetObjectCallback): void;
-            getForeignObject(id: string, options: any, callback: GetObjectCallback): void;
+            getForeignObject(id: string, options: unknown, callback: GetObjectCallback): void;
             /** Get foreign objects by pattern, by specific type and resolve their enums. */
             getForeignObjects(pattern: string, callback: GetObjectsCallback): void;
-            getForeignObjects(pattern: string, options: any, callback: GetObjectsCallback): void;
+            getForeignObjects(pattern: string, options: unknown, callback: GetObjectsCallback): void;
             getForeignObjects(pattern: string, type: ObjectType, callback: GetObjectsCallback): void;
             getForeignObjects(pattern: string, type: ObjectType, enums: EnumList, callback: GetObjectsCallback): void;
-            getForeignObjects(pattern: string, type: ObjectType, options: any, callback: GetObjectsCallback): void;
-            getForeignObjects(pattern: string, type: ObjectType, enums: EnumList, options: any, callback: GetObjectsCallback): void;
+            getForeignObjects(pattern: string, type: ObjectType, options: unknown, callback: GetObjectsCallback): void;
+            getForeignObjects(pattern: string, type: ObjectType, enums: EnumList, options: unknown, callback: GetObjectsCallback): void;
             /** Creates or overwrites an object (which might not belong to this adapter) in the object db */
-            setForeignObject(id: string, obj: ioBroker.Object, options?: any, callback?: SetObjectCallback): void;
+            setForeignObject(id: string, obj: ioBroker.SettableObject, callback?: SetObjectCallback): void;
+            setForeignObject(id: string, obj: ioBroker.SettableObject, options: unknown, callback?: SetObjectCallback): void;
             /** Creates an object (which might not belong to this adapter) in the object db. Existing objects are not overwritten. */
-            setForeignObjectNotExists(id: string, obj: ioBroker.Object, options?: any, callback?: SetObjectCallback): void;
+            setForeignObjectNotExists(id: string, obj: ioBroker.SettableObject, callback?: SetObjectCallback): void;
+            setForeignObjectNotExists(id: string, obj: ioBroker.SettableObject, options: unknown, callback?: SetObjectCallback): void;
             /** Extend an object (which might not belong to this adapter) and create it if it might not exist */
-            extendForeignObject(id: string, objPart: PartialObject, options?: any, callback?: SetObjectCallback): void;
+            extendForeignObject(id: string, objPart: PartialObject, callback?: SetObjectCallback): void;
+            extendForeignObject(id: string, objPart: PartialObject, options: unknown, callback?: SetObjectCallback): void;
             // tslint:enable:unified-signatures
             /**
              * Finds an object by its ID or name
              * @param type - common.type of the state
              */
             findForeignObject(idOrName: string, type: string, callback: FindObjectCallback): void;
-            findForeignObject(idOrName: string, type: string, options: any, callback: FindObjectCallback): void;
+            findForeignObject(idOrName: string, type: string, options: unknown, callback: FindObjectCallback): void;
             /**
              * Deletes an object (which might not belong to this adapter) from the object db
              * @param id - The id of the object including namespace
              */
-            delForeignObject(id: string, options?: any, callback?: ErrorCallback): void;
+            delForeignObject(id: string, callback?: ErrorCallback): void;
+            delForeignObject(id: string, options: unknown, callback?: ErrorCallback): void;
 
             // ==============================
             // states
+
+            // Multiple signatures help understanding what the parameters are about
+            // tslint:disable:unified-signatures
             /** Writes a value into the states DB. */
-            setState(id: string, state: string | number | boolean | State | Partial<State>, ack?: boolean, options?: any, callback?: SetStateCallback): void;
+            setState(id: string, state: string | number | boolean | State | Partial<State>, callback?: SetStateCallback): void;
+            setState(id: string, state: string | number | boolean | State | Partial<State>, ack: boolean, callback?: SetStateCallback): void;
+            setState(id: string, state: string | number | boolean | State | Partial<State>, options: unknown, callback?: SetStateCallback): void;
+            setState(id: string, state: string | number | boolean | State | Partial<State>, ack: boolean, options: unknown, callback?: SetStateCallback): void;
             /** Writes a value into the states DB only if it has changed. */
-            setStateChanged(id: string, state: string | number | boolean | State | Partial<State>, ack?: boolean, options?: any, callback?: SetStateChangedCallback): void;
+            setStateChanged(id: string, state: string | number | boolean | State | Partial<State>, callback?: SetStateChangedCallback): void;
+            setStateChanged(id: string, state: string | number | boolean | State | Partial<State>, ack: boolean, callback?: SetStateChangedCallback): void;
+            setStateChanged(id: string, state: string | number | boolean | State | Partial<State>, options: unknown, callback?: SetStateChangedCallback): void;
+            setStateChanged(id: string, state: string | number | boolean | State | Partial<State>, ack: boolean, options: unknown, callback?: SetStateChangedCallback): void;
             /** Writes a value (which might not belong to this adapter) into the states DB. */
-            setForeignState(id: string, state: string | number | boolean | State | Partial<State>, ack?: boolean, options?: any, callback?: SetStateCallback): void;
+            setForeignState(id: string, state: string | number | boolean | State | Partial<State>, callback?: SetStateCallback): void;
+            setForeignState(id: string, state: string | number | boolean | State | Partial<State>, ack: boolean, callback?: SetStateCallback): void;
+            setForeignState(id: string, state: string | number | boolean | State | Partial<State>, options: unknown, callback?: SetStateCallback): void;
+            setForeignState(id: string, state: string | number | boolean | State | Partial<State>, ack: boolean, options: unknown, callback?: SetStateCallback): void;
             /** Writes a value (which might not belong to this adapter) into the states DB only if it has changed. */
-            setForeignStateChanged(id: string, state: string | number | boolean | State | Partial<State>, ack?: boolean, options?: any, callback?: SetStateChangedCallback): void;
+            setForeignStateChanged(id: string, state: string | number | boolean | State | Partial<State>, callback?: SetStateChangedCallback): void;
+            setForeignStateChanged(id: string, state: string | number | boolean | State | Partial<State>, ack: boolean, callback?: SetStateChangedCallback): void;
+            setForeignStateChanged(id: string, state: string | number | boolean | State | Partial<State>, options: unknown, callback?: SetStateChangedCallback): void;
+            setForeignStateChanged(id: string, state: string | number | boolean | State | Partial<State>, ack: boolean, options: unknown, callback?: SetStateChangedCallback): void;
+            // tslint:enable:unified-signatures
 
             /** Read a value from the states DB. */
             getState(id: string, callback: GetStateCallback): void;
-            getState(id: string, options: any, callback: GetStateCallback): void;
+            getState(id: string, options: unknown, callback: GetStateCallback): void;
             /** Read a value (which might not belong to this adapter) from the states DB. */
             getForeignState(id: string, callback: GetStateCallback): void;
-            getForeignState(id: string, options: any, callback: GetStateCallback): void;
+            getForeignState(id: string, options: unknown, callback: GetStateCallback): void;
             /** Read all states of this adapter which match the given pattern */
             getStates(pattern: string, callback: GetStatesCallback): void;
-            getStates(pattern: string, options: any, callback: GetStatesCallback): void;
+            getStates(pattern: string, options: unknown, callback: GetStatesCallback): void;
             /** Read all states (which might not belong to this adapter) which match the given pattern */
             getForeignStates(pattern: string, callback: GetStatesCallback): void;
-            getForeignStates(pattern: string, options: any, callback: GetStatesCallback): void;
+            getForeignStates(pattern: string, options: unknown, callback: GetStatesCallback): void;
 
             /** Deletes a state from the states DB, but not the associated object. Consider using @link{deleteState} instead */
-            delState(id: string, options?: any, callback?: ErrorCallback): void;
+            delState(id: string, callback?: ErrorCallback): void;
+            delState(id: string, options: unknown, callback?: ErrorCallback): void;
             /** Deletes a state from the states DB, but not the associated object */
-            delForeignState(id: string, options?: any, callback?: ErrorCallback): void;
+            delForeignState(id: string, callback?: ErrorCallback): void;
+            delForeignState(id: string, options: unknown, callback?: ErrorCallback): void;
 
             getHistory(id: string, options: GetHistoryOptions, callback: GetHistoryCallback): void;
 
@@ -1106,7 +1137,7 @@ declare global {
              * @param callback Is called when the operation has finished (successfully or not)
              */
             setBinaryState(id: string, binary: Buffer, callback: SetStateCallback): void;
-            setBinaryState(id: string, binary: Buffer, options: any, callback: SetStateCallback): void;
+            setBinaryState(id: string, binary: Buffer, options: unknown, callback: SetStateCallback): void;
             /**
              * Reads a binary state from Redis
              * @param id The id of the state
@@ -1114,7 +1145,7 @@ declare global {
              * @param callback Is called when the operation has finished (successfully or not)
              */
             getBinaryState(id: string, callback: GetBinaryStateCallback): void;
-            getBinaryState(id: string, options: any, callback: GetBinaryStateCallback): void;
+            getBinaryState(id: string, options: unknown, callback: GetBinaryStateCallback): void;
 
             // ==============================
             // enums
@@ -1122,65 +1153,65 @@ declare global {
             /** Returns the enum tree, filtered by the optional enum name */
             getEnum(callback: GetEnumCallback): void;
             getEnum(name: string, callback: GetEnumCallback): void;
-            getEnum(name: string, options: any, callback: GetEnumCallback): void;
+            getEnum(name: string, options: unknown, callback: GetEnumCallback): void;
             getEnums(callback: GetEnumsCallback): void;
             getEnums(enumList: EnumList, callback: GetEnumsCallback): void;
-            getEnums(enumList: EnumList, options: any, callback: GetEnumsCallback): void;
+            getEnums(enumList: EnumList, options: unknown, callback: GetEnumsCallback): void;
 
-            addChannelToEnum(enumName: string, addTo: string, parentDevice: string, channelName: string, options?: any, callback?: ErrorCallback): void;
-            deleteChannelFromEnum(enumName: string, parentDevice: string, channelName: string, options?: any, callback?: ErrorCallback): void;
+            addChannelToEnum(enumName: string, addTo: string, parentDevice: string, channelName: string, options?: unknown, callback?: ErrorCallback): void;
+            deleteChannelFromEnum(enumName: string, parentDevice: string, channelName: string, options?: unknown, callback?: ErrorCallback): void;
 
-            addStateToEnum(enumName: string, addTo: string, parentDevice: string, parentChannel: string, stateName: string, options?: any, callback?: ErrorCallback): void;
-            deleteStateFromEnum(enumName: string, parentDevice: string, parentChannel: string, stateName: string, options?: any, callback?: ErrorCallback): void;
+            addStateToEnum(enumName: string, addTo: string, parentDevice: string, parentChannel: string, stateName: string, options?: unknown, callback?: ErrorCallback): void;
+            deleteStateFromEnum(enumName: string, parentDevice: string, parentChannel: string, stateName: string, options?: unknown, callback?: ErrorCallback): void;
 
             // ==============================
             // subscriptions
 
             /** Subscribe to changes of objects in this instance */
-            subscribeObjects(pattern: string, options?: any): void;
+            subscribeObjects(pattern: string, options?: unknown): void;
             /** Subscribe to changes of objects (which might not belong to this adapter) */
-            subscribeForeignObjects(pattern: string, options?: any): void;
+            subscribeForeignObjects(pattern: string, options?: unknown): void;
             /** Unsubscribe from changes of objects in this instance */
-            unsubscribeObjects(pattern: string, options?: any): void;
+            unsubscribeObjects(pattern: string, options?: unknown): void;
             /** Unsubscribe from changes of objects (which might not belong to this adapter) */
-            unsubscribeForeignObjects(pattern: string, options?: any): void;
+            unsubscribeForeignObjects(pattern: string, options?: unknown): void;
 
             /** Subscribe to changes of states in this instance */
-            subscribeStates(pattern: string, options?: any, callback?: ErrorCallback): void;
+            subscribeStates(pattern: string, options?: unknown, callback?: ErrorCallback): void;
             /** Subscribe to changes of states (which might not belong to this adapter) */
-            subscribeForeignStates(pattern: string, options?: any, callback?: ErrorCallback): void;
+            subscribeForeignStates(pattern: string, options?: unknown, callback?: ErrorCallback): void;
             /**
              * Subscribe from changes of states in this instance
              * @param pattern - Must match the pattern used to subscribe
              */
-            unsubscribeStates(pattern: string, options?: any, callback?: ErrorCallback): void;
+            unsubscribeStates(pattern: string, options?: unknown, callback?: ErrorCallback): void;
             /**
              * Subscribe from changes of states (which might not belong to this adapter)
              * @param pattern - Must match the pattern used to subscribe
              */
-            unsubscribeForeignStates(pattern: string, options?: any, callback?: ErrorCallback): void;
+            unsubscribeForeignStates(pattern: string, options?: unknown, callback?: ErrorCallback): void;
 
             // ==============================
             // devices and channels
 
             /** creates an object with type device */
-            createDevice(deviceName: string, common?: any, native?: any, options?: any, callback?: SetObjectCallback): void;
+            createDevice(deviceName: string, common?: any, native?: any, options?: unknown, callback?: SetObjectCallback): void;
             /** deletes a device, its channels and states */
-            deleteDevice(deviceName: string, options?: any, callback?: ErrorCallback): void;
+            deleteDevice(deviceName: string, options?: unknown, callback?: ErrorCallback): void;
             /** gets the devices of this instance */
 
             /** creates an object with type channel */
-            createChannel(parentDevice: string, channelName: string, roleOrCommon?: string | object, native?: any, options?: any, callback?: SetObjectCallback): void;
+            createChannel(parentDevice: string, channelName: string, roleOrCommon?: string | object, native?: any, options?: unknown, callback?: SetObjectCallback): void;
             /** deletes a channel and its states */
-            deleteChannel(channelName: string, options?: any, callback?: ErrorCallback): void;
-            deleteChannel(parentDevice: string, channelName: string, options?: any, callback?: ErrorCallback): void;
+            deleteChannel(channelName: string, options?: unknown, callback?: ErrorCallback): void;
+            deleteChannel(parentDevice: string, channelName: string, options?: unknown, callback?: ErrorCallback): void;
 
             /** creates a state and the corresponding object */
-            createState(parentDevice: string, parentChannel: string, stateName: string, roleOrCommon?: string | object, native?: any, options?: any, callback?: SetObjectCallback): void;
+            createState(parentDevice: string, parentChannel: string, stateName: string, roleOrCommon?: string | object, native?: any, options?: unknown, callback?: SetObjectCallback): void;
             /** deletes a state */
-            deleteState(stateName: string, options?: any, callback?: ErrorCallback): void;
-            deleteState(parentChannel: string, stateName: string, options?: any, callback?: ErrorCallback): void;
-            deleteState(parentDevice: string, parentChannel: string, stateName: string, options?: any, callback?: ErrorCallback): void;
+            deleteState(stateName: string, options?: unknown, callback?: ErrorCallback): void;
+            deleteState(parentChannel: string, stateName: string, options?: unknown, callback?: ErrorCallback): void;
+            deleteState(parentDevice: string, parentChannel: string, stateName: string, options?: unknown, callback?: ErrorCallback): void;
 
             /**
              * Returns a list of all devices in this adapter instance
@@ -1188,7 +1219,7 @@ declare global {
              * @param callback Is called when the operation has finished (successfully or not)
              */
             getDevices(callback: GetObjectsCallback3<DeviceObject>): void;
-            getDevices(options: any, callback: GetObjectsCallback3<DeviceObject>): void;
+            getDevices(options: unknown, callback: GetObjectsCallback3<DeviceObject>): void;
 
             /**
              * Returns a list of all channels in this adapter instance
@@ -1198,7 +1229,7 @@ declare global {
              */
             getChannels(callback: GetObjectsCallback3<ChannelObject>): void;
             getChannels(parentDevice: string | null, callback: GetObjectsCallback3<ChannelObject>): void;
-            getChannels(parentDevice: string | null, options: any, callback: GetObjectsCallback3<ChannelObject>): void;
+            getChannels(parentDevice: string | null, options: unknown, callback: GetObjectsCallback3<ChannelObject>): void;
             /**
              * Returns a list of all channels in this adapter instance
              * @param parentDevice (optional) Name of the parent device to filter the channels by
@@ -1207,7 +1238,7 @@ declare global {
              */
             getChannelsOf(callback: GetObjectsCallback3<ChannelObject>): void;
             getChannelsOf(parentDevice: string | null, callback: GetObjectsCallback3<ChannelObject>): void;
-            getChannelsOf(parentDevice: string | null, options: any, callback: GetObjectsCallback3<ChannelObject>): void;
+            getChannelsOf(parentDevice: string | null, options: unknown, callback: GetObjectsCallback3<ChannelObject>): void;
 
             /**
              * Returns a list of all states in this adapter instance
@@ -1219,7 +1250,7 @@ declare global {
             getStatesOf(callback: GetObjectsCallback3<StateObject>): void;
             getStatesOf(parentDevice: string | null, callback: GetObjectsCallback3<StateObject>): void;
             getStatesOf(parentDevice: string | null, parentChannel: string | null, callback: GetObjectsCallback3<StateObject>): void;
-            getStatesOf(parentDevice: string | null, parentChannel: string | null, options: any, callback: GetObjectsCallback3<StateObject>): void;
+            getStatesOf(parentDevice: string | null, parentChannel: string | null, options: unknown, callback: GetObjectsCallback3<StateObject>): void;
 
             // ==============================
             // filesystem
@@ -1230,23 +1261,23 @@ declare global {
              * @param path - path to direcory without adapter name. E.g. If you want to read "/vis.0/main/views.json", here must be "/main/views.json" and _adapter must be equal to "vis.0".
              */
             readDir(adapterName: string, path: string, callback: ReadDirCallback): void;
-            readDir(adapterName: string, path: string, options: any, callback: ReadDirCallback): void;
+            readDir(adapterName: string, path: string, options: unknown, callback: ReadDirCallback): void;
             mkDir(adapterName: string, path: string, callback: ErrorCallback): void;
-            mkDir(adapterName: string, path: string, options: any, callback: ErrorCallback): void;
+            mkDir(adapterName: string, path: string, options: unknown, callback: ErrorCallback): void;
 
             readFile(adapterName: string, path: string, callback: ReadFileCallback): void;
-            readFile(adapterName: string, path: string, options: any, callback: ReadFileCallback): void;
+            readFile(adapterName: string, path: string, options: unknown, callback: ReadFileCallback): void;
             writeFile(adapterName: string, path: string, data: Buffer | string, callback: ErrorCallback): void;
             // options see https://github.com/ioBroker/ioBroker.js-controller/blob/master/lib/objects/objectsInMemServer.js#L599
-            writeFile(adapterName: string, path: string, data: Buffer | string, options: any, callback: ErrorCallback): void;
+            writeFile(adapterName: string, path: string, data: Buffer | string, options: unknown, callback: ErrorCallback): void;
 
             delFile(adapterName: string, path: string, callback: ErrorCallback): void;
-            delFile(adapterName: string, path: string, options: any, callback: ErrorCallback): void;
+            delFile(adapterName: string, path: string, options: unknown, callback: ErrorCallback): void;
             unlink(adapterName: string, path: string, callback: ErrorCallback): void;
-            unlink(adapterName: string, path: string, options: any, callback: ErrorCallback): void;
+            unlink(adapterName: string, path: string, options: unknown, callback: ErrorCallback): void;
 
             rename(adapterName: string, oldName: string, newName: string, callback: ErrorCallback): void;
-            rename(adapterName: string, oldName: string, newName: string, options: any, callback: ErrorCallback): void;
+            rename(adapterName: string, oldName: string, newName: string, options: unknown, callback: ErrorCallback): void;
 
             /**
              * Changes access rights of all files in the adapter directory
@@ -1264,11 +1295,30 @@ declare global {
             formatValue(value: number | string, decimals: number, format: any): string;
             formatDate(dateObj: string | Date | number, format: string): string;
             formatDate(dateObj: string | Date | number, isDuration: boolean | string, format: string): string;
+
+            // =============================================
+            // Events exposed through EventEmitter interface
+            // =============================================
+            on(event: "ready", handler: ReadyHandler): this;
+            on(event: "unload", handler: UnloadHandler): this;
+            on(event: "stateChange", handler: StateChangeHandler): this;
+            on(event: "objectChange", handler: ObjectChangeHandler): this;
+            on(event: "message", handler: MessageHandler): this;
+
+            removeListener(event: "ready", handler: ReadyHandler): this;
+            removeListener(event: "unload", handler: UnloadHandler): this;
+            removeListener(event: "stateChange", handler: StateChangeHandler): this;
+            removeListener(event: "objectChange", handler: ObjectChangeHandler): this;
+            removeListener(event: "message", handler: MessageHandler): this;
+
+            removeAllListeners(event?: "ready" | "unload" | "stateChange" | "objectChange" | "message"): this;
         } // end interface Adapter
 
-        type ObjectChangeHandler = (id: string, obj: ioBroker.Object) => void;
-        type StateChangeHandler = (id: string, obj: State) => void;
+        type ReadyHandler = () => void;
+        type ObjectChangeHandler = (id: string, obj: ioBroker.Object | null | undefined) => void;
+        type StateChangeHandler = (id: string, obj: State | null | undefined) => void;
         type MessageHandler = (obj: Message) => void;
+        type UnloadHandler = (callback: EmptyCallback) => void;
 
         type EmptyCallback = () => void;
         type ErrorCallback = (err?: string) => void;
@@ -1276,7 +1326,7 @@ declare global {
         type GenericCallback<T> = (err: string | null, result?: T) => void;
 
         type SetObjectCallback = (err: string | null, obj: { id: string }) => void;
-        type GetObjectCallback = (err: string | null, obj: ioBroker.Object) => void;
+        type GetObjectCallback = (err: string | null, obj: ioBroker.Object | null | undefined) => void;
         type GetEnumCallback = (err: string | null, enums: Record<string, Enum>, requestedEnum: string) => void;
         type GetEnumsCallback = (
             err: string | null,
@@ -1304,7 +1354,7 @@ declare global {
         // This is a version used by GetDevices/GetChannelsOf/GetStatesOf
         type GetObjectsCallback3<T extends BaseObject> = (err: string | null, result?: Array<GetObjectsItem<T>>) => void;
 
-        type GetStateCallback = (err: string | null, state: State) => void;
+        type GetStateCallback = (err: string | null, state: State | null | undefined) => void;
         type GetStatesCallback = (err: string | null, states: Record<string, State>) => void;
         /** Version of the callback used by States.getStates */
         type GetStatesCallback2 = (err: string | null, states: State[]) => void;
@@ -1374,7 +1424,7 @@ declare global {
             /** The ID of this object */
             id: string;
             /** A copy of the object from the DB or some aggregation result */
-            value: ioBroker.Object | {}; // TODO: find out how the non-Object return result looks like
+            value: ioBroker.Object | unknown; // TODO: find out how the non-Object return result looks like
         }
         type GetObjectViewCallback = (err: string | null, result?: { rows: GetObjectViewItem[] }) => void;
 
diff --git a/types/iobroker/iobroker-tests.ts b/types/iobroker/iobroker-tests.ts
index c8b9f0d43e..997775c76f 100644
--- a/types/iobroker/iobroker-tests.ts
+++ b/types/iobroker/iobroker-tests.ts
@@ -1,5 +1,199 @@
-// Help! what to test here?
+// For now, this "utils" module is necessary, as it is included in every adapter
+// Once this PR is merged and @types/iobroker is available, it will become part of
+// `iobroker.adapter-core`, which brings typings for it
+declare const utils: {
+    readonly controllerDir: string;
+    getConfig(): string;
 
-declare const adapter: ioBroker.Adapter;
+    // tslint:disable:unified-signatures
+    adapter(adapterName: string): ioBroker.Adapter;
+    adapter(adapterOptions: ioBroker.AdapterOptions): ioBroker.Adapter;
+    // tslint:enable:unified-signatures
+};
 
-adapter.setState("not.a.state", true);
+declare function assertNever(val: never): never;
+
+// Let the tests begin
+let adapter: ioBroker.Adapter;
+
+// Test constructors
+adapter = utils.adapter("my-adapter-name");
+adapter = utils.adapter({
+    name: "my-adapter-name"
+});
+adapter = utils.adapter({
+    name: "my-adapter-name",
+    ready: readyHandler,
+    stateChange: stateChangeHandler,
+    objectChange: objectChangeHandler,
+    message: messageHandler,
+    unload: unloadHandler,
+});
+
+// Test EventEmitter definitions
+adapter
+    .on("ready", readyHandler)
+    .on("stateChange", stateChangeHandler)
+    .on("objectChange", objectChangeHandler)
+    .on("message", messageHandler)
+    .on("unload", unloadHandler)
+    ;
+adapter
+    .removeListener("ready", readyHandler)
+    .removeListener("stateChange", stateChangeHandler)
+    .removeListener("objectChange", objectChangeHandler)
+    .removeListener("message", messageHandler)
+    .removeListener("unload", unloadHandler)
+    ;
+adapter.removeAllListeners();
+
+function readyHandler() { }
+
+function stateChangeHandler(id: string, state: ioBroker.State | null | undefined) {
+    // Test State properties
+    if (state) {
+        state.ack;
+        state.c && state.c.toLowerCase();
+        state.expire && state.expire.toFixed();
+        state.from.toLowerCase();
+        state.lc.toFixed();
+        state.q && state.q.toFixed();
+        state.ts.toFixed();
+        state.val;
+    }
+}
+
+function objectChangeHandler(id: string, object: ioBroker.Object | null | undefined) {
+    // Test properties of all objects
+    if (object) {
+        object._id.toLowerCase();
+        object.common.name.toLowerCase();
+        object.common.role && object.common.role.toLowerCase();
+        object.common.icon && object.common.icon.toLowerCase();
+        object.native.toString();
+        object.enums && object.enums.toString();
+        if (object.acl) {
+            object.acl.object.toFixed();
+            object.acl.owner.toLowerCase();
+            object.acl.ownerGroup.toLowerCase();
+        }
+        // Test different object kinds
+        switch (object.type) {
+            case "adapter":
+            case "config":
+            case "enum":
+            case "group":
+            case "host":
+            case "info":
+            case "instance":
+            case "meta":
+            case "script":
+            case "user":
+                // nothing special here, update these tests when we have specialized definitions
+                break;
+
+            case "state":
+                if (object.acl) object.acl.state.toFixed();
+                object.common.def;
+                object.common.desc && object.common.desc.toLowerCase();
+                object.common.history;
+                object.common.max && object.common.max.toFixed();
+                object.common.min && object.common.min.toFixed();
+                object.common.read.valueOf();
+                object.common.states && object.common.states.toString();
+                object.common.type && object.common.type.toLowerCase();
+                object.common.unit && object.common.unit.toLowerCase();
+                object.common.workingID && object.common.workingID.toLowerCase();
+                object.common.write.valueOf();
+                break;
+
+            case "channel":
+                object.common.desc && object.common.desc.toLowerCase();
+                break;
+
+            case "device":
+                // nothing special here, update these tests when we have specialized definitions
+                break;
+        }
+    }
+}
+
+function messageHandler(msg: ioBroker.Message) {
+    msg._id.toFixed();
+    msg.callback.ack.valueOf();
+    msg.callback.id.toFixed();
+    msg.callback.message.toString();
+    msg.callback.time.toFixed();
+    msg.command.toLowerCase();
+    msg.from.toLowerCase();
+    msg.message.toString();
+}
+
+function unloadHandler(callback: ioBroker.EmptyCallback) {
+    adapter.log.info("shutting down");
+    callback();
+}
+
+// Test the most important methods
+adapter.setState("state.name", "value");
+adapter.setState("state.name", "value", true);
+adapter.setState("state.name", "value", (err, id) => { });
+adapter.setState("state.name", { val: "value", ack: true });
+adapter.setState("state.name", { val: "value", ack: true }, (err, id) => { });
+
+adapter.setStateChanged("state.name", "value");
+adapter.setStateChanged("state.name", "value", true);
+adapter.setStateChanged("state.name", "value", (err, id) => { });
+adapter.setStateChanged("state.name", { val: "value", ack: true });
+adapter.setStateChanged("state.name", { val: "value", ack: true }, (err, id) => { });
+
+adapter.setForeignState("state.name", "value");
+adapter.setForeignState("state.name", "value", true);
+adapter.setForeignState("state.name", "value", (err, id) => { });
+adapter.setForeignState("state.name", { val: "value", ack: true });
+adapter.setForeignState("state.name", { val: "value", ack: true }, (err, id) => { });
+
+adapter.setForeignStateChanged("state.name", "value");
+adapter.setForeignStateChanged("state.name", "value", true);
+adapter.setForeignStateChanged("state.name", "value", (err, id) => { });
+adapter.setForeignStateChanged("state.name", { val: "value", ack: true });
+adapter.setForeignStateChanged("state.name", { val: "value", ack: true }, (err, id) => { });
+
+adapter.setObject("obj.id", { type: "state", common: { name: "foo" }, native: {} });
+adapter.setObject("obj.id", { type: "state", common: { name: "foo" }, native: {} }, (err, id) => { });
+adapter.setForeignObject("obj.id", { type: "state", common: { name: "foo" }, native: {} });
+adapter.setForeignObject("obj.id", { type: "state", common: { name: "foo" }, native: {} }, (err, id) => { });
+
+adapter.setObjectNotExists("obj.id", { type: "state", common: { name: "foo" }, native: {} });
+adapter.setObjectNotExists("obj.id", { type: "state", common: { name: "foo" }, native: {} }, (err, id) => { });
+adapter.setForeignObjectNotExists("obj.id", { type: "state", common: { name: "foo" }, native: {} });
+adapter.setForeignObjectNotExists("obj.id", { type: "state", common: { name: "foo" }, native: {} }, (err, id) => { });
+
+adapter.getObject("obj.id", (err, obj) => { });
+adapter.getForeignObject("obj.id", (err, obj) => { });
+
+adapter.subscribeObjects("*");
+adapter.subscribeStates("*");
+adapter.subscribeForeignObjects("*");
+adapter.subscribeForeignStates("*");
+adapter.unsubscribeObjects("*");
+adapter.unsubscribeStates("*");
+adapter.unsubscribeForeignObjects("*");
+adapter.unsubscribeForeignStates("*");
+
+adapter.log.info("msg");
+adapter.log.debug("msg");
+adapter.log.warn("msg");
+adapter.log.error("msg");
+adapter.log.silly("msg");
+
+switch (adapter.log.level) {
+    case "debug":
+    case "error":
+    case "info":
+    case "silly":
+    case "warn":
+        break;
+    default:
+        assertNever(adapter.log.level);
+}

From e6ad7248578be028804e73688a6348fadca31b77 Mon Sep 17 00:00:00 2001
From: Yaroslav <ledz3pp@gmail.com>
Date: Sun, 25 Nov 2018 18:41:50 +0300
Subject: [PATCH 280/836] tus-js-client: fix fingerprint type

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

diff --git a/types/tus-js-client/index.d.ts b/types/tus-js-client/index.d.ts
index defb27fea0..4cbb34a818 100644
--- a/types/tus-js-client/index.d.ts
+++ b/types/tus-js-client/index.d.ts
@@ -6,7 +6,7 @@
 
 export interface UploadOptions {
     endpoint: string;
-    fingerprint?: string;
+    fingerprint?: (file: File, options?: UploadOptions) => string;
     resume?: boolean;
     metadata?: { [key: string]: string };
     onProgress?: ((bytesSent: number, bytesTotal: number) => void) | null;
diff --git a/types/tus-js-client/tus-js-client-tests.ts b/types/tus-js-client/tus-js-client-tests.ts
index a13d9da12f..237f1df233 100644
--- a/types/tus-js-client/tus-js-client-tests.ts
+++ b/types/tus-js-client/tus-js-client-tests.ts
@@ -10,7 +10,7 @@ const file = new File(["foo"], "foo.txt", {
 
 const upload = new Tus.Upload(file, {
     endpoint: "",
-    fingerprint: "fingerprint",
+    fingerprint: (file: File) => file.name,
     resume: true,
     metadata: {
         filename: "foo.txt"

From 715d23525775a2625e052b50b92e0068e2a40d2b Mon Sep 17 00:00:00 2001
From: Brian <bduff9@gmail.com>
Date: Sun, 25 Nov 2018 11:04:43 -0600
Subject: [PATCH 281/836] Added beforeSave and afterSave to hook definitions

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

diff --git a/types/sequelize/index.d.ts b/types/sequelize/index.d.ts
index 88ed87efae..f25aacc3e4 100644
--- a/types/sequelize/index.d.ts
+++ b/types/sequelize/index.d.ts
@@ -2295,8 +2295,8 @@ declare namespace sequelize {
      * interfaces.
      *
      * beforeValidate, afterValidate, beforeBulkCreate, beforeBulkDestroy, beforeBulkUpdate, beforeCreate,
-     * beforeDestroy, beforeUpdate, afterCreate, afterDestroy, afterUpdate, afterBulkCreate, afterBulkDestroy and
-     * afterBulkUpdate.
+     * beforeDestroy, beforeSave, beforeUpdate, afterCreate, afterDestroy, afterSave, afterUpdate, afterBulkCreate,
+     * afterBulkDestroy and afterBulkUpdate.
      */
     interface HooksDefineOptions<TInstance> {
 
@@ -2310,6 +2310,8 @@ declare namespace sequelize {
         afterDelete?: (instance: TInstance, options: Object, fn?: Function) => any;
         beforeUpdate?: (instance: TInstance, options: Object, fn?: Function) => any;
         afterUpdate?: (instance: TInstance, options: Object, fn?: Function) => any;
+        beforeSave?: (instance: TInstance, options: Object, fn?: Function) => any;
+        afterSave?: (instance: TInstance, options: Object, fn?: Function) => any;
         beforeBulkCreate?: (instances: TInstance[], options: Object, fn?: Function) => any;
         afterBulkCreate?: (instances: TInstance[], options: Object, fn?: Function) => any;
         beforeBulkDestroy?: (options: Object, fn?: Function) => any;
@@ -5272,9 +5274,10 @@ declare namespace sequelize {
         /**
          * An object of hook function that are called before and after certain lifecycle events.
          * The possible hooks are: beforeValidate, afterValidate, beforeBulkCreate, beforeBulkDestroy,
-         * beforeBulkUpdate, beforeCreate, beforeDestroy, beforeUpdate, afterCreate, afterDestroy, afterUpdate,
-         * afterBulkCreate, afterBulkDestory and afterBulkUpdate. See Hooks for more information about hook
-         * functions and their signatures. Each property can either be a function, or an array of functions.
+         * beforeBulkUpdate, beforeCreate, beforeDestroy, beforeSave, beforeUpdate, afterCreate, afterDestroy,
+         * afterSave, afterUpdate, afterBulkCreate, afterBulkDestory and afterBulkUpdate.
+         * See Hooks for more information about hook functions and their signatures. Each property can either
+         * be a function, or an array of functions.
          */
         hooks?: HooksDefineOptions<TInstance>;
 

From 839378616bfdf97838212e7f5443d9d4775a21c7 Mon Sep 17 00:00:00 2001
From: Yves Kaufmann <fxdapokalypse@googlemail.com>
Date: Sun, 25 Nov 2018 18:57:36 +0100
Subject: [PATCH 282/836] remove double block comments

---
 types/mongodb/index.d.ts | 27 ++++++++++++---------------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/types/mongodb/index.d.ts b/types/mongodb/index.d.ts
index e516e4d31f..b31a8dd7b9 100644
--- a/types/mongodb/index.d.ts
+++ b/types/mongodb/index.d.ts
@@ -261,11 +261,11 @@ export interface MongoClientOptions extends
     /**
      * The name of the application that created this MongoClient instance.
      */
-     appname?: string;
+    appname?: string;
 
-     /**
-      * Authentifikation credentials
-      */
+    /**
+     * Authentifikation credentials
+     */
     auth?: {
         /**
          * The username for auth
@@ -280,7 +280,7 @@ export interface MongoClientOptions extends
     /**
      * Determines whether or not to use the new url parser
      */
-     useNewUrlParser?: boolean;
+    useNewUrlParser?: boolean;
 
     /**
      * Mechanism for authentication: DEFAULT, GSSAPI, PLAIN, MONGODB-X509, 'MONGODB-CR', SCRAM-SHA-1 or SCRAM-SHA-256
@@ -428,12 +428,12 @@ export interface DbCreateOptions extends CommonOptions {
      * ES6 compatible promise constructor
      */
     promiseLibrary?: Object;
-    /** https://docs.mongodb.com/manual/reference/read-concern/#read-concern */
+    /**
+     * https://docs.mongodb.com/manual/reference/read-concern/#read-concern
+     **/
     readConcern?: ReadConcern;
     /**
      * Sets a cap on how many operations the driver will buffer up before giving up on getting a
-     */
-    /**
      * working connection, default is -1 which is unlimited.
      */
     bufferMaxEntries?: number;
@@ -463,11 +463,8 @@ export interface SocketOptions {
     connectTimeoutMS?: number;
     /**
      * Version of IP stack. Can be 4, 6 or null. default: null.
-     */
-    /**
+     *
      * If null, will attempt to connect with IPv6, and will fall back to IPv4 on failure
-     */
-    /**
      * refer to http://mongodb.github.io/node-mongodb-native/3.1/api/MongoClient.html
      */
     family?: 4 | 6 | null;
@@ -514,9 +511,9 @@ export interface MongosOptions extends SSLOptions, HighAvailabilityOptions {
      */
     acceptableLatencyMS?: number;
 
-     /**
-      * Socket Options
-      */
+    /**
+     * Socket Options
+     */
     socketOptions?: SocketOptions;
 }
 

From 43a1c3ef84dbfbe230c5386bb7a5d395d0562774 Mon Sep 17 00:00:00 2001
From: erikma <erikma1@hotmail.com>
Date: Sun, 25 Nov 2018 12:29:13 -0800
Subject: [PATCH 283/836] Update pigpio types to include changes up to version
 1.2.0

---
 types/pigpio/index.d.ts      | 28 ++++++++++++++++++++++++++--
 types/pigpio/pigpio-tests.ts |  9 +++++++++
 2 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/types/pigpio/index.d.ts b/types/pigpio/index.d.ts
index 79d0ebe0f9..1bc901f084 100644
--- a/types/pigpio/index.d.ts
+++ b/types/pigpio/index.d.ts
@@ -1,6 +1,6 @@
-// Type definitions for pigpio 0.4
+// Type definitions for pigpio 1.2
 // Project: https://github.com/fivdi/pigpio
-// Definitions by: ManerFan <https://github.com/manerfan>
+// Definitions by: ManerFan <https://github.com/manerfan> and erikma <https://github.com/erikma>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="node" />
@@ -424,3 +424,27 @@ export function configureClock(microseconds: number, peripheral: number): void;
  * @param port          an unsigned integer specifying the pigpio socket port number
  */
 export function configureSocketPort(port: number): void;
+
+/**
+ * Returns the Raspberry Pi hardware revision as an unsigned integer. Returns 0
+ * if the hardware revision can not be determined.
+ */
+export function hardwareRevision(): number;
+
+/**
+ * Gets the current unsigned 32-bit integer value of the number of microseconds
+ * since system boot. This value wraps around the 32-bit space in just over an hour.
+ * Use tickDiff() to get the difference between two tick values, to
+ * ensure the correct JavaScript operations are used to account for the possibility
+ * of overflow.
+ */
+export function getTick(): number;
+
+/**
+ * Returns the difference in microseconds between the end and start tick counts.
+ * The tick counts can be retrieved using getTick(), or may be passed
+ * in a GPIO event callback.
+ * @param startTick    The start of the measured interval. An unsigned integer tick value.
+ * @param endTick      The end of the measured interval. An unsigned integer tick value.
+ */
+export function tickDiff(startTick: number, endTick: number): number;
diff --git a/types/pigpio/pigpio-tests.ts b/types/pigpio/pigpio-tests.ts
index 90e7d4485d..f756058b03 100644
--- a/types/pigpio/pigpio-tests.ts
+++ b/types/pigpio/pigpio-tests.ts
@@ -880,6 +880,15 @@ import * as assert from 'assert';
     }, 2000);
 })();
 
+(function tickAndTickDiff(): void {
+    const startTick: number = pigpio.getTick();
+    setTimeout(() => {
+        const endTick: number = pigpio.getTick();
+        const diff: number = pigpio.tickDiff(startTick, endTick);
+        assert.ok(diff > 0, 'expected tick count to increase across a timer call');
+    }, 50);
+})();
+
 (function gpio_glitch_filter(): void {
     const Gpio = pigpio.Gpio;
     const input = new Gpio(7, {

From 3465be17ba8e9ec2628e3bfae2d5b67cdd1955ac Mon Sep 17 00:00:00 2001
From: erikma <erikma1@hotmail.com>
Date: Sun, 25 Nov 2018 12:35:43 -0800
Subject: [PATCH 284/836] fix lint issue

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

diff --git a/types/pigpio/index.d.ts b/types/pigpio/index.d.ts
index 1bc901f084..8eaa6491bb 100644
--- a/types/pigpio/index.d.ts
+++ b/types/pigpio/index.d.ts
@@ -1,6 +1,6 @@
 // Type definitions for pigpio 1.2
 // Project: https://github.com/fivdi/pigpio
-// Definitions by: ManerFan <https://github.com/manerfan> and erikma <https://github.com/erikma>
+// Definitions by: ManerFan <https://github.com/manerfan>, erikma <https://github.com/erikma>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="node" />

From 7416fd03c44b5a4d9e9ce6eb5bd4418d754adac0 Mon Sep 17 00:00:00 2001
From: Florian Dreschner <florian.dreschner@beekeeper.io>
Date: Sun, 25 Nov 2018 21:42:31 +0100
Subject: [PATCH 285/836] Add encrypt and decrypt to Pubnub types

---
 types/pubnub/index.d.ts      | 22 +++++++++++++++++++++-
 types/pubnub/pubnub-tests.ts | 12 ++++++++++++
 2 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/types/pubnub/index.d.ts b/types/pubnub/index.d.ts
index 8337acfbe4..1fc38edabf 100644
--- a/types/pubnub/index.d.ts
+++ b/types/pubnub/index.d.ts
@@ -1,6 +1,6 @@
 // Type definitions for pubnub 4.0
 // Project: https://github.com/pubnub/javascript
-// Definitions by: bitbankinc <https://github.com/bitbankinc>, rollymaduk <https://github.com/rollymaduk>, vitosamson <https://github.com/vitosamson>
+// Definitions by: bitbankinc <https://github.com/bitbankinc>, rollymaduk <https://github.com/rollymaduk>, vitosamson <https://github.com/vitosamson>, FlorianDr <https://github.com/FlorianDr>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // @see https://www.pubnub.com/docs/web-javascript/api-reference-configuration
 
@@ -88,6 +88,18 @@ declare class Pubnub {
   setState(
     params: Pubnub.SetStateParameters
   ): Promise<Pubnub.SetStateResponse>;
+
+  encrypt(
+    data: string,
+    customCipherKey?: string,
+    options?: Pubnub.CryptoParameters,
+  ): object | string | null;
+
+  decrypt(
+    data: object,
+    customCipherKey?: string,
+    options?: Pubnub.CryptoParameters
+  ): object | string | null;
 }
 
 declare namespace Pubnub {
@@ -296,6 +308,14 @@ declare namespace Pubnub {
     };
   }
 
+  // encrypt
+  interface CryptoParameters {
+    encryptKey?: boolean;
+    keyEncoding?: string;
+    keyLength?: number;
+    mode?: string;
+  }
+
   interface Categories {
     PNNetworkUpCategory: string;
     PNNetworkDownCategory: string;
diff --git a/types/pubnub/pubnub-tests.ts b/types/pubnub/pubnub-tests.ts
index 1d8b2bb1ca..50660bd942 100644
--- a/types/pubnub/pubnub-tests.ts
+++ b/types/pubnub/pubnub-tests.ts
@@ -86,3 +86,15 @@ pubnub.setState({ channels: [] }, (status, res) => {
 pubnub.setState({ channels: [] }).then(res => {
   console.log(res.state);
 });
+
+const cryptoOptions = {
+  encryptKey: true,
+  keyEncoding: 'utf8',
+  keyLength: 256,
+  mode: 'cbc'
+};
+const mySecret = {
+  message: 'Hi!',
+};
+pubnub.decrypt(mySecret, undefined, cryptoOptions);
+pubnub.encrypt('egrah5rwgrehwqh5eh3hwfwef', undefined, cryptoOptions);

From 147d828b80b191986af9e796d635e0cef3fdae14 Mon Sep 17 00:00:00 2001
From: Florian Dreschner <florian.dreschner@beekeeper.io>
Date: Sun, 25 Nov 2018 21:44:14 +0100
Subject: [PATCH 286/836] Add comment for decrypt parameters

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

diff --git a/types/pubnub/index.d.ts b/types/pubnub/index.d.ts
index 1fc38edabf..0b5f75901c 100644
--- a/types/pubnub/index.d.ts
+++ b/types/pubnub/index.d.ts
@@ -308,7 +308,7 @@ declare namespace Pubnub {
     };
   }
 
-  // encrypt
+  // encrypt & decrypt
   interface CryptoParameters {
     encryptKey?: boolean;
     keyEncoding?: string;

From 44ef75a9066b67df3e76d93f12bff05a408e7137 Mon Sep 17 00:00:00 2001
From: Florian Dreschner <florian.dreschner@beekeeper.io>
Date: Sun, 25 Nov 2018 21:58:23 +0100
Subject: [PATCH 287/836] Add version note under header

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

diff --git a/types/pubnub/index.d.ts b/types/pubnub/index.d.ts
index 0b5f75901c..7e148bc4c4 100644
--- a/types/pubnub/index.d.ts
+++ b/types/pubnub/index.d.ts
@@ -3,6 +3,7 @@
 // Definitions by: bitbankinc <https://github.com/bitbankinc>, rollymaduk <https://github.com/rollymaduk>, vitosamson <https://github.com/vitosamson>, FlorianDr <https://github.com/FlorianDr>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // @see https://www.pubnub.com/docs/web-javascript/api-reference-configuration
+// TypeScript Version: 2.2
 
 declare class Pubnub {
   constructor(config: Pubnub.PubnubConfig);

From 620ad409303126f5066dc1dda42ec23ce0bf2f4f Mon Sep 17 00:00:00 2001
From: Karol Samborski <karol.samborski@espeo.eu>
Date: Sun, 25 Nov 2018 22:50:42 +0100
Subject: [PATCH 288/836] Type definitions for multiSamlStrategy

---
 types/passport-saml/index.d.ts             |  1 +
 types/passport-saml/passport-saml-tests.ts | 25 ++++++++++++++++++++++
 types/passport-saml/tsconfig.json          |  3 ++-
 3 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/types/passport-saml/index.d.ts b/types/passport-saml/index.d.ts
index cc2faafe5c..9338b88deb 100644
--- a/types/passport-saml/index.d.ts
+++ b/types/passport-saml/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/bergie/passport-saml
 // Definitions by: Chris Barth <https://github.com/cjbarth>
 //                 Damian Assennato <https://github.com/dassennato>
+//                 Karol Samborski <https://github.com/ksamborski>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
diff --git a/types/passport-saml/passport-saml-tests.ts b/types/passport-saml/passport-saml-tests.ts
index 615c1b7320..b22421fe81 100644
--- a/types/passport-saml/passport-saml-tests.ts
+++ b/types/passport-saml/passport-saml-tests.ts
@@ -1,6 +1,7 @@
 import express = require('express');
 import passport = require('passport');
 import SamlStrategy = require('passport-saml');
+import MultiSamlStrategy = require('passport-saml/multiSamlStrategy');
 import fs = require('fs');
 
 const samlStrategy = new SamlStrategy.Strategy(
@@ -33,3 +34,27 @@ passport.use(samlStrategy);
 passport.authenticate('samlCustomName', {failureRedirect: '/', failureFlash: true});
 
 const metadata = samlStrategy.generateServiceProviderMetadata("decryptionCert");
+
+const multiSamlStrategy = new MultiSamlStrategy.MultiSamlStrategy(
+	{
+		name: 'samlCustomName',
+		path: '/login/callback',
+		entryPoint: 'https://openidp.feide.no/simplesaml/saml2/idp/SSOService.php',
+		issuer: 'passport-saml',
+        getSamlOptions(req: express.Request, callback: (err: Error | null, samlOptions: SamlStrategy.SamlConfig) => void) {
+            callback(null, {
+                name: 'samlCustomName',
+                path: '/login/callback2',
+                entryPoint: 'https://openidp.feide.no/simplesaml/saml2/idp/SSOService.php',
+                issuer: 'passport-saml',
+            });
+        }
+	},
+	(profile: {}, done: (err: Error | null, user: {}, info?: {}) => void) => {
+		const user = {};
+		done(null, user);
+	}
+);
+
+passport.use(multiSamlStrategy);
+passport.authenticate('samlCustomName', {failureRedirect: '/', failureFlash: true});
diff --git a/types/passport-saml/tsconfig.json b/types/passport-saml/tsconfig.json
index 0809dbbaf7..39283fa663 100644
--- a/types/passport-saml/tsconfig.json
+++ b/types/passport-saml/tsconfig.json
@@ -18,6 +18,7 @@
     },
     "files": [
         "index.d.ts",
+        "multiSamlStrategy.d.ts",
         "passport-saml-tests.ts"
     ]
-}
\ No newline at end of file
+}

From 58db065b6e539e777e8f0b9726fd187297651621 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Alvergnat?= <toilal.dev@gmail.com>
Date: Thu, 22 Nov 2018 22:54:38 +0100
Subject: [PATCH 289/836] Add types for deprecate

---
 types/deprecate/deprecate-tests.ts |  9 ++++++++
 types/deprecate/index.d.ts         | 33 ++++++++++++++++++++++++++++++
 types/deprecate/tsconfig.json      | 23 +++++++++++++++++++++
 types/deprecate/tslint.json        |  3 +++
 4 files changed, 68 insertions(+)
 create mode 100644 types/deprecate/deprecate-tests.ts
 create mode 100644 types/deprecate/index.d.ts
 create mode 100644 types/deprecate/tsconfig.json
 create mode 100644 types/deprecate/tslint.json

diff --git a/types/deprecate/deprecate-tests.ts b/types/deprecate/deprecate-tests.ts
new file mode 100644
index 0000000000..3df2257c40
--- /dev/null
+++ b/types/deprecate/deprecate-tests.ts
@@ -0,0 +1,9 @@
+import deprecate = require('deprecate');
+
+deprecate('someMethod');
+deprecate('someMethod', 'This is deprecated');
+deprecate('someMethod', 'This is deprecated', 'foo', 'bar');
+
+deprecate.color = '\x1b[31;1m';
+deprecate.silence = true;
+deprecate.stream = process.stderr;
diff --git a/types/deprecate/index.d.ts b/types/deprecate/index.d.ts
new file mode 100644
index 0000000000..a053721ff5
--- /dev/null
+++ b/types/deprecate/index.d.ts
@@ -0,0 +1,33 @@
+// Type definitions for deprecate 1.1
+// Project: https://github.com/brianc/node-deprecate
+// Definitions by: Toilal <https://github.com/Toilal>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.1
+
+/// <reference types="node" />
+
+declare namespace deprecate {
+    /**
+     * Set to false to not output a color. Defaults to '\x1b[31;1m' which is red.
+     */
+    let color: string;
+
+    /**
+     * Set to false to do nothing at all when the deprecate method is called. Useful in tests of the library you're deprecating things within.
+     */
+    let silence: boolean;
+
+    /**
+     * The stream to which output is written. Defaults to process.stderr
+     */
+    let stream: NodeJS.WriteStream;
+}
+
+/**
+ * Call deprecate within a function you are deprecating.
+ *
+ * It will spit out all the messages to the console the first time and only the first time the method is called.
+ */
+declare function deprecate(methodName: string, ...message: string[]): void;
+
+export = deprecate;
diff --git a/types/deprecate/tsconfig.json b/types/deprecate/tsconfig.json
new file mode 100644
index 0000000000..75acd6cda6
--- /dev/null
+++ b/types/deprecate/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "deprecate-tests.ts"
+    ]
+}
diff --git a/types/deprecate/tslint.json b/types/deprecate/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/deprecate/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}

From 6ffa94cda5b88a9cdefeb8a680c591e8e0c27439 Mon Sep 17 00:00:00 2001
From: Larry Gadea <trivex@gmail.com>
Date: Sun, 25 Nov 2018 20:36:20 -0500
Subject: [PATCH 290/836] [puppeteer] fix v1.10.0 definition of waitForTarget

hello! i'm using the fancy new waitForTarget and the definition appears to be slightly off. `options` is optional and the return is a `Target` Promise, not `void`. looking at the `BrowserContext` version, it's the same problem due to the new `Timeoutable` changes made in this recent version. i changed the one definition locally and the world did not seem to explode. i'm using Github's nasty PR generator, let me know if you'd prefer i edit this with the template. thanks!
---
 types/puppeteer/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/puppeteer/index.d.ts b/types/puppeteer/index.d.ts
index bfd14d9c35..cbb31f2fd0 100644
--- a/types/puppeteer/index.d.ts
+++ b/types/puppeteer/index.d.ts
@@ -1715,7 +1715,7 @@ export interface Page extends EventEmitter, FrameBase {
 }
 
 export interface TargetAwaiter {
-    waitForTarget(predicate: (target: Target) => boolean, options: Timeoutable): Promise<void>;
+    waitForTarget(predicate: (target: Target) => boolean, options?: Timeoutable): Promise<Target>;
 }
 
 /** A Browser is created when Puppeteer connects to a Chromium instance, either through puppeteer.launch or puppeteer.connect. */

From cc95a58bf19a53762240bcdabf1ac18c040a5904 Mon Sep 17 00:00:00 2001
From: Karol Samborski <karol.samborski@espeo.eu>
Date: Mon, 26 Nov 2018 07:13:25 +0100
Subject: [PATCH 291/836] Missing file

---
 types/passport-saml/multiSamlStrategy.d.ts | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 types/passport-saml/multiSamlStrategy.d.ts

diff --git a/types/passport-saml/multiSamlStrategy.d.ts b/types/passport-saml/multiSamlStrategy.d.ts
new file mode 100644
index 0000000000..405c7264dc
--- /dev/null
+++ b/types/passport-saml/multiSamlStrategy.d.ts
@@ -0,0 +1,10 @@
+import express = require('express');
+import { Strategy, SamlConfig, VerifyWithRequest, VerifyWithoutRequest } from './index';
+
+export interface MultiSamlConfig extends SamlConfig {
+    getSamlOptions(req: express.Request, callback: (err: Error | null, samlOptions: SamlConfig) => void): void;
+}
+
+export class MultiSamlStrategy extends Strategy {
+    constructor(config: MultiSamlConfig, verify: VerifyWithRequest | VerifyWithoutRequest);
+}

From bcd33769d53c79fc0840b4e8900e08d1cf22d878 Mon Sep 17 00:00:00 2001
From: Junyoung Choi <fluke8259@gmail.com>
Date: Mon, 26 Nov 2018 15:43:36 +0900
Subject: [PATCH 292/836] Fix abuse of generic type

---
 types/vfile/index.d.ts     | 24 ++++++++++--------------
 types/vfile/vfile-tests.ts | 17 +++++++++++++----
 2 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/types/vfile/index.d.ts b/types/vfile/index.d.ts
index 2ef3b03f19..792644dacc 100644
--- a/types/vfile/index.d.ts
+++ b/types/vfile/index.d.ts
@@ -10,26 +10,25 @@
 import * as Unist from 'unist';
 
 declare namespace vfile {
-    type Contents = string | Buffer;
+    type VFileContents = string | Buffer;
 
     interface NodeWithPosition extends Unist.Node {
         position: Unist.Position;
         [key: string]: any;
     }
 
-    interface VFileParamsBase<D> {
-        data?: D;
-        contents?: Contents;
+    interface VFileOptions {
+        contents?: VFileContents;
         path?: string;
         basename?: string;
         stem?: string;
         extname?: string;
         dirname?: string;
         cwd?: string;
+        data?: any;
+        [key: string]: any;
     }
 
-    type VFileParams<C extends {data?: {}}> = VFileParamsBase<C['data']> & C;
-
     /**
      * File-related message describing something at certain position.
      */
@@ -102,12 +101,11 @@ declare namespace vfile {
      */
     type ToString = (encoding?: BufferEncoding) => string;
 
-    interface VFileBase<C extends {data?: {}}> {
+    interface VFile {
         /**
          * @param options If `options` is `string` or `Buffer`, treats it as `{contents: options}`. If `options` is a `VFile`, returns it. All other options are set on the newly created `vfile`.
          */
-        (input?: Contents): VFile<C>;
-        <C>(input?: VFile<C> | VFileParams<C>): VFile<C>;
+        <F extends VFile>(input?: VFileContents | F | VFileOptions): F;
         message: Message;
         fail: Fail;
         info: Info;
@@ -119,7 +117,7 @@ declare namespace vfile {
          * Place to store custom information.
          * It's OK to store custom data directly on the `vfile`, moving it to `data` gives a little more privacy.
          */
-        data: C['data'];
+        data: any;
         /**
          * List of messages associated with the file.
          */
@@ -127,7 +125,7 @@ declare namespace vfile {
         /**
          * Raw value.
          */
-        contents: Contents;
+        contents: VFileContents;
         /**
          * Path of `vfile`.
          * Cannot be nullified.
@@ -161,8 +159,6 @@ declare namespace vfile {
         cwd: string;
         toString: ToString;
     }
-
-    type VFile<C> = VFileBase<C> & C;
 }
 
 /**
@@ -170,6 +166,6 @@ declare namespace vfile {
  * Path related properties are set in the following order (least specific to most specific): `history`, `path`, `basename`, `stem`, `extname`, `dirname`.
  * It’s not possible to set either `dirname` or `extname` without setting either `history`, `path`, `basename`, or `stem` as well.
  */
-declare const vfile: vfile.VFile<{}>;
+declare const vfile: vfile.VFile;
 
 export = vfile;
diff --git a/types/vfile/vfile-tests.ts b/types/vfile/vfile-tests.ts
index 0b19246ae8..4d146237b1 100644
--- a/types/vfile/vfile-tests.ts
+++ b/types/vfile/vfile-tests.ts
@@ -1,4 +1,4 @@
-import vfile = require("vfile");
+import vfile = require('vfile');
 import * as Unist from 'unist';
 
 // Instantiation
@@ -7,21 +7,30 @@ vfile('string');
 vfile(Buffer.from('string'));
 vfile(vfile());
 vfile({ stem: 'readme', extname: '.md' });
-vfile({ custom: 'data' });
 try {
     vfile({ extname: '.md' });
 } catch (e) {
     console.log('Error: set extname without path');
 }
 
-const file = vfile<{custom: string, data: {custom: number}}>({
+interface CustomVFile extends vfile.VFile {
+    custom: string;
+    data: {
+        custom: number;
+    };
+}
+
+const file = vfile<CustomVFile>({
     path: '~/example.txt',
     contents: 'Alpha *braavo* charlie.',
     custom: 'Custom tango',
     data: {
         custom: 12345
-    },
+    }
 });
+const customIsString: string = file.custom;
+const dataCustomIsNumber: number = file.data.custom;
+const copiedFile: CustomVFile = vfile(file);
 
 file.path; // => '~/example.txt'
 file.dirname; // => '~'

From 66d08e2f06fc28506c6d1a9e7fc86e524d43f0a3 Mon Sep 17 00:00:00 2001
From: Junyoung Choi <fluke8259@gmail.com>
Date: Mon, 26 Nov 2018 15:44:03 +0900
Subject: [PATCH 293/836] Include instruction how to extend vfiles

---
 types/vfile/readme.md | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 types/vfile/readme.md

diff --git a/types/vfile/readme.md b/types/vfile/readme.md
new file mode 100644
index 0000000000..349503cef8
--- /dev/null
+++ b/types/vfile/readme.md
@@ -0,0 +1,32 @@
+## VFile typescript Docs
+
+Below are some examples of how to use these Definitions.<br>
+Scenarios where the Typescript code is identical to plain Javascript code are omitted.
+
+### Extending VFile
+
+```ts
+import vfile = require('vfile')
+
+// 1. Define extended vfile interface
+interface CustomVFile extends vfile.VFile {
+    custom: string;
+    data: {
+        custom: number;
+    };
+}
+
+// 2. Provide the extended interface to generic type parameter
+// So it can be used for return value
+const file: CustomVFile = vfile<CustomVFile>({
+    path: '~/example.txt',
+    contents: 'Alpha *braavo* charlie.',
+    custom: 'Custom tango',
+    data: {
+        custom: 12345
+    }
+});
+
+// vfile recognize extended VFile values. So it will return same type.
+const copiedFile: CustomVFile = vfile(file);
+```

From f6a42a5032d678cfe4c210e72eb5da78107a2bd7 Mon Sep 17 00:00:00 2001
From: Junyoung Choi <fluke8259@gmail.com>
Date: Mon, 26 Nov 2018 15:49:41 +0900
Subject: [PATCH 294/836] Update vfile version

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

diff --git a/types/vfile/index.d.ts b/types/vfile/index.d.ts
index 792644dacc..ce8f1dce38 100644
--- a/types/vfile/index.d.ts
+++ b/types/vfile/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for VFile 2.2
+// Type definitions for VFile 3.0
 // Project: https://github.com/vfile/vfile
 // Definitions by: bizen241 <https://github.com/bizen241>
 //                 Junyoung Choi <https://github.com/rokt33r>

From 3ac5fe40247b925b313457259f42b486130e8a0d Mon Sep 17 00:00:00 2001
From: Junyoung Choi <fluke8259@gmail.com>
Date: Mon, 26 Nov 2018 15:51:15 +0900
Subject: [PATCH 295/836] Update vfile-location too

because it is using vfile
---
 types/vfile-location/index.d.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/types/vfile-location/index.d.ts b/types/vfile-location/index.d.ts
index e8ad37bc32..b991528c7e 100644
--- a/types/vfile-location/index.d.ts
+++ b/types/vfile-location/index.d.ts
@@ -1,12 +1,13 @@
 // Type definitions for vfile-location 2.0
 // Project: https://github.com/vfile/vfile-location
 // Definitions by: Ika <https://github.com/ikatyang>
+//                 Junyoung Choi <https://github.com/rokt33r>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.4
 
 import * as VFile from "vfile";
 
-declare function vfileLocation(vfile: string | VFile.VFile<{}>): vfileLocation.Location;
+declare function vfileLocation(vfile: string | VFile.VFile): vfileLocation.Location;
 
 declare namespace vfileLocation {
     interface Location {

From 264964b9a8676d3e81204914927fd81d1e439e6c Mon Sep 17 00:00:00 2001
From: obedm503 <obedm503@gmail.com>
Date: Mon, 26 Nov 2018 01:10:58 -0600
Subject: [PATCH 296/836] Add `onError` prop to `IntlProvider`

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

diff --git a/types/react-intl/index.d.ts b/types/react-intl/index.d.ts
index 17e738bb2a..a4cb8be9b5 100644
--- a/types/react-intl/index.d.ts
+++ b/types/react-intl/index.d.ts
@@ -9,6 +9,7 @@
 //                 Krister Kari <https://github.com/kristerkari>
 //                 Martin Raedlinger <https://github.com/formatlos>
 //                 Kanitkorn Sujautra <https://github.com/lukyth>
+//                 obedm503 <https://github.com/obedm503>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 
@@ -46,6 +47,7 @@ declare namespace ReactIntl {
         messages: React.Requireable<any>;
         defaultLocale: React.Requireable<any>;
         defaultFormats: React.Requireable<any>;
+        onError?: (error: string) => void
     }
 
     interface IntlFormat {
@@ -78,6 +80,7 @@ declare namespace ReactIntl {
         defaultLocale: string;
         defaultFormats: any;
         now(): number;
+        onError: (error: string) => void;
     }
 
     interface InjectedIntlProps {

From a2f88a9bc1295aa2c58700065536ac055b58308a Mon Sep 17 00:00:00 2001
From: obedm503 <obedm503@gmail.com>
Date: Mon, 26 Nov 2018 01:11:36 -0600
Subject: [PATCH 297/836] Add usage of `onError` prop

---
 types/react-intl/react-intl-tests.tsx | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/types/react-intl/react-intl-tests.tsx b/types/react-intl/react-intl-tests.tsx
index b3b23bb38f..74da23a12a 100644
--- a/types/react-intl/react-intl-tests.tsx
+++ b/types/react-intl/react-intl-tests.tsx
@@ -401,7 +401,15 @@ class TestApp extends React.Component {
             hello: "Hello, {name}!"
         };
         return (
-            <IntlProvider locale="en" formats={{}} messages={messages} defaultLocale="en" defaultFormats={messages} timeZone="UTC">
+            <IntlProvider 
+                locale="en" 
+                formats={{}} 
+                messages={messages} 
+                defaultLocale="en" 
+                defaultFormats={messages} 
+                timeZone="UTC" 
+                onError={(error: string) => console.error(error)}
+            >
                 <SomeComponentWithIntl className="just-for-test" />
                 <SomeFunctionalComponentWithIntl className="another-one" />
             </IntlProvider>

From 879ff2682e6118dcead7d40021087bbaa9b5bd3d Mon Sep 17 00:00:00 2001
From: obedm503 <obedm503@gmail.com>
Date: Mon, 26 Nov 2018 01:19:58 -0600
Subject: [PATCH 298/836] Increase minor version

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

diff --git a/types/react-intl/index.d.ts b/types/react-intl/index.d.ts
index a4cb8be9b5..3dc7e9dc59 100644
--- a/types/react-intl/index.d.ts
+++ b/types/react-intl/index.d.ts
@@ -11,7 +11,7 @@
 //                 Kanitkorn Sujautra <https://github.com/lukyth>
 //                 obedm503 <https://github.com/obedm503>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.8
+// TypeScript Version: 2.9
 
 declare namespace ReactIntl {
     type DateSource = Date | string | number;

From f69a5047986aed0669f04d8172cc5bbba2d6c4a8 Mon Sep 17 00:00:00 2001
From: obedm503 <obedm503@gmail.com>
Date: Mon, 26 Nov 2018 01:36:23 -0600
Subject: [PATCH 299/836] cleanup and test

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

diff --git a/types/react-intl/index.d.ts b/types/react-intl/index.d.ts
index 3dc7e9dc59..2c25a55b1f 100644
--- a/types/react-intl/index.d.ts
+++ b/types/react-intl/index.d.ts
@@ -47,7 +47,7 @@ declare namespace ReactIntl {
         messages: React.Requireable<any>;
         defaultLocale: React.Requireable<any>;
         defaultFormats: React.Requireable<any>;
-        onError?: (error: string) => void
+        onError: React.Requireable<any>;
     }
 
     interface IntlFormat {
@@ -80,7 +80,7 @@ declare namespace ReactIntl {
         defaultLocale: string;
         defaultFormats: any;
         now(): number;
-        onError: (error: string) => void;
+        onError(error: string): void;
     }
 
     interface InjectedIntlProps {
@@ -200,6 +200,7 @@ declare namespace ReactIntl {
             defaultFormats?: any;
             textComponent?: any;
             initialNow?: any;
+            onError?: (error: string) => void;
         }
     }
 

From 4cfb90807578b054644d81453ca145b90df00c86 Mon Sep 17 00:00:00 2001
From: Alexandre Piel <alexandre.piel@zooplus.com>
Date: Mon, 26 Nov 2018 09:14:35 +0100
Subject: [PATCH 300/836] make jest ProvidesCallback optinal

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

diff --git a/types/jest/index.d.ts b/types/jest/index.d.ts
index 2b378a6048..d434b5e198 100644
--- a/types/jest/index.d.ts
+++ b/types/jest/index.d.ts
@@ -251,7 +251,7 @@ declare namespace jest {
          * @param fn The function for your test
          * @param timeout The timeout for an async function test
          */
-        (name: string, fn: ProvidesCallback, timeout?: number): void;
+        (name: string, fn?: ProvidesCallback, timeout?: number): void;
         /**
          * Only runs this test in the current file.
          */

From 59bfd27bf6b5d17c6d9485d8d08b0db3e42add13 Mon Sep 17 00:00:00 2001
From: Jessica <jessicamfranco3@gmail.com>
Date: Mon, 26 Nov 2018 19:09:42 +0900
Subject: [PATCH 301/836] Add support to the `css` prop from
 babel-plugin-styled-components

---
 types/styled-components/index.d.ts     | 20 +++++++
 types/styled-components/test/index.tsx | 74 +++++++++++++++++++++++---
 2 files changed, 88 insertions(+), 6 deletions(-)

diff --git a/types/styled-components/index.d.ts b/types/styled-components/index.d.ts
index a842c94c63..ee64b37772 100644
--- a/types/styled-components/index.d.ts
+++ b/types/styled-components/index.d.ts
@@ -436,4 +436,24 @@ export class StyleSheetManager extends React.Component<
     StyleSheetManagerProps
 > {}
 
+export type CSSIntrinsicAttributeType =
+    | string
+    | CSSObject
+    | FlattenSimpleInterpolation
+    // Sad, but because this is global, there is no way to override it with the ThemedStyledComponentsModule
+    // Only augmenting DefaultTheme will work for inline css prop
+    | FlattenInterpolation<ThemeProps<AnyIfEmpty<DefaultTheme>>>;
+
 export default styled;
+
+declare module "react" {
+    interface Attributes {
+        // NOTE: unlike the plain javascript version, it is not possible to get access
+        // to the element's own attributes inside function interpolations.
+        // Only theme will be accessible, and only with the DefaultTheme due to the global
+        // nature of this declaration.
+        // If you are writing this inline you already have access to all the attributes anyway,
+        // no need for the extra indirection.
+        css?: import(".").CSSIntrinsicAttributeType; // tslint:disable-line whitespace
+    }
+}
diff --git a/types/styled-components/test/index.tsx b/types/styled-components/test/index.tsx
index e435d90011..c152ffd66e 100644
--- a/types/styled-components/test/index.tsx
+++ b/types/styled-components/test/index.tsx
@@ -172,7 +172,6 @@ const styledButton = styled.button`
 const name = "hey";
 
 const ThemedMyButton = withTheme(MyButton);
-
 <ThemedMyButton name={name} />;
 
 /**
@@ -290,7 +289,6 @@ const ObjectStylesBox = styled.div`
         fontSize: 2
     }};
 `;
-
 <ObjectStylesBox size="big" />;
 
 /**
@@ -322,7 +320,6 @@ const AttrsWithOnlyNewProps = styled.h2.attrs({ as: "h1" })`
 `;
 
 const AttrsInputExtra = styled(AttrsInput).attrs({ autoComplete: "off" })``;
-
 <AttrsInputExtra />;
 
 /**
@@ -419,10 +416,8 @@ const Component = (props: WithThemeProps) => (
 );
 
 const ComponentWithTheme = withTheme(Component);
-
 <ComponentWithTheme text={"hi"} />; // ok
 <ComponentWithTheme text={"hi"} theme={{ color: "red" }} />; // ok
-
 <ThemeConsumer>{theme => <Component text="hi" theme={theme} />}</ThemeConsumer>;
 
 /**
@@ -610,7 +605,6 @@ const divFnRef = (ref: HTMLDivElement | null) => {
 const divRef = React.createRef<HTMLDivElement>();
 
 const StyledDiv = styled.div``;
-
 <StyledDiv ref={divRef} />;
 <StyledDiv ref={divFnRef} />;
 <StyledDiv ref="string" />; // $ExpectError
@@ -771,3 +765,71 @@ async function themeAugmentation() {
         </base.ThemeProvider>
     );
 }
+
+// NOTE: this is needed for some tests inside cssProp,
+// but actually running this module augmentation will cause
+// tests elsewhere to break, and there is no way to contain it.
+// Uncomment out as needed to run tests.
+
+// declare module "styled-components" {
+//     interface DefaultTheme {
+//         background: string;
+//     }
+// }
+
+function cssProp() {
+    function Custom(props: React.ComponentPropsWithoutRef<"div">) {
+        return <div {...props} />;
+    }
+
+    return (
+        <>
+            <div css="background: blue;" />
+            <div css={{ background: "blue" }} />
+            <div css={undefined} />
+            <div
+                css={css`
+                    background: blue;
+                `}
+            />
+            <div
+                css={css`
+                    background: ${() => "blue"};
+                `}
+            />
+            <div
+                css={css`
+                    background: ${props => {
+                        // This requires the DefaultTheme augmentation
+                        // // $ExpectType string
+                        // props.theme.background;
+                        return props.theme.background;
+                    }};
+                `}
+            />
+            <Custom css="background: blue;" />
+            <Custom css={{ background: "blue" }} />
+            <Custom css={undefined} />
+            <Custom
+                css={css`
+                    background: blue;
+                `}
+            />
+            <Custom
+                css={css`
+                    background: ${() => "blue"};
+                `}
+            />
+            <Custom
+                css={css`
+                    background: ${props => {
+                        // This requires the DefaultTheme augmentation
+                        // // $ExpectType string
+                        // props.theme.background;
+                        return props.theme.background;
+                    }};
+                `}
+            />
+        </>
+    );
+}

From 3fc77b020c5482986330cc606cddc0981052e784 Mon Sep 17 00:00:00 2001
From: Jessica <jessicamfranco3@gmail.com>
Date: Mon, 26 Nov 2018 19:22:27 +0900
Subject: [PATCH 302/836] Fix the types in rebass__grid

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

diff --git a/types/rebass__grid/index.d.ts b/types/rebass__grid/index.d.ts
index 079506e631..f49d43a6c6 100644
--- a/types/rebass__grid/index.d.ts
+++ b/types/rebass__grid/index.d.ts
@@ -10,7 +10,7 @@
 export type Omit<T, K extends keyof T> = Pick<T, ({ [P in keyof T]: P } & { [P in K]: never } & { [x: string]: never, [x: number]: never })[keyof T]>;
 
 import { ComponentType } from "react";
-import { StyledComponent, Interpolation } from "styled-components";
+import { StyledComponent, CSSIntrinsicAttributeType } from "styled-components";
 
 export type ResponsiveProp = number | string | Array<string | number>;
 
@@ -34,7 +34,10 @@ export interface CommonProps {
     px?: ResponsiveProp;
     py?: ResponsiveProp;
     theme?: any;
-    css?: Interpolation<any>;
+    /**
+     * NOTE: this is not compatible with the styled-components babel plugin anymore
+     */
+    css?: CSSIntrinsicAttributeType;
 }
 
 export interface BoxProps

From d3c9c35fc625641c4c95d54eef25a8c0d84e71a7 Mon Sep 17 00:00:00 2001
From: Mihkel Sokk <mihkelsokk@gmail.com>
Date: Mon, 26 Nov 2018 14:26:50 +0200
Subject: [PATCH 303/836] [ejs] renderFile returns Promise without callback,
 fixes #28934

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

diff --git a/types/ejs/ejs-tests.ts b/types/ejs/ejs-tests.ts
index 8a0b2404d7..881a3fe103 100644
--- a/types/ejs/ejs-tests.ts
+++ b/types/ejs/ejs-tests.ts
@@ -29,6 +29,9 @@ result = ejs.render(template, data, options);
 result = ejs.renderFile(fileName, SimpleCallback);
 result = ejs.renderFile(fileName, data, SimpleCallback);
 result = ejs.renderFile(fileName, data, options, SimpleCallback);
+asyncResult = ejs.renderFile(fileName);
+asyncResult = ejs.renderFile(fileName, data);
+asyncResult = ejs.renderFile(fileName, data, options);
 
 ejsFunction = ejs.compile('');
 ejsFunction = ejs.compile(read(fileName, "utf8"));
diff --git a/types/ejs/index.d.ts b/types/ejs/index.d.ts
index 73eb716e23..fc578cffff 100644
--- a/types/ejs/index.d.ts
+++ b/types/ejs/index.d.ts
@@ -54,6 +54,8 @@ export type RenderFileCallback<T> = (err: Error, str?: string) => T;
 export function renderFile<T>(path: string, cb: RenderFileCallback<T>): T;
 export function renderFile<T>(path: string, data: Data, cb: RenderFileCallback<T>): T;
 export function renderFile<T>(path: string, data: Data, opts: Options, cb: RenderFileCallback<T>): T;
+// tslint:disable-next-line no-unnecessary-generics
+export function renderFile<T>(path: string, data?: Data, opts?: Options): Promise<T>;
 
 /**
  * Clear intermediate JavaScript cache. Calls {@link Cache#reset}.

From a941c86b563f56f65e6038c6f35debe28fba2514 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ba=C4=8D=C3=ADk?= <honason@gmail.com>
Date: Mon, 26 Nov 2018 14:57:35 +0100
Subject: [PATCH 304/836] Added RN Image width and height props

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

diff --git a/types/react-native/index.d.ts b/types/react-native/index.d.ts
index 2386fc71c2..112abe79a9 100644
--- a/types/react-native/index.d.ts
+++ b/types/react-native/index.d.ts
@@ -3629,6 +3629,12 @@ interface ImagePropsAndroid {
      * Duration of fade in animation.
      */
     fadeDuration?: number;
+    
+    /**
+     * Required sizes if using native image resources on Android
+     */
+    width?: number;
+    height?: number;
 }
 
 /**

From 18d0d101f1c388ce03b6f815337e195fd92fd1d8 Mon Sep 17 00:00:00 2001
From: Kai Dorschner <krnlde@users.noreply.github.com>
Date: Mon, 26 Nov 2018 15:05:20 +0100
Subject: [PATCH 305/836] Add missing inputIconPosition to type definition.

see http://airbnb.io/react-dates/?selectedKind=DRP%20-%20Input%20Props&selectedStory=with%20show%20calendar%20icon%20after%20input&full=0&addons=1&stories=1&panelRight=0&addonPanel=storybook%2Factions%2Factions-panel
---
 types/react-dates/index.d.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/types/react-dates/index.d.ts b/types/react-dates/index.d.ts
index 05058b2ca9..9e96538f7d 100644
--- a/types/react-dates/index.d.ts
+++ b/types/react-dates/index.d.ts
@@ -55,6 +55,7 @@ declare namespace ReactDates {
         screenReaderInputMessage?: string,
         showClearDates?: boolean,
         showDefaultInputIcon?: boolean,
+        inputIconPosition?: IconPositionShape,
         customInputIcon?: string | JSX.Element,
         customArrowIcon?: string | JSX.Element,
         customCloseIcon?: string | JSX.Element,

From 9d01bdd867de647f6469fd6e5e830295e8585c65 Mon Sep 17 00:00:00 2001
From: John Plusje <john.plusje@ivengi.com>
Date: Mon, 26 Nov 2018 15:24:11 +0100
Subject: [PATCH 306/836] Add declarations for stoppable 1.1

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

diff --git a/types/stoppable/index.d.ts b/types/stoppable/index.d.ts
index 395dd828c8..b15444c7ba 100644
--- a/types/stoppable/index.d.ts
+++ b/types/stoppable/index.d.ts
@@ -1,11 +1,16 @@
-// Type definitions for stoppable 1.0
+// Type definitions for stoppable 1.1
 // Project: https://github.com/hunterloftis/stoppable
 // Definitions by: Eric Byers <https://github.com/EricByers>
+//                 John Plusjé <https://github.com/jplusje>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="node" />
 import { Server } from 'http';
 
-declare function stoppable(server: Server, grace?: number): Server;
+interface StoppableServer extends Server {
+  stop(callback?: (e: Error, gracefully: boolean) => void): void;
+}
+
+declare function stoppable(server: Server, grace?: number): StoppableServer;
 
 export = stoppable;
diff --git a/types/stoppable/stoppable-tests.ts b/types/stoppable/stoppable-tests.ts
index 84cf826bef..89ebf64f6d 100644
--- a/types/stoppable/stoppable-tests.ts
+++ b/types/stoppable/stoppable-tests.ts
@@ -1,8 +1,11 @@
 import * as http from 'http';
 import stoppable = require('stoppable');
 
-const server: http.Server = stoppable(http.createServer());
-server.close();
+const server = stoppable(http.createServer());
+server.stop();
 
-const server2: http.Server = stoppable(http.createServer(), 10000);
-server2.close();
+const server2 = stoppable(http.createServer(), 10000);
+server2.stop();
+
+const server3 = stoppable(http.createServer());
+server.stop((err, gracefully) => {});

From ce71e7bb557834aa38e36ed35903d80cb35bb4cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ba=C4=8D=C3=ADk?= <honason@gmail.com>
Date: Mon, 26 Nov 2018 15:40:11 +0100
Subject: [PATCH 307/836] Removed whitespace

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

diff --git a/types/react-native/index.d.ts b/types/react-native/index.d.ts
index 112abe79a9..15423558e4 100644
--- a/types/react-native/index.d.ts
+++ b/types/react-native/index.d.ts
@@ -3629,7 +3629,7 @@ interface ImagePropsAndroid {
      * Duration of fade in animation.
      */
     fadeDuration?: number;
-    
+
     /**
      * Required sizes if using native image resources on Android
      */

From f26696ad1980206be1efc54f1f407b067801a5a7 Mon Sep 17 00:00:00 2001
From: Daan Boerlage <dboerlage@cimpress.com>
Date: Mon, 26 Nov 2018 15:32:07 +0100
Subject: [PATCH 308/836] add typings for open-apifactory

---
 types/openapi-factory/index.d.ts              | 49 +++++++++++++++++++
 .../openapi-factory/openapi-factory-tests.ts  | 25 ++++++++++
 types/openapi-factory/tsconfig.json           | 23 +++++++++
 types/openapi-factory/tslint.json             |  3 ++
 4 files changed, 100 insertions(+)
 create mode 100644 types/openapi-factory/index.d.ts
 create mode 100644 types/openapi-factory/openapi-factory-tests.ts
 create mode 100644 types/openapi-factory/tsconfig.json
 create mode 100644 types/openapi-factory/tslint.json

diff --git a/types/openapi-factory/index.d.ts b/types/openapi-factory/index.d.ts
new file mode 100644
index 0000000000..6cb22f7194
--- /dev/null
+++ b/types/openapi-factory/index.d.ts
@@ -0,0 +1,49 @@
+// Type definitions for openapi-factory 4.2
+// Project: https://github.com/wparad/openapi-factory.js
+// Definitions by: Daan Boerlage <https://github.com/runebaas>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+declare namespace OpenApi {
+    interface OpenApiOptions {
+        requestMiddleware?: () => any;
+        responseMiddleware?: () => any;
+        errorMiddleware?: () => any;
+    }
+}
+
+declare class OpenApi {
+    constructor(options: OpenApi.OpenApiOptions, overrideLogger?: () => void);
+
+    setAuthorizer(authorizerFunc: (req?: any) => any): void;
+    onEvent(onEventFunc: (req?: any) => any): void;
+    onSchedule(onScheduleFunc: (req?: any) => any): void;
+
+    head(route: string, p0: (req?: any) => any): void;
+    head(route: string, p0: object, p1: (req?: any) => any): void;
+
+    get(route: string, p0: (req?: any) => any): void;
+    get(route: string, p0: object, p1: (req?: any) => any): void;
+
+    post(route: string, p0: (req?: any) => any): void;
+    post(route: string, p0: object, p1: (req?: any) => any): void;
+
+    put(route: string, p0: (req?: any) => any): void;
+    put(route: string, p0: object, p1: (req?: any) => any): void;
+
+    patch(route: string, p0: (req?: any) => any): void;
+    patch(route: string, p0: object, p1: (req?: any) => any): void;
+
+    delete(route: string, p0: (req?: any) => any): void;
+    delete(route: string, p0: object, p1: (req?: any) => any): void;
+
+    options(route: string, p0: (req?: any) => any): void;
+    options(route: string, p0: object, p1: (req?: any) => any): void;
+
+    any(route: string, p0: (req?: any) => any): void;
+    any(route: string, p0: object, p1: (req?: any) => any): void;
+
+    handler(event: object, context: object): Promise<any>;
+}
+
+export = OpenApi;
diff --git a/types/openapi-factory/openapi-factory-tests.ts b/types/openapi-factory/openapi-factory-tests.ts
new file mode 100644
index 0000000000..13e1e0e7cc
--- /dev/null
+++ b/types/openapi-factory/openapi-factory-tests.ts
@@ -0,0 +1,25 @@
+import * as OpenApiFactory from 'openapi-factory';
+
+const api = new OpenApiFactory({});
+
+api.setAuthorizer((req: any) => req);
+api.onEvent((req: any) => req);
+api.onSchedule((req: any) => req);
+
+api.head('/v1/test', () => 'success');
+api.get('/v1/test', () => 'success');
+api.post('/v1/test', () => 'success');
+api.put('/v1/test', () => 'success');
+api.patch('/v1/test', () => 'success');
+api.delete('/v1/test', () => 'success');
+api.options('/v1/test', () => 'success');
+api.any('/v1/test2', () => 'success');
+
+api.head('/v2/test', {test: true}, () => 'success');
+api.get('/v2/test', {test: true}, () => 'success');
+api.post('/v2/test', {test: true}, () => 'success');
+api.put('/v2/test', {test: true}, () => 'success');
+api.patch('/v2/test', {test: true}, () => 'success');
+api.delete('/v2/test', {test: true}, () => 'success');
+api.options('/v2/test', {test: true}, () => 'success');
+api.any('/v2/test2', {test: true}, () => 'success');
diff --git a/types/openapi-factory/tsconfig.json b/types/openapi-factory/tsconfig.json
new file mode 100644
index 0000000000..e8528e8e84
--- /dev/null
+++ b/types/openapi-factory/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": false,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "openapi-factory-tests.ts"
+    ]
+}
diff --git a/types/openapi-factory/tslint.json b/types/openapi-factory/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/openapi-factory/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}

From f675d110aae80c33bdc289624c85052a2a1dc858 Mon Sep 17 00:00:00 2001
From: Florian Dreschner <code@dreschner.eu>
Date: Mon, 26 Nov 2018 16:16:36 +0100
Subject: [PATCH 309/836] Change crypto payload to any

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

diff --git a/types/pubnub/index.d.ts b/types/pubnub/index.d.ts
index 7e148bc4c4..257ca3cd44 100644
--- a/types/pubnub/index.d.ts
+++ b/types/pubnub/index.d.ts
@@ -94,13 +94,13 @@ declare class Pubnub {
     data: string,
     customCipherKey?: string,
     options?: Pubnub.CryptoParameters,
-  ): object | string | null;
+  ): any;
 
   decrypt(
     data: object,
     customCipherKey?: string,
     options?: Pubnub.CryptoParameters
-  ): object | string | null;
+  ): any;
 }
 
 declare namespace Pubnub {

From 5a89441def4da6974049400ae5733aa398400db4 Mon Sep 17 00:00:00 2001
From: juwar <juwar@microsoft.com>
Date: Mon, 26 Nov 2018 07:31:17 -0800
Subject: [PATCH 310/836] Updates

---
 types/highcharts/highcharts-more.d.ts         |  5 --
 types/highcharts/highstock.d.ts               |  8 ---
 types/highcharts/index.d.ts                   | 52 +++++++++----------
 types/highcharts/modules/boost.d.ts           |  5 --
 types/highcharts/modules/drilldown.d.ts       |  5 --
 types/highcharts/modules/exporting.d.ts       |  5 --
 types/highcharts/modules/map/index.d.ts       |  5 --
 .../modules/no-data-to-display.d.ts           |  5 --
 .../highcharts/modules/offline-exporting.d.ts |  5 --
 9 files changed, 26 insertions(+), 69 deletions(-)

diff --git a/types/highcharts/highcharts-more.d.ts b/types/highcharts/highcharts-more.d.ts
index 630dbb5622..aaa2da832c 100644
--- a/types/highcharts/highcharts-more.d.ts
+++ b/types/highcharts/highcharts-more.d.ts
@@ -1,8 +1,3 @@
-// Type definitions for Highcharts 4.2.6
-// Project: http://www.highcharts.com/
-// Definitions by: Maciej Suchecki <https://github.com/mc-suchecki>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
 import * as Highcharts from "highcharts";
 
 declare function HighchartsMore(H: Highcharts.Static): Highcharts.Static;
diff --git a/types/highcharts/highstock.d.ts b/types/highcharts/highstock.d.ts
index cc92bebe36..1b57d91a7d 100644
--- a/types/highcharts/highstock.d.ts
+++ b/types/highcharts/highstock.d.ts
@@ -1,11 +1,3 @@
-// Type definitions for Highstock 2.1.6
-// Project: http://www.highcharts.com/
-
-// Definitions by: David Deutsch <http://github.com/DavidKDeutsch>
-//                 Dave Baumann <https://github.com/route2Dev>
-//                 Richard Ison <https://github.com/richardison>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
 import * as Highcharts from "highcharts";
 
 declare namespace Highstock {
diff --git a/types/highcharts/index.d.ts b/types/highcharts/index.d.ts
index 58154954a3..7f0f15591b 100644
--- a/types/highcharts/index.d.ts
+++ b/types/highcharts/index.d.ts
@@ -4647,11 +4647,11 @@ declare namespace Highcharts {
         /**
          * For area-like series, allow the font size to vary so that small areas get a smaller font size. The default applies this effect to area-like series but not line-like series.
          */
-        maxFontSize?: number;
+        maxFontSize: number | null;
         /**
          * For area-like series, allow the font size to vary so that small areas get a smaller font size. The default applies this effect to area-like series but not line-like series.
          */
-        minFontSize?: number;
+        minFontSize: number | null;
         /**
          * A separate color for the negative part of the area.
          * @since 3.0
@@ -4753,7 +4753,7 @@ declare namespace Highcharts {
         /**
          * For area-like series, allow the font size to vary so that small areas get a smaller font size. The default applies this effect to area-like series but not line-like series.
          */
-        maxFontSize?: number;
+        maxFontSize: number | null;
         /**
          * The maximum allowed pixel width for a column, translated to the height of a bar in a bar chart. This prevents the
          * columns from becoming too wide when there is a small number of points in the chart.
@@ -4764,7 +4764,7 @@ declare namespace Highcharts {
         /**
          * For area-like series, allow the font size to vary so that small areas get a smaller font size. The default applies this effect to area-like series but not line-like series.
          */
-        minFontSize?: number;
+        minFontSize: number | null;
         /**
          * The minimal height for a column or width for a bar. By default, 0 values are not shown. To visualize a 0 (or
          * close to zero) point, set the minimal point length to a pixel value like 3. In stacked column charts,
@@ -4862,7 +4862,7 @@ declare namespace Highcharts {
         /**
          * For area-like series, allow the font size to vary so that small areas get a smaller font size. The default applies this effect to area-like series but not line-like series.
          */
-        maxFontSize?: number;
+        maxFontSize: number | null;
         /**
          * Maximum bubble size. Bubbles will automatically size between the minSize and maxSize to reflect the z value of
          * each bubble. Can be either pixels (when no unit is given), or a percentage of the smallest one of the plot width
@@ -4874,7 +4874,7 @@ declare namespace Highcharts {
         /**
          * For area-like series, allow the font size to vary so that small areas get a smaller font size. The default applies this effect to area-like series but not line-like series.
          */
-        minFontSize?: number;
+        minFontSize: number | null;
         /**
          * Minimum bubble size. Bubbles will automatically size between the minSize and maxSize to reflect the z value of
          * each bubble. Can be either pixels (when no unit is given), or a percentage of the smallest one of the plot width
@@ -5163,11 +5163,11 @@ declare namespace Highcharts {
         /**
          * For area-like series, allow the font size to vary so that small areas get a smaller font size. The default applies this effect to area-like series but not line-like series.
          */
-        maxFontSize?: number;
+        maxFontSize: number | null;
         /**
          * For area-like series, allow the font size to vary so that small areas get a smaller font size. The default applies this effect to area-like series but not line-like series.
          */
-        minFontSize?: number;
+        minFontSize: number | null;
         /**
          * Allow the dial to overshoot the end of the perimeter axis by this many degrees. Say if the gauge axis goes from 0
          * to 60, a value of 100, or 1000, will show 5 degrees beyond the end of the axis. Defaults to 0.
@@ -5239,7 +5239,7 @@ declare namespace Highcharts {
         /**
          * For area-like series, allow the font size to vary so that small areas get a smaller font size. The default applies this effect to area-like series but not line-like series.
          */
-        maxFontSize?: number;
+        maxFontSize: number | null;
         /**
          * The maximum allowed pixel width for a column, translated to the height of a bar in a bar chart. This prevents the
          * columns from becoming too wide when there is a small number of points in the chart.
@@ -5250,7 +5250,7 @@ declare namespace Highcharts {
         /**
          * For area-like series, allow the font size to vary so that small areas get a smaller font size. The default applies this effect to area-like series but not line-like series.
          */
-        minFontSize?: number;
+        minFontSize: number | null;
         /**
          * The row size - how many Y axis units each heatmap row should span.
          * @default 1
@@ -5272,11 +5272,11 @@ declare namespace Highcharts {
         /**
          * For area-like series, allow the font size to vary so that small areas get a smaller font size. The default applies this effect to area-like series but not line-like series.
          */
-        maxFontSize?: number;
+        maxFontSize: number | null;
         /**
          * For area-like series, allow the font size to vary so that small areas get a smaller font size. The default applies this effect to area-like series but not line-like series.
          */
-        minFontSize?: number;
+        minFontSize: number | null;
         /**
          * Whether to apply steps to the line. Possible values are left, center and right. Prior to 2.3.5, only left was
          * supported.
@@ -5350,11 +5350,11 @@ declare namespace Highcharts {
         /**
          * For area-like series, allow the font size to vary so that small areas get a smaller font size. The default applies this effect to area-like series but not line-like series.
          */
-        maxFontSize?: number;
+        maxFontSize: number | null;
         /**
          * For area-like series, allow the font size to vary so that small areas get a smaller font size. The default applies this effect to area-like series but not line-like series.
          */
-        minFontSize?: number;
+        minFontSize: number | null;
         /**
          * The minimum size for a pie in response to auto margins. The pie will try to shrink to make room for data labels
          * in side the plot area, but only to this size.
@@ -5405,11 +5405,11 @@ declare namespace Highcharts {
         /**
          * For area-like series, allow the font size to vary so that small areas get a smaller font size. The default applies this effect to area-like series but not line-like series.
          */
-        maxFontSize?: number;
+        maxFontSize: number | null;
         /**
          * For area-like series, allow the font size to vary so that small areas get a smaller font size. The default applies this effect to area-like series but not line-like series.
          */
-        minFontSize?: number;
+        minFontSize: number | null;
     }
 
     interface PyramidChart extends SeriesChart {
@@ -5488,11 +5488,11 @@ declare namespace Highcharts {
         /**
          * For area-like series, allow the font size to vary so that small areas get a smaller font size. The default applies this effect to area-like series but not line-like series.
          */
-        maxFontSize?: number;
+        maxFontSize: number | null;
         /**
          * For area-like series, allow the font size to vary so that small areas get a smaller font size. The default applies this effect to area-like series but not line-like series.
          */
-        minFontSize?: number;
+        minFontSize: number | null;
     }
 
     /**
@@ -5533,11 +5533,11 @@ declare namespace Highcharts {
         /**
          * For area-like series, allow the font size to vary so that small areas get a smaller font size. The default applies this effect to area-like series but not line-like series.
          */
-        maxFontSize?: number;
+        maxFontSize: number | null;
         /**
          * For area-like series, allow the font size to vary so that small areas get a smaller font size. The default applies this effect to area-like series but not line-like series.
          */
-        minFontSize?: number;
+        minFontSize: number | null;
     }
 
     /**
@@ -5613,7 +5613,7 @@ declare namespace Highcharts {
         /**
          * For area-like series, allow the font size to vary so that small areas get a smaller font size. The default applies this effect to area-like series but not line-like series.
          */
-        maxFontSize?: number;
+        maxFontSize: number | null;
         /**
          * The maximum allowed pixel width for a column, translated to the height of a bar in a bar chart. This prevents the
          * columns from becoming too wide when there is a small number of points in the chart.
@@ -5624,7 +5624,7 @@ declare namespace Highcharts {
         /**
          * For area-like series, allow the font size to vary so that small areas get a smaller font size. The default applies this effect to area-like series but not line-like series.
          */
-        minFontSize?: number;
+        minFontSize: number | null;
         /**
          * The sort index of the point inside the treemap level.
          * @since 4.1.10
@@ -5692,11 +5692,11 @@ declare namespace Highcharts {
         /**
          * For area-like series, allow the font size to vary so that small areas get a smaller font size. The default applies this effect to area-like series but not line-like series.
          */
-        maxFontSize?: number;
+        maxFontSize: number | null;
         /**
          * For area-like series, allow the font size to vary so that small areas get a smaller font size. The default applies this effect to area-like series but not line-like series.
          */
-        minFontSize?: number;
+        minFontSize: number | null;
         /**
          * This option decides which algorithm is used for placement, and rotation of a word. The choice of algorith is
          * therefore a crucial part of the resulting layout of the wordcloud. It is possible for users to add their own
@@ -5900,11 +5900,11 @@ declare namespace Highcharts {
         /**
          * For area-like series, allow the font size to vary so that small areas get a smaller font size. The default applies this effect to area-like series but not line-like series.
          */
-        maxFontSize?: number;
+        maxFontSize: number | null;
         /**
          * For area-like series, allow the font size to vary so that small areas get a smaller font size. The default applies this effect to area-like series but not line-like series.
          */
-        minFontSize?: number;
+        minFontSize: number | null;
         /**
          * The name of the series as shown in the legend, tooltip etc.
          */
diff --git a/types/highcharts/modules/boost.d.ts b/types/highcharts/modules/boost.d.ts
index e0a3480f95..2e4da45b13 100644
--- a/types/highcharts/modules/boost.d.ts
+++ b/types/highcharts/modules/boost.d.ts
@@ -1,8 +1,3 @@
-// Type definitions for Highcharts 4.2.6 (boost module)
-// Project: http://www.highcharts.com/
-// Definitions by: Daniel Martin <https://github.com/inad9300>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
 import { Static } from "highcharts";
 
 declare function HighchartsBoost(H: Static): Static;
diff --git a/types/highcharts/modules/drilldown.d.ts b/types/highcharts/modules/drilldown.d.ts
index adf9bae6f8..46115cb4ad 100644
--- a/types/highcharts/modules/drilldown.d.ts
+++ b/types/highcharts/modules/drilldown.d.ts
@@ -1,8 +1,3 @@
-// Type definitions for Highcharts Drilldown 4.2.7
-// Project: http://www.highcharts.com/
-// Definitions by: Konstantin Rohde <https://github.com/RohdeK>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
 import { Static } from "highcharts";
 
 declare function HighchartsDrilldown(H: Static): Static;
diff --git a/types/highcharts/modules/exporting.d.ts b/types/highcharts/modules/exporting.d.ts
index b4b0124a66..18f9615d41 100644
--- a/types/highcharts/modules/exporting.d.ts
+++ b/types/highcharts/modules/exporting.d.ts
@@ -1,8 +1,3 @@
-// Type definitions for Highcharts 4.2.6 (exporting module)
-// Project: http://www.highcharts.com/
-// Definitions by: Maciej Suchecki <https://github.com/mc-suchecki>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
 import { Static } from "highcharts";
 
 declare function HighchartsExporting(H: Static): Static;
diff --git a/types/highcharts/modules/map/index.d.ts b/types/highcharts/modules/map/index.d.ts
index ecf553945b..12b2ca0a7e 100644
--- a/types/highcharts/modules/map/index.d.ts
+++ b/types/highcharts/modules/map/index.d.ts
@@ -1,8 +1,3 @@
-// Type definitions for Highmaps 4.2.7
-// Project: http://www.highcharts.com/products/highmaps
-// Definitions by: Albert Ozimek <https://github.com/AlbertOzimek>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
 import * as highcharts from 'highcharts';
 import * as geojson from 'geojson';
 
diff --git a/types/highcharts/modules/no-data-to-display.d.ts b/types/highcharts/modules/no-data-to-display.d.ts
index f79ce249d1..bb8d406e03 100644
--- a/types/highcharts/modules/no-data-to-display.d.ts
+++ b/types/highcharts/modules/no-data-to-display.d.ts
@@ -1,8 +1,3 @@
-// Type definitions for Highcharts No Data to Display 4.2.7
-// Project: http://www.highcharts.com/
-// Definitions by: Andrey Zolotin <https://github.com/nitoloz>, Rowell Heria <https://github.com/rowellx68>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
 import { Static } from "highcharts";
 
 declare module "highcharts" {
diff --git a/types/highcharts/modules/offline-exporting.d.ts b/types/highcharts/modules/offline-exporting.d.ts
index ee38e1c91b..5f536a8588 100644
--- a/types/highcharts/modules/offline-exporting.d.ts
+++ b/types/highcharts/modules/offline-exporting.d.ts
@@ -1,8 +1,3 @@
-// Type definitions for Highcharts 4.2.6 (offline exporting module)
-// Project: http://www.highcharts.com/
-// Definitions by: Daniel Martin <https://github.com/inad9300>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
 import { Static } from "highcharts";
 
 declare function HighchartsOfflineExporting(H: Static): Static;

From f3a20e8a3e339390d03f3fbc89e48a49673bfadb Mon Sep 17 00:00:00 2001
From: juwar <juwar@microsoft.com>
Date: Mon, 26 Nov 2018 07:59:33 -0800
Subject: [PATCH 311/836] Enable some of the lint rules and fix them.

---
 types/highcharts/highstock.d.ts |  15 +---
 types/highcharts/index.d.ts     | 120 +++++++++-----------------------
 types/highcharts/test/index.ts  |   2 +-
 types/highcharts/tslint.json    |   2 -
 4 files changed, 37 insertions(+), 102 deletions(-)

diff --git a/types/highcharts/highstock.d.ts b/types/highcharts/highstock.d.ts
index 1b57d91a7d..70ebfcb5c1 100644
--- a/types/highcharts/highstock.d.ts
+++ b/types/highcharts/highstock.d.ts
@@ -121,8 +121,7 @@ declare namespace Highstock {
     }
 
     interface Chart {
-        new (options: Options): ChartObject;
-        new (options: Options, callback: (chart: ChartObject) => void): ChartObject;
+        new (options: Options, callback?: (chart: ChartObject) => void): ChartObject;
     }
 
     interface Static extends Highcharts.Static {
@@ -134,13 +133,6 @@ declare namespace Highstock {
 declare global {
     interface JQuery {
         highcharts(type: "StockChart"): Highstock.ChartObject;
-        /**
-         * Creates a new Highcharts.Chart for the current JQuery selector; usually
-         * a div selected by $('#container')
-         * @param options Options for this chart
-         * @return current selector the current JQuery selector
-         */
-        highcharts(type: "StockChart", options: Highstock.Options): JQuery;
         /**
          * Creates a new Highcharts.Chart for the current JQuery selector; usually
          * a div selected by $('#container')
@@ -148,11 +140,10 @@ declare global {
          * @param callback Callback function used to manipulate the constructed chart instance
          * @return current selector the current JQuery selector
          */
-        highcharts(type: "StockChart", options: Highstock.Options, callback: (chart: Highstock.ChartObject) => void): JQuery;
+        highcharts(type: "StockChart", options: Highstock.Options, callback?: (chart: Highstock.ChartObject) => void): JQuery;
 
         highcharts(type: string): Highcharts.ChartObject;
-        highcharts(type: string, options: Highcharts.Options): JQuery;
-        highcharts(type: string, options: Highcharts.Options, callback: (chart: Highcharts.ChartObject) => void): JQuery;
+        highcharts(type: string, options: Highcharts.Options, callback?: (chart: Highcharts.ChartObject) => void): JQuery;
     }
 }
 
diff --git a/types/highcharts/index.d.ts b/types/highcharts/index.d.ts
index 7f0f15591b..5214c4c54c 100644
--- a/types/highcharts/index.d.ts
+++ b/types/highcharts/index.d.ts
@@ -4647,11 +4647,11 @@ declare namespace Highcharts {
         /**
          * For area-like series, allow the font size to vary so that small areas get a smaller font size. The default applies this effect to area-like series but not line-like series.
          */
-        maxFontSize: number | null;
+        maxFontSize?: number | null;
         /**
          * For area-like series, allow the font size to vary so that small areas get a smaller font size. The default applies this effect to area-like series but not line-like series.
          */
-        minFontSize: number | null;
+        minFontSize?: number | null;
         /**
          * A separate color for the negative part of the area.
          * @since 3.0
@@ -4753,7 +4753,7 @@ declare namespace Highcharts {
         /**
          * For area-like series, allow the font size to vary so that small areas get a smaller font size. The default applies this effect to area-like series but not line-like series.
          */
-        maxFontSize: number | null;
+        maxFontSize?: number | null;
         /**
          * The maximum allowed pixel width for a column, translated to the height of a bar in a bar chart. This prevents the
          * columns from becoming too wide when there is a small number of points in the chart.
@@ -4764,7 +4764,7 @@ declare namespace Highcharts {
         /**
          * For area-like series, allow the font size to vary so that small areas get a smaller font size. The default applies this effect to area-like series but not line-like series.
          */
-        minFontSize: number | null;
+        minFontSize?: number | null;
         /**
          * The minimal height for a column or width for a bar. By default, 0 values are not shown. To visualize a 0 (or
          * close to zero) point, set the minimal point length to a pixel value like 3. In stacked column charts,
@@ -4862,7 +4862,7 @@ declare namespace Highcharts {
         /**
          * For area-like series, allow the font size to vary so that small areas get a smaller font size. The default applies this effect to area-like series but not line-like series.
          */
-        maxFontSize: number | null;
+        maxFontSize?: number | null;
         /**
          * Maximum bubble size. Bubbles will automatically size between the minSize and maxSize to reflect the z value of
          * each bubble. Can be either pixels (when no unit is given), or a percentage of the smallest one of the plot width
@@ -4874,7 +4874,7 @@ declare namespace Highcharts {
         /**
          * For area-like series, allow the font size to vary so that small areas get a smaller font size. The default applies this effect to area-like series but not line-like series.
          */
-        minFontSize: number | null;
+        minFontSize?: number | null;
         /**
          * Minimum bubble size. Bubbles will automatically size between the minSize and maxSize to reflect the z value of
          * each bubble. Can be either pixels (when no unit is given), or a percentage of the smallest one of the plot width
@@ -5163,11 +5163,11 @@ declare namespace Highcharts {
         /**
          * For area-like series, allow the font size to vary so that small areas get a smaller font size. The default applies this effect to area-like series but not line-like series.
          */
-        maxFontSize: number | null;
+        maxFontSize?: number | null;
         /**
          * For area-like series, allow the font size to vary so that small areas get a smaller font size. The default applies this effect to area-like series but not line-like series.
          */
-        minFontSize: number | null;
+        minFontSize?: number | null;
         /**
          * Allow the dial to overshoot the end of the perimeter axis by this many degrees. Say if the gauge axis goes from 0
          * to 60, a value of 100, or 1000, will show 5 degrees beyond the end of the axis. Defaults to 0.
@@ -5239,7 +5239,7 @@ declare namespace Highcharts {
         /**
          * For area-like series, allow the font size to vary so that small areas get a smaller font size. The default applies this effect to area-like series but not line-like series.
          */
-        maxFontSize: number | null;
+        maxFontSize?: number | null;
         /**
          * The maximum allowed pixel width for a column, translated to the height of a bar in a bar chart. This prevents the
          * columns from becoming too wide when there is a small number of points in the chart.
@@ -5250,7 +5250,7 @@ declare namespace Highcharts {
         /**
          * For area-like series, allow the font size to vary so that small areas get a smaller font size. The default applies this effect to area-like series but not line-like series.
          */
-        minFontSize: number | null;
+        minFontSize?: number | null;
         /**
          * The row size - how many Y axis units each heatmap row should span.
          * @default 1
@@ -5272,11 +5272,11 @@ declare namespace Highcharts {
         /**
          * For area-like series, allow the font size to vary so that small areas get a smaller font size. The default applies this effect to area-like series but not line-like series.
          */
-        maxFontSize: number | null;
+        maxFontSize?: number | null;
         /**
          * For area-like series, allow the font size to vary so that small areas get a smaller font size. The default applies this effect to area-like series but not line-like series.
          */
-        minFontSize: number | null;
+        minFontSize?: number | null;
         /**
          * Whether to apply steps to the line. Possible values are left, center and right. Prior to 2.3.5, only left was
          * supported.
@@ -5350,11 +5350,11 @@ declare namespace Highcharts {
         /**
          * For area-like series, allow the font size to vary so that small areas get a smaller font size. The default applies this effect to area-like series but not line-like series.
          */
-        maxFontSize: number | null;
+        maxFontSize?: number | null;
         /**
          * For area-like series, allow the font size to vary so that small areas get a smaller font size. The default applies this effect to area-like series but not line-like series.
          */
-        minFontSize: number | null;
+        minFontSize?: number | null;
         /**
          * The minimum size for a pie in response to auto margins. The pie will try to shrink to make room for data labels
          * in side the plot area, but only to this size.
@@ -5405,11 +5405,11 @@ declare namespace Highcharts {
         /**
          * For area-like series, allow the font size to vary so that small areas get a smaller font size. The default applies this effect to area-like series but not line-like series.
          */
-        maxFontSize: number | null;
+        maxFontSize?: number | null;
         /**
          * For area-like series, allow the font size to vary so that small areas get a smaller font size. The default applies this effect to area-like series but not line-like series.
          */
-        minFontSize: number | null;
+        minFontSize?: number | null;
     }
 
     interface PyramidChart extends SeriesChart {
@@ -5488,11 +5488,11 @@ declare namespace Highcharts {
         /**
          * For area-like series, allow the font size to vary so that small areas get a smaller font size. The default applies this effect to area-like series but not line-like series.
          */
-        maxFontSize: number | null;
+        maxFontSize?: number | null;
         /**
          * For area-like series, allow the font size to vary so that small areas get a smaller font size. The default applies this effect to area-like series but not line-like series.
          */
-        minFontSize: number | null;
+        minFontSize?: number | null;
     }
 
     /**
@@ -5533,11 +5533,11 @@ declare namespace Highcharts {
         /**
          * For area-like series, allow the font size to vary so that small areas get a smaller font size. The default applies this effect to area-like series but not line-like series.
          */
-        maxFontSize: number | null;
+        maxFontSize?: number | null;
         /**
          * For area-like series, allow the font size to vary so that small areas get a smaller font size. The default applies this effect to area-like series but not line-like series.
          */
-        minFontSize: number | null;
+        minFontSize?: number | null;
     }
 
     /**
@@ -5613,7 +5613,7 @@ declare namespace Highcharts {
         /**
          * For area-like series, allow the font size to vary so that small areas get a smaller font size. The default applies this effect to area-like series but not line-like series.
          */
-        maxFontSize: number | null;
+        maxFontSize?: number | null;
         /**
          * The maximum allowed pixel width for a column, translated to the height of a bar in a bar chart. This prevents the
          * columns from becoming too wide when there is a small number of points in the chart.
@@ -5624,7 +5624,7 @@ declare namespace Highcharts {
         /**
          * For area-like series, allow the font size to vary so that small areas get a smaller font size. The default applies this effect to area-like series but not line-like series.
          */
-        minFontSize: number | null;
+        minFontSize?: number | null;
         /**
          * The sort index of the point inside the treemap level.
          * @since 4.1.10
@@ -5692,11 +5692,11 @@ declare namespace Highcharts {
         /**
          * For area-like series, allow the font size to vary so that small areas get a smaller font size. The default applies this effect to area-like series but not line-like series.
          */
-        maxFontSize: number | null;
+        maxFontSize?: number | null;
         /**
          * For area-like series, allow the font size to vary so that small areas get a smaller font size. The default applies this effect to area-like series but not line-like series.
          */
-        minFontSize: number | null;
+        minFontSize?: number | null;
         /**
          * This option decides which algorithm is used for placement, and rotation of a word. The choice of algorith is
          * therefore a crucial part of the resulting layout of the wordcloud. It is possible for users to add their own
@@ -5900,11 +5900,11 @@ declare namespace Highcharts {
         /**
          * For area-like series, allow the font size to vary so that small areas get a smaller font size. The default applies this effect to area-like series but not line-like series.
          */
-        maxFontSize: number | null;
+        maxFontSize?: number | null;
         /**
          * For area-like series, allow the font size to vary so that small areas get a smaller font size. The default applies this effect to area-like series but not line-like series.
          */
-        minFontSize: number | null;
+        minFontSize?: number | null;
         /**
          * The name of the series as shown in the legend, tooltip etc.
          */
@@ -6729,16 +6729,10 @@ declare namespace Highcharts {
         /**
          * Set new categories for the axis. Redraws.
          * @param categories The new category names.
+         * @param redraw Whether to redraw the axis or wait for an explicit call to chart.redraw().
          * @since 1.2.0
          */
-        setCategories(categories: string[]): void;
-        /**
-         * Set new categories for the axis.
-         * @param categories The new category names.
-         * @param  redraw     Whether to redraw the axis or wait for an explicit call to chart.redraw().
-         * @since 1.2.0
-         */
-        setCategories(categories: string[], redraw: boolean): void;
+        setCategories(categories: string[], redraw?: boolean): void;
         /**
          * Set the minimum and maximum of the axes after render time. If the startOnTick and endOnTick options are true, the
          * minimum and maximum values are rounded off to the nearest tick. To prevent this, these options can be set to
@@ -6848,22 +6842,6 @@ declare namespace Highcharts {
          * @since 3.0.8
          */
         drillUp(): void;
-        /**
-         * Exporting module required. Submit an SVG version of the chart to a server along with some parameters for
-         * conversion.
-         * @since 2.0
-         */
-        exportChart(): void;
-        /**
-         * Exporting module required. Submit an SVG version of the chart to a server along with some parameters for
-         * conversion.
-         * @param options Exporting options. Out of the exporting options, the following options can be given as parameters to the exportChart method.
-         * All options default to the values given in the exporting config options. filename: the filename for the export without extension,
-         * url: the URL for the server module to do the conversion, width: the width of the PNG or JPEG image generated on the server,
-         * type: the MIME type of the converted image, sourceWidth: the width of the source (in-page) chart, sourceHeight: the height of the source chart.
-         * @since 2.0
-         */
-        exportChart(options: ExportingOptions): void;
         /**
          * Exporting module required. Submit an SVG version of the chart to a server along with some parameters for
          * conversion.
@@ -6874,31 +6852,17 @@ declare namespace Highcharts {
          * @param chartOptions Additional chart options for the exported chart. For example a different background color can be added here.
          * @since 2.0
          */
-        exportChart(options: ExportingOptions, chartOptions: Options): void;
+        exportChart(options?: ExportingOptions, chartOptions?: Options): void;
         /**
          * Export the chart to a PNG or SVG without sending it to a server. Requires
          * modules/exporting.js and modules/offline-exporting.js.
-         * @since 2.0
-         */
-        exportChartLocal(): void;
-        /**
-         * Export the chart to a PNG or SVG without sending it to a server. Requires
-         * modules/exporting.js and modules/offline-exporting.js.
-         * @param options Exporting options. Same as
-         * the exportChart params.
-         * @since 2.0
-         */
-        exportChartLocal(options: ExportingOptions): void;
-        /**
-         * Export the chart to a PNG or SVG without sending it to a server.
-         * Requires modules/exporting.js and modules/offline-exporting.js.
          * @param options Exporting options. Same as
          * the exportChart params.
          * @param chartOptions Additional chart options for the
          * exported chart. Same as the exportChart params.
          * @since 2.0
          */
-        exportChartLocal(options: ExportingOptions, chartOptions: Options): void;
+        exportChartLocal(options?: ExportingOptions, chartOptions?: Options): void;
         /**
          * Get an axis, series or point by its id as given in the configuration options.
          * @param  id The id of the axis, series or point to get.
@@ -7042,23 +7006,12 @@ declare namespace Highcharts {
         /**
          * This is the constructor for creating a new chart object.
          * @param  options The chart options
-         */
-        new (options: Options): ChartObject;
-        /**
-         * This is the constructor for creating a new chart object.
-         * @param options The chart options
          * @param callback A function to execute when the chart object is finished loading and rendering. In most cases the chart is built in one thread,
          * but in Internet Explorer version 8 or less the chart is sometimes initiated before the document is ready,
          * and in these cases the chart object will not be finished directly after callingnew Highcharts.Chart().
          * s a consequence, code that relies on the newly built Chart object should always run in the callback. Defining a chart.event.load handler is equivalent.
          */
-        new (options: Options, callback: (chart: ChartObject) => void): ChartObject;
-        /**
-         * This is the constructor for creating a new chart object.
-         * @param renderTo The id or a reference to a DOM element where the chart should be rendered (since v4.2.0).
-         * @param options The chart options
-         */
-        new (renderTo: string | HTMLElement, options: Options): ChartObject;
+        new (options: Options, callback?: (chart: ChartObject) => void): ChartObject;
         /**
          * This is the constructor for creating a new chart object.
          * @param renderTo The id or a reference to a DOM element where the chart should be rendered (since v4.2.0).
@@ -7068,7 +7021,7 @@ declare namespace Highcharts {
          * and in these cases the chart object will not be finished directly after callingnew Highcharts.Chart().
          * As a consequence, code that relies on the newly built Chart object should always run in the callback. Defining a chart.event.load handler is equivalent.
          */
-        new (renderTo: string | HTMLElement, options: Options, callback: (chart: ChartObject) => void): ChartObject;
+        new (renderTo: string | HTMLElement, options: Options, callback?: (chart: ChartObject) => void): ChartObject;
     }
 
     /**
@@ -7642,13 +7595,6 @@ declare namespace Highcharts {
 declare global {
     interface JQuery {
         highcharts(): Highcharts.ChartObject;
-        /**
-         * Creates a new Highcharts.Chart for the current JQuery selector; usually
-         * a div selected by $('#container')
-         * @param options Options for this chart
-         * @return current {JQuery} selector the current JQuery selector
-         */
-        highcharts(options: Highcharts.Options): JQuery;
         /**
          * Creates a new Highcharts.Chart for the current JQuery selector; usually
          * a div selected by $('#container')
@@ -7656,7 +7602,7 @@ declare global {
          * @param callback Callback function used to manipulate the constructed chart instance
          * @return current {JQuery} selector the current JQuery selector
          */
-        highcharts(options: Highcharts.Options, callback: (chart: Highcharts.ChartObject) => void): JQuery;
+        highcharts(options: Highcharts.Options, callback?: (chart: Highcharts.ChartObject) => void): JQuery;
     }
 }
 
diff --git a/types/highcharts/test/index.ts b/types/highcharts/test/index.ts
index 1eaa5da438..c1fd8b5676 100644
--- a/types/highcharts/test/index.ts
+++ b/types/highcharts/test/index.ts
@@ -48,7 +48,7 @@ function originalTests() {
         }]
     });
 
-    chart1.addSeries<Highcharts.BarChartSeriesOptions>({
+    chart1.addSeries({
         enableMouseTracking: true,
         data: [1, 2, 3, 4, 5],
         description: "some description"
diff --git a/types/highcharts/tslint.json b/types/highcharts/tslint.json
index cfc8218eab..d6b6fde9be 100644
--- a/types/highcharts/tslint.json
+++ b/types/highcharts/tslint.json
@@ -3,9 +3,7 @@
     "rules": {
         // TODOs
         "ban-types": false,
-        "unified-signatures": false,
         "no-empty-interface": false,
-        "dt-header": false,
         "no-declare-current-package": false,
         "no-object-literal-type-assertion": false,
         "no-self-import": false,

From 84e48532798da9e4488bf047e7595ff8996a7380 Mon Sep 17 00:00:00 2001
From: Alex Lipatov <alexey.lipatov@ge.com>
Date: Mon, 26 Nov 2018 11:56:22 -0500
Subject: [PATCH 312/836] Use swagger-parser's namespace as type instead of
 defining our own.

---
 types/swagger-express-middleware/index.d.ts | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/types/swagger-express-middleware/index.d.ts b/types/swagger-express-middleware/index.d.ts
index 4d83cebfb0..d6b5789e3e 100644
--- a/types/swagger-express-middleware/index.d.ts
+++ b/types/swagger-express-middleware/index.d.ts
@@ -32,6 +32,9 @@ app.listen(8000, function () {
 
 declare module "swagger-express-middleware" {
     import { Application, Router, RequestHandler, Request, Response } from "express";
+    import * as parser from "swagger-parser";
+
+    type SwaggerParser = typeof parser.SwaggerParser;
 
     let s: s.SwaggerMiddlewareConstructor;
 
@@ -363,11 +366,6 @@ declare module "swagger-express-middleware" {
             externalDocs?: ExternalDocumentationObject
         }
 
-        export interface SwaggerParser {
-            $refs: any
-            schema: SwaggerObject
-        }
-
         type MimeTypes = string[]
 
         export interface InfoObject {

From 7bba952b5759fceb1b6307c807482380600047b5 Mon Sep 17 00:00:00 2001
From: Daan Boerlage <dboerlage@cimpress.com>
Date: Mon, 26 Nov 2018 18:29:53 +0100
Subject: [PATCH 313/836] [openapi-factory] fix http methods param typings

---
 types/openapi-factory/index.d.ts              | 52 +++++++++++--------
 .../openapi-factory/openapi-factory-tests.ts  | 36 +++++++------
 2 files changed, 51 insertions(+), 37 deletions(-)

diff --git a/types/openapi-factory/index.d.ts b/types/openapi-factory/index.d.ts
index 6cb22f7194..e41958e6df 100644
--- a/types/openapi-factory/index.d.ts
+++ b/types/openapi-factory/index.d.ts
@@ -5,43 +5,53 @@
 // TypeScript Version: 2.2
 
 declare namespace OpenApi {
-    interface OpenApiOptions {
+    interface ApiOptions {
         requestMiddleware?: () => any;
         responseMiddleware?: () => any;
         errorMiddleware?: () => any;
     }
+
+    interface HttpMethodOptions {
+        rawBody?: boolean;
+    }
+
+    interface HttpResponse {
+        statusCode?: number;
+        headers?: object;
+        body?: (object | string);
+    }
 }
 
 declare class OpenApi {
-    constructor(options: OpenApi.OpenApiOptions, overrideLogger?: () => void);
+    constructor(options: OpenApi.ApiOptions, overrideLogger?: () => void);
 
-    setAuthorizer(authorizerFunc: (req?: any) => any): void;
-    onEvent(onEventFunc: (req?: any) => any): void;
-    onSchedule(onScheduleFunc: (req?: any) => any): void;
+    setAuthorizer(authorizerFunc: (req?: any) => Promise<any>): void;
+    onEvent(onEventFunc: (req?: any) => Promise<any>): void;
+    onSchedule(onScheduleFunc: (req?: any) => Promise<any>): void;
 
-    head(route: string, p0: (req?: any) => any): void;
-    head(route: string, p0: object, p1: (req?: any) => any): void;
+    head(route: string, handler: (req?: object) => (OpenApi.HttpResponse | Promise<OpenApi.HttpResponse>)): void;
+    head(route: string, options: OpenApi.HttpMethodOptions, handler: (req?: any) => any): void;
 
-    get(route: string, p0: (req?: any) => any): void;
-    get(route: string, p0: object, p1: (req?: any) => any): void;
+    get(route: string, handler: (req?: object) => (OpenApi.HttpResponse | Promise<OpenApi.HttpResponse>)): void;
+    get(route: string, options: OpenApi.HttpMethodOptions, handler: (req?: object) => (OpenApi.HttpResponse | Promise<OpenApi.HttpResponse>)): void;
 
-    post(route: string, p0: (req?: any) => any): void;
-    post(route: string, p0: object, p1: (req?: any) => any): void;
+    post(route: string, handler: (req?: object) => (OpenApi.HttpResponse | Promise<OpenApi.HttpResponse>)): void;
+    post(route: string, options: OpenApi.HttpMethodOptions, handler: (req?: object) => (OpenApi.HttpResponse | Promise<OpenApi.HttpResponse>)): void;
 
-    put(route: string, p0: (req?: any) => any): void;
-    put(route: string, p0: object, p1: (req?: any) => any): void;
+    put(route: string, handler: (req?: object) => (OpenApi.HttpResponse | Promise<OpenApi.HttpResponse>)): void;
+    put(route: string, options: OpenApi.HttpMethodOptions, handler: (req?: object) => (OpenApi.HttpResponse | Promise<OpenApi.HttpResponse>)): void;
 
-    patch(route: string, p0: (req?: any) => any): void;
-    patch(route: string, p0: object, p1: (req?: any) => any): void;
+    patch(route: string, handler: (req?: object) => (OpenApi.HttpResponse | Promise<OpenApi.HttpResponse>)): void;
+    patch(route: string, options: OpenApi.HttpMethodOptions, handler: (req?: object) => (OpenApi.HttpResponse | Promise<OpenApi.HttpResponse>)): void;
 
-    delete(route: string, p0: (req?: any) => any): void;
-    delete(route: string, p0: object, p1: (req?: any) => any): void;
+    delete(route: string, handler: (req?: object) => (OpenApi.HttpResponse | Promise<OpenApi.HttpResponse>)): void;
+    delete(route: string, options: OpenApi.HttpMethodOptions, handler: (req?: object) => (OpenApi.HttpResponse | Promise<OpenApi.HttpResponse>)): void;
 
-    options(route: string, p0: (req?: any) => any): void;
-    options(route: string, p0: object, p1: (req?: any) => any): void;
+    options(route: string, handler: (req?: object) => (OpenApi.HttpResponse | Promise<OpenApi.HttpResponse>)): void;
+    options(route: string, options: OpenApi.HttpMethodOptions, handler: (req?: object) => (OpenApi.HttpResponse | Promise<OpenApi.HttpResponse>)): void;
 
-    any(route: string, p0: (req?: any) => any): void;
-    any(route: string, p0: object, p1: (req?: any) => any): void;
+    any(route: string, handler: (req?: object) => (OpenApi.HttpResponse | Promise<OpenApi.HttpResponse>)): void;
+    any(route: string, options: OpenApi.HttpMethodOptions, handler: (req?: object) => (OpenApi.HttpResponse | Promise<OpenApi.HttpResponse>)): void;
 
     handler(event: object, context: object): Promise<any>;
 }
diff --git a/types/openapi-factory/openapi-factory-tests.ts b/types/openapi-factory/openapi-factory-tests.ts
index 13e1e0e7cc..ad24a5021d 100644
--- a/types/openapi-factory/openapi-factory-tests.ts
+++ b/types/openapi-factory/openapi-factory-tests.ts
@@ -6,20 +6,24 @@ api.setAuthorizer((req: any) => req);
 api.onEvent((req: any) => req);
 api.onSchedule((req: any) => req);
 
-api.head('/v1/test', () => 'success');
-api.get('/v1/test', () => 'success');
-api.post('/v1/test', () => 'success');
-api.put('/v1/test', () => 'success');
-api.patch('/v1/test', () => 'success');
-api.delete('/v1/test', () => 'success');
-api.options('/v1/test', () => 'success');
-api.any('/v1/test2', () => 'success');
+const testReponse = {
+    statusCode: 200
+};
 
-api.head('/v2/test', {test: true}, () => 'success');
-api.get('/v2/test', {test: true}, () => 'success');
-api.post('/v2/test', {test: true}, () => 'success');
-api.put('/v2/test', {test: true}, () => 'success');
-api.patch('/v2/test', {test: true}, () => 'success');
-api.delete('/v2/test', {test: true}, () => 'success');
-api.options('/v2/test', {test: true}, () => 'success');
-api.any('/v2/test2', {test: true}, () => 'success');
+api.head('/v1/test', () => testReponse);
+api.get('/v1/test', () => testReponse);
+api.post('/v1/test', () => testReponse);
+api.put('/v1/test', () => testReponse);
+api.patch('/v1/test', () => testReponse);
+api.delete('/v1/test', () => testReponse);
+api.options('/v1/test', () => testReponse);
+api.any('/v1/test2', () => testReponse);
+
+api.head('/v2/test', { rawBody: true }, () => testReponse);
+api.get('/v2/test', { rawBody: true }, () => testReponse);
+api.post('/v2/test', { rawBody: true }, () => testReponse);
+api.put('/v2/test', { rawBody: true }, () => testReponse);
+api.patch('/v2/test', { rawBody: true }, () => testReponse);
+api.delete('/v2/test', { rawBody: true }, () => testReponse);
+api.options('/v2/test', { rawBody: true }, () => testReponse);
+api.any('/v2/test2', { rawBody: true }, () => testReponse);

From f69313ade8615953ace3f73eeb27bf0480a9166a Mon Sep 17 00:00:00 2001
From: juwar <juwar@microsoft.com>
Date: Mon, 26 Nov 2018 10:01:54 -0800
Subject: [PATCH 314/836] Remove no-angle-bracket-type-assertion issues

---
 types/highcharts/test/highstock.ts |   2 +-
 types/highcharts/test/index.ts     | 240 ++++++++++++++---------------
 2 files changed, 121 insertions(+), 121 deletions(-)

diff --git a/types/highcharts/test/highstock.ts b/types/highcharts/test/highstock.ts
index f1a464f491..e80e0cb7a3 100644
--- a/types/highcharts/test/highstock.ts
+++ b/types/highcharts/test/highstock.ts
@@ -66,7 +66,7 @@ $(() => {
             }
         },
 
-        series: [<Highcharts.AreaRangeChartSeriesOptions> {
+        series: [{
             name: 'USD to EUR',
             data: someData,
             lineColor: "blue"
diff --git a/types/highcharts/test/index.ts b/types/highcharts/test/index.ts
index c1fd8b5676..2bb429ec7a 100644
--- a/types/highcharts/test/index.ts
+++ b/types/highcharts/test/index.ts
@@ -40,12 +40,12 @@ function originalTests() {
             renderTo: "container"
         },
         xAxis: {},
-        series: [<Highcharts.LineChartSeriesOptions> {
+        series: [{
             data: [29.9, 71.5, 106.4, 129.2, 144.0, 176.0, 135.6, 148.5, 216.4, 194.1, 95.6, 54.4],
             description: "foo",
             type: "line",
             allowPointSelect: true
-        }]
+        } as Highcharts.LineChartSeriesOptions]
     });
 
     chart1.addSeries({
@@ -61,7 +61,7 @@ function originalTests() {
             height: 400,
             spacingRight: 20
         },
-        xAxis: [<Highcharts.AxisOptions> {
+        xAxis: [{
             description: 'x-foo',
             min: 1,
             max: 1000,
@@ -71,7 +71,7 @@ function originalTests() {
             gridLineWidth: 1,
             type: 'logarithmic'
         }],
-        yAxis: [<Highcharts.AxisOptions> {
+        yAxis: [{
             description: 'y-foo',
             min: 1,
             max: 1000,
@@ -85,7 +85,7 @@ function originalTests() {
         legend: {
             enabled: false
         },
-        series: [<Highcharts.ScatterChartSeriesOptions> {
+        series: [{
             data: [
                 [550, 870], [738, 362], [719, 711], [547, 665], [595, 197], [332, 144],
                 [581, 555], [196, 862], [6, 837], [400, 924], [888, 148], [785, 730],
@@ -114,12 +114,12 @@ function originalTests() {
             renderTo: "container"
         },
         xAxis: {},
-        series: [<Highcharts.ColumnRangeChartSeriesOptions> {
+        series: [{
             data: [[1, 1, 2], [2, 2, 3], [3, 2, 3]],
             description: "foo",
             type: "columnrange",
             allowPointSelect: true
-        }]
+        } as Highcharts.ColumnRangeChartSeriesOptions]
     });
 
     const chart4 = new Highcharts.Chart({
@@ -127,12 +127,12 @@ function originalTests() {
             renderTo: "container"
         },
         xAxis: {},
-        series: [<Highcharts.ColumnRangeChartSeriesOptions> {
+        series: [{
             data: [["01-01-2018", 1, 2], ["02-01-2018", 2, 3], ["03-01-2018", 2, 3]],
             description: "column range data",
             type: "columnrange",
             allowPointSelect: true
-        }]
+        } as Highcharts.ColumnRangeChartSeriesOptions]
     });
 
     const div: HTMLDivElement = null as any;
@@ -146,7 +146,7 @@ function originalTests() {
         },
         xAxis: [{
         }],
-        series: [<Highcharts.PieChartSeriesOptions> {
+        series: [{
             data: [29.9, 71.5, 106.4, 129.2, 144.0, 176.0, 135.6, 148.5, 216.4, 194.1, 95.6, 54.4]
         }]
     };
@@ -164,47 +164,47 @@ function originalTests() {
 
     const renderToIdChart = new Highcharts.Chart("container", {
         xAxis: {},
-        series: [<Highcharts.LineChartSeriesOptions> {
+        series: [{
             data: [29.9, 71.5, 106.4, 129.2, 144.0, 176.0, 135.6, 148.5, 216.4, 194.1, 95.6, 54.4],
             type: "line",
             allowPointSelect: true
-        }]
+        } as Highcharts.LineChartSeriesOptions]
     });
 
     const renderToElementChart = new Highcharts.Chart(div, {
         xAxis: {},
-        series: [<Highcharts.LineChartSeriesOptions> {
+        series: [{
             data: [29.9, 71.5, 106.4, 129.2, 144.0, 176.0, 135.6, 148.5, 216.4, 194.1, 95.6, 54.4],
             type: "line",
             allowPointSelect: true
-        }]
+        } as Highcharts.LineChartSeriesOptions]
     });
 
     const createWithFunction = Highcharts.chart({
         xAxis: {},
-        series: [<Highcharts.LineChartSeriesOptions> {
+        series: [{
             data: [29.9, 71.5, 106.4, 129.2, 144.0, 176.0, 135.6, 148.5, 216.4, 194.1, 95.6, 54.4],
             type: "line",
             allowPointSelect: true
-        }]
+        } as Highcharts.LineChartSeriesOptions]
     });
 
     const createWithFunctionRenderToId = Highcharts.chart("container", {
         xAxis: {},
-        series: [<Highcharts.LineChartSeriesOptions> {
+        series: [{
             data: [29.9, 71.5, 106.4, 129.2, 144.0, 176.0, 135.6, 148.5, 216.4, 194.1, 95.6, 54.4],
             type: "line",
             allowPointSelect: true
-        }]
+        } as Highcharts.LineChartSeriesOptions]
     });
 
     const createWithFunctionRenderToElement = Highcharts.chart(div, {
         xAxis: {},
-        series: [<Highcharts.LineChartSeriesOptions> {
+        series: [{
             data: [29.9, 71.5, 106.4, 129.2, 144.0, 176.0, 135.6, 148.5, 216.4, 194.1, 95.6, 54.4],
             type: "line",
             allowPointSelect: true
-        }]
+        } as Highcharts.LineChartSeriesOptions]
     });
 }
 
@@ -245,7 +245,7 @@ function test_ChartOptions() {
             duration: 500,
             easing: "linear"
         },
-        backgroundColor: <Highcharts.Gradient> {
+        backgroundColor: {
             linearGradient: {
                 x1: 0,
                 y1: 0,
@@ -261,7 +261,7 @@ function test_ChartOptions() {
         colorCount: 42,
         defaultSeriesType: "deprecated",
         description: "an arbitrary description",
-        events: <Highcharts.ChartEvents> {
+        events: {
             addSeries: () => { },
             afterPrint: () => { },
             beforePrint: () => { },
@@ -281,21 +281,21 @@ function test_ChartOptions() {
         marginLeft: 10,
         marginRight: 10,
         marginTop: 10,
-        options3d: <Highcharts.ChartOptions3d> {
+        options3d: {
             alpha: 20,
             beta: 20,
             depth: 50,
             enabled: true,
             frame: {
-                back: <Highcharts.ChartOptions3dFrame> {
+                back: {
                     color: "black",
                     size: 2
                 },
-                bottom: <Highcharts.ChartOptions3dFrame> {
+                bottom: {
                     color: "black",
                     size: 2
                 },
-                side: <Highcharts.ChartOptions3dFrame> {
+                side: {
                     color: "black",
                     size: 2
                 }
@@ -309,7 +309,7 @@ function test_ChartOptions() {
         plotBackgroundImage: "http://image.url/image.jpg",
         plotBorderColor: "grey",
         plotBorderWidth: 5,
-        plotShadow: <Highcharts.Shadow> {
+        plotShadow: {
             color: "magenta",
             offsetX: 10,
             offsetY: 10,
@@ -319,15 +319,15 @@ function test_ChartOptions() {
         polar: true,
         reflow: false,
         renderTo: "elementId",
-        resetZoomButton: <Highcharts.ChartResetZoomButton> {
-            position: <Highcharts.Position> {
+        resetZoomButton: {
+            position: {
                 align: "left",
                 verticalAlign: "top",
                 x: 5,
                 y: 5
             },
             relativeTo: "chart",
-            theme: <Highcharts.ButtonTheme> {
+            theme: {
                 display: "hidden",
                 fill: "black",
                 stroke: "white",
@@ -394,7 +394,7 @@ function test_ChartOptions() {
     });
 
     // animation example
-    $('#container').highcharts(<Highcharts.Options> {
+    $('#container').highcharts({
         chart: {
             animation: {
                 duration: 1500,
@@ -479,7 +479,7 @@ function test_ChartOptions() {
         chart: {
             events: {
                 addSeries() {
-                    const label = (<Highcharts.ChartObject> this).renderer.label('A series was added, about to redraw chart', 100, 120)
+                    const label = (this as Highcharts.ChartObject).renderer.label('A series was added, about to redraw chart', 100, 120)
                         .attr({
                             fill: Highcharts.getOptions().colors[0],
                             padding: 10,
@@ -729,21 +729,21 @@ function test_Data() {
             }
         },
         series: [
-            <Highcharts.LineChartSeriesOptions> {
+            {
                 lineWidth: 1
             },
-            <Highcharts.AreaSplineChartSeriesOptions> {
+            {
                 type: 'areaspline',
                 color: '#c4392d',
                 negativeColor: '#5679c4',
                 fillOpacity: 0.5
-            }
+            } as Highcharts.AreaSplineChartSeriesOptions
         ]
     });
 
     // limited data example
     $('#container').highcharts({
-        data: <Highcharts.DataOptions> {
+        data: {
             csv: document.getElementById('csv').innerHTML,
             startRow: 114,
             endRow: 134,
@@ -753,7 +753,7 @@ function test_Data() {
         xAxis: {
             allowDecimals: false
         },
-        series: [<Highcharts.LineChartSeriesOptions> {
+        series: [{
             name: 'Annual mean'
         }]
     });
@@ -784,14 +784,14 @@ function test_Drilldown() {
             type: 'category'
         },
         plotOptions: {
-            series: <Highcharts.ColumnChart> {
+            series: {
                 borderWidth: 0,
                 dataLabels: {
                     enabled: true
                 }
-            }
+            } as Highcharts.ColumnChart
         },
-        series: [<Highcharts.ColumnChartSeriesOptions> {
+        series: [{
             name: '2010',
             data: [{
                 name: 'Republican',
@@ -806,7 +806,7 @@ function test_Drilldown() {
                 y: 4,
                 drilldown: 'other-2010'
             }]
-        }, <Highcharts.ColumnChartSeriesOptions> {
+        }, {
             name: '2014',
             data: [{
                 name: 'Republican',
@@ -823,7 +823,7 @@ function test_Drilldown() {
             }]
         }],
         drilldown: {
-            series: [<Highcharts.ColumnChartSeriesOptions> {
+            series: [{
                 id: 'republican-2010',
                 data: [
                     ['East', 4],
@@ -831,7 +831,7 @@ function test_Drilldown() {
                     ['North', 1],
                     ['South', 4]
                 ]
-            }, <Highcharts.ColumnChartSeriesOptions> {
+            }, {
                 id: 'democrats-2010',
                 data: [
                     ['East', 6],
@@ -839,7 +839,7 @@ function test_Drilldown() {
                     ['North', 2],
                     ['South', 4]
                 ]
-            }, <Highcharts.ColumnChartSeriesOptions> {
+            }, {
                 id: 'other-2010',
                 data: [
                     ['East', 2],
@@ -847,7 +847,7 @@ function test_Drilldown() {
                     ['North', 3],
                     ['South', 2]
                 ]
-            }, <Highcharts.ColumnChartSeriesOptions> {
+            }, {
                 id: 'republican-2014',
                 data: [
                     ['East', 2],
@@ -855,7 +855,7 @@ function test_Drilldown() {
                     ['North', 1],
                     ['South', 7]
                 ]
-            }, <Highcharts.ColumnChartSeriesOptions> {
+            }, {
                 id: 'democrats-2014',
                 data: [
                     ['East', 4],
@@ -863,7 +863,7 @@ function test_Drilldown() {
                     ['North', 5],
                     ['South', 3]
                 ]
-            }, <Highcharts.ColumnChartSeriesOptions> {
+            }, {
                 id: 'other-2014',
                 data: [
                     ['East', 7],
@@ -881,14 +881,14 @@ function test_Drilldown() {
             type: 'column'
         },
         plotOptions: {
-            series: <Highcharts.ColumnChart> {
+            series: {
                 borderWidth: 0,
                 dataLabels: {
                     enabled: true
                 }
-            }
+            } as Highcharts.ColumnChart
         },
-        series: [<Highcharts.ColumnChartSeriesOptions> {
+        series: [{
             name: 'Things',
             colorByPoint: true,
             data: [{
@@ -903,7 +903,7 @@ function test_Drilldown() {
                 name: 'Cars',
                 y: 4
             }]
-        }],
+        } as Highcharts.ColumnChartSeriesOptions],
         drilldown: {
             activeAxisLabelStyle: {
                 textDecoration: 'none',
@@ -976,7 +976,7 @@ function test_Exporting() {
         series: [{
             data: [29.9, 71.5, 106.4, 129.2, 144.0, 176.0, 135.6, 148.5, 216.4, 194.1, 95.6, 54.4]
         }],
-        exporting: <Highcharts.ExportingOptions> {
+        exporting: {
             error: () => {
                 console.log('succesfully asserted exporting.error');
             },
@@ -987,7 +987,7 @@ function test_Exporting() {
             chartOptions: {
                 subtitle: null
             }
-        }
+        } as Highcharts.ExportingOptions
     });
 }
 
@@ -1113,12 +1113,12 @@ function test_AreaOptions() {
             categories: ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec']
         },
         plotOptions: {
-            series: <Highcharts.AreaChartSeriesOptions> {
+            series: {
                 fillColor: {
                     linearGradient: [0, 0, 0, 300],
                     stops: [
                         [0, Highcharts.getOptions().colors[0]],
-                        [1, (<Highcharts.Gradient> Highcharts.Color(Highcharts.getOptions().colors[0])).setOpacity(0).get('rgba')]
+                        [1, ((Highcharts.Color(Highcharts.getOptions().colors[0])) as Highcharts.Gradient).setOpacity(0).get('rgba')]
                     ]
                 },
                 fillOpacity: 0.1,
@@ -1129,7 +1129,7 @@ function test_AreaOptions() {
                 threshold: 100,
                 trackByArea: true,
                 stickyTracking: false // to show the difference in tracking
-            }
+            } as Highcharts.AreaChartSeriesOptions
         },
         series: [{
             data: [29.9, 71.5, 106.4, 129.2, 144.0, 176.0, 135.6, 148.5, 216.4, 194.1, 95.6, 54.4]
@@ -1146,7 +1146,7 @@ function test_AreaRange() {
             type: "arearange",
             zoomType: 'x'
         },
-        series: [<Highcharts.AreaRangeChartSeriesOptions> {
+        series: [{
             data: (((arr: number[], len: number) => {
                 for (let i = 0; i < len; i = i + 1) {
                     arr.push(i);
@@ -1191,7 +1191,7 @@ function test_AreaRange() {
             legend: {
                 enabled: false
             },
-            series: [<Highcharts.AreaRangeChartSeriesOptions> {
+            series: [{
                 name: 'Temperatures',
                 data,
                 dataLabels: {
@@ -1199,7 +1199,7 @@ function test_AreaRange() {
                     yHigh: 20,
                     yLow: -20
                 }
-            }]
+            } as Highcharts.AreaRangeChartSeriesOptions]
         });
     });
 }
@@ -1215,7 +1215,7 @@ function test_Bar() {
             categories: ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec']
         },
         plotOptions: {
-            series: <Highcharts.BarChartSeriesOptions> {
+            series: {
                 borderColor: '#303030',
                 borderRadius: 5,
                 borderWidth: 2,
@@ -1240,7 +1240,7 @@ function test_Bar() {
                         }
                     }
                 }
-            }
+            } as Highcharts.BarChartSeriesOptions
         },
         series: [{
             data: [29.9, 71.5, 106.4, 129.2, 144.0, 176.0, 135.6, 148.5, 216.4, 194.1, 95.6, 54.4]
@@ -1274,7 +1274,7 @@ function test_Bar() {
 
     // grouping example
     Highcharts.getOptions().colors = Highcharts.map(Highcharts.getOptions().colors, (color: string) => {
-        return (<Highcharts.Gradient> Highcharts.Color(color))
+        return (Highcharts.Color(color) as Highcharts.Gradient)
             .setOpacity(0.5)
             .get('rgba');
     });
@@ -1309,19 +1309,19 @@ function test_Bar() {
                 shadow: false
             }
         },
-        series: [<Highcharts.BarChartSeriesOptions> {
+        series: [{
             name: 'Tokyo',
             data: [49.9, 71.5, 106.4, 129.2, 144.0, 176.0, 135.6, 148.5, 216.4, 194.1, 95.6, 54.4],
             pointPadding: 0
-        }, <Highcharts.BarChartSeriesOptions> {
+        } as Highcharts.BarChartSeriesOptions, {
             name: 'New York',
             data: [83.6, 78.8, 98.5, 93.4, 106.0, 84.5, 105.0, 104.3, 91.2, 83.5, 106.6, 92.3],
             pointPadding: 0.1
-        }, <Highcharts.BarChartSeriesOptions> {
+        }, {
             name: 'London',
             data: [48.9, 38.8, 39.3, 41.4, 47.0, 48.3, 59.0, 59.6, 52.4, 65.2, 59.3, 51.2],
             pointPadding: 0.2
-        }, <Highcharts.BarChartSeriesOptions> {
+        }, {
             name: 'Berlin',
             data: [42.4, 33.2, 34.5, 39.7, 52.6, 75.5, 57.4, 60.4, 47.6, 39.1, 46.8, 51.1],
             pointPadding: 0.3
@@ -1407,7 +1407,7 @@ function test_Bubble() {
                 maxSize: 50
             }
         },
-        series: [<Highcharts.BubbleChartSeriesOptions> {
+        series: [{
             data: [
                 [9, 81, 13],
                 [98, 5, 39],
@@ -1430,7 +1430,7 @@ function test_Bubble() {
             zMin: 0,
             zMax: 100,
             zThreshold: 0
-        }]
+        } as Highcharts.BubbleChartSeriesOptions]
     });
 
     // size by absolute value example
@@ -1444,7 +1444,7 @@ function test_Bubble() {
         subtitle: {
             text: 'Size is computed by absolute value on negative bubbles'
         },
-        series: [<Highcharts.BubbleChartSeriesOptions> {
+        series: [{
             data: [
                 [-5, 0, -5],
                 [-4, 0, -4],
@@ -1460,7 +1460,7 @@ function test_Bubble() {
             ],
             sizeByAbsoluteValues: true,
             negativeColor: '#FF0000'
-        }]
+        } as Highcharts.BubbleChartSeriesOptions]
     });
 }
 
@@ -1479,7 +1479,7 @@ function test_ColumnCrispFalse() {
         }
         return arr;
     };
-    const chart = new Highcharts.Chart(<Highcharts.Options> {
+    const chart = new Highcharts.Chart({
         title: {
             text: 'Crisp columns are disabled'
         },
@@ -1527,7 +1527,7 @@ function test_ErrorBar() {
         tooltip: {
             shared: true
         },
-        series: [<Highcharts.SplineChartSeriesOptions> {
+        series: [{
             name: 'Temperature',
             type: 'spline',
             data: [7.0, 6.9, 9.5, 14.5, 18.2, 21.5, 25.2, 26.5, 23.3, 18.3, 13.9, 9.6],
@@ -1537,7 +1537,7 @@ function test_ErrorBar() {
             tooltip: {
                 pointFormat: '<span style="font-weight: bold; color: {series.color}"> {series.name}</span> : <b> {point.y:.1f}°C</b> <br/> '
             }
-        }, <Highcharts.ErrorBarChartSeriesOptions> {
+        } as Highcharts.SplineChartSeriesOptions, {
             color: '#FF0000',
             name: 'Temperature error',
             type: 'errorbar',
@@ -1549,7 +1549,7 @@ function test_ErrorBar() {
             stemDashStyle: "Solid",
             stemWidth: 3,
             whiskerLength: 0
-        }]
+        } as Highcharts.ErrorBarChartSeriesOptions]
     });
 }
 
@@ -1568,7 +1568,7 @@ function test_FindNearestPointBy() {
             }
         },
 
-        series: [<Highcharts.IndividualSeriesOptions> {
+        series: [{
             findNearestPointBy: 'x',
             // Hover at [3.5, 6] to demo x-dimension search
             // Compare to Series 2 behavior at [5.5, 3]
@@ -1584,7 +1584,7 @@ function test_FindNearestPointBy() {
                 [6, 6],
                 [7, 6]
             ]
-        }, <Highcharts.IndividualSeriesOptions> {
+        } as Highcharts.IndividualSeriesOptions, {
             findNearestPointBy: 'xy',
             // Hover at [1, 4] to demo xy-dimension search.
             // Useful when having multiple points on the same x-value.
@@ -1600,7 +1600,7 @@ function test_FindNearestPointBy() {
                 [6, 3],
                 [7, 3]
             ]
-        }]
+        } as Highcharts.IndividualSeriesOptions]
     });
 }
 
@@ -1618,7 +1618,7 @@ function test_Funnel() {
             x: -50
         },
         plotOptions: {
-            series: <Highcharts.FunnelChartSeriesOptions> {
+            series: {
                 dataLabels: {
                     enabled: true,
                     format: '<b> {point.name}</b>  ({point.y:,.0f})',
@@ -1630,7 +1630,7 @@ function test_Funnel() {
                 reversed: false,
                 height: "10%",
                 width: 100
-            }
+            } as Highcharts.FunnelChartSeriesOptions
         },
         legend: {
             enabled: false
@@ -1701,10 +1701,10 @@ function test_Gauge() {
                 }
             }
         },
-        series: [<Highcharts.GaugeChartSeriesOptions> {
+        series: [{
             data: [80],
             overshoot: 5
-        }]
+        } as Highcharts.GaugeChartSeriesOptions]
     });
 }
 
@@ -1757,14 +1757,14 @@ function test_HeatMap() {
             ],
             min: -5
         },
-        series: [<Highcharts.HeatMapSeriesOptions> {
+        series: [{
             borderWidth: 0,
             colsize: 24 * 36e5, // one day
             tooltip: {
                 headerFormat: 'Temperature<br/> ',
                 pointFormat: '{point.x:%e %b, %Y} {point.y}:00: <b> {point.value} ℃</b> '
             }
-        }]
+        } as Highcharts.HeatMapSeriesOptions]
     });
 }
 
@@ -1779,17 +1779,17 @@ function test_Line() {
         xAxis: {
             categories: ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec']
         },
-        series: [<Highcharts.LineChartSeriesOptions> {
+        series: [{
             data: [1, 2, 3, 4, null, 6, 7, null, 9],
             step: 'right',
             name: 'Right',
             linecap: 'round'
-        }, <Highcharts.LineChartSeriesOptions> {
+        } as Highcharts.LineChartSeriesOptions, {
             data: [5, 6, 7, 8, null, 10, 11, null, 13],
             step: 'center',
             name: 'Center',
             linecap: 'round'
-        }, <Highcharts.LineChartSeriesOptions> {
+        }, {
             data: [9, 10, 11, 12, null, 14, 15, null, 17],
             step: 'left',
             name: 'Left',
@@ -1829,7 +1829,7 @@ function test_Pie() {
                 }
             }
         },
-        series: [<Highcharts.PieChartSeriesOptions> {
+        series: [{
             name: "Brands",
             colorByPoint: true,
             data: [{
@@ -1853,7 +1853,7 @@ function test_Pie() {
                 name: "Proprietary or Undetectable",
                 y: 0.2
             }]
-        }]
+        } as Highcharts.PieChartSeriesOptions]
     });
 
     // semi circle
@@ -1888,7 +1888,7 @@ function test_Pie() {
                 center: ['50%', '75%']
             }
         },
-        series: [<Highcharts.PieChartSeriesOptions> {
+        series: [{
             type: 'pie',
             name: 'Browser share',
             innerSize: '50%',
@@ -2161,10 +2161,10 @@ function test_Waterfall() {
 }
 
 function test_AccessibilityOptions() {
-    const accessibilityOptions: Highcharts.AccessibilityOptions = <Highcharts.AccessibilityOptions> {
+    const accessibilityOptions: Highcharts.AccessibilityOptions = {
         describeSingleSeries: true,
         enabled: true,
-        keyboardNavigation: <Highcharts.KeyboardNavigationOptions> {
+        keyboardNavigation: {
             enabled: true,
             skipNullPoints: true
         },
@@ -2177,7 +2177,7 @@ function test_AccessibilityOptions() {
         seriesDescriptionFormatter: () => { }
     };
 
-    const chart = new Highcharts.Chart(<Highcharts.Options> {
+    const chart = new Highcharts.Chart({
         accessibility: accessibilityOptions
     });
 }
@@ -2435,31 +2435,31 @@ function test_AxisObject() {
     axis.toPixels(10, true);
     axis.toValue(10);
     axis.toValue(10, true);
-    axis.update(<Highcharts.AxisOptions> {});
-    axis.update(<Highcharts.AxisOptions> {}, true);
+    axis.update({});
+    axis.update({}, true);
 }
 
 function test_ChartObject() {
     const chart = $("#container").highcharts();
-    chart.addAxis(<Highcharts.AxisOptions> {});
-    chart.addAxis(<Highcharts.AxisOptions> {}, true);
-    chart.addAxis(<Highcharts.AxisOptions> {}, true, false);
-    chart.addAxis(<Highcharts.AxisOptions> {}, true, true, false);
-    chart.addAxis(<Highcharts.AxisOptions> {}, true, true, { duration: 50 });
-    chart.addSeries(<Highcharts.IndividualSeriesOptions> {});
-    chart.addSeries(<Highcharts.IndividualSeriesOptions> {}, false);
-    chart.addSeries(<Highcharts.IndividualSeriesOptions> {}, false, false);
-    chart.addSeries(<Highcharts.IndividualSeriesOptions> {}, false, { duration: 50 });
-    chart.addSeriesAsDrilldown(<Highcharts.PointObject> {}, <Highcharts.IndividualSeriesOptions> {});
+    chart.addAxis({});
+    chart.addAxis({}, true);
+    chart.addAxis({}, true, false);
+    chart.addAxis({}, true, true, false);
+    chart.addAxis({}, true, true, { duration: 50 });
+    chart.addSeries({});
+    chart.addSeries({}, false);
+    chart.addSeries({}, false, false);
+    chart.addSeries({}, false, { duration: 50 });
+    chart.addSeriesAsDrilldown({}, {});
     const container = chart.container;
     console.log(container.id);
     chart.destroy();
     chart.drillUp();
-    chart.exportChart(<Highcharts.ExportingOptions> {}, <Highcharts.Options> {});
-    chart.exportChartLocal(<Highcharts.ExportingOptions> {}, <Highcharts.Options> {});
+    chart.exportChart({}, {});
+    chart.exportChartLocal({}, {});
     const object = chart.get('axisIdOrSeriesIdOrPointId');
     const svg1 = chart.getSVG();
-    const svg2 = chart.getSVG(<Highcharts.Options> {});
+    const svg2 = chart.getSVG({});
     const selectedPoints = chart.getSelectedPoints();
     const selectedSeries = chart.getSelectedSeries();
     chart.hideLoading();
@@ -2480,11 +2480,11 @@ function test_ChartObject() {
     const firstXAxis = chart.xAxis[0];
     const firstYAxis = chart.yAxis[0];
     const legend = chart.legend;
-    chart.update(<Highcharts.Options> {});
-    chart.update(<Highcharts.Options> {}, true);
-    chart.update(<Highcharts.Options> {}, true, true);
-    chart.update(<Highcharts.Options> {}, true, true, true);
-    chart.update(<Highcharts.Options> {}, true, true, {
+    chart.update({});
+    chart.update({}, true);
+    chart.update({}, true, true);
+    chart.update({}, true, true, true);
+    chart.update({}, true, true, {
         duration: 3000,
     });
 }
@@ -2564,7 +2564,7 @@ function test_NumericSymbolMagnitude() {
 }
 
 function test_PaneBackground() {
-    const pane = <Highcharts.PaneBackground> {
+    const pane = {
         backgroundColor: 'blue',
         borderColor: 'white',
         borderWidth: 5,
@@ -2576,7 +2576,7 @@ function test_PaneBackground() {
 }
 
 function test_PointObject() {
-    const point = <Highcharts.PointObject> $('#container').highcharts().get('point1');
+    const point = $('#container').highcharts().get('point1') as Highcharts.PointObject;
     const category = point.category;
     const percentage = point.percentage;
     point.index;
@@ -2608,7 +2608,7 @@ function test_RendererObject() {
     const renderer = $('#container').highcharts().renderer;
     renderer.arc(0, 0, 20, 10, 0, Math.PI);
     renderer.circle(0, 0, 100);
-    renderer.definition(<object> {});
+    renderer.definition({});
     renderer.g('groupName');
     renderer.image('http://source', 20, 20, 100, 100);
     renderer.label('Label', 200, 100, 'rect', 0, 0, false, false, 'class');
@@ -2618,15 +2618,15 @@ function test_RendererObject() {
 }
 
 function test_ResponsiveOptions() {
-    const responsiveOptions: Highcharts.ResponsiveOptions = <Highcharts.ResponsiveOptions> {
+    const responsiveOptions: Highcharts.ResponsiveOptions = {
         rules: [
-            <Highcharts.RulesOptions> {
-                chartOptions: <Highcharts.Options> {
+            {
+                chartOptions: {
                     chart: {
                         description: 'just a test'
                     }
                 },
-                condition: <Highcharts.ConditionOptions> {
+                condition: {
                     callback: () => { },
                     maxHeight: 420,
                     maxWidth: 420,
@@ -2643,7 +2643,7 @@ function test_ResponsiveOptions() {
 }
 
 function test_SeriesObject() {
-    const series = <Highcharts.SeriesObject> $('#container').highcharts().get('series1');
+    const series = $('#container').highcharts().get('series1') as Highcharts.SeriesObject;
     series.addPoint(0);
     series.addPoint([0, 0]);
     series.addPoint({});

From 5b7fc62ce75b058b26c601a0021bb0a89d30d411 Mon Sep 17 00:00:00 2001
From: juwar <juwar@microsoft.com>
Date: Mon, 26 Nov 2018 10:12:10 -0800
Subject: [PATCH 315/836] Small fixes from more issues.

---
 types/highcharts/test/highstock.ts | 2 +-
 types/highcharts/test/index.ts     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/types/highcharts/test/highstock.ts b/types/highcharts/test/highstock.ts
index e80e0cb7a3..af9de8d1f9 100644
--- a/types/highcharts/test/highstock.ts
+++ b/types/highcharts/test/highstock.ts
@@ -70,6 +70,6 @@ $(() => {
             name: 'USD to EUR',
             data: someData,
             lineColor: "blue"
-        }]
+        } as Highcharts.AreaRangeChartSeriesOptions]
     });
 });
diff --git a/types/highcharts/test/index.ts b/types/highcharts/test/index.ts
index 2bb429ec7a..e5c891b5ef 100644
--- a/types/highcharts/test/index.ts
+++ b/types/highcharts/test/index.ts
@@ -2450,7 +2450,7 @@ function test_ChartObject() {
     chart.addSeries({}, false);
     chart.addSeries({}, false, false);
     chart.addSeries({}, false, { duration: 50 });
-    chart.addSeriesAsDrilldown({}, {});
+    chart.addSeriesAsDrilldown({} as Highcharts.PointObject, {});
     const container = chart.container;
     console.log(container.id);
     chart.destroy();

From 1fef27e8affcb1a8eb34fb7a1f9889d980f65baa Mon Sep 17 00:00:00 2001
From: juwar <juwar@microsoft.com>
Date: Mon, 26 Nov 2018 10:20:33 -0800
Subject: [PATCH 316/836] Another one.

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

diff --git a/types/highcharts/test/index.ts b/types/highcharts/test/index.ts
index e5c891b5ef..1474ee7e9c 100644
--- a/types/highcharts/test/index.ts
+++ b/types/highcharts/test/index.ts
@@ -2637,7 +2637,7 @@ function test_ResponsiveOptions() {
         ]
     };
 
-    const chart = new Highcharts.Chart(<Highcharts.Options> {
+    const chart = new Highcharts.Chart({
         responsive: responsiveOptions
     });
 }

From d73f3efdcfadea4fb6100686286b53bf92be8275 Mon Sep 17 00:00:00 2001
From: dyniper <dyniper@users.noreply.github.com>
Date: Tue, 20 Nov 2018 11:56:00 -0800
Subject: [PATCH 317/836] Add new partialBundledLanguages InitOptions

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

diff --git a/types/i18next/index.d.ts b/types/i18next/index.d.ts
index 84433c26ec..d2e0b4ee6b 100644
--- a/types/i18next/index.d.ts
+++ b/types/i18next/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for i18next 11.9
+// Type definitions for i18next 12.1
 // Project: http://i18next.com
 // Definitions by: Michael Ledin <https://github.com/mxl>
 //                 Budi Irawan <https://github.com/deerawan>
@@ -160,6 +160,12 @@ declare namespace i18next {
          */
         resources?: Resource;
 
+        /**
+         * Allow initializing with bundled resources while using a backend to load non bundled ones.
+         * @default false
+         */
+        partialBundledLanguages?: boolean;
+
         /**
          * language to use (overrides language detection)
          * @default undefined

From e3c335e16e88c7869c90ec2e4b942e3a176f6682 Mon Sep 17 00:00:00 2001
From: John Plusje <john.plusje@ivengi.com>
Date: Mon, 26 Nov 2018 19:48:57 +0100
Subject: [PATCH 318/836] Add call to server.close() in order to show that
 http.Server is properly extended. Added a StoppableServer type for typing the
 created server instance.

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

diff --git a/types/stoppable/index.d.ts b/types/stoppable/index.d.ts
index b15444c7ba..1b30c5a995 100644
--- a/types/stoppable/index.d.ts
+++ b/types/stoppable/index.d.ts
@@ -7,10 +7,12 @@
 /// <reference types="node" />
 import { Server } from 'http';
 
-interface StoppableServer extends Server {
-  stop(callback?: (e: Error, gracefully: boolean) => void): void;
+declare namespace stoppable {
+  interface StoppableServer extends Server {
+    stop(callback?: (e: Error, gracefully: boolean) => void): void;
+  }
 }
 
-declare function stoppable(server: Server, grace?: number): StoppableServer;
+declare function stoppable(server: Server, grace?: number): stoppable.StoppableServer;
 
 export = stoppable;
diff --git a/types/stoppable/stoppable-tests.ts b/types/stoppable/stoppable-tests.ts
index 89ebf64f6d..930a2340bd 100644
--- a/types/stoppable/stoppable-tests.ts
+++ b/types/stoppable/stoppable-tests.ts
@@ -1,11 +1,12 @@
 import * as http from 'http';
 import stoppable = require('stoppable');
 
-const server = stoppable(http.createServer());
+const server: stoppable.StoppableServer = stoppable(http.createServer());
 server.stop();
 
-const server2 = stoppable(http.createServer(), 10000);
+const server2: stoppable.StoppableServer = stoppable(http.createServer(), 10000);
 server2.stop();
 
-const server3 = stoppable(http.createServer());
+const server3: stoppable.StoppableServer = stoppable(http.createServer());
 server.stop((err, gracefully) => {});
+server.close();

From 35483b43559b94114dca755f130e6ccb48f18d3b Mon Sep 17 00:00:00 2001
From: Dimitri Benin <dimitri.benin@gmail.com>
Date: Mon, 26 Nov 2018 20:30:14 +0100
Subject: [PATCH 319/836] Impove types for bitwise-xor

---
 types/bitwise-xor/bitwise-xor-tests.ts | 12 ++--
 types/bitwise-xor/index.d.ts           |  7 +--
 types/bitwise-xor/tsconfig.json        |  4 +-
 types/bitwise-xor/tslint.json          | 78 +-------------------------
 4 files changed, 11 insertions(+), 90 deletions(-)

diff --git a/types/bitwise-xor/bitwise-xor-tests.ts b/types/bitwise-xor/bitwise-xor-tests.ts
index b19768f11f..13ddab8b66 100644
--- a/types/bitwise-xor/bitwise-xor-tests.ts
+++ b/types/bitwise-xor/bitwise-xor-tests.ts
@@ -1,10 +1,8 @@
+'use strict';
 
+import xor = require('bitwise-xor');
 
-"use strict";
+let b: Buffer;
 
-import xor = require("bitwise-xor");
-
-var b: Buffer;
-
-b = xor("a", "b");
-b = xor(new Buffer("a"), new Buffer("b"));
+b = xor('a', 'b');
+b = xor(new Buffer('a'), new Buffer('b'));
diff --git a/types/bitwise-xor/index.d.ts b/types/bitwise-xor/index.d.ts
index 9960023c97..3147c5b675 100644
--- a/types/bitwise-xor/index.d.ts
+++ b/types/bitwise-xor/index.d.ts
@@ -1,15 +1,14 @@
-// Type definitions for bitwise-xor 0.0.0
+// Type definitions for bitwise-xor 0.0
 // Project: https://github.com/czzarr/node-bitwise-xor
 // Definitions by: Rogier Schouten <https://github.com/rogierschouten>
+//                 BendingBender <https://github.com/BendingBender>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="node" />
 
-
 /**
  * Bitwise XOR between two Buffers or Strings, returns a Buffer
  */
-declare function xor(b1: Buffer, b2: Buffer): Buffer;
-declare function xor(s1: string, s2: string): Buffer;
+declare function xor(a: Buffer | string, b: Buffer | string): Buffer;
 
 export = xor;
diff --git a/types/bitwise-xor/tsconfig.json b/types/bitwise-xor/tsconfig.json
index a6b66cda37..f02f5ef72b 100644
--- a/types/bitwise-xor/tsconfig.json
+++ b/types/bitwise-xor/tsconfig.json
@@ -6,7 +6,7 @@
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
-        "strictNullChecks": false,
+        "strictNullChecks": true,
         "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [
@@ -20,4 +20,4 @@
         "index.d.ts",
         "bitwise-xor-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/bitwise-xor/tslint.json b/types/bitwise-xor/tslint.json
index a41bf5d19a..f93cf8562a 100644
--- a/types/bitwise-xor/tslint.json
+++ b/types/bitwise-xor/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 c830fd6999d65e1c02f3be796233fb380f396826 Mon Sep 17 00:00:00 2001
From: Dimitri Benin <dimitri.benin@gmail.com>
Date: Mon, 26 Nov 2018 21:00:12 +0100
Subject: [PATCH 320/836] Add types for create-hash

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

diff --git a/types/create-hash/create-hash-tests.ts b/types/create-hash/create-hash-tests.ts
new file mode 100644
index 0000000000..d039a5a704
--- /dev/null
+++ b/types/create-hash/create-hash-tests.ts
@@ -0,0 +1,9 @@
+import createHash = require('create-hash');
+
+const hash = createHash('sha224');
+
+hash.update('synchronous write');
+hash.digest();
+hash.write('write to it as a stream');
+hash.end();
+hash.read();
diff --git a/types/create-hash/index.d.ts b/types/create-hash/index.d.ts
new file mode 100644
index 0000000000..712be2520f
--- /dev/null
+++ b/types/create-hash/index.d.ts
@@ -0,0 +1,26 @@
+// Type definitions for create-hash 1.2
+// Project: https://github.com/crypto-browserify/createHash
+// Definitions by: BendingBender <https://github.com/BendingBender>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.1
+
+/// <reference types="node" />
+
+import { Hash } from 'crypto';
+
+export = createHash;
+
+declare function createHash(algo: createHash.Algorithm): Hash;
+
+declare namespace createHash {
+    type Algorithm =
+        | 'md5'
+        | 'rmd160'
+        | 'ripemd160'
+        | 'sha'
+        | 'sha1'
+        | 'sha224'
+        | 'sha256'
+        | 'sha384'
+        | 'sha512';
+}
diff --git a/types/create-hash/tsconfig.json b/types/create-hash/tsconfig.json
new file mode 100644
index 0000000000..83e50b425c
--- /dev/null
+++ b/types/create-hash/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "create-hash-tests.ts"
+    ]
+}
diff --git a/types/create-hash/tslint.json b/types/create-hash/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/create-hash/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From b41337dd487ca3a99359e93a9067073643870d99 Mon Sep 17 00:00:00 2001
From: Dimitri Benin <dimitri.benin@gmail.com>
Date: Mon, 26 Nov 2018 21:15:37 +0100
Subject: [PATCH 321/836] Add types for create-hmac

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

diff --git a/types/create-hmac/create-hmac-tests.ts b/types/create-hmac/create-hmac-tests.ts
new file mode 100644
index 0000000000..f233a0390a
--- /dev/null
+++ b/types/create-hmac/create-hmac-tests.ts
@@ -0,0 +1,9 @@
+import createHmac = require('create-hmac');
+
+const hmac = createHmac('sha224', Buffer.from('secret key'));
+
+hmac.update('synchronous write');
+hmac.digest();
+hmac.write('write to it as a stream');
+hmac.end();
+hmac.read();
diff --git a/types/create-hmac/index.d.ts b/types/create-hmac/index.d.ts
new file mode 100644
index 0000000000..3d6bcfeafa
--- /dev/null
+++ b/types/create-hmac/index.d.ts
@@ -0,0 +1,26 @@
+// Type definitions for create-hmac 1.1
+// Project: https://github.com/crypto-browserify/createHmac
+// Definitions by: BendingBender <https://github.com/BendingBender>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.1
+
+/// <reference types="node" />
+
+import { Hmac } from 'crypto';
+
+export = createHmac;
+
+declare function createHmac(algo: createHmac.Algorithm, key: string | Buffer): Hmac;
+
+declare namespace createHmac {
+    type Algorithm =
+        | 'rmd160'
+        | 'ripemd160'
+        | 'md5'
+        | 'sha'
+        | 'sha1'
+        | 'sha224'
+        | 'sha256'
+        | 'sha384'
+        | 'sha512';
+}
diff --git a/types/create-hmac/tsconfig.json b/types/create-hmac/tsconfig.json
new file mode 100644
index 0000000000..badd99da29
--- /dev/null
+++ b/types/create-hmac/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "create-hmac-tests.ts"
+    ]
+}
diff --git a/types/create-hmac/tslint.json b/types/create-hmac/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/create-hmac/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From afe5664ded8cec5ccf443e2dd682298f5b53c5b7 Mon Sep 17 00:00:00 2001
From: Dimitri Benin <dimitri.benin@gmail.com>
Date: Mon, 26 Nov 2018 21:41:06 +0100
Subject: [PATCH 322/836] Add types for sha.js

---
 types/sha.js/index.d.ts      | 26 ++++++++++++++++++++++++++
 types/sha.js/sha.js-tests.ts | 15 +++++++++++++++
 types/sha.js/tsconfig.json   | 23 +++++++++++++++++++++++
 types/sha.js/tslint.json     |  1 +
 4 files changed, 65 insertions(+)
 create mode 100644 types/sha.js/index.d.ts
 create mode 100644 types/sha.js/sha.js-tests.ts
 create mode 100644 types/sha.js/tsconfig.json
 create mode 100644 types/sha.js/tslint.json

diff --git a/types/sha.js/index.d.ts b/types/sha.js/index.d.ts
new file mode 100644
index 0000000000..d5dc4ba752
--- /dev/null
+++ b/types/sha.js/index.d.ts
@@ -0,0 +1,26 @@
+// Type definitions for sha.js 2.4
+// Project: https://github.com/crypto-browserify/sha.js
+// Definitions by: BendingBender <https://github.com/BendingBender>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+import { Hash } from 'crypto';
+
+export = SHA;
+
+declare function SHA(algorithm: string): Hash;
+
+declare namespace SHA {
+    type Algorithm = 'sha' | 'sha1' | 'sha224' | 'sha256' | 'sha384' | 'sha512';
+    interface HashStatic {
+        new (): Hash;
+    }
+
+    const sha: HashStatic;
+    const sha1: HashStatic;
+    const sha224: HashStatic;
+    const sha256: HashStatic;
+    const sha384: HashStatic;
+    const sha512: HashStatic;
+}
diff --git a/types/sha.js/sha.js-tests.ts b/types/sha.js/sha.js-tests.ts
new file mode 100644
index 0000000000..fd3cde2e47
--- /dev/null
+++ b/types/sha.js/sha.js-tests.ts
@@ -0,0 +1,15 @@
+import shajs = require('sha.js');
+
+shajs('sha256')
+    .update('42')
+    .digest('hex');
+new shajs.sha().update('42').digest('hex');
+new shajs.sha1().update('42').digest('hex');
+new shajs.sha224().update('42').digest('hex');
+new shajs.sha256().update('42').digest('hex');
+new shajs.sha384().update('42').digest('hex');
+new shajs.sha512().update('42').digest('hex');
+
+const sha256stream = shajs('sha256');
+sha256stream.end('42');
+(sha256stream.read() as Buffer).toString('hex');
diff --git a/types/sha.js/tsconfig.json b/types/sha.js/tsconfig.json
new file mode 100644
index 0000000000..9f10462f5a
--- /dev/null
+++ b/types/sha.js/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "sha.js-tests.ts"
+    ]
+}
diff --git a/types/sha.js/tslint.json b/types/sha.js/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/sha.js/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 9ed2a742a2989285e8ca98bbc3b3c418df508c72 Mon Sep 17 00:00:00 2001
From: Dimitri Benin <dimitri.benin@gmail.com>
Date: Mon, 26 Nov 2018 22:03:57 +0100
Subject: [PATCH 323/836] Add types for ripemd160

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

diff --git a/types/ripemd160/index.d.ts b/types/ripemd160/index.d.ts
new file mode 100644
index 0000000000..27de423a18
--- /dev/null
+++ b/types/ripemd160/index.d.ts
@@ -0,0 +1,16 @@
+// Type definitions for ripemd160 2.0
+// Project: https://github.com/crypto-browserify/ripemd160#readme
+// Definitions by: BendingBender <https://github.com/BendingBender>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+import { Hash } from 'crypto';
+
+export = RIPEMD160;
+
+declare const RIPEMD160: RIPEMD160Static;
+
+interface RIPEMD160Static {
+    new (): Hash;
+}
diff --git a/types/ripemd160/ripemd160-tests.ts b/types/ripemd160/ripemd160-tests.ts
new file mode 100644
index 0000000000..3a78efbac3
--- /dev/null
+++ b/types/ripemd160/ripemd160-tests.ts
@@ -0,0 +1,7 @@
+import RIPEMD160 = require('ripemd160');
+
+new RIPEMD160().update('42').digest('hex');
+
+const ripemd160stream = new RIPEMD160();
+ripemd160stream.end('42');
+(ripemd160stream.read() as Buffer).toString('hex');
diff --git a/types/ripemd160/tsconfig.json b/types/ripemd160/tsconfig.json
new file mode 100644
index 0000000000..07abc9bd05
--- /dev/null
+++ b/types/ripemd160/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "ripemd160-tests.ts"
+    ]
+}
diff --git a/types/ripemd160/tslint.json b/types/ripemd160/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/ripemd160/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From dac19ea9e5d43d976abce50f6302cd7df32ddbb7 Mon Sep 17 00:00:00 2001
From: Cameron Martin <cameronmartin123@gmail.com>
Date: Mon, 26 Nov 2018 21:40:06 +0000
Subject: [PATCH 324/836] [@babel/core]: Fixed typo in method name.

Renamed one overload of `transformFromAstSync` to `transformFromAstAsync`. See https://github.com/babel/babel/blob/61f2aed5b0d3ef869dca2f8e2673e46079df7d09/packages/babel-core/src/transform-ast.js#L75 and https://github.com/babel/babel/blob/61f2aed5b0d3ef869dca2f8e2673e46079df7d09/packages/babel-core/src/index.js#L29
---
 types/babel__core/babel__core-tests.ts | 4 ++++
 types/babel__core/index.d.ts           | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/types/babel__core/babel__core-tests.ts b/types/babel__core/babel__core-tests.ts
index a873c3392f..623d4121fe 100644
--- a/types/babel__core/babel__core-tests.ts
+++ b/types/babel__core/babel__core-tests.ts
@@ -29,3 +29,7 @@ babel.transformFromAst(parsedAst!, sourceCode, options, (err, result) => {
 
 const transformFromAstSyncResult = babel.transformFromAstSync(parsedAst!, sourceCode, options);
 const { code, map, ast } = transformFromAstSyncResult!;
+
+babel.transformFromAstAsync(parsedAst!, sourceCode, options).then(transformFromAstAsyncResult => {
+    const { code, map, ast } = transformFromAstAsyncResult!;
+});
diff --git a/types/babel__core/index.d.ts b/types/babel__core/index.d.ts
index 85a89392af..ad061fba80 100644
--- a/types/babel__core/index.d.ts
+++ b/types/babel__core/index.d.ts
@@ -349,7 +349,7 @@ export function transformFromAstSync(ast: Node, code?: string, opts?: TransformO
 /**
  * Given an AST, transform it.
  */
-export function transformFromAstSync(ast: Node, code?: string, opts?: TransformOptions): Promise<BabelFileResult | null>;
+export function transformFromAstAsync(ast: Node, code?: string, opts?: TransformOptions): Promise<BabelFileResult | null>;
 
 // A babel plugin is a simple function which must return an object matching
 // the following interface. Babel will throw if it finds unknown properties.

From 9fa2b6599f6309a7e33e5b5ab1387537ed68d9df Mon Sep 17 00:00:00 2001
From: Boris Sergeyev <surgeboris@gmail.com>
Date: Mon, 26 Nov 2018 22:18:35 +0100
Subject: [PATCH 325/836] [react-redux] extended ThunkActionCreator testsuite
 to check all overloads

---
 types/react-redux/react-redux-tests.tsx | 59 ++++++++++++++++++++++---
 1 file changed, 54 insertions(+), 5 deletions(-)

diff --git a/types/react-redux/react-redux-tests.tsx b/types/react-redux/react-redux-tests.tsx
index f47683047e..554ace09ff 100644
--- a/types/react-redux/react-redux-tests.tsx
+++ b/types/react-redux/react-redux-tests.tsx
@@ -120,12 +120,61 @@ function MapDispatchWithThunkActionCreators() {
    }
     class TestComponent extends React.Component<TestComponentProps> {}
 
-    const Test = connect(
-        null,
-        ({ simpleAction, thunkAction }),
-    )(TestComponent);
+    const mapStateToProps = ({ foo }: { foo: string }) => ({ foo });
+    const mapDispatchToProps = { simpleAction, thunkAction };
 
-    const verify = <Test foo='bar' />;
+    const Test1 = connect(null, mapDispatchToProps)(TestComponent);
+    const Test2 = connect(mapStateToProps, mapDispatchToProps)(TestComponent);
+    const Test3 = connect(
+        null, mapDispatchToProps, null, { storeKey: 'somekey' }
+    )(TestComponent);
+    const Test4 = connect(
+        mapStateToProps, mapDispatchToProps, null, { storeKey: 'somekey' }
+    )(TestComponent);
+    const verify = <div>
+        <Test1 foo='bar' />;
+        <Test2 />
+        <Test3 foo='bar' />;
+        <Test4 />
+    </div>;
+}
+
+function MapManualDispatchThatLooksLikeThunk() {
+    interface OwnProps {
+        foo: string;
+    }
+    interface TestComponentProps extends OwnProps {
+        remove: (item: string) => () => object;
+   }
+    class TestComponent extends React.Component<TestComponentProps> {
+        render() {
+            return <div onClick={this.props.remove('someid')} />;
+        }
+    }
+
+    const mapStateToProps = ({ foo }: { foo: string }) => ({ foo });
+    function mapDispatchToProps(dispatch: Dispatch) {
+        return {
+            remove(item: string) {
+                return () => dispatch({ type: 'REMOVE_ITEM', item });
+            }
+        };
+    }
+
+    const Test1 = connect(null, mapDispatchToProps)(TestComponent);
+    const Test2 = connect(mapStateToProps, mapDispatchToProps)(TestComponent);
+    const Test3 = connect(
+        null, mapDispatchToProps, null, { storeKey: 'somekey' }
+    )(TestComponent);
+    const Test4 = connect(
+        mapStateToProps, mapDispatchToProps, null, { storeKey: 'somekey' }
+    )(TestComponent);
+    const verify = <div>
+        <Test1 foo='bar' />;
+        <Test2 />
+        <Test3 foo='bar' />;
+        <Test4 />
+    </div>;
 }
 
 function MapStateAndDispatchObject() {

From 8cbf6d938de2e838a4f3cc9695576958ed55f4c3 Mon Sep 17 00:00:00 2001
From: Boris Sergeyev <surgeboris@gmail.com>
Date: Mon, 26 Nov 2018 22:19:18 +0100
Subject: [PATCH 326/836] [react-redux] fixed type definitions to pass extended
 tests

---
 types/react-redux/index.d.ts | 36 +++++++++++++++++++++++++++++++-----
 1 file changed, 31 insertions(+), 5 deletions(-)

diff --git a/types/react-redux/index.d.ts b/types/react-redux/index.d.ts
index bf65d89fd5..dc8a9af912 100644
--- a/types/react-redux/index.d.ts
+++ b/types/react-redux/index.d.ts
@@ -160,7 +160,12 @@ export interface Connect {
 
     <no_state = {}, TDispatchProps = {}, TOwnProps = {}>(
         mapStateToProps: null | undefined,
-        mapDispatchToProps: MapDispatchToPropsParam<TDispatchProps, TOwnProps>
+        mapDispatchToProps: MapDispatchToPropsNonObject<TDispatchProps, TOwnProps>
+    ): InferableComponentEnhancerWithProps<TDispatchProps, TOwnProps>;
+
+    <no_state = {}, TDispatchProps = {}, TOwnProps = {}>(
+        mapStateToProps: null | undefined,
+        mapDispatchToProps: TDispatchProps,
     ): InferableComponentEnhancerWithProps<
         WithThunkActionCreators<TDispatchProps>,
         TOwnProps
@@ -168,7 +173,12 @@ export interface Connect {
 
     <TStateProps = {}, TDispatchProps = {}, TOwnProps = {}, State = {}>(
         mapStateToProps: MapStateToPropsParam<TStateProps, TOwnProps, State>,
-        mapDispatchToProps: MapDispatchToPropsParam<TDispatchProps, TOwnProps>
+        mapDispatchToProps: MapDispatchToPropsNonObject<TDispatchProps, TOwnProps>
+    ): InferableComponentEnhancerWithProps<TStateProps & TDispatchProps, TOwnProps>;
+
+    <TStateProps = {}, TDispatchProps = {}, TOwnProps = {}, State = {}>(
+        mapStateToProps: MapStateToPropsParam<TStateProps, TOwnProps, State>,
+        mapDispatchToProps: TDispatchProps,
     ): InferableComponentEnhancerWithProps<
         TStateProps & WithThunkActionCreators<TDispatchProps>,
         TOwnProps
@@ -208,7 +218,14 @@ export interface Connect {
 
     <TStateProps = {}, TDispatchProps = {}, TOwnProps = {}>(
         mapStateToProps: null | undefined,
-        mapDispatchToProps: MapDispatchToPropsParam<TDispatchProps, TOwnProps>,
+        mapDispatchToProps: MapDispatchToPropsNonObject<TDispatchProps, TOwnProps>,
+        mergeProps: null | undefined,
+        options: Options<{}, TStateProps, TOwnProps>
+    ): InferableComponentEnhancerWithProps<TDispatchProps, TOwnProps>;
+
+    <TStateProps = {}, TDispatchProps = {}, TOwnProps = {}>(
+        mapStateToProps: null | undefined,
+        mapDispatchToProps: TDispatchProps,
         mergeProps: null | undefined,
         options: Options<{}, TStateProps, TOwnProps>
     ): InferableComponentEnhancerWithProps<
@@ -218,7 +235,14 @@ export interface Connect {
 
     <TStateProps = {}, TDispatchProps = {}, TOwnProps = {}, State = {}>(
         mapStateToProps: MapStateToPropsParam<TStateProps, TOwnProps, State>,
-        mapDispatchToProps: MapDispatchToPropsParam<TDispatchProps, TOwnProps>,
+        mapDispatchToProps: MapDispatchToPropsNonObject<TDispatchProps, TOwnProps>,
+        mergeProps: null | undefined,
+        options: Options<State, TStateProps, TOwnProps>
+    ): InferableComponentEnhancerWithProps<TStateProps & TDispatchProps, TOwnProps>;
+
+    <TStateProps = {}, TDispatchProps = {}, TOwnProps = {}, State = {}>(
+        mapStateToProps: MapStateToPropsParam<TStateProps, TOwnProps, State>,
+        mapDispatchToProps: TDispatchProps,
         mergeProps: null | undefined,
         options: Options<State, TStateProps, TOwnProps>
     ): InferableComponentEnhancerWithProps<
@@ -248,10 +272,12 @@ export type MapDispatchToProps<TDispatchProps, TOwnProps> =
     MapDispatchToPropsFunction<TDispatchProps, TOwnProps> | TDispatchProps;
 
 export type MapDispatchToPropsFactory<TDispatchProps, TOwnProps> =
-    (dispatch: Dispatch<Action>, ownProps: TOwnProps) => MapDispatchToProps<TDispatchProps, TOwnProps>;
+    (dispatch: Dispatch<Action>, ownProps: TOwnProps) => MapDispatchToPropsFunction<TDispatchProps, TOwnProps>;
 
 export type MapDispatchToPropsParam<TDispatchProps, TOwnProps> = MapDispatchToPropsFactory<TDispatchProps, TOwnProps> | MapDispatchToProps<TDispatchProps, TOwnProps>;
 
+export type MapDispatchToPropsNonObject<TDispatchProps, TOwnProps> = MapDispatchToPropsFactory<TDispatchProps, TOwnProps> | MapDispatchToPropsFunction<TDispatchProps, TOwnProps>;
+
 export type MergeProps<TStateProps, TDispatchProps, TOwnProps, TMergedProps> =
     (stateProps: TStateProps, dispatchProps: TDispatchProps, ownProps: TOwnProps) => TMergedProps;
 

From 009260118e5ebe5a5afe3ebf749998d69e0e5ea7 Mon Sep 17 00:00:00 2001
From: Dimitri Benin <dimitri.benin@gmail.com>
Date: Sun, 25 Nov 2018 23:53:43 +0100
Subject: [PATCH 327/836] Add types for saslmechanisms

---
 types/saslmechanisms/index.d.ts              | 31 ++++++++++++++++++++
 types/saslmechanisms/saslmechanisms-tests.ts | 22 ++++++++++++++
 types/saslmechanisms/tsconfig.json           | 23 +++++++++++++++
 types/saslmechanisms/tslint.json             |  1 +
 4 files changed, 77 insertions(+)
 create mode 100644 types/saslmechanisms/index.d.ts
 create mode 100644 types/saslmechanisms/saslmechanisms-tests.ts
 create mode 100644 types/saslmechanisms/tsconfig.json
 create mode 100644 types/saslmechanisms/tslint.json

diff --git a/types/saslmechanisms/index.d.ts b/types/saslmechanisms/index.d.ts
new file mode 100644
index 0000000000..62f71e8a25
--- /dev/null
+++ b/types/saslmechanisms/index.d.ts
@@ -0,0 +1,31 @@
+// Type definitions for saslmechanisms 0.1
+// Project: https://github.com/jaredhanson/js-sasl
+// Definitions by: BendingBender <https://github.com/BendingBender>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export = Factory;
+
+declare class Factory {
+    static Factory: typeof Factory;
+
+    use(name: string, mechanism: Factory.MechanismStatic): this;
+    use(mechanism: Factory.MechanismStatic): this;
+    create(mechanisms: string[]): Factory.Mechanism | null;
+}
+
+declare namespace Factory {
+    interface MechanismStatic {
+        new (): Mechanism;
+        prototype: {
+            [key: string]: any;
+            name: string;
+        };
+    }
+    interface Mechanism {
+        name: string;
+
+        response(cred: { [key: string]: any }): string;
+
+        challenge(chal: string): void;
+    }
+}
diff --git a/types/saslmechanisms/saslmechanisms-tests.ts b/types/saslmechanisms/saslmechanisms-tests.ts
new file mode 100644
index 0000000000..d7e6fe7620
--- /dev/null
+++ b/types/saslmechanisms/saslmechanisms-tests.ts
@@ -0,0 +1,22 @@
+import Fct = require('saslmechanisms');
+import { Factory, MechanismStatic, Mechanism } from 'saslmechanisms';
+
+const Mech: MechanismStatic = null as any;
+
+const factory = new Fct();
+new Factory();
+new Factory.Factory();
+
+// $ExpectType Factory
+factory.use(Mech);
+factory.use('Mech', Mech);
+
+const mech: Mechanism | null = factory.create(['Mech']);
+if (mech) {
+    // $ExpectType string
+    mech.name;
+    // $ExpectType string
+    mech.response({ foo: 'bar' });
+    // $ExpectType void
+    mech.challenge('challenge');
+}
diff --git a/types/saslmechanisms/tsconfig.json b/types/saslmechanisms/tsconfig.json
new file mode 100644
index 0000000000..64beedfc0f
--- /dev/null
+++ b/types/saslmechanisms/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "saslmechanisms-tests.ts"
+    ]
+}
diff --git a/types/saslmechanisms/tslint.json b/types/saslmechanisms/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/saslmechanisms/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 9f4587cc6731cf6e733de34f6a09c71415a373f8 Mon Sep 17 00:00:00 2001
From: Cameron Martin <cameronmartin123@gmail.com>
Date: Mon, 26 Nov 2018 23:52:05 +0000
Subject: [PATCH 328/836] [@babel/traverse]: Added types to argument of
 Scope#push.

Copied from the flow types (https://github.com/babel/babel/blob/61f2aed5b0d3ef869dca2f8e2673e46079df7d09/packages/babel-traverse/src/scope/index.js#L778) with one exception - kind was made optional, since this is assigned a default value (https://github.com/babel/babel/blob/61f2aed5b0d3ef869dca2f8e2673e46079df7d09/packages/babel-traverse/src/scope/index.js#L801) and is most likely a mistake in the flow types.
---
 types/babel__traverse/index.d.ts | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/types/babel__traverse/index.d.ts b/types/babel__traverse/index.d.ts
index 465a60464f..4825dc5303 100644
--- a/types/babel__traverse/index.d.ts
+++ b/types/babel__traverse/index.d.ts
@@ -90,7 +90,13 @@ export class Scope {
 
     removeData(key: string): void;
 
-    push(opts: any): void;
+    push(opts: {
+        id: object,
+        init?: object,
+        unique?: boolean,
+        _blockHoist?: number,
+        kind?: "var" | "let",
+    }): void;
 
     getProgramParent(): Scope;
 

From aa086a84c1eb3b2499f77d0d075f91a672f11573 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Santiago=20Aguilar=20Hern=C3=A1ndez?=
 <santiago777@outlook.com>
Date: Mon, 26 Nov 2018 19:16:28 -0500
Subject: [PATCH 329/836] * Applied better practices

---
 types/better-sqlite3/better-sqlite3-tests.ts | 22 +++--
 types/better-sqlite3/index.d.ts              | 86 +++++++++++++++++++-
 types/better-sqlite3/tsconfig.json           |  1 -
 types/better-sqlite3/types.d.ts              | 80 ------------------
 4 files changed, 99 insertions(+), 90 deletions(-)
 delete mode 100644 types/better-sqlite3/types.d.ts

diff --git a/types/better-sqlite3/better-sqlite3-tests.ts b/types/better-sqlite3/better-sqlite3-tests.ts
index 5d8b95ecf7..7272d88f7e 100644
--- a/types/better-sqlite3/better-sqlite3-tests.ts
+++ b/types/better-sqlite3/better-sqlite3-tests.ts
@@ -1,27 +1,33 @@
 import Database = require('better-sqlite3');
-import { RunResult } from 'better-sqlite3/types';
 
 const integer = Database.Integer(1);
 const err = new Database.SqliteError('ok', 'ok');
-const result: RunResult = { changes: 1, lastInsertRowid: 1 };
+const result: Database.RunResult = { changes: 1, lastInsertRowid: 1 };
+const options: Database.Options = { fileMustExist: true, memory: true, readonly: true };
+const registrationOptions: Database.RegistrationOptions = {
+    deterministic: true,
+    name: '',
+    safeIntegers: true,
+    varargs: true
+};
 
 let db = Database('.');
-db = new Database('.', {memory: true});
+db = new Database('.', { memory: true });
 db.exec('CREATE TABLE test (id INTEGER PRIMARY KEY NOT NULL, name TEXT NOT NULL);');
 db.exec('INSERT INTO test(name) VALUES("name");');
 db.pragma('data_version', true);
 db.checkpoint();
 db.checkpoint('main');
-db.register(() => {});
-db.register({name: 'noop', deterministic: true, varargs: true}, () => {});
+db.register(() => { });
+db.register({ name: 'noop', deterministic: true, varargs: true }, () => { });
 db.defaultSafeIntegers();
 db.defaultSafeIntegers(true);
 
 const stmt = db.prepare('SELECT * FROM test WHERE name == ?;');
 stmt.get(['name']);
-stmt.all({name: 'name'});
-stmt.each('name', (row: {name: string}) => {});
-stmt.each((row: {name: string}) => {});
+stmt.all({ name: 'name' });
+stmt.each('name', (row: { name: string }) => { });
+stmt.each((row: { name: string }) => { });
 stmt.pluck();
 stmt.pluck(true);
 stmt.bind('name');
diff --git a/types/better-sqlite3/index.d.ts b/types/better-sqlite3/index.d.ts
index d120209765..5a4859e21f 100644
--- a/types/better-sqlite3/index.d.ts
+++ b/types/better-sqlite3/index.d.ts
@@ -5,7 +5,91 @@
 //                 Santiago Aguilar <https://github.com/sant123>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-import { DatabaseConstructor } from "./types";
+import Integer = require("integer");
+
+declare class Statement {
+    database: Database;
+    source: string;
+    returnsData: boolean;
+    constructor(db: Database, sources: string[]);
+
+    run(...params: any[]): Database.RunResult;
+    get(...params: any[]): any;
+    all(...params: any[]): any[];
+    each(params: any, cb: (row: any) => void): void;
+    each(cb: (row: any) => void): void;
+    each(...params: any[]): void;
+    pluck(toggleState?: boolean): this;
+    bind(...params: any[]): this;
+    safeIntegers(toggleState?: boolean): this;
+}
+
+declare class Transaction {
+    database: Database;
+    source: string;
+    constructor(db: Database, sources: string[]);
+
+    run(...params: any[]): Database.RunResult;
+    bind(...params: any[]): this;
+    safeIntegers(toggleState?: boolean): this;
+}
+
+interface Database {
+    memory: boolean;
+    readonly: boolean;
+    name: string;
+    open: boolean;
+    inTransaction: boolean;
+
+    prepare(source: string): Statement;
+    transaction(sources: string[]): Transaction;
+    exec(source: string): this;
+    pragma(source: string, simplify?: boolean): any;
+    checkpoint(databaseName?: string): this;
+    register(cb: (...params: any[]) => any): this;
+    register(
+        options: Database.RegistrationOptions,
+        cb: (...params: any[]) => any
+    ): this;
+    close(): this;
+    defaultSafeIntegers(toggleState?: boolean): this;
+}
+
+declare class SqliteError implements Error {
+    name: string;
+    message: string;
+    code: string;
+    constructor(message: string, code: string);
+}
+
+interface DatabaseConstructor {
+    new (filename: string, options?: Database.Options): Database;
+    (filename: string, options?: Database.Options): Database;
+    prototype: Database;
+
+    Integer: typeof Integer;
+    SqliteError: typeof SqliteError;
+}
+
+declare namespace Database {
+    interface RunResult {
+        changes: number;
+        lastInsertRowid: Integer.IntLike;
+    }
+
+    interface Options {
+        memory?: boolean;
+        readonly?: boolean;
+        fileMustExist?: boolean;
+    }
+
+    interface RegistrationOptions {
+        name?: string;
+        varargs?: boolean;
+        deterministic?: boolean;
+        safeIntegers?: boolean;
+    }
+}
 
 declare const Database: DatabaseConstructor;
 export = Database;
diff --git a/types/better-sqlite3/tsconfig.json b/types/better-sqlite3/tsconfig.json
index 891afa0aad..30a480355b 100644
--- a/types/better-sqlite3/tsconfig.json
+++ b/types/better-sqlite3/tsconfig.json
@@ -18,7 +18,6 @@
     },
     "files": [
         "index.d.ts",
-        "types.d.ts",
         "better-sqlite3-tests.ts"
     ]
 }
\ No newline at end of file
diff --git a/types/better-sqlite3/types.d.ts b/types/better-sqlite3/types.d.ts
deleted file mode 100644
index 61f376b0bf..0000000000
--- a/types/better-sqlite3/types.d.ts
+++ /dev/null
@@ -1,80 +0,0 @@
-import Integer = require("integer");
-
-export interface RunResult {
-    changes: number;
-    lastInsertRowid: Integer.IntLike;
-}
-
-export class Statement {
-    database: Database;
-    source: string;
-    returnsData: boolean;
-    constructor(db: Database, sources: string[]);
-
-    run(...params: any[]): RunResult;
-    get(...params: any[]): any;
-    all(...params: any[]): any[];
-    each(params: any, cb: (row: any) => void): void;
-    each(cb: (row: any) => void): void;
-    each(...params: any[]): void;
-    pluck(toggleState?: boolean): this;
-    bind(...params: any[]): this;
-    safeIntegers(toggleState?: boolean): this;
-}
-
-export class Transaction {
-    database: Database;
-    source: string;
-    constructor(db: Database, sources: string[]);
-
-    run(...params: any[]): RunResult;
-    bind(...params: any[]): this;
-    safeIntegers(toggleState?: boolean): this;
-}
-
-export interface DatabaseOptions {
-    memory?: boolean;
-    readonly?: boolean;
-    fileMustExist?: boolean;
-}
-
-export interface RegistrationOptions {
-    name?: string;
-    varargs?: boolean;
-    deterministic?: boolean;
-    safeIntegers?: boolean;
-}
-
-export interface Database {
-    memory: boolean;
-    readonly: boolean;
-    name: string;
-    open: boolean;
-    inTransaction: boolean;
-
-    prepare(source: string): Statement;
-    transaction(sources: string[]): Transaction;
-    exec(source: string): this;
-    pragma(source: string, simplify?: boolean): any;
-    checkpoint(databaseName?: string): this;
-    register(cb: (...params: any[]) => any): this;
-    register(options: RegistrationOptions, cb: (...params: any[]) => any): this;
-    close(): this;
-    defaultSafeIntegers(toggleState?: boolean): this;
-}
-
-export class SqliteError implements Error {
-    name: string;
-    message: string;
-    code: string;
-    constructor(message: string, code: string);
-}
-
-export interface DatabaseConstructor {
-    new (filename: string, options?: DatabaseOptions): Database;
-    (filename: string, options?: DatabaseOptions): Database;
-    prototype: Database;
-
-    Integer: typeof Integer;
-    SqliteError: typeof SqliteError;
-}

From 838a295269bc8f0674c902db18d87b95e3cc406e Mon Sep 17 00:00:00 2001
From: ksaryan <ksaryan@gmail.com>
Date: Mon, 26 Nov 2018 16:20:05 -0800
Subject: [PATCH 330/836] Add ios_backgroundColor prop to Switch

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

diff --git a/types/react-native/index.d.ts b/types/react-native/index.d.ts
index 2386fc71c2..9e68e283a9 100644
--- a/types/react-native/index.d.ts
+++ b/types/react-native/index.d.ts
@@ -8177,6 +8177,13 @@ export interface SwitchProps extends SwitchPropsIOS {
      * Default value is false.
      */
     value?: boolean;
+
+     /**
+     * On iOS, custom color for the background.
+     * Can be seen when the switch value is false or when the switch is disabled.
+     */
+    ios_backgroundColor?: string;
+
     style?: StyleProp<ViewStyle>;
 }
 

From 389b8185f9630eb48b27b95c40f5c39b8c15137a Mon Sep 17 00:00:00 2001
From: obedm503 <obedm503@gmail.com>
Date: Mon, 26 Nov 2018 20:31:12 -0600
Subject: [PATCH 331/836] Revert typescript version change

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

diff --git a/types/react-intl/index.d.ts b/types/react-intl/index.d.ts
index 2c25a55b1f..aaba74820b 100644
--- a/types/react-intl/index.d.ts
+++ b/types/react-intl/index.d.ts
@@ -11,7 +11,7 @@
 //                 Kanitkorn Sujautra <https://github.com/lukyth>
 //                 obedm503 <https://github.com/obedm503>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.9
+// TypeScript Version: 2.8
 
 declare namespace ReactIntl {
     type DateSource = Date | string | number;

From 5934128c87ea053d8443a14b5fa1b692f1db2730 Mon Sep 17 00:00:00 2001
From: obedm503 <obedm503@gmail.com>
Date: Mon, 26 Nov 2018 20:39:22 -0600
Subject: [PATCH 332/836] fix trailing whitespace

---
 types/react-intl/react-intl-tests.tsx | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/types/react-intl/react-intl-tests.tsx b/types/react-intl/react-intl-tests.tsx
index 74da23a12a..63af762e61 100644
--- a/types/react-intl/react-intl-tests.tsx
+++ b/types/react-intl/react-intl-tests.tsx
@@ -401,13 +401,13 @@ class TestApp extends React.Component {
             hello: "Hello, {name}!"
         };
         return (
-            <IntlProvider 
-                locale="en" 
-                formats={{}} 
-                messages={messages} 
-                defaultLocale="en" 
-                defaultFormats={messages} 
-                timeZone="UTC" 
+            <IntlProvider
+                locale="en"
+                formats={{}}
+                messages={messages}
+                defaultLocale="en"
+                defaultFormats={messages}
+                timeZone="UTC"
                 onError={(error: string) => console.error(error)}
             >
                 <SomeComponentWithIntl className="just-for-test" />

From 82d92693da98494f58dcbaf62b514fa14051fad5 Mon Sep 17 00:00:00 2001
From: quas94 <quasar.exe@hotmail.com>
Date: Tue, 27 Nov 2018 16:27:11 +1100
Subject: [PATCH 333/836] Update typedefs

---
 .../dropbox-chooser/dropbox-chooser-tests.ts  |  6 +++---
 types/dropbox-chooser/index.d.ts              | 19 ++++++++++---------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/types/dropbox-chooser/dropbox-chooser-tests.ts b/types/dropbox-chooser/dropbox-chooser-tests.ts
index f0930733f8..e998bad7bf 100644
--- a/types/dropbox-chooser/dropbox-chooser-tests.ts
+++ b/types/dropbox-chooser/dropbox-chooser-tests.ts
@@ -1,7 +1,7 @@
 // Tests for Dropbox Chooser DefinitelyTyped TS definitions
 
-const options: DropboxChooserOptions = {
-  success: (files: ReadonlyArray<DropboxChooserFile>) => {
+const options: Dropbox.ChooserOptions = {
+  success: (files: ReadonlyArray<Dropbox.ChooserFile>) => {
     console.log('Success, selected files were:', files);
   },
 };
@@ -9,7 +9,7 @@ const options: DropboxChooserOptions = {
 const Dropbox = window.Dropbox!;
 Dropbox.choose(options);
 
-const sampleFile: DropboxChooserFile = {
+const sampleFile: Dropbox.ChooserFile = {
   id: 'SAMPLE_ID',
   name: 'HelloBox.jpg',
   link: 'http://localhost/1.png',
diff --git a/types/dropbox-chooser/index.d.ts b/types/dropbox-chooser/index.d.ts
index 8c9db6f72d..c9a9db4d70 100644
--- a/types/dropbox-chooser/index.d.ts
+++ b/types/dropbox-chooser/index.d.ts
@@ -4,13 +4,14 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 declare namespace Dropbox {
-    interface DropboxChooser {
+
+    interface Chooser {
       choose(options: ChooserOptions): void;
     }
 
     interface ChooserOptions {
-        // alled when a user selects an item in the Chooser
-        success(files: ReadonlyArray<File>): void;
+        // called when a user selects an item in the Chooser
+        success(files: ReadonlyArray<ChooserFile>): void;
 
         // called when the user closes the dialog without selecting a file
         cancel?(): void;
@@ -31,7 +32,7 @@ declare namespace Dropbox {
         sizeLimit?: number;
     }
 
-    interface File {
+    interface ChooserFile {
         // Unique ID for the file, compatible with Dropbox API v2.
         id: string;
 
@@ -55,12 +56,12 @@ declare namespace Dropbox {
         // whether or not the file is actually a directory
         isDir: boolean;
     }
-}
 
-type DropboxChooser = Dropbox.DropboxChooser;
-type DropboxChooserOptions = Dropbox.ChooserOptions;
-type DropboxChooserFile = Dropbox.File;
+    // Refer to "Handling the response" section of: https://www.dropbox.com/developers/chooser
+    type ChooserFileBoundingBox = 75 | 256 | 800 | 1280 | 2048;
+    type ChooserFileMode = 'fit' | 'crop' | 'fit_one_and_overflow';
+}
 
 interface Window {
-    Dropbox?: DropboxChooser;
+    Dropbox?: Dropbox.Chooser;
 }

From 2df4d594006f2a9070e2359ac791768c14430623 Mon Sep 17 00:00:00 2001
From: Junyoung Choi <fluke8259@gmail.com>
Date: Tue, 27 Nov 2018 14:40:20 +0900
Subject: [PATCH 334/836] Set data unknown

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

diff --git a/types/vfile/index.d.ts b/types/vfile/index.d.ts
index ce8f1dce38..7329e8e9ec 100644
--- a/types/vfile/index.d.ts
+++ b/types/vfile/index.d.ts
@@ -117,7 +117,7 @@ declare namespace vfile {
          * Place to store custom information.
          * It's OK to store custom data directly on the `vfile`, moving it to `data` gives a little more privacy.
          */
-        data: any;
+        data: unknown;
         /**
          * List of messages associated with the file.
          */

From 1da614b33511ba1968a40a86df80dede10895967 Mon Sep 17 00:00:00 2001
From: Junyoung Choi <fluke8259@gmail.com>
Date: Tue, 27 Nov 2018 14:40:34 +0900
Subject: [PATCH 335/836] Clean up type tests

---
 types/vfile/vfile-tests.ts | 116 ++++++++++++++++++++++---------------
 1 file changed, 68 insertions(+), 48 deletions(-)

diff --git a/types/vfile/vfile-tests.ts b/types/vfile/vfile-tests.ts
index 4d146237b1..5c14c8502b 100644
--- a/types/vfile/vfile-tests.ts
+++ b/types/vfile/vfile-tests.ts
@@ -2,56 +2,38 @@ import vfile = require('vfile');
 import * as Unist from 'unist';
 
 // Instantiation
-vfile();
+const file: vfile.VFile = vfile();
 vfile('string');
 vfile(Buffer.from('string'));
 vfile(vfile());
 vfile({ stem: 'readme', extname: '.md' });
-try {
-    vfile({ extname: '.md' });
-} catch (e) {
-    console.log('Error: set extname without path');
-}
 
-interface CustomVFile extends vfile.VFile {
-    custom: string;
-    data: {
-        custom: number;
-    };
-}
-
-const file = vfile<CustomVFile>({
-    path: '~/example.txt',
-    contents: 'Alpha *braavo* charlie.',
-    custom: 'Custom tango',
-    data: {
-        custom: 12345
-    }
-});
-const customIsString: string = file.custom;
-const dataCustomIsNumber: number = file.data.custom;
-const copiedFile: CustomVFile = vfile(file);
-
-file.path; // => '~/example.txt'
-file.dirname; // => '~'
+vfile({ path: 1234 }); // $ExpectError
 
+file.path = '~/test.txt';
+file.dirname = '~';
 file.extname = '.md';
+file.basename = 'test.text';
+file.history = ['~/test.txt']; // => ['~/example.txt', '~/example.md', '~/index.text']
+file.messages = [{
+    file: '~/test.txt',
+    ruleId: '',
+    reason: '',
+    line: 1,
+    column: 1,
+    location: {
+        start: {
+            line: 1,
+            column: 1,
+        },
+        end: {
+            line: 1,
+            column: 1,
+        }
+    },
+    source: ''
+}];
 
-file.basename; // => 'example.md'
-
-file.basename = 'index.text';
-
-file.history; // => ['~/example.txt', '~/example.md', '~/index.text']
-
-file.message('`braavo` is misspelt; did you mean `bravo`?', {line: 1, column: 8});
-
-console.log(file.messages);
-
-// Typings of the custom data can be resolved from the parameters above
-const custom: string = file.custom; // 'Custom tango'
-const dataCustom: number = file.data.custom; // 12345
-
-// message method accept any Stringifiable Position(e.g. point, position, node with position)
 const startPoint: Unist.Point = {
     line: 1,
     column: 1,
@@ -63,18 +45,56 @@ const position: Unist.Position = {
         column: 2,
     },
 };
-// Accept Point
+
 file.message('test', startPoint);
-// Accept Position
 file.message('test', position);
-// Accept Node with extra value
 file.message('test', {
     type: 'ramdom node',
     position,
     extraValue: 'extra tango',
 });
-// But, it must reject any malformed position
+
 file.message('test', { start: 'invalid point' }); // $ExpectError
 
-// Typings of original properties must be kept
-const fileWithWrongParams = vfile({ path: 1234 }); // $ExpectError
+// Using `data` prop
+interface CustomData {
+    message: string;
+}
+function isCustomData(data: any): data is CustomData {
+    return data != null && typeof data.message === 'string';
+}
+function doSomethingWithCustomData(data: CustomData) {
+}
+const customData: CustomData = {
+    message: 'tango'
+};
+const fileWithData = vfile({
+    data: customData
+});
+
+if (isCustomData(fileWithData.data)) {
+    doSomethingWithCustomData(fileWithData.data);
+}
+doSomethingWithCustomData(fileWithData.data); // $ExpectError
+
+// Extending vfile
+interface CustomVFile extends vfile.VFile {
+    custom: string;
+    data: {
+        custom: number;
+    };
+}
+
+const customVFile = vfile<CustomVFile>({
+    path: '~/example.txt',
+    contents: 'Alpha *braavo* charlie.',
+    custom: 'Custom tango',
+    data: {
+        custom: 12345
+    }
+});
+
+customVFile.custom = 'test';
+customVFile.data.custom = 1234;
+
+const copiedFile: CustomVFile = vfile(customVFile);

From dcf5a0dbd497d343a92b6084440c7ffb12cc220f Mon Sep 17 00:00:00 2001
From: Junyoung Choi <fluke8259@gmail.com>
Date: Tue, 27 Nov 2018 14:47:42 +0900
Subject: [PATCH 336/836] Add decription for `data` prop

---
 types/vfile/readme.md | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/types/vfile/readme.md b/types/vfile/readme.md
index 349503cef8..21525242cb 100644
--- a/types/vfile/readme.md
+++ b/types/vfile/readme.md
@@ -3,6 +3,34 @@
 Below are some examples of how to use these Definitions.<br>
 Scenarios where the Typescript code is identical to plain Javascript code are omitted.
 
+### Using `data` property
+
+Because `data` property type is set `unknown`, you have to make your own type guard.
+
+```ts
+interface CustomData {
+    message: string;
+}
+// This is the type guard
+function isCustomData(data: any): data is CustomData {
+    return data != null && typeof data.message === 'string';
+}
+function doSomethingWithCustomData(data: CustomData) {
+}
+const customData: CustomData = {
+    message: 'tango'
+};
+const fileWithData = vfile({
+    data: customData
+});
+
+if (isCustomData(fileWithData.data)) {
+    doSomethingWithCustomData(fileWithData.data);
+}
+// The below code will throw a compiler error
+doSomethingWithCustomData(fileWithData.data); // $ExpectError
+```
+
 ### Extending VFile
 
 ```ts

From dcc3948836f0a3683aeb8cb9b6395742760757a8 Mon Sep 17 00:00:00 2001
From: Junyoung Choi <fluke8259@gmail.com>
Date: Tue, 27 Nov 2018 14:49:51 +0900
Subject: [PATCH 337/836] Upgrade typescript version because it is using
 `unknown`

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

diff --git a/types/vfile/index.d.ts b/types/vfile/index.d.ts
index 7329e8e9ec..df729e0a49 100644
--- a/types/vfile/index.d.ts
+++ b/types/vfile/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: bizen241 <https://github.com/bizen241>
 //                 Junyoung Choi <https://github.com/rokt33r>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.4
+// TypeScript Version: 3.0
 
 /// <reference types='node' />
 

From e0b6335bbc3545f111bf199e52f4364569b806f1 Mon Sep 17 00:00:00 2001
From: quas94 <quasar.exe@hotmail.com>
Date: Tue, 27 Nov 2018 16:55:24 +1100
Subject: [PATCH 338/836] Remove newline

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

diff --git a/types/dropbox-chooser/index.d.ts b/types/dropbox-chooser/index.d.ts
index c9a9db4d70..c5fd8a6cd6 100644
--- a/types/dropbox-chooser/index.d.ts
+++ b/types/dropbox-chooser/index.d.ts
@@ -4,7 +4,6 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 declare namespace Dropbox {
-
     interface Chooser {
       choose(options: ChooserOptions): void;
     }

From 84bc355df06ea07679ab0634483c08f76ac4bb7c Mon Sep 17 00:00:00 2001
From: Boris Sergeyev <surgeboris@gmail.com>
Date: Tue, 27 Nov 2018 07:18:16 +0100
Subject: [PATCH 339/836] [react-redux] improved naming of higher-order-type
 that handles thunks

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

diff --git a/types/react-redux/index.d.ts b/types/react-redux/index.d.ts
index dc8a9af912..bcbcced0bd 100644
--- a/types/react-redux/index.d.ts
+++ b/types/react-redux/index.d.ts
@@ -112,19 +112,19 @@ export type InferableComponentEnhancerWithProps<TInjectedProps, TNeedsProps> =
 export type InferableComponentEnhancer<TInjectedProps> =
     InferableComponentEnhancerWithProps<TInjectedProps, {}>;
 
-export type WrappedThunkActionCreator<TActionCreator extends (...args: any[]) => any> =
+export type InferThunkActionCreatorType<TActionCreator extends (...args: any[]) => any> =
     TActionCreator extends (...args: infer TParams) => (...args: any[]) => infer TReturn
         ? (...args: TParams) => TReturn
         : TActionCreator;
 
 export type HandleThunkActionCreator<TActionCreator> =
     TActionCreator extends (...args: any[]) => any
-        ? WrappedThunkActionCreator<TActionCreator>
+        ? InferThunkActionCreatorType<TActionCreator>
         : TActionCreator;
 
 // redux-thunk middleware returns thunk's return value from dispatch call
 // https://github.com/reduxjs/redux-thunk#composition
-export type WithThunkActionCreators<TDispatchProps> =
+export type ResolveThunks<TDispatchProps> =
     TDispatchProps extends { [key: string]: any }
         ? {
             [C in keyof TDispatchProps]: HandleThunkActionCreator<TDispatchProps[C]>
@@ -167,7 +167,7 @@ export interface Connect {
         mapStateToProps: null | undefined,
         mapDispatchToProps: TDispatchProps,
     ): InferableComponentEnhancerWithProps<
-        WithThunkActionCreators<TDispatchProps>,
+        ResolveThunks<TDispatchProps>,
         TOwnProps
     >;
 
@@ -180,7 +180,7 @@ export interface Connect {
         mapStateToProps: MapStateToPropsParam<TStateProps, TOwnProps, State>,
         mapDispatchToProps: TDispatchProps,
     ): InferableComponentEnhancerWithProps<
-        TStateProps & WithThunkActionCreators<TDispatchProps>,
+        TStateProps & ResolveThunks<TDispatchProps>,
         TOwnProps
     >;
 
@@ -229,7 +229,7 @@ export interface Connect {
         mergeProps: null | undefined,
         options: Options<{}, TStateProps, TOwnProps>
     ): InferableComponentEnhancerWithProps<
-        WithThunkActionCreators<TDispatchProps>,
+        ResolveThunks<TDispatchProps>,
         TOwnProps
     >;
 
@@ -246,7 +246,7 @@ export interface Connect {
         mergeProps: null | undefined,
         options: Options<State, TStateProps, TOwnProps>
     ): InferableComponentEnhancerWithProps<
-        TStateProps & WithThunkActionCreators<TDispatchProps>,
+        TStateProps & ResolveThunks<TDispatchProps>,
         TOwnProps
     >;
     // tslint:enable:no-unnecessary-generics

From ebb397fb9eab1217421bd2f80d301a157ec15bb2 Mon Sep 17 00:00:00 2001
From: Cameron Martin <cameronmartin123@gmail.com>
Date: Tue, 27 Nov 2018 09:12:09 +0000
Subject: [PATCH 340/836] Implemented suggested changes.

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

diff --git a/types/babel__traverse/babel__traverse-tests.ts b/types/babel__traverse/babel__traverse-tests.ts
index 5b4fbbef5f..2f5b5ca74d 100644
--- a/types/babel__traverse/babel__traverse-tests.ts
+++ b/types/babel__traverse/babel__traverse-tests.ts
@@ -89,7 +89,8 @@ const v1: Visitor = {
 
         const id = path.scope.generateUidIdentifierBasedOnNode(path.node.id!);
         path.remove();
-        path.scope.parent.push({ id, init: path.node });
+        path.scope.parent.push({ id });
+        path.scope.parent.push({ id, init: t.stringLiteral('foo'), kind: "const" });
 
         path.scope.rename("n", "x");
         path.scope.rename("n");
diff --git a/types/babel__traverse/index.d.ts b/types/babel__traverse/index.d.ts
index 4825dc5303..93c768a913 100644
--- a/types/babel__traverse/index.d.ts
+++ b/types/babel__traverse/index.d.ts
@@ -91,11 +91,10 @@ export class Scope {
     removeData(key: string): void;
 
     push(opts: {
-        id: object,
-        init?: object,
+        id: t.LVal,
+        init?: t.Expression,
         unique?: boolean,
-        _blockHoist?: number,
-        kind?: "var" | "let",
+        kind?: "var" | "let" | "const",
     }): void;
 
     getProgramParent(): Scope;

From 9b183dbac86e46d7ffd08bcb6c5ee6385c3cc081 Mon Sep 17 00:00:00 2001
From: Cameron Martin <cameronmartin123@gmail.com>
Date: Tue, 27 Nov 2018 09:13:03 +0000
Subject: [PATCH 341/836] Introduced $ExpectError.

See https://github.com/Microsoft/dtslint#write-tests
---
 types/babel__traverse/babel__traverse-tests.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/types/babel__traverse/babel__traverse-tests.ts b/types/babel__traverse/babel__traverse-tests.ts
index 2f5b5ca74d..1a1bf712d7 100644
--- a/types/babel__traverse/babel__traverse-tests.ts
+++ b/types/babel__traverse/babel__traverse-tests.ts
@@ -105,7 +105,7 @@ const BindingKindTest: Visitor = {
         kind === 'const';
         kind === 'let';
         kind === 'var';
-        // The following should fail when uncommented
-        // kind === 'anythingElse';
+        // $ExpectError
+        kind === 'anythingElse';
     },
 };

From 0d5716d5f08c94062e7ac396587ed956f168ea6d Mon Sep 17 00:00:00 2001
From: Stefano Bourscheid <stefano.bourscheid@gmail.com>
Date: Tue, 27 Nov 2018 11:33:48 +0100
Subject: [PATCH 342/836] Remove 2.x support from react-native-video

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

diff --git a/types/react-native-video/index.d.ts b/types/react-native-video/index.d.ts
index 726169caca..63d0ff6c89 100644
--- a/types/react-native-video/index.d.ts
+++ b/types/react-native-video/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for react-native-video 2.0 and 3.1
+// Type definitions for react-native-video 3.1
 // Project: https://github.com/react-native-community/react-native-video
 // Definitions by: HuHuanming <https://github.com/huhuanming>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -95,8 +95,6 @@ export interface VideoProperties extends ViewProps {
   onPlaybackRateChange?(): void;
   onAudioFocusChanged?(): void;
   onAudioBecomingNoisy?(): void;
-
-  /* 3.0 onwards */
   selectedTextTrack?: {
     type: 'system' | 'disabled' | 'title' | 'language' | 'index';
     value?: string | number;

From 97c9978a5636017e3df50a6dba07d6184d2eae63 Mon Sep 17 00:00:00 2001
From: Christian Chown <christianchown@gmail.com>
Date: Tue, 27 Nov 2018 12:05:37 +0000
Subject: [PATCH 343/836] Correct onSelect signature for unenhanced calendars

---
 types/react-infinite-calendar/index.d.ts | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/types/react-infinite-calendar/index.d.ts b/types/react-infinite-calendar/index.d.ts
index 3f0c827ed9..8d17e6dd4e 100644
--- a/types/react-infinite-calendar/index.d.ts
+++ b/types/react-infinite-calendar/index.d.ts
@@ -8,6 +8,21 @@ import * as React from 'react';
 
 export type DateType = Date | string | number;
 
+export enum EVENT_TYPE {
+    START = 1,
+    HOVER,
+    END
+}
+
+export interface RangedSelection {
+    eventType: EVENT_TYPE;
+    start: Date;
+    end: Date;
+}
+
+type RangedSelectFunction = (rangedDate: RangedSelection) => void;
+type DateSelectFunction = (date: string) => void;
+
 export interface ReactInfiniteCalendarProps {
     selected?: DateType | false | { start: DateType; end: DateType };
     width?: number | 'auto' | '100%';
@@ -57,7 +72,7 @@ export interface ReactInfiniteCalendarProps {
         weekdayColor?: string;
     };
     className?: string;
-    onSelect?: (date: string | { eventType: EVENT_TYPE; start: Date; end: Date }) => void;
+    onSelect?: DateSelectFunction | RangedSelectFunction;
     onScroll?: (scrollTop: number) => void;
     onScrollEnd?: (scrollTop: number) => void;
     rowHeight?: number;
@@ -75,10 +90,4 @@ export function withMultipleDates(component: CalendarClass): CalendarClass;
 export function withKeyboardSupport(component: CalendarClass): CalendarClass;
 export function defaultMultipleDateInterpolation(component: CalendarClass): CalendarClass;
 
-export enum EVENT_TYPE {
-    START = 1,
-    HOVER,
-    END
-}
-
 export default class ReactInfiniteCalendar extends React.Component<ReactInfiniteCalendarProps> {}

From aa7352876a9c634bcae92726746bd92ea0c02005 Mon Sep 17 00:00:00 2001
From: Christian Chown <christianchown@gmail.com>
Date: Tue, 27 Nov 2018 12:13:54 +0000
Subject: [PATCH 344/836] Export onSelect function types

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

diff --git a/types/react-infinite-calendar/index.d.ts b/types/react-infinite-calendar/index.d.ts
index 8d17e6dd4e..10a246c5ae 100644
--- a/types/react-infinite-calendar/index.d.ts
+++ b/types/react-infinite-calendar/index.d.ts
@@ -20,8 +20,8 @@ export interface RangedSelection {
     end: Date;
 }
 
-type RangedSelectFunction = (rangedDate: RangedSelection) => void;
-type DateSelectFunction = (date: string) => void;
+export type RangedSelectFunction = (rangedDate: RangedSelection) => void;
+export type DateSelectFunction = (date: string) => void;
 
 export interface ReactInfiniteCalendarProps {
     selected?: DateType | false | { start: DateType; end: DateType };

From 7e23c69081ef5211b821463eb9c223e891c7a456 Mon Sep 17 00:00:00 2001
From: Nokky Goren <30292793+ApeNox@users.noreply.github.com>
Date: Tue, 27 Nov 2018 16:31:11 +0200
Subject: [PATCH 345/836] Update definitions to accommodate API changes

InputProps are now optional.
The Component now receives props via direct application.
---
 types/react-places-autocomplete/index.d.ts | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/types/react-places-autocomplete/index.d.ts b/types/react-places-autocomplete/index.d.ts
index 62e3d93a1d..26046fc06f 100644
--- a/types/react-places-autocomplete/index.d.ts
+++ b/types/react-places-autocomplete/index.d.ts
@@ -15,9 +15,7 @@ export interface formattedSuggestionType {
 }
 
 export interface PropTypes {
-    inputProps: {
-        value: string;
-        onChange: (value: string) => void;
+    inputProps?: {
         type?: string;
         name?: string;
         placeholder?: string;
@@ -49,6 +47,9 @@ export interface PropTypes {
         radius?: number | string;
         types?: string[];
     };
+    value: string;
+    onChange?: (value: string) => void;
+    onBlur?: (event: React.FocusEvent<HTMLInputElement>) => void;
 
     debounce?: number;
     highlightFirstSuggestion?: boolean;

From b91830f72f5a229b7376fcfa238ef38c077b2122 Mon Sep 17 00:00:00 2001
From: Junyoung Choi <fluke8259@gmail.com>
Date: Tue, 27 Nov 2018 23:35:27 +0900
Subject: [PATCH 346/836] Fix typescript version of vfile-location

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

diff --git a/types/vfile-location/index.d.ts b/types/vfile-location/index.d.ts
index b991528c7e..fbea17630e 100644
--- a/types/vfile-location/index.d.ts
+++ b/types/vfile-location/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Ika <https://github.com/ikatyang>
 //                 Junyoung Choi <https://github.com/rokt33r>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.4
+// TypeScript Version: 3.0
 
 import * as VFile from "vfile";
 

From f5e979aa4e03525afab03c4bff3c339762b57314 Mon Sep 17 00:00:00 2001
From: Nokky Goren <30292793+ApeNox@users.noreply.github.com>
Date: Tue, 27 Nov 2018 16:53:21 +0200
Subject: [PATCH 347/836] fix optional inputs

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

diff --git a/types/react-places-autocomplete/index.d.ts b/types/react-places-autocomplete/index.d.ts
index 26046fc06f..f95164a89d 100644
--- a/types/react-places-autocomplete/index.d.ts
+++ b/types/react-places-autocomplete/index.d.ts
@@ -19,7 +19,6 @@ export interface PropTypes {
         type?: string;
         name?: string;
         placeholder?: string;
-        onBlur?: (event: React.FocusEvent<HTMLInputElement>) => void;
         disabled?: boolean;
     };
     onError?: (status: string, clearSuggestion: () => void) => void;
@@ -47,7 +46,7 @@ export interface PropTypes {
         radius?: number | string;
         types?: string[];
     };
-    value: string;
+    value?: string;
     onChange?: (value: string) => void;
     onBlur?: (event: React.FocusEvent<HTMLInputElement>) => void;
 

From f4f4074e189ffb8b461566c4430bd3d4620daa17 Mon Sep 17 00:00:00 2001
From: Nokky Goren <30292793+ApeNox@users.noreply.github.com>
Date: Tue, 27 Nov 2018 16:55:07 +0200
Subject: [PATCH 348/836] Update types version

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

diff --git a/types/react-places-autocomplete/index.d.ts b/types/react-places-autocomplete/index.d.ts
index f95164a89d..19d53c863d 100644
--- a/types/react-places-autocomplete/index.d.ts
+++ b/types/react-places-autocomplete/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for react-places-autocomplete 6.1
+// Type definitions for react-places-autocomplete 7
 // Project: https://github.com/kenny-hibino/react-places-autocomplete/
 // Definitions by: Guilherme Hübner <https://github.com/guilhermehubner>
 //                 Andrew Makarov <https://github.com/r3nya>

From 0a3010fe25eaded32b64e515df877479ca13cb53 Mon Sep 17 00:00:00 2001
From: Nokky Goren <30292793+ApeNox@users.noreply.github.com>
Date: Tue, 27 Nov 2018 16:57:11 +0200
Subject: [PATCH 349/836] Update Tests

---
 .../react-places-autocomplete-tests.tsx                         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/react-places-autocomplete/react-places-autocomplete-tests.tsx b/types/react-places-autocomplete/react-places-autocomplete-tests.tsx
index 41e6ff37b4..a7a7816d99 100644
--- a/types/react-places-autocomplete/react-places-autocomplete-tests.tsx
+++ b/types/react-places-autocomplete/react-places-autocomplete-tests.tsx
@@ -45,7 +45,7 @@ class Test extends React.Component {
 
         return (
             <form onSubmit={this.handleFormSubmit}>
-                <PlacesAutocomplete inputProps={inputProps} />
+                <PlacesAutocomplete value={this.state.address} onChange={this.onChange} />
             </form>
         );
     }

From 4731065fe25d5aa1e192166802321482db70dd21 Mon Sep 17 00:00:00 2001
From: Nokky Goren <30292793+ApeNox@users.noreply.github.com>
Date: Tue, 27 Nov 2018 17:02:42 +0200
Subject: [PATCH 350/836] Update index.d.ts

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

diff --git a/types/react-places-autocomplete/index.d.ts b/types/react-places-autocomplete/index.d.ts
index 19d53c863d..6a6a85c19e 100644
--- a/types/react-places-autocomplete/index.d.ts
+++ b/types/react-places-autocomplete/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for react-places-autocomplete 7
+// Type definitions for react-places-autocomplete 7.2
 // Project: https://github.com/kenny-hibino/react-places-autocomplete/
 // Definitions by: Guilherme Hübner <https://github.com/guilhermehubner>
 //                 Andrew Makarov <https://github.com/r3nya>

From 83a419ec7bd69ba15089a669a0aab466189d2b42 Mon Sep 17 00:00:00 2001
From: Chris O'Toole <chris@ignitenet.com>
Date: Tue, 27 Nov 2018 10:38:11 -0500
Subject: [PATCH 351/836] Don't update main package version number

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

diff --git a/package.json b/package.json
index 2bd57a4c7c..09fe064d48 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "private": true,
     "name": "definitely-typed",
-    "version": "0.0.4",
+    "version": "0.0.3",
     "homepage": "https://github.com/DefinitelyTyped/DefinitelyTyped",
     "repository": {
         "type": "git",

From c7f49bd2d0d3e9f5cd066b6e340db5f404a0d212 Mon Sep 17 00:00:00 2001
From: dasimple <dasimple.com@gmail.com>
Date: Tue, 27 Nov 2018 18:47:12 +0200
Subject: [PATCH 352/836] First typings for gdal package

---
 types/gdal/gdal-tests.ts |  78 ++++
 types/gdal/index.d.ts    | 764 +++++++++++++++++++++++++++++++++++++++
 types/gdal/tsconfig.json |  22 ++
 types/gdal/tslint.json   |   1 +
 4 files changed, 865 insertions(+)
 create mode 100644 types/gdal/gdal-tests.ts
 create mode 100644 types/gdal/index.d.ts
 create mode 100644 types/gdal/tsconfig.json
 create mode 100644 types/gdal/tslint.json

diff --git a/types/gdal/gdal-tests.ts b/types/gdal/gdal-tests.ts
new file mode 100644
index 0000000000..d30c83d571
--- /dev/null
+++ b/types/gdal/gdal-tests.ts
@@ -0,0 +1,78 @@
+import * as gdal from 'gdal';
+
+// gdal.checksumImage(srcRasterBand, 0, 0, 512, 512);
+
+gdal.config.get('GDAL_DATA');
+gdal.config.set('GDAL_DATA', 'C:\\warmerda\\bld\\data');
+
+/*gdal.contourGenerate({
+	src: srcRasterBand,
+	dst: dstRasterBand
+});*/
+
+gdal.decToDMS(60, 'lat');
+gdal.decToDMS(60, 'lat', 2);
+
+/*gdal.fillNodata({
+
+});*/
+
+let creationOptionsArray: string[];
+creationOptionsArray = ['VRT_CREATION_OPTION=...'];
+let creationOptionsObject: object;
+creationOptionsObject = {
+	VRT_CREATION_OPTION: '...'
+};
+gdal.open('C:\\datasets\\ogr.shp');
+gdal.open('C:\\datasets\\ogr.shp', 'r');
+gdal.open('C:\\datasets\\ogr.shp', 'r', 'ESRI Shapefile');
+gdal.open('C:\\datasets\\ogr.shp', 'r', ['ESRI Shapefile']);
+gdal.open('C:\\datasets\\ogr.shp', 'r+');
+gdal.open('C:\\datasets\\ogr.shp', 'r+', 'ESRI Shapefile');
+gdal.open('C:\\datasets\\ogr.shp', 'r+', ['ESRI Shapefile']);
+gdal.open('C:\\datasets\\raster.vrt', 'w', 'VRT');
+gdal.open('C:\\datasets\\raster.vrt', 'w', 'VRT', 512, 512, 3, 1, creationOptionsArray);
+gdal.open('C:\\datasets\\raster.vrt', 'w', 'VRT', 512, 512, 3, 1, creationOptionsObject);
+gdal.open('C:\\datasets\\raster.vrt', 'w', ['VRT']);
+gdal.open('C:\\datasets\\raster.vrt', 'w', ['VRT'], 512, 512, 3, 1, creationOptionsArray);
+gdal.open('C:\\datasets\\raster.vrt', 'w', ['VRT'], 512, 512, 3, 1, creationOptionsObject);
+
+/*let polygonizeOptions: gdal.PolygonizeOptions;
+polygonizeOptions = {
+	src: srcRasterBand,
+	dst: dstRasterBand,
+	connectedness: 1,
+	mask: maskRasterBand,
+	pixValField: 1,
+	useFloats: true
+};
+gdal.polygonize(polygonizeOptions);
+gdal.polygonize({
+	src: srcRasterBand,
+	dst: dstRasterBand,
+	pixValField: 1
+});*/
+
+gdal.quiet();
+
+/*let reprojectImageOptions: gdal.ReprojectImageOptions;
+reprojectImageOptions = {
+	src: srcRasterBand,
+	dst: dstRasterBand,
+	s_srs: sourceSRS,
+	t_srs: targetSRS
+};
+gdal.reprojectImage(reprojectImageOptions);
+gdal.reprojectImage({
+
+});
+
+gdal.sieveFilter({
+
+});
+
+gdal.suggestedWarpOutput({
+
+});*/
+
+gdal.verbose();
diff --git a/types/gdal/index.d.ts b/types/gdal/index.d.ts
new file mode 100644
index 0000000000..50280cff3d
--- /dev/null
+++ b/types/gdal/index.d.ts
@@ -0,0 +1,764 @@
+// Type definitions for gdal 0.9
+// Project: https://github.com/naturalatlas/node-gdal#readme
+// Definitions by: Andrei Digori <https://github.com/andreidigori>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 3.0
+
+export as namespace gdal;
+
+/* Internal interfaces */
+
+export type TypedArray = Int8Array | Uint8Array | Uint8ClampedArray | Int16Array | Uint16Array | Int32Array | Uint32Array | Float32Array | Float64Array;
+export type Resampling = 'NEAREST' | 'GAUSS' | 'CUBIC' | 'AVERAGE' | 'MODE' | 'AVERAGE_MAGPHASE' | 'NONE';
+
+export interface XY
+{
+	x: number;
+	y: number;
+}
+
+export interface XYZ extends XY
+{
+	z: number;
+}
+
+export interface EnvelopeBounds
+{
+    minX: number,
+    maxX: number,
+    minY: number,
+    maxY: number
+}
+
+export interface Envelope3DBounds extends EnvelopeBounds
+{
+    minZ: number,
+    maxZ: number
+}
+
+export interface RasterBandStatistics
+{
+	min: number;
+	max: number;
+	mean: number;
+	std_dev: number;
+}
+
+export interface RasterBandPixelsWriteOptions
+{
+	buffer_width?: number;
+	buffer_height?: number;
+	pixel_space?: number;
+	line_space?: number;
+}
+
+export interface RasterBandPixelsReadOptions
+{
+	buffer_width?: number;
+	buffer_height?: number;
+	pixel_space?: number;
+	line_space?: number;
+	data_type?: string;
+}
+
+export interface ContourGenerateOptions
+{
+    src: RasterBand;
+    dst: Layer;
+    offset?: number;
+    interval?: number;
+    fixedLevels?: number[];
+    nodata?: number;
+    idField?: number;
+    elevField?: number;
+}
+
+export interface FillNoDataOptions
+{
+    src: RasterBand;
+    mask?: RasterBand;
+    searchDist: number;
+    smoothingIterations?: number;
+}
+
+export interface PolygonizeOptions
+{
+    src: RasterBand;
+    dst: Layer;
+    mask?: RasterBand;
+    pixValField: number;
+    connectedness?: number;
+    useFloats?: boolean;
+}
+
+export interface ReprojectImageOptions
+{
+    src: Dataset;
+    dst: Dataset;
+    s_srs: SpatialReference;
+    t_srs: SpatialReference;
+    resampling?: string;
+    cutline?: Geometry;
+    srcBands?: number[];
+    dstBands?: number[];
+    srcAlphaBand?: number;
+    dstAlphaBand?: number;
+    srcNodata?: number;
+    dstNodata?: number;
+    memoryLimit?: number;
+    maxError?: number;
+    multi?: boolean;
+    options?: string[] | object;
+}
+
+export interface SieveFilterOptions
+{
+    src: RasterBand;
+    dst: RasterBand;
+    mask?: RasterBand;
+    threshold: number;
+    connectedness?: number;
+}
+
+export interface SuggestedWarpOutputOptions
+{
+    src: Dataset;
+    s_srs: SpatialReference;
+    t_srs: SpatialReference;
+    maxError?: number;
+}
+
+/* From API: https://naturalatlas.github.io/node-gdal/ */
+
+/* Constants */
+
+// CPL Error Codes
+export const CPLE_AppDefined: number;
+export const CPLE_AssertionFailed: number;
+export const CPLE_FileIO: number;
+export const CPLE_IllegalArg: number;
+export const CPLE_None: number;
+export const CPLE_NotSupported: number;
+export const CPLE_NoWriteAccess: number;
+export const CPLE_ObjectNull: number;
+export const CPLE_OpenFailed: number;
+export const CPLE_OutOfMemory: number;
+export const CPLE_UserInterrupt: number;
+
+// CPL Error Levels
+export const CE_Debug: number;
+export const CE_Failure: number;
+export const CE_Fatal: number;
+export const CE_None: number;
+export const CE_Warning: number;
+
+// DCAP
+export const DCAP_CREATE: string;
+export const DCAP_CREATECOPY: string;
+export const DCAP_VIRTUALIO: string;
+
+// DMD
+export const DMD_CREATIONDATATYPES: string;
+export const DMD_CREATIONOPTIONLIST: string;
+export const DMD_EXTENSION: string;
+export const DMD_HELPTOPIC: string;
+export const DMD_LONGNAME: string;
+export const DMD_MIMETYPE: string;
+
+// GCI
+export const GCI_AlphaBand: string;
+export const GCI_BlackBand: string;
+export const GCI_BlueBand: string;
+export const GCI_CyanBand: string;
+export const GCI_GrayIndex: string;
+export const GCI_GreenBand: string;
+export const GCI_HueBand: string;
+export const GCI_LightnessBand: string;
+export const GCI_MagentaBand: string;
+export const GCI_PaletteIndex: string;
+export const GCI_RedBand: string;
+export const GCI_SaturationBand: string;
+export const GCI_Undefined: string;
+export const GCI_YCbCr_CbBand: string;
+export const GCI_YCbCr_CrBand: string;
+export const GCI_YCbCr_YBand: string;
+export const GCI_YellowBand: string;
+
+// GDT
+export const GDT_Byte: string;
+export const GDT_CFloat32: string;
+export const GDT_CFloat64: string;
+export const GDT_CInt16: string;
+export const GDT_CInt32: string;
+export const GDT_Float32: string;
+export const GDT_Float64: string;
+export const GDT_Int16: string;
+export const GDT_Int32: string;
+export const GDT_UInt16: string;
+export const GDT_UInt32: string;
+export const GDT_Unknown: string;
+
+// GRA
+export const GRA_Average: string;
+export const GRA_Bilinear: string;
+export const GRA_Cubic: string;
+export const GRA_CubicSpline: string;
+export const GRA_Lanczos: string;
+export const GRA_Mode: string;
+export const GRA_NearestNeighbor: string;
+
+// ODsC
+export const ODrCCreateDataSource: string;
+export const ODrCDeleteDataSource: string;
+export const ODsCCreateGeomFieldAfterCreateLayer: string;
+export const ODsCCreateLayer: string;
+export const ODsCDeleteLayer: string;
+
+// OFT
+export const OFTBinary: string;
+export const OFTDate: string;
+export const OFTDateTime: string;
+export const OFTInteger: string;
+export const OFTIntegerList: string;
+export const OFTReal: string;
+export const OFTRealList: string;
+export const OFTString: string;
+export const OFTStringList: string;
+export const OFTTime: string;
+export const OFTWideString: string;
+export const OFTWideStringList: string;
+
+// OJ
+export const OJLeft: string;
+export const OJRight: string;
+export const OJUndefined: string;
+
+// OLC
+export const OLCAlterFieldDefn: string;
+export const OLCCreateField: string;
+export const OLCCreateGeomField: string;
+export const OLCDeleteFeature: string;
+export const OLCDeleteField: string;
+export const OLCFastFeatureCount: string;
+export const OLCFastGetExtent: string;
+export const OLCFastSetNextByIndex: string;
+export const OLCFastSpatialFilter: string;
+export const OLCIgnoreFields: string;
+export const OLCRandomRead: string;
+export const OLCRandomWrite: string;
+export const OLCReorderFields: string;
+export const OLCSequentialWrite: string;
+export const OLCStringsAsUTF8: string;
+export const OLCTransactions: string;
+
+// wkbByteOrder
+export const wkbNDR: string;
+export const wkbXDR: string;
+
+// wkbGeometryType
+export const wkb25DBit: number;
+export const wkbGeometryCollection: number;
+export const wkbGeometryCollection25D: number;
+export const wkbLinearRing: string;
+export const wkbLinearRing25D: number;
+export const wkbLineString: number;
+export const wkbLineString25D: number;
+export const wkbMultiLineString: number;
+export const wkbMultiLineString25D: number;
+export const wkbMultiPoint: number;
+export const wkbMultiPoint25D: number;
+export const wkbMultiPolygon: number;
+export const wkbMultiPolygon25D: number;
+export const wkbNone: number;
+export const wkbPoint: number;
+export const wkbPoint25D: number;
+export const wkbPolygon: number;
+export const wkbPolygon25D: number;
+export const wkbUnknown: number;
+
+// wkbVariant
+export const wkbVariantIso: string;
+export const wkbVariantOgc: string;
+export const wkbVariantOldOgc: string;
+
+/* Classes and interfaces */
+
+export class CoordinateTransformation
+{
+    constructor(source: SpatialReference, target: SpatialReference | Dataset);
+    transformPoint(x: number, y: number, z?: number): XYZ;
+}
+
+export interface Dataset
+{
+    buildOverviews(resampling: Resampling, overviews: number[], bands?: number[]): void;
+    close(): void;
+    executeSQL(statement: string, spatial_filter?: Geometry, dialect?: string): Layer;
+    flush(): void;
+    getFileList(): string[];
+    getGCPProjection(): string;
+    getGCPs(): object[];
+    getMetadata(domain?: string): object;
+    setGCPs(gcps: object[], projection: string): void;
+    testCapability(capability: string): boolean;
+
+    readonly bands: DatasetBands;
+    readonly description: string;
+    readonly driver: Driver;
+    geoTransform: number[];
+    readonly layers: DatasetLayers;
+    readonly rasterSize: XY;
+    srs: SpatialReference;
+}
+
+export interface DatasetBands
+{
+    count(): number;
+    create(dataType: number): RasterBand;
+    forEach(callback: (band: RasterBand, i: number) => void): void;
+    get(id: number): RasterBand;
+    map<T>(callback: (band: RasterBand, i: number) => T): T[];
+
+    readonly ds: Dataset;
+}
+
+export interface DatasetLayers
+{
+    copy(src_lyr_name: string, dst_lyr_name: string, options?: object | string[]): Layer;
+    count(): number;
+    create(name: string, srs: SpatialReference, geomType: number | Function, creation_options: string[] | object): Layer;
+    forEach(callback: (layer: Layer, i: number) => void): void;
+    get(key: string | number): Layer;
+    map<T>(callback: (layer: Layer, i: number) => T): T[];
+    remove(index: number): void;
+
+    readonly ds: Dataset;
+}
+
+export interface Driver
+{
+    copyFiles(name_old: string, name_new: string): void;
+    create(filename: string, x_size?: number, y_size?: number, band_count?: number, data_type?: number, creation_options?: string[] | object): Dataset;
+    createCopy(filename: string, src: Dataset, strict?: boolean, options?: string[] | object): Dataset;
+    deleteDataset(filename: string): void;
+    getMetadata(domain?: string): object;
+    open(path: string, mode?: 'r' | 'r+'): Dataset;
+    rename(new_name: string, old_name: string): void;
+
+    readonly description: string;
+}
+
+export class Envelope
+{
+    constructor(bounds: EnvelopeBounds);
+    contains(envelope: Envelope): boolean;
+    intersect(envelope: Envelope): void;
+    intersects(envelope: Envelope): boolean;
+    isEmpty(): boolean;
+    merge(envelope: Envelope): void;
+    toPolygon(): Polygon;
+}
+
+export class Envelope3D extends Envelope
+{
+    constructor(bounds: Envelope3DBounds);
+}
+
+export class Feature
+{
+    constructor(definition: Layer | FeatureDefn);
+    clone(): Feature;
+    destroy(): void;
+    equals(feature: Feature): boolean;
+    getFieldDefn(index: number): FieldDefn;
+    getGeometry(): Geometry;
+    setFrom(feature: Feature, index_map?: number[], forgiving?: boolean): void;
+    setGeometry(geometry: Geometry): void;
+
+    readonly defn: FeatureDefn;
+    fid: number;
+    readonly fields: FeatureFields;
+}
+
+export class FeatureDefn
+{
+    constructor();
+    clone(): FeatureDefn;
+
+	readonly fields: FeatureDefnFields;
+	geomIgnored: boolean;
+	geomType: number;
+	readonly name: string;
+	styleIgnored: boolean;
+}
+
+export interface FeatureDefnFields
+{
+	add(field: FieldDefn | FieldDefn[]): void;
+	count(): number;
+	forEach(callback: (field: FieldDefn, i: number) => void): void;
+	get(key: string | number): FieldDefn;
+	getNames(): string[];
+	indexOf(name: string): number;
+	map<T>(callback: (field: FieldDefn, i: number) => T): T[];
+	remove(key: string | number): void;
+	reorder(map: number[]): void;
+
+	readonly featureDefn: FeatureDefn;
+}
+
+export interface FeatureFields
+{
+	count(): number;
+	forEach(callback: (value: any, key: string) => void): void;
+	get(key: string | number): any;
+	getNames(): string[];
+	indexOf(name: string): number;
+	map<T>(callback: (value: any, key: string) => T): T[];
+	reset(values: object, value: any): void;
+	set(key: string | number, value: any): void;
+	toArray(): any[];
+	toJSON(): string;
+	toObject(): object;
+
+	readonly feature: Feature;
+}
+
+export class FieldDefn
+{
+	constructor(name: string, type: string);
+
+	ignored: boolean;
+	justification: string;
+	name: string;
+	precision: number;
+	type: string;
+	width: number;
+}
+
+export interface GDALDrivers
+{
+    count(): number;
+    forEach(callback: (driver: Driver, i: number) => void): void;
+	get(index: number | string): Driver;
+	getNames(): string[];
+    map<T>(callback: (driver: Driver, i: number) => T): T[];
+}
+
+export abstract class Geometry
+{
+	static create(type: number): Geometry;
+	static fromWKB(wkb: number, srs?: SpatialReference): Geometry;
+	static fromWKT(wkt: string, srs?: SpatialReference): Geometry;
+	static getConstructor(type: number): Function;
+	static getName(type: number): string;
+
+	boundary(): Geometry;
+	buffer(distance: number, segments: number): Geometry;
+	centroid(): Point;
+	clone(): Geometry;
+	closeRings(): void;
+	contains(geometry: Geometry): boolean;
+	convexHull(): Geometry;
+	crosses(geometry: Geometry): boolean;
+	difference(geometry: Geometry): Geometry;
+	disjoint(geometry: Geometry): boolean;
+	distance(geometry: Geometry): number;
+	empty(): void;
+	equals(geometry: Geometry): boolean;
+	getEnvelope(): Envelope;
+	getEnvelope3D(): Envelope3D;
+	intersection(geometry: Geometry): Geometry;
+	intersects(geometry: Geometry): boolean;
+	isEmpty(): boolean;
+	isRing(): boolean;
+	isSimple(): boolean;
+	isValid(): boolean;
+	overlaps(geometry: Geometry): boolean;
+	segmentize(segment_length: number): number;
+	simplify(tolerance: number): Geometry;
+	simplifyPreserveTopology(tolerance: number): Geometry;
+	swapXY(): void;
+	symDifference(geometry: Geometry): Geometry;
+	toGML(): Geometry;
+	toJSON(): Geometry;
+	toKML(): Geometry;
+	toObject(): object;
+	touches(geometry: Geometry): boolean;
+	toWKB(byte_order?: string, variant?: string): Geometry;
+	toWKT(): Geometry;
+	transform(transformation: CoordinateTransformation): void;
+	transformTo(srs: SpatialReference): void;
+	union(geometry: Geometry): Geometry;
+	within(geometry: Geometry): boolean;
+
+	readonly coordinateDimension: number;
+	readonly dimension: number;
+	readonly name: string;
+	srs: SpatialReference;
+	readonly wkbSize: number;
+	readonly wkbType: number;
+}
+
+export class GeometryCollection extends Geometry
+{
+	getArea(): number;
+	getLength(): number;
+
+	children: GeometryCollectionChildren;
+}
+
+export interface GeometryCollectionChildren
+{
+	add(geometry: Geometry | Geometry[]): void;
+	count(): number;
+    forEach(callback: (geometry: Geometry, i: number) => void): void;
+    get(index: number): Geometry;
+    map<T>(callback: (geometry: Geometry, i: number) => T): T[];
+    remove(index: number): void;
+	toArray(): Geometry[];
+	
+	readonly layer: Layer;
+}
+
+export interface Layer
+{
+	flush(): void;
+	getExtent(force?: boolean): Envelope;
+	getSpatialFilter(): Geometry;
+	setAttributeFilter(filter: string): void;
+	setSpatialFilter(filter: Geometry): void;
+	setSpatialFilter(minX: number, maxX: number, minY: number, maxY: number): void;
+	testCapability(capability: string): boolean;
+
+	readonly ds: Dataset;
+	readonly features: LayerFeatures;
+	readonly fidColumn: string;
+	readonly fields: LayerFields;
+	readonly geomColumn: string;
+	readonly geomType: number;
+	readonly name: string;
+	readonly srs: SpatialReference;
+}
+
+export interface LayerFeatures
+{
+	add(feature: Feature): void;
+	count(force?: boolean): number;
+	first(): Feature;
+    forEach(callback: (feature: Feature, i: number) => void): void;
+    get(id: number): Feature;
+    map<T>(callback: (feature: Feature, i: number) => T): T[];
+	next(): Feature;
+    remove(id: number): void;
+	set(id: number, feature: Feature): void;
+	
+	readonly layer: Layer;
+}
+
+export interface LayerFields
+{
+	add(def: FieldDefn | FieldDefn[], approx?: boolean): void;
+	count(): number;
+	forEach(callback: (field: FieldDefn, i: number) => void): void;
+	fromJSON(object: object, approx_ok?: boolean): LayerFields;
+	get(field: string | number): FieldDefn;
+	getNames(): string[];
+	indexOf(field: string): number;
+    map<T>(callback: (field: FieldDefn, i: number) => T): T[];
+    remove(field: string | number): void;
+	reorder(map: number[]): void;
+	
+	readonly layer: Layer;
+}
+
+export class LinearRing extends LineString
+{
+	getArea(): number;
+}
+
+export class LineString extends Geometry
+{
+	addSubLineString(line: LineString, start?: number, end?: number): void;
+	getLength(): number;
+	value(distance: number): Point;
+
+	readonly points: LineStringPoints;
+}
+
+export interface LineStringPoints
+{
+	add(point: Point | Point[]): void;
+	count(): number;
+    forEach(callback: (point: Point, i: number) => void): void;
+    get(index: number): Point;
+    map<T>(callback: (point: Point, i: number) => T): T[];
+	remove(index: number): void;
+	resize(count: number): void;
+	reverse(): void;
+    set(index: number, point: Point): void;
+	toArray(): Point[];
+}
+
+export class MultiLineString extends GeometryCollection
+{
+	polygonize(): Polygon;
+}
+
+export class MultiPoint extends GeometryCollection
+{
+	
+}
+
+export class MultiPolygon extends GeometryCollection
+{
+	getArea(): number;
+	unionCascaded(): Geometry;
+}
+
+export class Point extends Geometry
+{
+	constructor(x: number, y: number, z?: number);
+
+	x: number;
+	y: number;
+	z: number;
+}
+
+export class Polygon extends Geometry
+{
+	getArea(): number;
+
+	rings: PolygonRings;
+}
+
+export interface PolygonRings
+{
+	add(ring: LinearRing | LinearRing[]): void;
+	count(): number;
+    forEach(callback: (ring: LinearRing, i: number) => void): void;
+    get(index: number): LinearRing;
+    map<T>(callback: (ring: LinearRing, i: number) => T): T[];
+    remove(index: number): void;
+	toArray(): LinearRing[];
+	
+	readonly layer: Layer;
+}
+
+export interface RasterBand
+{
+	computeStatistics(allow_approximation: boolean): RasterBandStatistics;
+	createMaskBand(flags: number): void;
+	fill(real_value: number, imaginary_value?: number): void;
+	flush(): void;
+	getMaskBand(): RasterBand;
+	getMaskFlags(): number;
+	getMetadata(domain?: string): object;
+	getStatistics(allow_approximation: boolean, force: boolean): RasterBandStatistics;
+	setStatistics(min: number, max: number, mean: number, std_dev: number): void;
+
+	readonly blockSize: XY;
+	categoryNames: string[];
+	colorInterpretation: string;
+	readonly dataType: string;
+	readonly description: string;
+	readonly ds: Dataset;
+	readonly hasArbitraryOverviews: boolean;
+	readonly id: number;
+	readonly maximum: number;
+	readonly minimum: number;
+	noDataValue: number;
+	offset: number;
+	readonly overviews: RasterBandOverviews;
+	readonly pixels: RasterBandPixels;
+	readonly readOnly: boolean;
+	scale: number;
+	readonly size: XY;
+	unitType: string;
+}
+
+export interface RasterBandOverviews
+{
+	count(): number;
+    forEach(callback: (overviewBand: RasterBand, i: number) => void): void;
+    get(index: number): RasterBand;
+    getBySampleCount(samples: number): RasterBand;
+    map<T>(callback: (overviewBand: RasterBand, i: number) => T): T[];
+}
+
+export interface RasterBandPixels
+{
+	get(x: number, y: number): number;
+	read(x: number, y: number, width: number, height: number, data?: TypedArray, options?: RasterBandPixelsReadOptions): TypedArray;
+	readBlock(x: number, y: number, data?: TypedArray): TypedArray;
+	set(x: number, y: number, value: number): void;
+	write(x: number, y: number, width: number, height: number, data: TypedArray, options?: RasterBandPixelsWriteOptions): void;
+	writeBlock(x: number, y: number, data: TypedArray): void;
+}
+
+export class SpatialReference
+{
+	constructor(wkt?: string);
+	autoIdentifyEPSG(): void;
+	clone(): SpatialReference;
+	cloneGeogCS(): SpatialReference;
+	EPSGTreatsAsLatLong(): boolean;
+	EPSGTreatsAsNorthingEasting(): boolean;
+	getAngularUnits(): { value: any, unit: any };
+	getAttrValue(node_name: string, attr_index?: number): string;
+	getAuthorityCode(target_key: string): string;
+	getAuthorityName(target_key: string): string;
+	getLinearUnits(): { value: any, unit: any };
+	isCompound(): boolean;
+	isGeocentric(): boolean;
+	isGeographic(): boolean;
+	isLocal(): boolean;
+	isProjected(): boolean;
+	isSame(srs: SpatialReference): boolean;
+	isSameGeogCS(srs: SpatialReference): boolean;
+	isSameVertCS(srs: SpatialReference): boolean;
+	isVertical(): boolean;
+	morphFromESRI(): void;
+	morphToESRI(): void;
+	setWellKnownGeogCS(name: string): void;
+	toPrettyWKT(simplify?: boolean): string;
+	toProj4(): string;
+	toWKT(): string;
+	toXML(): string;
+	validate(): string;
+
+	static fromCRSURL(input: string): SpatialReference;
+	static fromEPSG(input: string): SpatialReference;
+	static fromEPSGA(input: number): SpatialReference;
+	static fromESRI(input: string[]): SpatialReference;
+	static fromMICoordSys(input: string): SpatialReference;
+	static fromProj4(input: string): SpatialReference;
+	static fromURL(url: string): SpatialReference;
+	static fromURN(input: string): SpatialReference;
+	static fromUserInput(input: string): SpatialReference;
+	static fromWKT(wkt: string): SpatialReference;
+	static fromWMSAUTO(input: string): SpatialReference;
+	static fromXML(input: string): SpatialReference;
+}
+
+export namespace config
+{
+	function get(key: string): string;
+	function set(key: string, value: string): void;
+}
+
+export const drivers: GDALDrivers;
+export const lastError: { number: any, message: any, type: any };
+export const version: string;
+
+export function checksumImage(src: RasterBand, x?: number, y?: number, w?: number, h?: number): number;
+export function contourGenerate(options: ContourGenerateOptions): void;
+export function decToDMS(angle: number, axis: 'lat' | 'long', precision?: number): string;
+export function fillNodata(options: FillNoDataOptions): void;
+export function open(path: string, mode?: 'r' | 'r+' | 'w', drivers?: string | string[], x_size?: number, y_size?: number, band_count?: number, data_type?: number, creation_options?: string[] | object): Dataset;
+export function polygonize(options: PolygonizeOptions): void;
+export function quiet(): void;
+export function reprojectImage(options: ReprojectImageOptions): void;
+export function sieveFilter(options: SieveFilterOptions): void;
+export function suggestedWarpOutput(options: SuggestedWarpOutputOptions): { rasterSize: any, geoTransform: any };
+export function verbose(): void;
\ No newline at end of file
diff --git a/types/gdal/tsconfig.json b/types/gdal/tsconfig.json
new file mode 100644
index 0000000000..a7bd1cf386
--- /dev/null
+++ b/types/gdal/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",
+        "gdal-tests.ts"
+    ]
+}
diff --git a/types/gdal/tslint.json b/types/gdal/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/gdal/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 37d0e8c735d8573f238b51461fb3489190274def Mon Sep 17 00:00:00 2001
From: Nicolas Biehler <biehler.nicolas@gmail.com>
Date: Fri, 23 Nov 2018 15:35:35 +0100
Subject: [PATCH 353/836] fix: extend elasticsearch alias params

As shown in elasticsearch documentation (https://www.elastic.co/guide/en/elasticsearch/reference/current/indices-aliases.html#filtered), an alias can have a routing value and a filter specified.
---
 types/elasticsearch/elasticsearch-tests.ts | 43 ++++++++++++++++------
 types/elasticsearch/index.d.ts             |  2 -
 2 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/types/elasticsearch/elasticsearch-tests.ts b/types/elasticsearch/elasticsearch-tests.ts
index ee57f847fa..0d12a931ed 100644
--- a/types/elasticsearch/elasticsearch-tests.ts
+++ b/types/elasticsearch/elasticsearch-tests.ts
@@ -209,7 +209,7 @@ client.get({
   id: '1',
   routing: '1'
 }, (error, response) => {
-    const routing = response._routing;
+  const routing = response._routing;
 });
 
 client.mget({
@@ -338,22 +338,43 @@ client.indices.updateAliases({
   // ...
 });
 
-client.reindex({
-    body: {
-        source: {
-          index: "twitter"
-        },
-        dest: {
-          index: "new_twitter"
+client.indices.updateAliases({
+  body: {
+    actions: [
+      {
+        add: {
+          index: 'logstash-2018.11', alias: 'logstash-filtered', filter: {
+            query: {
+              exists: { field: 'id' }
+            }
+          },
+          routing: 'id'
         }
       }
+    ]
+  }
+}).then((response) => {
+  // ...
+}, (error) => {
+  // ...
+});
+
+client.reindex({
+  body: {
+    source: {
+      index: "twitter"
+    },
+    dest: {
+      index: "new_twitter"
+    }
+  }
 })
-.then(response => {
+  .then(response => {
     const { took, timed_out } = response;
     // ...
-});
+  });
 
 // Errors
 function testErrors() {
-    throw new elasticsearch.errors.AuthenticationException();
+  throw new elasticsearch.errors.AuthenticationException();
 }
diff --git a/types/elasticsearch/index.d.ts b/types/elasticsearch/index.d.ts
index 62202dbc90..401627d2c1 100644
--- a/types/elasticsearch/index.d.ts
+++ b/types/elasticsearch/index.d.ts
@@ -1407,8 +1407,6 @@ export interface IndicesUpdateAliasesParamsAction {
         index?: string;
         indices?: string[];
         alias: string;
-        routing?: string;
-        filter?: object;
     };
     remove_index?: {
         index: string;

From cf4ed80a0837167bd53fdb9d23321fac19468efc Mon Sep 17 00:00:00 2001
From: NN <nn1436401@gmail.com>
Date: Tue, 27 Nov 2018 17:58:48 +0200
Subject: [PATCH 354/836] Fix #30848 configHash can be a string in
 HardSourceWebpackPlugin

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

diff --git a/types/hard-source-webpack-plugin/index.d.ts b/types/hard-source-webpack-plugin/index.d.ts
index 3e02ee1d8a..4a83b58034 100644
--- a/types/hard-source-webpack-plugin/index.d.ts
+++ b/types/hard-source-webpack-plugin/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for hard-source-webpack-plugin 0.9
+// Type definitions for hard-source-webpack-plugin 1.0
 // Project: https://github.com/mzgoddard/hard-source-webpack-plugin#readme
 // Definitions by: woitechen <https://github.com/woitechen>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -15,7 +15,7 @@ declare namespace hard_source_webpack_plugin { }
 
 interface Options {
     cacheDirectory?: string;
-    configHash?: (webpackConfig?: webpack.Configuration) => string;
+    configHash?: string | ((webpackConfig?: webpack.Configuration) => string);
     environmentHash?: {
         root: string;
         directories: string[];

From a104ee185677834365ba69b74bd14cd14723d5e7 Mon Sep 17 00:00:00 2001
From: andreidigori <45198612+andreidigori@users.noreply.github.com>
Date: Tue, 27 Nov 2018 19:05:34 +0200
Subject: [PATCH 355/836] Update tsconfig.json

Set "strictFunctionTypes": false,
---
 types/gdal/tsconfig.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/types/gdal/tsconfig.json b/types/gdal/tsconfig.json
index a7bd1cf386..3a5bfaf917 100644
--- a/types/gdal/tsconfig.json
+++ b/types/gdal/tsconfig.json
@@ -7,6 +7,7 @@
         "noImplicitAny": true,
         "noImplicitThis": true,
         "strictNullChecks": true,
+        "strictFunctionTypes": false,
         "baseUrl": "../",
         "typeRoots": [
             "../"

From 08b098667ad9ab2e6ff405662be41b947af7e04f Mon Sep 17 00:00:00 2001
From: andreidigori <45198612+andreidigori@users.noreply.github.com>
Date: Tue, 27 Nov 2018 19:20:57 +0200
Subject: [PATCH 356/836] Update index.d.ts

TsLint check
---
 types/gdal/index.d.ts | 138 ++++++++++++++----------------------------
 1 file changed, 46 insertions(+), 92 deletions(-)

diff --git a/types/gdal/index.d.ts b/types/gdal/index.d.ts
index 50280cff3d..41a89ff72f 100644
--- a/types/gdal/index.d.ts
+++ b/types/gdal/index.d.ts
@@ -11,49 +11,42 @@ export as namespace gdal;
 export type TypedArray = Int8Array | Uint8Array | Uint8ClampedArray | Int16Array | Uint16Array | Int32Array | Uint32Array | Float32Array | Float64Array;
 export type Resampling = 'NEAREST' | 'GAUSS' | 'CUBIC' | 'AVERAGE' | 'MODE' | 'AVERAGE_MAGPHASE' | 'NONE';
 
-export interface XY
-{
+export interface XY {
 	x: number;
 	y: number;
 }
 
-export interface XYZ extends XY
-{
+export interface XYZ extends XY {
 	z: number;
 }
 
-export interface EnvelopeBounds
-{
+export interface EnvelopeBounds {
     minX: number,
     maxX: number,
     minY: number,
     maxY: number
 }
 
-export interface Envelope3DBounds extends EnvelopeBounds
-{
+export interface Envelope3DBounds extends EnvelopeBounds {
     minZ: number,
     maxZ: number
 }
 
-export interface RasterBandStatistics
-{
+export interface RasterBandStatistics {
 	min: number;
 	max: number;
 	mean: number;
 	std_dev: number;
 }
 
-export interface RasterBandPixelsWriteOptions
-{
+export interface RasterBandPixelsWriteOptions {
 	buffer_width?: number;
 	buffer_height?: number;
 	pixel_space?: number;
 	line_space?: number;
 }
 
-export interface RasterBandPixelsReadOptions
-{
+export interface RasterBandPixelsReadOptions {
 	buffer_width?: number;
 	buffer_height?: number;
 	pixel_space?: number;
@@ -61,8 +54,7 @@ export interface RasterBandPixelsReadOptions
 	data_type?: string;
 }
 
-export interface ContourGenerateOptions
-{
+export interface ContourGenerateOptions {
     src: RasterBand;
     dst: Layer;
     offset?: number;
@@ -73,16 +65,14 @@ export interface ContourGenerateOptions
     elevField?: number;
 }
 
-export interface FillNoDataOptions
-{
+export interface FillNoDataOptions {
     src: RasterBand;
     mask?: RasterBand;
     searchDist: number;
     smoothingIterations?: number;
 }
 
-export interface PolygonizeOptions
-{
+export interface PolygonizeOptions {
     src: RasterBand;
     dst: Layer;
     mask?: RasterBand;
@@ -91,8 +81,7 @@ export interface PolygonizeOptions
     useFloats?: boolean;
 }
 
-export interface ReprojectImageOptions
-{
+export interface ReprojectImageOptions {
     src: Dataset;
     dst: Dataset;
     s_srs: SpatialReference;
@@ -111,8 +100,7 @@ export interface ReprojectImageOptions
     options?: string[] | object;
 }
 
-export interface SieveFilterOptions
-{
+export interface SieveFilterOptions {
     src: RasterBand;
     dst: RasterBand;
     mask?: RasterBand;
@@ -120,8 +108,7 @@ export interface SieveFilterOptions
     connectedness?: number;
 }
 
-export interface SuggestedWarpOutputOptions
-{
+export interface SuggestedWarpOutputOptions {
     src: Dataset;
     s_srs: SpatialReference;
     t_srs: SpatialReference;
@@ -283,14 +270,12 @@ export const wkbVariantOldOgc: string;
 
 /* Classes and interfaces */
 
-export class CoordinateTransformation
-{
+export class CoordinateTransformation {
     constructor(source: SpatialReference, target: SpatialReference | Dataset);
     transformPoint(x: number, y: number, z?: number): XYZ;
 }
 
-export interface Dataset
-{
+export interface Dataset {
     buildOverviews(resampling: Resampling, overviews: number[], bands?: number[]): void;
     close(): void;
     executeSQL(statement: string, spatial_filter?: Geometry, dialect?: string): Layer;
@@ -311,8 +296,7 @@ export interface Dataset
     srs: SpatialReference;
 }
 
-export interface DatasetBands
-{
+export interface DatasetBands {
     count(): number;
     create(dataType: number): RasterBand;
     forEach(callback: (band: RasterBand, i: number) => void): void;
@@ -322,8 +306,7 @@ export interface DatasetBands
     readonly ds: Dataset;
 }
 
-export interface DatasetLayers
-{
+export interface DatasetLayers {
     copy(src_lyr_name: string, dst_lyr_name: string, options?: object | string[]): Layer;
     count(): number;
     create(name: string, srs: SpatialReference, geomType: number | Function, creation_options: string[] | object): Layer;
@@ -335,8 +318,7 @@ export interface DatasetLayers
     readonly ds: Dataset;
 }
 
-export interface Driver
-{
+export interface Driver {
     copyFiles(name_old: string, name_new: string): void;
     create(filename: string, x_size?: number, y_size?: number, band_count?: number, data_type?: number, creation_options?: string[] | object): Dataset;
     createCopy(filename: string, src: Dataset, strict?: boolean, options?: string[] | object): Dataset;
@@ -348,8 +330,7 @@ export interface Driver
     readonly description: string;
 }
 
-export class Envelope
-{
+export class Envelope {
     constructor(bounds: EnvelopeBounds);
     contains(envelope: Envelope): boolean;
     intersect(envelope: Envelope): void;
@@ -359,13 +340,11 @@ export class Envelope
     toPolygon(): Polygon;
 }
 
-export class Envelope3D extends Envelope
-{
+export class Envelope3D extends Envelope {
     constructor(bounds: Envelope3DBounds);
 }
 
-export class Feature
-{
+export class Feature {
     constructor(definition: Layer | FeatureDefn);
     clone(): Feature;
     destroy(): void;
@@ -380,8 +359,7 @@ export class Feature
     readonly fields: FeatureFields;
 }
 
-export class FeatureDefn
-{
+export class FeatureDefn {
     constructor();
     clone(): FeatureDefn;
 
@@ -392,8 +370,7 @@ export class FeatureDefn
 	styleIgnored: boolean;
 }
 
-export interface FeatureDefnFields
-{
+export interface FeatureDefnFields {
 	add(field: FieldDefn | FieldDefn[]): void;
 	count(): number;
 	forEach(callback: (field: FieldDefn, i: number) => void): void;
@@ -407,8 +384,7 @@ export interface FeatureDefnFields
 	readonly featureDefn: FeatureDefn;
 }
 
-export interface FeatureFields
-{
+export interface FeatureFields {
 	count(): number;
 	forEach(callback: (value: any, key: string) => void): void;
 	get(key: string | number): any;
@@ -424,8 +400,7 @@ export interface FeatureFields
 	readonly feature: Feature;
 }
 
-export class FieldDefn
-{
+export class FieldDefn {
 	constructor(name: string, type: string);
 
 	ignored: boolean;
@@ -436,8 +411,7 @@ export class FieldDefn
 	width: number;
 }
 
-export interface GDALDrivers
-{
+export interface GDALDrivers {
     count(): number;
     forEach(callback: (driver: Driver, i: number) => void): void;
 	get(index: number | string): Driver;
@@ -445,8 +419,7 @@ export interface GDALDrivers
     map<T>(callback: (driver: Driver, i: number) => T): T[];
 }
 
-export abstract class Geometry
-{
+export abstract class Geometry {
 	static create(type: number): Geometry;
 	static fromWKB(wkb: number, srs?: SpatialReference): Geometry;
 	static fromWKT(wkt: string, srs?: SpatialReference): Geometry;
@@ -500,16 +473,14 @@ export abstract class Geometry
 	readonly wkbType: number;
 }
 
-export class GeometryCollection extends Geometry
-{
+export class GeometryCollection extends Geometry {
 	getArea(): number;
 	getLength(): number;
 
 	children: GeometryCollectionChildren;
 }
 
-export interface GeometryCollectionChildren
-{
+export interface GeometryCollectionChildren {
 	add(geometry: Geometry | Geometry[]): void;
 	count(): number;
     forEach(callback: (geometry: Geometry, i: number) => void): void;
@@ -521,8 +492,7 @@ export interface GeometryCollectionChildren
 	readonly layer: Layer;
 }
 
-export interface Layer
-{
+export interface Layer {
 	flush(): void;
 	getExtent(force?: boolean): Envelope;
 	getSpatialFilter(): Geometry;
@@ -541,8 +511,7 @@ export interface Layer
 	readonly srs: SpatialReference;
 }
 
-export interface LayerFeatures
-{
+export interface LayerFeatures {
 	add(feature: Feature): void;
 	count(force?: boolean): number;
 	first(): Feature;
@@ -556,8 +525,7 @@ export interface LayerFeatures
 	readonly layer: Layer;
 }
 
-export interface LayerFields
-{
+export interface LayerFields {
 	add(def: FieldDefn | FieldDefn[], approx?: boolean): void;
 	count(): number;
 	forEach(callback: (field: FieldDefn, i: number) => void): void;
@@ -572,13 +540,11 @@ export interface LayerFields
 	readonly layer: Layer;
 }
 
-export class LinearRing extends LineString
-{
+export class LinearRing extends LineString {
 	getArea(): number;
 }
 
-export class LineString extends Geometry
-{
+export class LineString extends Geometry {
 	addSubLineString(line: LineString, start?: number, end?: number): void;
 	getLength(): number;
 	value(distance: number): Point;
@@ -586,8 +552,7 @@ export class LineString extends Geometry
 	readonly points: LineStringPoints;
 }
 
-export interface LineStringPoints
-{
+export interface LineStringPoints {
 	add(point: Point | Point[]): void;
 	count(): number;
     forEach(callback: (point: Point, i: number) => void): void;
@@ -600,24 +565,20 @@ export interface LineStringPoints
 	toArray(): Point[];
 }
 
-export class MultiLineString extends GeometryCollection
-{
+export class MultiLineString extends GeometryCollection {
 	polygonize(): Polygon;
 }
 
-export class MultiPoint extends GeometryCollection
-{
+export class MultiPoint extends GeometryCollection {
 	
 }
 
-export class MultiPolygon extends GeometryCollection
-{
+export class MultiPolygon extends GeometryCollection {
 	getArea(): number;
 	unionCascaded(): Geometry;
 }
 
-export class Point extends Geometry
-{
+export class Point extends Geometry {
 	constructor(x: number, y: number, z?: number);
 
 	x: number;
@@ -625,15 +586,13 @@ export class Point extends Geometry
 	z: number;
 }
 
-export class Polygon extends Geometry
-{
+export class Polygon extends Geometry {
 	getArea(): number;
 
 	rings: PolygonRings;
 }
 
-export interface PolygonRings
-{
+export interface PolygonRings {
 	add(ring: LinearRing | LinearRing[]): void;
 	count(): number;
     forEach(callback: (ring: LinearRing, i: number) => void): void;
@@ -645,8 +604,7 @@ export interface PolygonRings
 	readonly layer: Layer;
 }
 
-export interface RasterBand
-{
+export interface RasterBand {
 	computeStatistics(allow_approximation: boolean): RasterBandStatistics;
 	createMaskBand(flags: number): void;
 	fill(real_value: number, imaginary_value?: number): void;
@@ -677,8 +635,7 @@ export interface RasterBand
 	unitType: string;
 }
 
-export interface RasterBandOverviews
-{
+export interface RasterBandOverviews {
 	count(): number;
     forEach(callback: (overviewBand: RasterBand, i: number) => void): void;
     get(index: number): RasterBand;
@@ -686,8 +643,7 @@ export interface RasterBandOverviews
     map<T>(callback: (overviewBand: RasterBand, i: number) => T): T[];
 }
 
-export interface RasterBandPixels
-{
+export interface RasterBandPixels {
 	get(x: number, y: number): number;
 	read(x: number, y: number, width: number, height: number, data?: TypedArray, options?: RasterBandPixelsReadOptions): TypedArray;
 	readBlock(x: number, y: number, data?: TypedArray): TypedArray;
@@ -696,8 +652,7 @@ export interface RasterBandPixels
 	writeBlock(x: number, y: number, data: TypedArray): void;
 }
 
-export class SpatialReference
-{
+export class SpatialReference {
 	constructor(wkt?: string);
 	autoIdentifyEPSG(): void;
 	clone(): SpatialReference;
@@ -741,8 +696,7 @@ export class SpatialReference
 	static fromXML(input: string): SpatialReference;
 }
 
-export namespace config
-{
+export namespace config {
 	function get(key: string): string;
 	function set(key: string, value: string): void;
 }

From 6260aa95216a27a4a5816b1f45bff85c22e6eaea Mon Sep 17 00:00:00 2001
From: Josh Dover <me@joshdover.com>
Date: Tue, 27 Nov 2018 11:26:43 -0600
Subject: [PATCH 357/836] Order overloaded functions consistently

---
 types/elasticsearch/index.d.ts | 58 +++++++++++++++++-----------------
 1 file changed, 29 insertions(+), 29 deletions(-)

diff --git a/types/elasticsearch/index.d.ts b/types/elasticsearch/index.d.ts
index 0d16cc6a4b..8b8bf07d96 100644
--- a/types/elasticsearch/index.d.ts
+++ b/types/elasticsearch/index.d.ts
@@ -23,76 +23,76 @@ export class Client {
     nodes: Nodes;
     snapshot: Snapshot;
     tasks: Tasks;
-    bulk(params: BulkIndexDocumentsParams): Promise<any>;
     bulk(params: BulkIndexDocumentsParams, callback: (error: any, response: any) => void): void;
+    bulk(params: BulkIndexDocumentsParams): Promise<any>;
     clearScroll(params: ClearScrollParams, callback: (error: any, response: any) => void): void;
     clearScroll(params: ClearScrollParams): Promise<any>;
     count(params: CountParams, callback: (error: any, response: CountResponse) => void): void;
     count(params: CountParams): Promise<CountResponse>;
-    create(params: CreateDocumentParams): Promise<CreateDocumentResponse>;
     create(params: CreateDocumentParams, callback: (err: any, response: CreateDocumentResponse, status: any) => void): void;
-    delete(params: DeleteDocumentParams): Promise<DeleteDocumentResponse>;
+    create(params: CreateDocumentParams): Promise<CreateDocumentResponse>;
     delete(params: DeleteDocumentParams, callback: (error: any, response: DeleteDocumentResponse) => void): void;
-    deleteByQuery(params: DeleteDocumentByQueryParams): Promise<DeleteDocumentByQueryResponse>;
+    delete(params: DeleteDocumentParams): Promise<DeleteDocumentResponse>;
     deleteByQuery(params: DeleteDocumentByQueryParams, callback: (error: any, response: DeleteDocumentByQueryResponse) => void): void;
-    deleteScript(params: DeleteScriptParams): Promise<any>;
+    deleteByQuery(params: DeleteDocumentByQueryParams): Promise<DeleteDocumentByQueryResponse>;
     deleteScript(params: DeleteScriptParams, callback: (error: any, response: any) => void): void;
-    deleteTemplate(params: DeleteTemplateParams): Promise<any>;
+    deleteScript(params: DeleteScriptParams): Promise<any>;
     deleteTemplate(params: DeleteTemplateParams, callback: (error: any, response: any) => void): void;
-    exists(params: ExistsParams): Promise<boolean>;
+    deleteTemplate(params: DeleteTemplateParams): Promise<any>;
     exists(params: ExistsParams, callback: (error: any, response: boolean, status?: any) => void): void;
-    explain(params: ExplainParams): Promise<ExplainResponse>;
+    exists(params: ExistsParams): Promise<boolean>;
     explain(params: ExplainParams, callback: (error: any, response: ExplainResponse) => void): void;
-    fieldStats(params: FieldStatsParams): Promise<FieldStatsResponse>;
+    explain(params: ExplainParams): Promise<ExplainResponse>;
     fieldStats(params: FieldStatsParams, callback: (error: any, response: FieldStatsResponse) => void): void;
+    fieldStats(params: FieldStatsParams): Promise<FieldStatsResponse>;
     get<T>(params: GetParams, callback: (error: any, response: GetResponse<T>) => void): void;
     get<T>(params: GetParams): Promise<GetResponse<T>>;
-    getScript(params: GetScriptParams): Promise<any>;
     getScript(params: GetScriptParams, callback: (error: any, response: any) => void): void;
-    getSource(params: GetSourceParams): Promise<any>;
+    getScript(params: GetScriptParams): Promise<any>;
     getSource(params: GetSourceParams, callback: (error: any, response: any) => void): void;
-    getTemplate(params: GetTemplateParams): Promise<any>;
+    getSource(params: GetSourceParams): Promise<any>;
     getTemplate(params: GetTemplateParams, callback: (error: any, response: any) => void): void;
-    index<T>(params: IndexDocumentParams<T>): Promise<any>;
+    getTemplate(params: GetTemplateParams): Promise<any>;
     index<T>(params: IndexDocumentParams<T>, callback: (error: any, response: any) => void): void;
-    info(params: InfoParams): Promise<any>;
+    index<T>(params: IndexDocumentParams<T>): Promise<any>;
     info(params: InfoParams, callback: (error: any, response: any) => void): void;
+    info(params: InfoParams): Promise<any>;
     mget<T>(params: MGetParams, callback: (error: any, response: MGetResponse<T>) => void): void;
     mget<T>(params: MGetParams): Promise<MGetResponse<T>>;
     msearch<T>(params: MSearchParams, callback: (error: any, response: MSearchResponse<T>) => void): void;
     msearch<T>(params: MSearchParams): Promise<MSearchResponse<T>>;
     msearchTemplate<T>(params: MSearchTemplateParams, callback: (error: any, response: MSearchResponse<T>) => void): void;
     msearchTemplate<T>(params: MSearchTemplateParams): Promise<MSearchResponse<T>>;
-    mtermvectors(params: MTermVectorsParams): Promise<any>;
     mtermvectors(params: MTermVectorsParams, callback: (error: any, response: any) => void): void;
-    ping(params: PingParams): Promise<any>;
+    mtermvectors(params: MTermVectorsParams): Promise<any>;
     ping(params: PingParams, callback: (err: any, response: any, status: any) => void): void;
-    putScript(params: PutScriptParams): Promise<any>;
+    ping(params: PingParams): Promise<any>;
     putScript(params: PutScriptParams, callback: (err: any, response: any, status: any) => void): void;
-    putTemplate(params: PutTemplateParams): Promise<any>;
+    putScript(params: PutScriptParams): Promise<any>;
     putTemplate(params: PutTemplateParams, callback: (err: any, response: any, status: any) => void): void;
-    reindex(params: ReindexParams): Promise<ReindexResponse>;
+    putTemplate(params: PutTemplateParams): Promise<any>;
     reindex(params: ReindexParams, callback: (error: any, response: ReindexResponse) => void): void;
-    reindexRethrottle(params: ReindexRethrottleParams): Promise<any>;
+    reindex(params: ReindexParams): Promise<ReindexResponse>;
     reindexRethrottle(params: ReindexRethrottleParams, callback: (error: any, response: any) => void): void;
-    renderSearchTemplate(params: RenderSearchTemplateParams): Promise<any>;
+    reindexRethrottle(params: ReindexRethrottleParams): Promise<any>;
     renderSearchTemplate(params: RenderSearchTemplateParams, callback: (error: any, response: any) => void): void;
-    scroll<T>(params: ScrollParams): Promise<SearchResponse<T>>;
+    renderSearchTemplate(params: RenderSearchTemplateParams): Promise<any>;
     scroll<T>(params: ScrollParams, callback: (error: any, response: SearchResponse<T>) => void): void;
-    search<T>(params: SearchParams): Promise<SearchResponse<T>>;
+    scroll<T>(params: ScrollParams): Promise<SearchResponse<T>>;
     search<T>(params: SearchParams, callback: (error: any, response: SearchResponse<T>) => void): void;
-    searchShards(params: SearchShardsParams): Promise<SearchShardsResponse>;
+    search<T>(params: SearchParams): Promise<SearchResponse<T>>;
     searchShards(params: SearchShardsParams, callback: (error: any, response: SearchShardsResponse) => void): void;
-    searchTemplate(params: SearchTemplateParams): Promise<any>;
+    searchShards(params: SearchShardsParams): Promise<SearchShardsResponse>;
     searchTemplate(params: SearchTemplateParams, callback: (error: any, response: any) => void): void;
-    suggest(params: SuggestParams): Promise<any>;
+    searchTemplate(params: SearchTemplateParams): Promise<any>;
     suggest(params: SuggestParams, callback: (error: any, response: any) => void): void;
-    termvectors(params: TermvectorsParams): Promise<any>;
+    suggest(params: SuggestParams): Promise<any>;
     termvectors(params: TermvectorsParams, callback: (error: any, response: any) => void): void;
-    update(params: UpdateDocumentParams): Promise<any>;
+    termvectors(params: TermvectorsParams): Promise<any>;
     update(params: UpdateDocumentParams, callback: (error: any, response: any) => void): void;
-    updateByQuery(params: UpdateDocumentByQueryParams): Promise<UpdateDocumentByQueryResponse>;
+    update(params: UpdateDocumentParams): Promise<any>;
     updateByQuery(params: UpdateDocumentByQueryParams, callback: (error: any, response: UpdateDocumentByQueryResponse) => void): void;
+    updateByQuery(params: UpdateDocumentByQueryParams): Promise<UpdateDocumentByQueryResponse>;
     close(): void;
 }
 

From 2de6fbab6151900dba10d85f9a6268ac13a88d1b Mon Sep 17 00:00:00 2001
From: huan086 <huan086@gmail.com>
Date: Tue, 27 Nov 2018 14:37:15 +0800
Subject: [PATCH 358/836] [radix64] Add Typescript definitions.

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

diff --git a/types/radix64/index.d.ts b/types/radix64/index.d.ts
new file mode 100644
index 0000000000..f376184fce
--- /dev/null
+++ b/types/radix64/index.d.ts
@@ -0,0 +1,23 @@
+// Type definitions for radix64 1.1
+// Project: https://github.com/maxired/radix64
+// Definitions by: Jeow Li Huan <https://github.com/huan086>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+type MethodsString = 'base64' | 'base64URL' | 'base64URLNaturalSort' | 'base64URLASCIISort';
+
+interface MethodsEnum {
+    BASE64: MethodsString;
+    BASE64URL: MethodsString;
+    BASE64NATURAL: MethodsString;
+    BASE64ASCII: MethodsString;
+    DEFAULT: MethodsString;
+}
+
+interface Radix {
+    radix64: (number: number, method?: MethodsString) => string;
+    ascii64: (number: number, pad?: number) => string;
+    methods: MethodsEnum;
+}
+
+declare const radix: Radix;
+export = radix;
diff --git a/types/radix64/radix64-tests.ts b/types/radix64/radix64-tests.ts
new file mode 100644
index 0000000000..a77554c238
--- /dev/null
+++ b/types/radix64/radix64-tests.ts
@@ -0,0 +1,11 @@
+import radix64 = require("radix64");
+
+const num: string = radix64.radix64(42);
+
+const numAndEnum: string = radix64.radix64(1337, radix64.methods.BASE64NATURAL);
+
+const numAndString: string = radix64.radix64(1337, 'base64URL');
+
+const asciiNum: string = radix64.ascii64(42);
+
+const asciiNumAndPad: string = radix64.ascii64(42, 25);
diff --git a/types/radix64/tsconfig.json b/types/radix64/tsconfig.json
new file mode 100644
index 0000000000..362ad6d26e
--- /dev/null
+++ b/types/radix64/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "radix64-tests.ts"
+    ]
+}
diff --git a/types/radix64/tslint.json b/types/radix64/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/radix64/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From e6924a21bba6f7f30810c69d3796bce5ce6a9129 Mon Sep 17 00:00:00 2001
From: Christian Chown <christianchown@gmail.com>
Date: Tue, 27 Nov 2018 17:29:18 +0000
Subject: [PATCH 359/836] DateSelectFunction takes a Date, not a string

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

diff --git a/types/react-infinite-calendar/index.d.ts b/types/react-infinite-calendar/index.d.ts
index 10a246c5ae..ac09df7bf4 100644
--- a/types/react-infinite-calendar/index.d.ts
+++ b/types/react-infinite-calendar/index.d.ts
@@ -21,7 +21,7 @@ export interface RangedSelection {
 }
 
 export type RangedSelectFunction = (rangedDate: RangedSelection) => void;
-export type DateSelectFunction = (date: string) => void;
+export type DateSelectFunction = (date: Date) => void;
 
 export interface ReactInfiniteCalendarProps {
     selected?: DateType | false | { start: DateType; end: DateType };

From acd8209e0673bf6e558e8342706c7b5809b9e7c5 Mon Sep 17 00:00:00 2001
From: andreidigori <45198612+andreidigori@users.noreply.github.com>
Date: Tue, 27 Nov 2018 19:29:25 +0200
Subject: [PATCH 360/836] Update index.d.ts

Linting
---
 types/gdal/index.d.ts | 31 +++++++++++--------------------
 1 file changed, 11 insertions(+), 20 deletions(-)

diff --git a/types/gdal/index.d.ts b/types/gdal/index.d.ts
index 41a89ff72f..6aca0120de 100644
--- a/types/gdal/index.d.ts
+++ b/types/gdal/index.d.ts
@@ -21,15 +21,15 @@ export interface XYZ extends XY {
 }
 
 export interface EnvelopeBounds {
-    minX: number,
-    maxX: number,
-    minY: number,
-    maxY: number
+    minX: number;
+    maxX: number;
+    minY: number;
+    maxY: number;
 }
 
 export interface Envelope3DBounds extends EnvelopeBounds {
-    minZ: number,
-    maxZ: number
+    minZ: number;
+    maxZ: number;
 }
 
 export interface RasterBandStatistics {
@@ -309,7 +309,7 @@ export interface DatasetBands {
 export interface DatasetLayers {
     copy(src_lyr_name: string, dst_lyr_name: string, options?: object | string[]): Layer;
     count(): number;
-    create(name: string, srs: SpatialReference, geomType: number | Function, creation_options: string[] | object): Layer;
+    create(name: string, srs: SpatialReference, geomType: number | Geometry, creation_options: string[] | object): Layer;
     forEach(callback: (layer: Layer, i: number) => void): void;
     get(key: string | number): Layer;
     map<T>(callback: (layer: Layer, i: number) => T): T[];
@@ -423,7 +423,7 @@ export abstract class Geometry {
 	static create(type: number): Geometry;
 	static fromWKB(wkb: number, srs?: SpatialReference): Geometry;
 	static fromWKT(wkt: string, srs?: SpatialReference): Geometry;
-	static getConstructor(type: number): Function;
+	static getConstructor(type: number): Geometry;
 	static getName(type: number): string;
 
 	boundary(): Geometry;
@@ -488,7 +488,6 @@ export interface GeometryCollectionChildren {
     map<T>(callback: (geometry: Geometry, i: number) => T): T[];
     remove(index: number): void;
 	toArray(): Geometry[];
-	
 	readonly layer: Layer;
 }
 
@@ -500,7 +499,6 @@ export interface Layer {
 	setSpatialFilter(filter: Geometry): void;
 	setSpatialFilter(minX: number, maxX: number, minY: number, maxY: number): void;
 	testCapability(capability: string): boolean;
-
 	readonly ds: Dataset;
 	readonly features: LayerFeatures;
 	readonly fidColumn: string;
@@ -521,7 +519,6 @@ export interface LayerFeatures {
 	next(): Feature;
     remove(id: number): void;
 	set(id: number, feature: Feature): void;
-	
 	readonly layer: Layer;
 }
 
@@ -536,7 +533,6 @@ export interface LayerFields {
     map<T>(callback: (field: FieldDefn, i: number) => T): T[];
     remove(field: string | number): void;
 	reorder(map: number[]): void;
-	
 	readonly layer: Layer;
 }
 
@@ -548,7 +544,6 @@ export class LineString extends Geometry {
 	addSubLineString(line: LineString, start?: number, end?: number): void;
 	getLength(): number;
 	value(distance: number): Point;
-
 	readonly points: LineStringPoints;
 }
 
@@ -580,7 +575,6 @@ export class MultiPolygon extends GeometryCollection {
 
 export class Point extends Geometry {
 	constructor(x: number, y: number, z?: number);
-
 	x: number;
 	y: number;
 	z: number;
@@ -588,7 +582,6 @@ export class Point extends Geometry {
 
 export class Polygon extends Geometry {
 	getArea(): number;
-
 	rings: PolygonRings;
 }
 
@@ -600,7 +593,6 @@ export interface PolygonRings {
     map<T>(callback: (ring: LinearRing, i: number) => T): T[];
     remove(index: number): void;
 	toArray(): LinearRing[];
-	
 	readonly layer: Layer;
 }
 
@@ -614,7 +606,6 @@ export interface RasterBand {
 	getMetadata(domain?: string): object;
 	getStatistics(allow_approximation: boolean, force: boolean): RasterBandStatistics;
 	setStatistics(min: number, max: number, mean: number, std_dev: number): void;
-
 	readonly blockSize: XY;
 	categoryNames: string[];
 	colorInterpretation: string;
@@ -681,7 +672,6 @@ export class SpatialReference {
 	toWKT(): string;
 	toXML(): string;
 	validate(): string;
-
 	static fromCRSURL(input: string): SpatialReference;
 	static fromEPSG(input: string): SpatialReference;
 	static fromEPSGA(input: number): SpatialReference;
@@ -709,10 +699,11 @@ export function checksumImage(src: RasterBand, x?: number, y?: number, w?: numbe
 export function contourGenerate(options: ContourGenerateOptions): void;
 export function decToDMS(angle: number, axis: 'lat' | 'long', precision?: number): string;
 export function fillNodata(options: FillNoDataOptions): void;
-export function open(path: string, mode?: 'r' | 'r+' | 'w', drivers?: string | string[], x_size?: number, y_size?: number, band_count?: number, data_type?: number, creation_options?: string[] | object): Dataset;
+export function open(path: string, mode?: 'r' | 'r+' | 'w', drivers?: string | string[]): Dataset;
+export function open(path: string, mode?: 'w', drivers?: string | string[], x_size?: number, y_size?: number, band_count?: number, data_type?: number, creation_options?: string[] | object): Dataset;
 export function polygonize(options: PolygonizeOptions): void;
 export function quiet(): void;
 export function reprojectImage(options: ReprojectImageOptions): void;
 export function sieveFilter(options: SieveFilterOptions): void;
 export function suggestedWarpOutput(options: SuggestedWarpOutputOptions): { rasterSize: any, geoTransform: any };
-export function verbose(): void;
\ No newline at end of file
+export function verbose(): void;

From d076418dc2fb9748a78bb49a4a585b577703d158 Mon Sep 17 00:00:00 2001
From: andreidigori <45198612+andreidigori@users.noreply.github.com>
Date: Tue, 27 Nov 2018 19:33:23 +0200
Subject: [PATCH 361/836] Update index.d.ts

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

diff --git a/types/gdal/index.d.ts b/types/gdal/index.d.ts
index 6aca0120de..d6c76ba226 100644
--- a/types/gdal/index.d.ts
+++ b/types/gdal/index.d.ts
@@ -564,9 +564,7 @@ export class MultiLineString extends GeometryCollection {
 	polygonize(): Polygon;
 }
 
-export class MultiPoint extends GeometryCollection {
-	
-}
+export class MultiPoint extends GeometryCollection {}
 
 export class MultiPolygon extends GeometryCollection {
 	getArea(): number;

From 289c533aadb4ee5d6a7ef2a740c4d38cd7b6cc59 Mon Sep 17 00:00:00 2001
From: Cameron Martin <cameron_martin@shelter.org.uk>
Date: Tue, 27 Nov 2018 17:27:21 +0000
Subject: [PATCH 362/836] [@babel/traverse]: Fixed type of path when using
 enter & exit visitor.

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

diff --git a/types/babel__traverse/babel__traverse-tests.ts b/types/babel__traverse/babel__traverse-tests.ts
index 5b4fbbef5f..974831dbca 100644
--- a/types/babel__traverse/babel__traverse-tests.ts
+++ b/types/babel__traverse/babel__traverse-tests.ts
@@ -4,10 +4,14 @@ import * as t from "@babel/types";
 // Examples from: https://github.com/thejameskyle/babel-handbook/blob/master/translations/en/plugin-handbook.md
 const MyVisitor: Visitor = {
     Identifier: {
-        enter() {
+        enter(path) {
+            // $ExpectType NodePath<Identifier>
+            path;
             console.log("Entered!");
         },
-        exit() {
+        exit(path) {
+            // $ExpectType NodePath<Identifier>
+            path;
             console.log("Exited!");
         }
     }
diff --git a/types/babel__traverse/index.d.ts b/types/babel__traverse/index.d.ts
index 465a60464f..740f5f4429 100644
--- a/types/babel__traverse/index.d.ts
+++ b/types/babel__traverse/index.d.ts
@@ -142,7 +142,7 @@ export type Visitor<S = Node> = VisitNodeObject<Node> & {
     [P in Node["type"]]?: VisitNode<S, Extract<Node, { type: P; }>>;
 };
 
-export type VisitNode<T, P> = VisitNodeFunction<T, P> | VisitNodeObject<T>;
+export type VisitNode<T, P> = VisitNodeFunction<T, P> | VisitNodeObject<P>;
 
 export type VisitNodeFunction<T, P> = (this: T, path: NodePath<P>, state: any) => void;
 

From 2bd511da769254c4dc31a651b7ff05c1e3dd571f Mon Sep 17 00:00:00 2001
From: timhwang21 <timhwang21@gmail.com>
Date: Tue, 27 Nov 2018 12:47:24 -0500
Subject: [PATCH 363/836] [node-forge] add types for missing modules; fix
 incorrect types

Add typedefs for:
* `jsbn` (bare minimum); API isn't public so should be fine
* `random`

Improve typedefs for:
* `pki` public and private keys
  * Add types for `pki.rsa` keys

Add stubs for: (I didn't fix as these types aren't currently relevant to
my work)
* `pss`
* `pki.ed25519`

Also fixed some incorrect types, e.g. `createBuffer` was mistyped.

Added test case for RSA signing. Also fixed some incorrect tests, and
commented out ones that seemed entirely broken. The two removed lines
don't trigger type errors on master, but if you actually run the file
they will error: `ts-node types/node-forge/node-forge-tests.ts`
---
 types/node-forge/index.d.ts          | 132 ++++++++++++++++++---------
 types/node-forge/node-forge-tests.ts |  20 +++-
 2 files changed, 104 insertions(+), 48 deletions(-)

diff --git a/types/node-forge/index.d.ts b/types/node-forge/index.d.ts
index d362eb1c27..40badbbcf4 100644
--- a/types/node-forge/index.d.ts
+++ b/types/node-forge/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for node-forge 0.7.6
+// Type definitions for node-forge 0.7.7
 // Project: https://github.com/digitalbazaar/forge
 // Definitions by: Seth Westphal    <https://github.com/westy92>
 //                 Kay Schecker     <https://github.com/flynetworks>
@@ -7,6 +7,7 @@
 //                 Beeno Tung       <https://github.com/beenotung>
 //                 Joe Flateau      <https://github.com/joeflateau>
 //                 Nikita Koryabkin <https://github.com/Apologiz>
+//                 timhwang21       <https://github.com/timhwang21>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
 
@@ -20,6 +21,15 @@ declare module "node-forge" {
     type Utf8 = string;
     type OID = string;
 
+    namespace jsbn {
+        class BigInteger {
+            data: number[];
+            t: number;
+            s: number;
+            toString(): string;
+        }
+    }
+
     namespace pem {
 
         interface EncodeOptions {
@@ -40,28 +50,18 @@ declare module "node-forge" {
     }
 
     namespace pki {
-
         type PEM = string;
-        type Key = any;
+        type PublicKey = rsa.PublicKey | ed25519.Key;
+        type PrivateKey = rsa.PrivateKey | ed25519.Key;
 
         interface KeyPair {
             publicKey: PublicKey;
             privateKey: PrivateKey;
         }
 
-        interface PublicKey {
-            encrypt(data: string, scheme?: string, schemeOptions?: number): Bytes
-            verify(digest: string, signature: string, scheme?: string): boolean
-        }
-
-        interface PrivateKey {
-            decrypt(data: string, scheme?: string, schemeOptions?: number): string
-            sign(md: string, scheme?: string): Bytes
-        }
-
         function pemToDer(pem: PEM): util.ByteStringBuffer;
         function privateKeyToPem(key: PrivateKey, maxline?: number): PEM;
-        function privateKeyInfoToPem(key: PrivateKey, maxline?: number): PEM;
+        function privateKeyInfoToPem(key: Bytes, maxline?: number): PEM;
         function publicKeyToPem(key: PublicKey, maxline?: number): PEM;
         function publicKeyFromPem(pem: PEM): PublicKey;
         function privateKeyFromPem(pem: PEM): PrivateKey;
@@ -73,7 +73,38 @@ declare module "node-forge" {
         }
         var oids: oids;
 
+        namespace ed25519 {
+            type Key = ArrayBuffer;
+        }
+
         namespace rsa {
+            type EncryptionScheme = 'RSAES-PKCS1-V1_5' | 'RSA-OAEP' | 'RAW' | 'NONE' | null;
+            type SignatureScheme = 'RSASSA-PKCS1-V1_5' | pss.PSS | 'NONE' | null;
+
+            interface PublicKey {
+                n: jsbn.BigInteger;
+                e: jsbn.BigInteger;
+                encrypt(data: Bytes, scheme?: EncryptionScheme, schemeOptions?: any): Bytes;
+                verify(digest: Bytes, signature: Bytes, scheme?: SignatureScheme): boolean;
+            }
+
+            interface PrivateKey {
+                n: jsbn.BigInteger;
+                e: jsbn.BigInteger;
+                d: jsbn.BigInteger;
+                p: jsbn.BigInteger;
+                q: jsbn.BigInteger;
+                dP: jsbn.BigInteger;
+                dQ: jsbn.BigInteger;
+                qInv: jsbn.BigInteger;
+                decrypt(data: Bytes, scheme?: EncryptionScheme, schemeOptions?: any): Bytes;
+                sign(md: md.MessageDigest, scheme?: SignatureScheme): Bytes;
+            }
+
+            interface KeyPair {
+                publicKey: PublicKey;
+                privateKey: PrivateKey;
+            }
 
             interface GenerateKeyPairOptions {
                 bits?: number;
@@ -84,9 +115,9 @@ declare module "node-forge" {
                 prng?: any;
                 algorithm?: string;
             }
-            
+
             function setPublicKey(n: any, e: any): any;
-            
+
             function generateKeyPair(bits?: number, e?: number, callback?: (err: Error, keypair: KeyPair) => void): KeyPair;
             function generateKeyPair(options?: GenerateKeyPairOptions, callback?: (err: Error, keypair: KeyPair) => void): KeyPair;
         }
@@ -160,8 +191,8 @@ declare module "node-forge" {
                 hash: any;
             };
             extensions: any[];
-            privateKey: Key;
-            publicKey: Key;
+            privateKey: PrivateKey;
+            publicKey: PublicKey;
             md: any;
             /**
              * Sets the subject of this certificate.
@@ -200,7 +231,7 @@ declare module "node-forge" {
              * @param key the private key to sign with.
              * @param md the message digest object to use (defaults to forge.md.sha1).
              */
-            sign(key: pki.Key, md: md.MessageDigest): void;
+            sign(key: pki.PrivateKey, md?: md.MessageDigest): void;
             /**
              * Attempts verify the signature on the passed certificate using this
              * certificate's public key.
@@ -215,19 +246,30 @@ declare module "node-forge" {
 
         function certificateFromAsn1(obj: asn1.Asn1, computeHash?: boolean): Certificate;
 
-        function decryptRsaPrivateKey(pem: PEM, passphrase?: string): Key;
+        function decryptRsaPrivateKey(pem: PEM, passphrase?: string): PrivateKey;
 
         function createCertificate(): Certificate;
-            
+
         function certificationRequestToPem(cert: Certificate, maxline?: number): PEM;
-            
+
         function certificationRequestFromPem(pem: PEM, computeHash?: boolean, strict?: boolean): Certificate;
-            
+
         function createCertificationRequest(): Certificate;
-            
-        function publicKeyToAsn1(publicKey: Key): any;
-            
-        function publicKeyToRSAPublicKey(publicKey: Key): any;
+
+        function publicKeyToAsn1(publicKey: PublicKey): any;
+
+        function publicKeyToRSAPublicKey(publicKey: PublicKey): any;
+    }
+
+    namespace random {
+        function getBytes(count: number, callback?: (bytes: Bytes) => any): Bytes;
+        function getBytesSync(count: number): Bytes;
+        type CB = (_: any, seed: string) => void;
+        interface Random {
+            seedFileSync: (needed: number) => string;
+            seedFile: (needed: number, cb: CB) => void;
+        }
+        function createInstance(): Random;
     }
 
     namespace ssh {
@@ -249,22 +291,22 @@ declare module "node-forge" {
         /**
          * @description Encodes a private RSA key as an OpenSSH file
          */
-        function privateKeyToOpenSSH(privateKey: pki.Key, passphrase?: string): string;
+        function privateKeyToOpenSSH(privateKey: pki.PrivateKey, passphrase?: string): string;
 
         /**
          * @description Encodes (and optionally encrypts) a private RSA key as a Putty PPK file
          */
-        function privateKeyToPutty(privateKey: pki.Key, passphrase?: string, comment?: string): string;
+        function privateKeyToPutty(privateKey: pki.PrivateKey, passphrase?: string, comment?: string): string;
 
         /**
          * @description Encodes a public RSA key as an OpenSSH file
          */
-        function publicKeyToOpenSSH(publicKey: pki.Key, comment?: string): string | pki.PEM;
+        function publicKeyToOpenSSH(publicKey: pki.PublicKey, comment?: string): string | pki.PEM;
 
         /**
          * @description Gets the SSH fingerprint for the given public key
          */
-        function getPublicKeyFingerprint(publicKey: pki.Key, options?: FingerprintOptions): util.ByteStringBuffer | Hex | string;
+        function getPublicKeyFingerprint(publicKey: pki.PublicKey, options?: FingerprintOptions): util.ByteStringBuffer | Hex | string;
     }
 
     namespace asn1 {
@@ -377,7 +419,7 @@ declare module "node-forge" {
         function decodeUtf8(encoded: Utf8): string;
 
         function createBuffer(): ByteBuffer;
-        function createBuffer(input: string, encode: string): ByteBuffer;
+        function createBuffer(input: Bytes | ArrayBuffer | ArrayBufferView | ByteStringBuffer, encode: string): ByteBuffer;
 
         namespace binary {
             namespace raw {
@@ -418,7 +460,7 @@ declare module "node-forge" {
         interface Bag {
             type: string;
             attributes: any;
-            key?: pki.Key;
+            key?: pki.PrivateKey;
             cert?: pki.Certificate;
             asn1: asn1.Asn1
         }
@@ -441,12 +483,12 @@ declare module "node-forge" {
         function pkcs12FromAsn1(obj: any, strict?: boolean, password?: string): Pkcs12Pfx;
         function pkcs12FromAsn1(obj: any, password?: string): Pkcs12Pfx;
     }
-        
+
     namespace pkcs7 {
         interface PkcsSignedData {
             content?: string | util.ByteBuffer;
             contentInfo?: { value: any[] };
-  
+
             addCertificate(certificate: pki.Certificate): void;
             addSigner(options: {
                 key: string;
@@ -459,14 +501,16 @@ declare module "node-forge" {
             }): void;
             toAsn1(): asn1.Asn1;
         }
-  
+
         function createSignedData(): PkcsSignedData;
     }
 
     namespace md {
 
+        type Encoding = "raw" | "utf8"
+
         interface MessageDigest {
-            update(msg: string, encoding?: string): MessageDigest;
+            update(msg: string, encoding?: Encoding): MessageDigest;
             digest(): util.ByteStringBuffer;
         }
 
@@ -477,7 +521,7 @@ declare module "node-forge" {
         namespace sha256 {
             function create(): MessageDigest;
         }
-            
+
         namespace sha512 {
             function create(): MessageDigest;
         }
@@ -513,18 +557,16 @@ declare module "node-forge" {
             tag: util.ByteStringBuffer;
         }
     }
-        
+
     namespace pss {
-        function create(any: any): any;
+        type PSS = any;
+
+        function create(any: any): PSS;
     }
-        
+
     namespace mgf {
         namespace mgf1 {
             function create(any: any): any;
         }
     }
-
-    namespace random {
-        function getBytesSync(length: number): Bytes;
-    }
 }
diff --git a/types/node-forge/node-forge-tests.ts b/types/node-forge/node-forge-tests.ts
index abc863f7ff..a8d352ad1a 100644
--- a/types/node-forge/node-forge-tests.ts
+++ b/types/node-forge/node-forge-tests.ts
@@ -8,9 +8,7 @@ let x: string = forge.ssh.privateKeyToOpenSSH(key);
 let pemKey: forge.pki.PEM = publicKeyPem;
 let publicKeyRsa = forge.pki.publicKeyFromPem(pemKey);
 let privateKeyRsa = forge.pki.privateKeyFromPem(privateKeyPem);
-let privateKeyRsa2 = forge.pki.privateKeyInfoToPem(privateKeyRsa);
 let byteBufferString = forge.pki.pemToDer(privateKeyPem);
-let certPem = forge.pki.certificateFromPem(pemKey);
 let cert = forge.pki.createCertificate();
 
 {
@@ -118,6 +116,7 @@ if (forge.util.fillString('1', 5) !== '11111') throw Error('forge.util.fillStrin
 }
 
 {
+    let key = forge.random.getBytesSync(24)
     let payload = { asd: 'asd' };
     let cipher = forge.cipher.createCipher('3DES-ECB', forge.util.createBuffer(key, 'raw'));
     cipher.start();
@@ -133,7 +132,7 @@ if (forge.util.fillString('1', 5) !== '11111') throw Error('forge.util.fillStrin
     let decrypted = decipher.output as forge.util.ByteStringBuffer;
     let content = JSON.parse(forge.util.encodeUtf8(decrypted.getBytes()));
 
-    if (content.asd == payload.asd) throw Error('forge.cipher.createCipher failed');
+    if (content.asd !== payload.asd) throw Error('forge.cipher.createCipher failed');
 }
 
 {
@@ -189,3 +188,18 @@ if (forge.util.fillString('1', 5) !== '11111') throw Error('forge.util.fillStrin
     // self-sign certificate
     cert.sign(keypair.privateKey, forge.md.sha256.create());
 }
+
+{
+    let md: forge.md.MessageDigest;
+    let hex: string;
+    let signature: forge.Bytes
+
+    md = forge.md.sha256.create();
+    md = md.update('Test');
+    hex = md.digest().toHex();
+
+    signature = keypair.privateKey.sign(md)
+    if (!keypair.publicKey.verify(md.digest().bytes(), signature)) {
+        throw Error("rsa signature verification fail");
+    }
+}

From f757203084ed5793a80255c032740738d0a82c86 Mon Sep 17 00:00:00 2001
From: Jake Boone <jakeboone02@gmail.com>
Date: Tue, 27 Nov 2018 11:44:14 -0700
Subject: [PATCH 364/836] [react-datepicker] v2.0.0

---
 types/react-datepicker/index.d.ts   | 69 ++++++++++++++++++-----------
 types/react-datepicker/package.json |  1 -
 2 files changed, 44 insertions(+), 26 deletions(-)

diff --git a/types/react-datepicker/index.d.ts b/types/react-datepicker/index.d.ts
index 23e542d322..6368e273e3 100644
--- a/types/react-datepicker/index.d.ts
+++ b/types/react-datepicker/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for react-datepicker 1.1
+// Type definitions for react-datepicker 2.0
 // Project: https://github.com/Hacker0x01/react-datepicker
 // Definitions by: Rajab Shakirov <https://github.com/radziksh>,
 //                 Andrey Balokha <https://github.com/andrewBalekha>,
@@ -7,11 +7,11 @@
 //                 Roy Xue <https://github.com/royxue>
 //                 Koala Human <https://github.com/KoalaHuman>
 //                 Sean Kelley <https://github.com/seansfkelley>
+//                 Jake Boone <https://github.com/jakeboone02>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 
 import * as React from "react";
-import * as moment from "moment";
 import * as Popper from "popper.js";
 
 export interface ReactDatePickerProps {
@@ -20,59 +20,65 @@ export interface ReactDatePickerProps {
 	autoComplete?: string;
 	autoFocus?: boolean;
 	calendarClassName?: string;
+	calendarContainer?(props: { children: React.ReactNode[] }): React.ReactNode;
 	children?: React.ReactNode;
 	className?: string;
 	customInput?: React.ReactNode;
 	customInputRef?: string;
 	dateFormat?: string | string[];
 	dateFormatCalendar?: string;
-	dayClassName?(date: moment.Moment): string | null;
+	dayClassName?(date: Date): string | null;
 	disabled?: boolean;
 	disabledKeyboardNavigation?: boolean;
 	dropdownMode?: 'scroll' | 'select';
-	endDate?: moment.Moment;
-	excludeDates?: moment.Moment[];
-	excludeTimes?: moment.Moment[];
-	filterDate?(date: moment.Moment): boolean;
+	endDate?: Date;
+	excludeDates?: Date[];
+	excludeTimes?: Date[];
+	filterDate?(date: Date): boolean;
 	fixedHeight?: boolean;
 	forceShowMonthNavigation?: boolean;
-	formatWeekNumber?(date: moment.Moment): string | number;
-	highlightDates?: moment.Moment[];
+	formatWeekNumber?(date: Date): string | number;
+	highlightDates?: Date[];
 	id?: string;
-	includeDates?: moment.Moment[];
-	includeTimes?: moment.Moment[];
+	includeDates?: Date[];
+	includeTimes?: Date[];
+	injectTimes?: Date[];
 	inline?: boolean;
 	isClearable?: boolean;
 	locale?: string;
-	maxDate?: moment.Moment;
-	maxTime?: moment.Moment;
-	minDate?: moment.Moment;
-	minTime?: moment.Moment;
+	maxDate?: Date;
+	maxTime?: Date;
+	minDate?: Date;
+	minTime?: Date;
 	monthsShown?: number;
 	name?: string;
 	onBlur?(event: React.FocusEvent<HTMLInputElement>): void;
-	onChange(date: moment.Moment | null, event: React.SyntheticEvent<any> | undefined): void;
+	onChange(date: Date | null, event: React.SyntheticEvent<any> | undefined): void;
 	onChangeRaw?(event: React.FocusEvent<HTMLInputElement>): void;
 	onClickOutside?(event: React.MouseEvent<HTMLDivElement>): void;
 	onFocus?(event: React.FocusEvent<HTMLInputElement>): void;
 	onKeyDown?(event: React.KeyboardEvent<HTMLDivElement>): void;
-	onMonthChange?(date: moment.Moment): void;
-	onSelect?(date: moment.Moment, event: React.SyntheticEvent<any> | undefined): void;
-	onWeekSelect?(firstDayOfWeek: moment.Moment, weekNumber: string | number, event: React.SyntheticEvent<any> | undefined): void;
-	onYearChange?(date: moment.Moment): void;
-	openToDate?: moment.Moment;
+	onMonthChange?(date: Date): void;
+	onSelect?(date: Date, event: React.SyntheticEvent<any> | undefined): void;
+	onWeekSelect?(firstDayOfWeek: Date, weekNumber: string | number, event: React.SyntheticEvent<any> | undefined): void;
+	onInputClick?(): void;
+	onYearChange?(date: Date): void;
+	onInputError?(err: {code: number; msg: string}): void;
+	open?: boolean;
+	openToDate?: Date;
 	peekNextMonth?: boolean;
 	placeholderText?: string;
 	popperClassName?: string;
 	popperContainer?(props: { children: React.ReactNode[] }): React.ReactNode;
 	popperModifiers?: Popper.Modifiers;
 	popperPlacement?: string;
+	popperProps?: {};
 	preventOpenOnFocus?: boolean;
 	readOnly?: boolean;
 	required?: boolean;
 	scrollableMonthYearDropdown?: boolean;
 	scrollableYearDropdown?: boolean;
-	selected?: moment.Moment | null;
+	selected?: Date | null;
 	selectsEnd?: boolean;
 	selectsStart?: boolean;
 	shouldCloseOnSelect?: boolean;
@@ -83,21 +89,34 @@ export interface ReactDatePickerProps {
 	showTimeSelectOnly?: boolean;
 	showWeekNumbers?: boolean;
 	showYearDropdown?: boolean;
-	startDate?: moment.Moment;
+	startDate?: Date;
 	startOpen?: boolean;
 	tabIndex?: number;
 	timeCaption?: string;
 	timeFormat?: string;
 	timeIntervals?: number;
 	title?: string;
-	todayButton?: string;
+	todayButton?: React.ReactNode;
 	useShortMonthInDropdown?: boolean;
 	useWeekdaysShort?: boolean;
-	utcOffset?: number;
 	value?: string;
 	weekLabel?: string;
 	withPortal?: boolean;
 	yearDropdownItemNumber?: number;
+	formatWeekDay?(date: Date): string;
+	clearButtonTitle?: string;
+	previousMonthButtonLabel?: string;
+	nextMonthButtonLabel?: string;
+	renderCustomHeader?(params: {
+		date: Date;
+		changeYear(year: number): void;
+		changeMonth(month: number): void;
+		decreaseMonth(): void;
+		increaseMonth(): void;
+		prevMonthButtonDisabled: boolean;
+		nextMonthButtonDisabled: boolean;
+	}): React.ReactNode;
+	renderDayContents?(dayOfMonth: number): React.ReactNode;
 }
 declare const ReactDatePicker: React.ClassicComponentClass<ReactDatePickerProps>;
 export default ReactDatePicker;
diff --git a/types/react-datepicker/package.json b/types/react-datepicker/package.json
index fc763e4d4b..245f69cd2c 100644
--- a/types/react-datepicker/package.json
+++ b/types/react-datepicker/package.json
@@ -1,7 +1,6 @@
 {
     "private": true,
     "dependencies": {
-        "moment": ">=2.14.0",
         "popper.js": "^1.14.1"
     }
 }

From 075dc4a1ce3f16807dfe3e4aa13893a814958fde Mon Sep 17 00:00:00 2001
From: Dominik Moritz <domoritz@gmail.com>
Date: Tue, 27 Nov 2018 10:48:49 -0800
Subject: [PATCH 365/836] Delete Vega typings since Vega comes with its own
 types.

---
 types/vega/index.d.ts    |  562 -----------
 types/vega/tsconfig.json |   24 -
 types/vega/tslint.json   |   79 --
 types/vega/vega-tests.ts | 2035 --------------------------------------
 4 files changed, 2700 deletions(-)
 delete mode 100644 types/vega/index.d.ts
 delete mode 100644 types/vega/tsconfig.json
 delete mode 100644 types/vega/tslint.json
 delete mode 100644 types/vega/vega-tests.ts

diff --git a/types/vega/index.d.ts b/types/vega/index.d.ts
deleted file mode 100644
index da7b0fee32..0000000000
--- a/types/vega/index.d.ts
+++ /dev/null
@@ -1,562 +0,0 @@
-// Type definitions for Vega
-// Project: http://trifacta.github.io/vega/
-// Definitions by: Tom Crockett <https://github.com/pelotom>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare namespace vg {
-
-  export type ChartViewConstructor = {
-    (args: {renderer: 'svg'} & ViewArgs): SvgView;
-    (args: {renderer: 'canvas'} & ViewArgs): CanvasView;
-    (args: ViewArgs): View;
-  };
-
-  export interface Parse {
-    spec(url: string, callback: (chart: ChartViewConstructor) => void): void;
-    spec(spec: Spec, callback: (chart: ChartViewConstructor) => void): void;
-    data(dataSet: Data[], callback: () => void): void;
-    // TODO all the other stuff
-  }
-
-  export interface ViewArgs {
-    // TODO docs
-    el?: any;
-    data?: any;
-    hover?: boolean;
-    renderer?: string;
-  }
-
-  export interface View {
-    // TODO docs
-    width(): number;
-    width(w: number): this;
-
-    height(): number;
-    height(h: number): this;
-
-    padding(): Padding;
-    padding(p: Padding): this;
-
-    viewport(): number[];
-    viewport(v: number[]): this;
-
-    renderer(r: string): this;
-
-    data(): Runtime.DataSets;
-    data(d: any/*TODO*/): this;
-
-    initialize(selector: string): this;
-    initialize(node: Element): this;
-
-    render(r?: any[]): this;
-
-    update(options?: UpdateOptions): this;
-
-    model(): Vega.Model;
-
-    defs(): Defs;
-    defs(defs: Defs): this;
-  }
-
-  export interface SvgView extends View {
-    svg(): string;
-  }
-
-  export interface CanvasView extends View {
-    canvas(): any; // Returns a node-canvas instance
-  }
-
-  export interface Padding {
-    // TODO docs
-    top: number;
-    right: number;
-    bottom: number;
-    left: number;
-  }
-
-  export interface UpdateOptions {
-    // TODO docs
-    props?: string;
-    items?: any;
-    duration?: number;
-    ease?: string;
-  }
-
-  export interface Bounds {
-    x1: number;
-    y1: number;
-    x2: number;
-    y2: number;
-    clear(): Bounds;
-    set(x1: number, y1: number, x2: number, y2: number): Bounds;
-    add(x: number, y: number): Bounds;
-    expand(d: number): Bounds;
-    round(): Bounds;
-    translate(dx: number, dy: number): Bounds;
-    rotate(angle: number, x: number, y: number): Bounds;
-    union(b: Bounds): Bounds;
-    encloses(b: Bounds): boolean;
-    intersects(b: Bounds): boolean;
-    contains(x: number, y: number): boolean;
-    width(): number;
-    height(): number;
-  }
-
-  export interface Model {
-    defs(): Defs;
-    defs(defs: Defs): Model;
-
-    data(): Runtime.DataSets;
-    data(data: Runtime.DataSets): Model;
-
-    ingest(name: string, tx: any/*TODO*/, input: any/*TODO*/): void;
-
-    dependencies(name: string, tx: any/*TODO*/): void;
-
-    width(w: number): Model;
-
-    height(h: number): Model;
-
-    scene(): Node;
-    scene(node: Node): Model;
-
-    build(): Model;
-
-    encode(trans?: any/*TODO*/, request?: string, item?: any): Model;
-
-    reset(): Model;
-  }
-
-  export namespace Runtime {
-    export interface DataSets {
-      [name: string]: Datum[];
-    }
-
-    export interface Datum {
-      [key: string]: any
-    }
-
-    export interface Marks {
-      type: string;
-      width: number;
-      height: number;
-      scales: Scale[];
-      axes: Axis[];
-      legends: Legend[];
-      marks: Mark[];
-    }
-
-    export interface PropertySets {
-      enter?: Properties;
-      exit?: Properties;
-      update?: Properties;
-      hover?: Properties;
-    }
-
-    export interface Properties {
-      (item: Node, group: Node, trans: any/*TODO*/): void;
-    }
-  }
-
-  export interface Node {
-    def: Vega.Mark;
-    marktype: string;
-    interactive: boolean;
-    items: Node[];
-    bounds: Bounds;
-
-    // mark item members
-    hasPropertySet(name: string): boolean;
-    cousin(offset: number, index: number): Node;
-    sibling(offset: number): Node;
-    remove(): Node;
-    touch(): void;
-
-    // group members
-    scales?: {[name: string]: any};
-    axisItems?: Node[];
-  }
-
-  export interface Defs {
-    width: number;
-    height: number;
-    viewport?: number[];
-    padding: any;
-    marks: Runtime.Marks;
-    data: Data[];
-  }
-
-  export interface Spec {
-    /**
-    * A unique name for the visualization specification.
-    */
-    name?: string;
-    /**
-    * The total width, in pixels, of the data rectangle. Default is 500 if
-    * undefined.
-    */
-    width?: number;
-    /**
-    * The total height, in pixels, of the data rectangle. Default is 500 if
-    * undefined.
-    */
-    height?: number;
-    /**
-    * The width and height of the on-screen viewport, in pixels. If necessary,
-    * clipping and scrolling will be applied.
-    */
-    viewport?: number[];
-    /**
-    * [Number | Object | String]
-    * The internal padding, in pixels, from the edge of the visualization
-    * canvas to the data rectangle. If an object is provided, it must include
-    * {top, left, right, bottom} properties. Two string values are also
-    * acceptable: "auto" (the default) and "strict". Auto-padding computes the
-    * padding dynamically based on the contents of the visualization. All
-    * marks, including axes and legends, are used to compute the necessary
-    * padding. "Strict" auto-padding attempts to adjust the padding such that
-    * the overall width and height of the visualization is unchanged. This mode
-    * can cause the visualization's width and height parameters to be adjusted
-    * such that the total size, including padding, remains constant. Note that
-    * in some cases strict padding is not possible; for example, if the axis
-    * labels are much larger than the data rectangle.
-    */
-    padding?: number | string | {
-        top: number; left: number; right: number; bottom: number
-    }; // string is "auto" or "strict"
-    /**
-    * Definitions of data to visualize.
-    */
-    data: Data[];
-    /**
-    * Scale transform definitions.
-    */
-    scales?: Scale[];
-    /**
-    * Axis definitions.
-    */
-    axes?: Axis[];
-    /**
-    * Legend definitions.
-    */
-    legends?: Legend[];
-    /**
-    * Graphical mark definitions.
-    */
-    marks: (Mark | GroupMark)[];
-  }
-
-  export interface Data {
-    /**
-    * A unique name for the data set.
-    */
-    name: string;
-    /**
-    * An object that specifies the format for the data file, if loaded from a
-    * URL.
-    */
-    format?: Data.Format;
-    /**
-    * The actual data set to use. The values property allows data to be inlined
-    * directly within the specification itself.
-    */
-    values?: any;
-    /**
-    * The name of another data set to use as the source for this data set. The
-    * source property is particularly useful in combination with a transform
-    * pipeline to derive new data.
-    */
-    source?: string;
-    /**
-    * A URL from which to load the data set. Use the format property to ensure
-    * the loaded data is correctly parsed. If the format property is not specified,
-    * the data is assumed to be in a row-oriented JSON format.
-    */
-    url?: string;
-    /**
-    * An array of transforms to perform on the data. Transform operators will be
-    * run on the default data, as provided by late-binding or as specified by the
-    *   source, values, or url properties.
-    */
-    transform?: Data.Transform[];
-  }
-
-  export namespace Data {
-    export interface FormatBase {
-      /**
-      * The currently supported format types are json (JavaScript Object
-      * Notation), csv (comma-separated values), tsv (tab-separated values),
-      * topojson, and treejson.
-      */
-      type: string;
-      // TODO: fields for specific formats
-    }
-
-    /**
-     * The JSON property containing the desired data.
-     * This parameter can be used when the loaded JSON file may have surrounding structure or meta-data.
-     * For example "property": "values.features" is equivalent to retrieving json.values.features from the
-     * loaded JSON object.
-     */
-    export interface JsonFormat extends FormatBase {
-      type: string; // "json"
-      property?: string;
-    }
-
-    export interface CsvOrTsvFormat extends FormatBase {
-      type: string; // "csv" | "tsv"
-      parse?: {
-       [propertyName: string]: string; // "number" | "boolean" | "date"
-      }
-    }
-
-    export interface TopoJsonFormat extends FormatBase {
-      type: string; // "topojson"
-      feature?: string;
-      mesh?: string;
-    }
-
-    export interface TreeJson extends FormatBase {
-      type: string; // "treejson"
-      children?: string;
-      parse?: {
-       [propertyName: string]: string; // "number" | "boolean" | "date"
-      }
-    }
-
-    export type Format = JsonFormat | CsvOrTsvFormat | TopoJsonFormat | TreeJson;
-
-    export interface Transform {
-      // TODO
-    }
-  }
-
-  export interface Scale {
-    // TODO docs
-
-    // -- Common scale properties
-    name?: string;
-    type?: string;
-    domain?: any;
-    domainMin?: any;
-    domainMax?: any;
-    range?: any;
-    rangeMin?: any;
-    rangeMax?: any;
-    reverse?: boolean;
-    round?: boolean;
-
-    // -- Ordinal scale properties
-    points?: boolean;
-    padding?: number;
-    sort?: boolean;
-
-    // -- Time/Quantitative scale properties
-    clamp?: boolean;
-    /** boolean for quantitative scales, string for time scales */
-    nice?: boolean | string;
-
-    // -- Quantitative scale properties
-    exponent?: number;
-    zero?: boolean;
-  }
-
-  export interface Axis {
-    // TODO docs
-    type: string;
-    scale: string;
-    orient?: string;
-    title?: string;
-    titleOffset?: number;
-    format?: string;
-    ticks?: number;
-    values?: any[];
-    subdivide?: number;
-    tickPadding?: number;
-    tickSize?: number;
-    tickSizeMajor?: number;
-    tickSizeMinor?: number;
-    tickSizeEnd?: number;
-    offset?: any;
-    layer?: string;
-    grid?: boolean;
-    properties?: Axis.Properties
-  }
-
-  export namespace Axis {
-    export interface Properties {
-      ticks?: PropertySet;
-      minorTicks?: PropertySet;
-      grid?: PropertySet;
-      labels?: PropertySet;
-      title?: PropertySet;
-      axis?: PropertySet;
-    }
-  }
-
-  export interface Legend {
-    // TODO
-  }
-
-  export interface Mark {
-    // TODO docs
-    // Stuff from Spec.Mark
-    type: string; // "rect" | "symbol" | "path" | "arc" | "area" | "line" | "rule" | "image" | "text" | "group"
-    name?: string;
-    description?: string;
-    from?: Mark.From;
-    key?: string;
-    delay?: ValueRefs;
-    /**
-    * "linear-in" | "linear-out" | "linear-in-out" | "linear-out-in" | "quad-in" | "quad-out" | "quad-in-out" |
-    * "quad-out-in" | "cubic-in" | "cubic-out" | "cubic-in-out" | "cubic-out-in" | "sin-in" | "sin-out" | "sin-in-out" |
-    * "sin-out-in" | "exp-in" | "exp-out" | "exp-in-out" | "exp-out-in" | "circle-in" | "circle-out" | "circle-in-out" |
-    * "circle-out-in" | "bounce-in" | "bounce-out" | "bounce-in-out" | "bounce-out-in"
-    */
-    ease?: string;
-
-    interactive?: boolean;
-
-    // Runtime PropertySets
-    properties?: PropertySets;
-  }
-
-  export module Mark {
-    export interface From {
-      // TODO docs
-      data?: string;
-      mark?: string;
-      transform?: Data.Transform[];
-    }
-  }
-
-  export interface GroupMark extends Mark {
-    type: string; // "group"
-    /**
-     * Scale transform definitions.
-     */
-    scales?: Scale[];
-    /**
-     * Axis definitions.
-     */
-    axes?: Axis[];
-    /**
-     * Legend definitions.
-     */
-    legends?: Legend[];
-    /**
-     * Groups differ from other mark types in their ability to contain children marks.
-     * Marks defined within a group mark can inherit data from their parent group.
-     * For inheritance to work each data element for a group must contain data elements of its own.
-     * This arrangement of nested data is typically achieved by facetting the data, such that each group-level data element includes its own array of sub-elements
-     */
-    marks?: (Mark | GroupMark)[];
-  }
-
-  export interface PropertySets {
-    // TODO docs
-    enter?: PropertySet;
-    exit?: PropertySet;
-    update?: PropertySet;
-    hover?: PropertySet;
-  }
-
-  export interface PropertySet {
-    // TODO docs
-
-    // -- Shared visual properties
-    x?: ValueRefs;
-    x2?: ValueRefs;
-    width?: ValueRefs;
-    y?: ValueRefs;
-    y2?: ValueRefs;
-    height?: ValueRefs;
-    opacity?: ValueRefs;
-    fill?: ValueRefs;
-    fillOpacity?: ValueRefs;
-    stroke?: ValueRefs;
-    strokeWidth?: ValueRefs;
-    strokeOpacity?: ValueRefs;
-    strokeDash?: ValueRefs;
-    strokeDashOffset?: ValueRefs;
-
-    // -- symbol
-    size?: ValueRefs;
-    shape?: ValueRefs;
-
-    // -- path
-    path?: ValueRefs;
-
-    // -- arc
-    innerRadius?: ValueRefs;
-    outerRadius?: ValueRefs;
-    startAngle?: ValueRefs;
-    endAngle?: ValueRefs;
-
-    // -- area / line
-    interpolate?: ValueRefs;
-    tension?: ValueRefs;
-
-    // -- image / text
-    align?: ValueRefs;
-    baseline?: ValueRefs;
-
-    // -- image
-    url?: ValueRefs;
-
-    // -- text
-    text?: ValueRefs;
-    dx?: ValueRefs;
-    dy?: ValueRefs;
-    angle?: ValueRefs;
-    font?: ValueRefs;
-    fontSize?: ValueRefs;
-    fontWeight?: ValueRefs;
-    fontStyle?: ValueRefs;
-  }
-
-  export interface ValueRef {
-    // TODO docs
-    value?: any;
-    field?: any;
-    group?: any;
-    scale?: any;
-    mult?: number;
-    offset?: number;
-    band?: boolean;
-    test?: string;
-  }
-
-  export type ValueRefs = ValueRef | ValueRef[];
-
-  export var parse: Parse;
-  export namespace scene {
-    export function item(mark: Node): Node;
-  }
-
-  export class Bounds implements Bounds {
-    x1: number;
-    y1: number;
-    x2: number;
-    y2: number;
-    clear(): Bounds;
-    set(x1: number, y1: number, x2: number, y2: number): Bounds;
-    add(x: number, y: number): Bounds;
-    expand(d: number): Bounds;
-    round(): Bounds;
-    translate(dx: number, dy: number): Bounds;
-    rotate(angle: number, x: number, y: number): Bounds;
-    union(b: Bounds): Bounds;
-    encloses(b: Bounds): boolean;
-    intersects(b: Bounds): boolean;
-    contains(x: number, y: number): boolean;
-    width(): number;
-    height(): number;
-  }
-
-  // TODO: classes for View, Model, etc.
-}
-
-export = vg;
-export as namespace vg;
-export as namespace Vega;
diff --git a/types/vega/tsconfig.json b/types/vega/tsconfig.json
deleted file mode 100644
index f49e5e811b..0000000000
--- a/types/vega/tsconfig.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6",
-            "dom"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": false,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "vega-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/vega/tslint.json b/types/vega/tslint.json
deleted file mode 100644
index a41bf5d19a..0000000000
--- a/types/vega/tslint.json
+++ /dev/null
@@ -1,79 +0,0 @@
-{
-    "extends": "dtslint/dt.json",
-    "rules": {
-        "adjacent-overload-signatures": false,
-        "array-type": false,
-        "arrow-return-shorthand": false,
-        "ban-types": false,
-        "callable-types": false,
-        "comment-format": false,
-        "dt-header": false,
-        "eofline": false,
-        "export-just-namespace": false,
-        "import-spacing": false,
-        "interface-name": false,
-        "interface-over-type-literal": false,
-        "jsdoc-format": false,
-        "max-line-length": false,
-        "member-access": false,
-        "new-parens": false,
-        "no-any-union": false,
-        "no-boolean-literal-compare": false,
-        "no-conditional-assignment": false,
-        "no-consecutive-blank-lines": false,
-        "no-construct": false,
-        "no-declare-current-package": false,
-        "no-duplicate-imports": false,
-        "no-duplicate-variable": false,
-        "no-empty-interface": false,
-        "no-for-in-array": false,
-        "no-inferrable-types": false,
-        "no-internal-module": false,
-        "no-irregular-whitespace": false,
-        "no-mergeable-namespace": false,
-        "no-misused-new": false,
-        "no-namespace": false,
-        "no-object-literal-type-assertion": false,
-        "no-padding": false,
-        "no-redundant-jsdoc": false,
-        "no-redundant-jsdoc-2": false,
-        "no-redundant-undefined": false,
-        "no-reference-import": false,
-        "no-relative-import-in-test": false,
-        "no-self-import": false,
-        "no-single-declare-module": false,
-        "no-string-throw": false,
-        "no-unnecessary-callback-wrapper": false,
-        "no-unnecessary-class": false,
-        "no-unnecessary-generics": false,
-        "no-unnecessary-qualifier": false,
-        "no-unnecessary-type-assertion": false,
-        "no-useless-files": false,
-        "no-var-keyword": false,
-        "no-var-requires": false,
-        "no-void-expression": false,
-        "no-trailing-whitespace": false,
-        "object-literal-key-quotes": false,
-        "object-literal-shorthand": false,
-        "one-line": false,
-        "one-variable-per-declaration": false,
-        "only-arrow-functions": false,
-        "prefer-conditional-expression": false,
-        "prefer-const": false,
-        "prefer-declare-function": false,
-        "prefer-for-of": false,
-        "prefer-method-signature": false,
-        "prefer-template": false,
-        "radix": false,
-        "semicolon": false,
-        "space-before-function-paren": false,
-        "space-within-parens": false,
-        "strict-export-declare-modifiers": false,
-        "trim-file": false,
-        "triple-equals": false,
-        "typedef-whitespace": false,
-        "unified-signatures": false,
-        "void-return": false,
-        "whitespace": false
-    }
-}
diff --git a/types/vega/vega-tests.ts b/types/vega/vega-tests.ts
deleted file mode 100644
index 5baeaee024..0000000000
--- a/types/vega/vega-tests.ts
+++ /dev/null
@@ -1,2035 +0,0 @@
-
-
-// examples from http://trifacta.github.io/vega/editor/
-var specs: Vega.Spec[];
-
-specs[0] = {
-  "name": "arc",
-  "width": 400,
-  "height": 400,
-  "data": [
-    {
-      "name": "table",
-      "values": [12, 23, 47, 6, 52, 19],
-      "transform": [
-        { "type": "pie", "value": "data" }
-      ]
-    }
-  ],
-  "scales": [
-    {
-      "name": "r",
-      "type": "sqrt",
-      "domain": { "data": "table", "field": "data" },
-      "range": [20, 100]
-    }
-  ],
-  "marks": [
-    {
-      "type": "arc",
-      "from": { "data": "table" },
-      "properties": {
-        "enter": {
-          "x": { "group": "width", "mult": 0.5 },
-          "y": { "group": "height", "mult": 0.5 },
-          "startAngle": { "field": "startAngle" },
-          "endAngle": { "field": "endAngle" },
-          "innerRadius": { "value": 20 },
-          "outerRadius": { "scale": "r" },
-          "stroke": { "value": "#fff" }
-        },
-        "update": {
-          "fill": { "value": "#ccc" }
-        },
-        "hover": {
-          "fill": { "value": "pink" }
-        }
-      }
-    }
-  ]
-}
-
-specs[1] = {
-  "width": 500,
-  "height": 200,
-  "padding": { "top": 10, "left": 30, "bottom": 30, "right": 10 },
-  "data": [
-    {
-      "name": "table",
-      "values": [
-        { "x": 1, "y": 28 }, { "x": 2, "y": 55 },
-        { "x": 3, "y": 43 }, { "x": 4, "y": 91 },
-        { "x": 5, "y": 81 }, { "x": 6, "y": 53 },
-        { "x": 7, "y": 19 }, { "x": 8, "y": 87 },
-        { "x": 9, "y": 52 }, { "x": 10, "y": 48 },
-        { "x": 11, "y": 24 }, { "x": 12, "y": 49 },
-        { "x": 13, "y": 87 }, { "x": 14, "y": 66 },
-        { "x": 15, "y": 17 }, { "x": 16, "y": 27 },
-        { "x": 17, "y": 68 }, { "x": 18, "y": 16 },
-        { "x": 19, "y": 49 }, { "x": 20, "y": 15 }
-      ]
-    }
-  ],
-  "scales": [
-    {
-      "name": "x",
-      "type": "linear",
-      "range": "width",
-      "zero": false,
-      "domain": { "data": "table", "field": "data.x" }
-    },
-    {
-      "name": "y",
-      "type": "linear",
-      "range": "height",
-      "nice": true,
-      "domain": { "data": "table", "field": "data.y" }
-    }
-  ],
-  "axes": [
-    { "type": "x", "scale": "x", "ticks": 20 },
-    { "type": "y", "scale": "y" }
-  ],
-  "marks": [
-    {
-      "type": "area",
-      "from": { "data": "table" },
-      "properties": {
-        "enter": {
-          "interpolate": { "value": "monotone" },
-          "x": { "scale": "x", "field": "data.x" },
-          "y": { "scale": "y", "field": "data.y" },
-          "y2": { "scale": "y", "value": 0 },
-          "fill": { "value": "steelblue" }
-        },
-        "update": {
-          "fillOpacity": { "value": 1 }
-        },
-        "hover": {
-          "fillOpacity": { "value": 0.5 }
-        }
-      }
-    }
-  ]
-}
-
-specs[2] = {
-  "width": 200,
-  "height": 720,
-  "data": [
-    {
-      "name": "barley",
-      "url": "data/barley.json"
-    },
-    {
-      "name": "variety",
-      "source": "barley",
-      "transform": [
-        { "type": "facet", "keys": ["data.variety"] },
-        { "type": "stats", "value": "data.yield", "median": true },
-        { "type": "sort", "by": "-median" }
-      ]
-    },
-    {
-      "name": "site",
-      "source": "barley",
-      "transform": [
-        { "type": "facet", "keys": ["data.site"] },
-        { "type": "stats", "value": "data.yield", "median": true },
-        { "type": "sort", "by": "-median" }
-      ]
-    }
-  ],
-  "scales": [
-    {
-      "name": "g",
-      "type": "ordinal",
-      "range": "height",
-      "padding": 0.15,
-      "domain": { "data": "site", "field": "key" }
-    },
-    {
-      "name": "x",
-      "type": "linear",
-      "nice": true,
-      "range": "width",
-      "domain": { "data": "barley", "field": "data.yield" }
-    },
-    {
-      "name": "c",
-      "type": "ordinal",
-      "range": "category10"
-    }
-  ],
-  "axes": [
-    { "type": "x", "scale": "x", "offset": -12 }
-  ],
-  "marks": [
-    {
-      "type": "text",
-      "from": { "data": "site" },
-      "properties": {
-        "enter": {
-          "x": { "group": "width", "mult": 0.5 },
-          "y": { "scale": "g", "field": "key", "offset": -2 },
-          "fontWeight": { "value": "bold" },
-          "text": { "field": "key" },
-          "align": { "value": "center" },
-          "baseline": { "value": "bottom" },
-          "fill": { "value": "#000" }
-        }
-      }
-    },
-    {
-      "type": "group",
-      "from": { "data": "site" },
-      "scales": [
-        {
-          "name": "y",
-          "type": "ordinal",
-          "range": "height",
-          "points": true,
-          "padding": 1.2,
-          "domain": { "data": "variety", "field": "key" }
-        }
-      ],
-      "axes": [
-        {
-          "type": "y",
-          "scale": "y",
-          "tickSize": 0,
-          "properties": { "axis": { "stroke": { "value": "transparent" } } }
-        }
-      ],
-      "properties": {
-        "enter": {
-          "x": { "value": 0.5 },
-          "y": { "scale": "g", "field": "key" },
-          "height": { "scale": "g", "band": true },
-          "width": { "group": "width" },
-          "stroke": { "value": "#ccc" }
-        }
-      },
-      "marks": [
-        {
-          "type": "symbol",
-          "properties": {
-            "enter": {
-              "x": { "scale": "x", "field": "data.yield" },
-              "y": { "scale": "y", "field": "data.variety" },
-              "size": { "value": 50 },
-              "stroke": { "scale": "c", "field": "data.year" },
-              "strokeWidth": { "value": 2 }
-            }
-          }
-        }
-      ]
-    }
-  ]
-}
-
-specs[3] = {
-  "width": 960,
-  "height": 500,
-  "data": [
-    {
-      "name": "unemp",
-      "url": "data/unemployment.tsv",
-      "format": { "type": "tsv", "parse": { "rate": "number" } }
-    },
-    {
-      "name": "counties",
-      "url": "data/us-10m.json",
-      "format": { "type": "topojson", "feature": "counties" },
-      "transform": [
-        { "type": "geopath", "value": "data", "projection": "albersUsa" },
-        {
-          "type": "zip",
-          "key": "data.id",
-          "with": "unemp",
-          "withKey": "data.id",
-          "as": "value",
-          "default": null
-        },
-        { "type": "filter", "test": "d.path!=null && d.value!=null" }
-      ]
-    }
-  ],
-  "scales": [
-    {
-      "name": "color",
-      "type": "quantize",
-      "domain": [0, 0.15],
-      "range": ["#f7fbff", "#deebf7", "#c6dbef", "#9ecae1", "#6baed6",
-        "#4292c6", "#2171b5", "#08519c", "#08306b"]
-    }
-  ],
-  "marks": [
-    {
-      "type": "path",
-      "from": { "data": "counties" },
-      "properties": {
-        "enter": { "path": { "field": "path" } },
-        "update": { "fill": { "scale": "color", "field": "value.data.rate" } },
-        "hover": { "fill": { "value": "red" } }
-      }
-    }
-  ]
-}
-
-specs[4] = {
-  "width": 300,
-  "height": 240,
-  "data": [
-    {
-      "name": "table",
-      "url": "data/groups.json"
-    }
-  ],
-  "scales": [
-    {
-      "name": "cat",
-      "type": "ordinal",
-      "range": "height",
-      "padding": 0.2,
-      "domain": { "data": "table", "field": "data.category" }
-    },
-    {
-      "name": "val",
-      "range": "width",
-      "round": true,
-      "nice": true,
-      "domain": { "data": "table", "field": "data.value" }
-    },
-    {
-      "name": "color",
-      "type": "ordinal",
-      "range": "category20"
-    }
-  ],
-  "axes": [
-    { "type": "y", "scale": "cat", "tickSize": 0, "tickPadding": 8 },
-    { "type": "x", "scale": "val" }
-  ],
-  "marks": [
-    {
-      "type": "group",
-      "from": {
-        "data": "table",
-        "transform": [{ "type": "facet", "keys": ["data.category"] }]
-      },
-      "properties": {
-        "enter": {
-          "y": { "scale": "cat", "field": "key" },
-          "height": { "scale": "cat", "band": true }
-        }
-      },
-      "scales": [
-        {
-          "name": "pos",
-          "type": "ordinal",
-          "range": "height",
-          "domain": { "field": "data.position" }
-        }
-      ],
-      "marks": [
-        {
-          "type": "rect",
-          "properties": {
-            "enter": {
-              "y": { "scale": "pos", "field": "data.position" },
-              "height": { "scale": "pos", "band": true },
-              "x": { "scale": "val", "field": "data.value" },
-              "x2": { "scale": "val", "value": 0 },
-              "fill": { "scale": "color", "field": "data.position" }
-            }
-          }
-        },
-        {
-          "type": "text",
-          "properties": {
-            "enter": {
-              "y": { "scale": "pos", "field": "data.position" },
-              "dy": { "scale": "pos", "band": true, "mult": 0.5 },
-              "x": { "scale": "val", "field": "data.value", "offset": -4 },
-              "fill": { "value": "white" },
-              "align": { "value": "right" },
-              "baseline": { "value": "middle" },
-              "text": { "field": "data.value" }
-            }
-          }
-        }
-      ]
-    }
-  ]
-}
-
-specs[5] = {
-  "width": 400,
-  "height": 100,
-  "padding": { "top": 30, "left": 30, "bottom": 30, "right": 10 },
-  "data": [
-    {
-      "name": "stats",
-      "values": [
-        { "label": "Category A", "mean": 1, "lo": 0, "hi": 2 },
-        { "label": "Category B", "mean": 2, "lo": 1.5, "hi": 2.5 },
-        { "label": "Category C", "mean": 3, "lo": 1.7, "hi": 4.3 },
-        { "label": "Category D", "mean": 4, "lo": 3, "hi": 5 },
-        { "label": "Category E", "mean": 5, "lo": 4.1, "hi": 5.9 }
-      ]
-    }
-  ],
-  "scales": [
-    {
-      "name": "y",
-      "type": "ordinal",
-      "range": "height",
-      "domain": { "data": "stats", "field": "index" }
-    },
-    {
-      "name": "x",
-      "range": [100, 400],
-      "nice": true,
-      "zero": true,
-      "domain": { "data": "stats", "field": "data.hi" }
-    }
-  ],
-  "axes": [
-    { "type": "x", "scale": "x", "ticks": 6 }
-  ],
-  "marks": [
-    {
-      "type": "text",
-      "from": { "data": "stats" },
-      "properties": {
-        "enter": {
-          "x": { "value": 0 },
-          "y": { "scale": "y", "field": "index" },
-          "baseline": { "value": "middle" },
-          "fill": { "value": "#000" },
-          "text": { "field": "data.label" },
-          "font": { "value": "Helvetica Neue" },
-          "fontSize": { "value": 13 }
-        }
-      }
-    },
-    {
-      "type": "rect",
-      "from": { "data": "stats" },
-      "properties": {
-        "enter": {
-          "x": { "scale": "x", "field": "data.lo" },
-          "x2": { "scale": "x", "field": "data.hi" },
-          "y": { "scale": "y", "field": "index", "offset": -1 },
-          "height": { "value": 1 },
-          "fill": { "value": "#888" }
-        }
-      }
-    },
-    {
-      "type": "symbol",
-      "from": { "data": "stats" },
-      "properties": {
-        "enter": {
-          "x": { "scale": "x", "field": "data.mean" },
-          "y": { "scale": "y", "field": "index" },
-          "size": { "value": 40 },
-          "fill": { "value": "#000" }
-        }
-      }
-    }
-  ]
-}
-
-specs[6] = {
-  "name": "force",
-  "width": 500,
-  "height": 500,
-  "padding": { "top": 0, "bottom": 0, "left": 0, "right": 0 },
-  "data": [
-    {
-      "name": "edges",
-      "url": "data/miserables.json",
-      "format": { "type": "json", "property": "links" },
-      "transform": [
-        { "type": "copy", "from": "data", "fields": ["source", "target"] }
-      ]
-    },
-    {
-      "name": "nodes",
-      "url": "data/miserables.json",
-      "format": { "type": "json", "property": "nodes" },
-      "transform": [
-        {
-          "type": "force",
-          "links": "edges",
-          "linkDistance": 70,
-          "charge": -100,
-          "iterations": 1000
-        }
-      ]
-    }
-  ],
-  "marks": [
-    {
-      "type": "path",
-      "from": {
-        "data": "edges",
-        "transform": [
-          { "type": "link", "shape": "line" }
-        ]
-      },
-      "properties": {
-        "update": {
-          "path": { "field": "path" },
-          "stroke": { "value": "#ccc" },
-          "strokeWidth": { "value": 0.5 }
-        }
-      }
-    },
-    {
-      "type": "symbol",
-      "from": { "data": "nodes" },
-      "properties": {
-        "enter": {
-          "fillOpacity": { "value": 0.3 },
-          "stroke": { "value": "steelblue" }
-        },
-        "update": {
-          "x": { "field": "x" },
-          "y": { "field": "y" },
-          "fill": { "value": "steelblue" }
-        },
-        "hover": {
-          "fill": { "value": "#f00" }
-        }
-      }
-    }
-  ]
-};
-
-specs[7] = {
-  "name": "image",
-  "width": 200,
-  "height": 200,
-  "padding": { "left": 30, "top": 10, "bottom": 30, "right": 10 },
-  "data": [
-    {
-      "name": "data",
-      "values": [
-        { "x": 0.5, "y": 0.5, "img": "data/ffox.png" },
-        { "x": 1.5, "y": 1.5, "img": "data/gimp.png" },
-        { "x": 2.5, "y": 2.5, "img": "data/7zip.png" }
-      ]
-    }
-  ],
-  "scales": [
-    { "name": "x", "domain": [0, 3], "range": "width" },
-    { "name": "y", "domain": [0, 3], "range": "height" }
-  ],
-  "axes": [
-    { "type": "x", "scale": "x" },
-    { "type": "y", "scale": "y" }
-  ],
-  "marks": [
-    {
-      "type": "image",
-      "from": { "data": "data" },
-      "properties": {
-        "enter": {
-          "url": { "field": "data.img" },
-          "width": { "value": 50 },
-          "height": { "value": 50 },
-          "x": { "scale": "x", "field": "data.x" },
-          "y": { "scale": "y", "field": "data.y" },
-          "align": { "value": "center" },
-          "baseline": { "value": "middle" }
-        },
-        "update": {
-          "opacity": { "value": 1.0 }
-        },
-        "hover": {
-          "opacity": { "value": 0.5 }
-        }
-      }
-    }
-  ]
-}
-
-specs[8] = {
-  "width": 800,
-  "height": 500,
-  "padding": { "left": 15, "right": 65, "top": 10, "bottom": 20 },
-  "data": [
-    {
-      "name": "jobs",
-      "url": "data/jobs.json"
-    },
-    {
-      "name": "series",
-      "source": "jobs",
-      "transform": [
-        { "type": "facet", "keys": ["data.job", "data.sex"] },
-        { "type": "stats", "value": "data.perc" },
-        { "type": "stack", "point": "data.year", "height": "data.perc", "order": "reverse" }
-      ]
-    },
-    {
-      "name": "stats",
-      "source": "jobs",
-      "transform": [
-        { "type": "facet", "keys": ["data.year"] },
-        { "type": "stats", "value": "data.perc" }
-      ]
-    }
-  ],
-  "scales": [
-    {
-      "name": "x",
-      "type": "linear",
-      "range": "width",
-      "zero": false, "round": true,
-      "domain": { "data": "jobs", "field": "data.year" }
-    },
-    {
-      "name": "y",
-      "type": "linear",
-      "range": "height", "round": true,
-      "domain": { "data": "stats", "field": "sum" }
-    },
-    {
-      "name": "color",
-      "type": "ordinal",
-      "domain": ["men", "women"],
-      "range": ["#33f", "#f33"]
-    },
-    {
-      "name": "alpha",
-      "type": "linear",
-      "domain": { "data": "series", "field": "sum" },
-      "range": [0.4, 0.8]
-    },
-    {
-      "name": "font",
-      "type": "sqrt",
-      "range": [0, 24], "round": true,
-      "domain": { "data": "stats", "field": "sum" }
-    },
-    {
-      "name": "align",
-      "type": "quantize",
-      "range": ["left", "center", "right"], "zero": false,
-      "domain": [1730, 2130]
-    },
-    {
-      "name": "offset",
-      "type": "quantize",
-      "range": [6, 0, -6], "zero": false,
-      "domain": [1730, 2130]
-    }
-  ],
-  "axes": [
-    { "type": "x", "scale": "x", "format": "d", "ticks": 15, "tickSizeEnd": 0 },
-    {
-      "type": "y", "scale": "y", "format": "n", "orient": "right",
-      "grid": true, "layer": "back", "tickSize": 12,
-      "properties": {
-        "axis": { "stroke": { "value": "transparent" } },
-        "grid": { "stroke": { "value": "#ccc" } },
-        "ticks": { "stroke": { "value": "#ccc" } }
-      }
-    }
-  ],
-  "marks": [
-    {
-      "type": "group",
-      "from": { "data": "series" },
-      "marks": [
-        {
-          "type": "area",
-          "properties": {
-            "update": {
-              "x": { "scale": "x", "field": "data.year" },
-              "y": { "scale": "y", "field": "y" },
-              "y2": { "scale": "y", "field": "y2" },
-              "fill": { "scale": "color", "field": "data.sex" },
-              "fillOpacity": { "scale": "alpha", "group": "sum" }
-            },
-            "hover": {
-              "fillOpacity": { "value": 0.2 }
-            }
-          }
-        }
-      ]
-    },
-    {
-      "type": "group",
-      "from": { "data": "series" },
-      "marks": [
-        {
-          "type": "text",
-          "from": {
-            "transform": [
-              { "type": "slice", "by": "max", "field": "data.perc" }
-            ]
-          },
-          "interactive": false,
-          "properties": {
-            "update": {
-              "x": { "scale": "x", "field": "data.year" },
-              "dx": { "scale": "offset", "field": "data.year" },
-              "y": { "scale": "y", "field": "cy" },
-              "fill": { "value": "#000" },
-              "fillOpacity": { "scale": "font", "field": "data.perc", "mult": 0.15 },
-              "fontSize": { "scale": "font", "field": "data.perc", "offset": 5 },
-              "text": { "field": "data.job" },
-              "align": { "scale": "align", "field": "data.year" },
-              "baseline": { "value": "middle" }
-            }
-          }
-        }
-      ]
-    }
-  ]
-};
-
-specs[9] = {
-  "name": "lifelines",
-  "width": 400,
-  "height": 100,
-  "data": [
-    {
-      "name": "people",
-      "values": [
-        {
-          "label": "Washington", "born": -7506057600000, "died": -5366196000000,
-          "enter": -5701424400000, "leave": -5453884800000
-        },
-        {
-          "label": "Adams", "born": -7389766800000, "died": -4528285200000,
-          "enter": -5453884800000, "leave": -5327740800000
-        },
-        {
-          "label": "Jefferson", "born": -7154586000000, "died": -4528285200000,
-          "enter": -5327740800000, "leave": -5075280000000
-        },
-        {
-          "label": "Madison", "born": -6904544400000, "died": -4213184400000,
-          "enter": -5075280000000, "leave": -4822819200000
-        },
-        {
-          "label": "Monroe", "born": -6679904400000, "died": -4370518800000,
-          "enter": -4822819200000, "leave": -4570358400000
-        }
-      ]
-    },
-    {
-      "name": "events",
-      "format": { "type": "json", "parse": { "when": "date" } },
-      "values": [
-        { "name": "Decl. of Independence", "when": "July 4, 1776" },
-        { "name": "U.S. Constitution", "when": "3/4/1789" },
-        { "name": "Louisiana Purchase", "when": "April 30, 1803" },
-        { "name": "Monroe Doctrine", "when": "Dec 2, 1823" }
-      ]
-    }
-
-  ],
-  "scales": [
-    {
-      "name": "y",
-      "type": "ordinal",
-      "range": "height",
-      "domain": { "data": "people", "field": "data.label" }
-    },
-    {
-      "name": "x",
-      "type": "time",
-      "range": "width",
-      "round": true,
-      "nice": "year",
-      "domain": { "data": "people", "field": ["data.born", "data.died"] }
-    }
-  ],
-  "axes": [
-    { "type": "x", "scale": "x" }
-  ],
-  "marks": [
-    {
-      "type": "text",
-      "from": { "data": "events" },
-      "properties": {
-        "enter": {
-          "x": { "scale": "x", "field": "data.when" },
-          "y": { "value": -10 },
-          "angle": { "value": -25 },
-          "fill": { "value": "#000" },
-          "text": { "field": "data.name" },
-          "font": { "value": "Helvetica Neue" },
-          "fontSize": { "value": 10 }
-        }
-      }
-    },
-    {
-      "type": "rect",
-      "from": { "data": "events" },
-      "properties": {
-        "enter": {
-          "x": { "scale": "x", "field": "data.when" },
-          "y": { "value": -8 },
-          "width": { "value": 1 },
-          "height": { "group": "height", "offset": 8 },
-          "fill": { "value": "#888" }
-        }
-      }
-    },
-    {
-      "type": "text",
-      "from": { "data": "people" },
-      "properties": {
-        "enter": {
-          "x": { "scale": "x", "field": "data.born" },
-          "y": { "scale": "y", "field": "data.label", "offset": -3 },
-          "fill": { "value": "#000" },
-          "text": { "field": "data.label" },
-          "font": { "value": "Helvetica Neue" },
-          "fontSize": { "value": 10 }
-        }
-      }
-    },
-    {
-      "type": "rect",
-      "from": { "data": "people" },
-      "properties": {
-        "enter": {
-          "x": { "scale": "x", "field": "data.born" },
-          "x2": { "scale": "x", "field": "data.died" },
-          "y": { "scale": "y", "field": "data.label" },
-          "height": { "value": 2 },
-          "fill": { "value": "#557" }
-        }
-      }
-    },
-    {
-      "type": "rect",
-      "from": { "data": "people" },
-      "properties": {
-        "enter": {
-          "x": { "scale": "x", "field": "data.enter" },
-          "x2": { "scale": "x", "field": "data.leave" },
-          "y": { "scale": "y", "field": "data.label", "offset": -1 },
-          "height": { "value": 4 },
-          "fill": { "value": "#e44" }
-        }
-      }
-    }
-  ]
-}
-
-specs[10] = {
-  "width": 1920,
-  "height": 1000,
-  "viewport": [960, 500],
-  "data": [
-    {
-      "name": "world",
-      "url": "data/world-110m.json",
-      "format": { "type": "topojson", "feature": "countries" }
-    }
-  ],
-  "marks": [
-    {
-      "type": "path",
-      "from": {
-        "data": "world",
-        "transform": [{
-          "type": "geopath",
-          "value": "data",
-          "projection": "winkel3",
-          "scale": 300,
-          "translate": [960, 500]
-        }]
-      },
-      "properties": {
-        "enter": {
-          "stroke": { "value": "#fff" },
-          "path": { "field": "path" }
-        },
-        "update": { "fill": { "value": "#ccc" } },
-        "hover": { "fill": { "value": "pink" } }
-      }
-    }
-  ]
-}
-
-specs[11] = {
-  "width": 760,
-  "height": 260,
-  "data": [
-    {
-      "name": "temp",
-      "url": "data/napoleon.json",
-      "format": { "type": "json", "property": "temp" },
-      "transform": [
-        { "type": "formula", "field": "lat", "expr": "55" },
-        {
-          "type": "geo",
-          "lat": "lat",
-          "lon": "data.lon",
-          "center": [32.52, 53.3],
-          "scale": 3000
-        }
-      ]
-    },
-    {
-      "name": "army",
-      "url": "data/napoleon.json",
-      "format": { "type": "json", "property": "army" },
-      "transform": [
-        {
-          "type": "geo",
-          "lat": "data.lat",
-          "lon": "data.lon",
-          "center": [32.52, 53.3],
-          "scale": 3000
-        }
-      ]
-    },
-    {
-      "name": "cities",
-      "url": "data/napoleon.json",
-      "format": { "type": "json", "property": "cities" },
-      "transform": [
-        {
-          "type": "geo",
-          "lat": "data.lat",
-          "lon": "data.lon",
-          "center": [32.52, 53.3],
-          "scale": 3000
-        }
-      ]
-    }
-  ],
-  "scales": [
-    {
-      "name": "color",
-      "type": "ordinal",
-      "domain": { "data": "army", "field": "data.dir" },
-      "range": ["brown", "black"]
-    },
-    {
-      "name": "lw",
-      "type": "linear", "zero": false,
-      "domain": { "data": "army", "field": "data.size" },
-      "range": [1, 50]
-    }
-  ],
-  "marks": [
-    {
-      "type": "group",
-      "properties": {
-        "enter": {
-          "x": { "value": 0 },
-          "y": { "value": 200 },
-          "width": { "group": "width" },
-          "height": { "value": 60 }
-        }
-      },
-      "scales": [
-        {
-          "name": "y",
-          "type": "linear", "zero": false, "round": true,
-          "domain": { "data": "temp", "field": "data.temp" },
-          "range": "height"
-        }
-      ],
-      "axes": [
-        {
-          "type": "y", "scale": "y", "ticks": 4, "orient": "right",
-          "grid": true, "layer": "back"
-        }
-      ],
-      "marks": [
-        {
-          "type": "rule",
-          "from": { "data": "temp" },
-          "properties": {
-            "enter": {
-              "x": { "field": "x" },
-              "y1": 0,
-              "y2": { "scale": "y", "field": "data.temp" },
-              "stroke": { "value": "#ccc" }
-            }
-          }
-        },
-        {
-          "type": "line",
-          "from": { "data": "temp" },
-          "properties": {
-            "enter": {
-              "x": { "field": "x" },
-              "y": { "scale": "y", "field": "data.temp" },
-              "stroke": { "value": "#000" },
-              "strokeWidth": { "value": 2 }
-            }
-          }
-        },
-        {
-          "type": "text",
-          "from": { "data": "temp" },
-          "properties": {
-            "enter": {
-              "x": { "field": "x", "offset": -2 },
-              "y": { "scale": "y", "field": "data.temp", "offset": 6 },
-              "fill": { "value": "#000" },
-              "text": { "field": "data.date" },
-              "font": { "value": "Georgia" },
-              "fontSize": { "value": 10 },
-              "align": { "value": "center" },
-              "baseline": { "value": "top" }
-            }
-          }
-        }
-      ]
-    },
-    {
-      "type": "group",
-      "from": {
-        "data": "army",
-        "transform": [
-          { "type": "facet", "keys": ["data.group", "data.dir"] }
-        ]
-      },
-      "marks": [
-        {
-          "type": "group",
-          "from": {
-            "transform": [
-              { "type": "window", "size": 2, "step": 1 }
-            ]
-          },
-          "marks": [
-            {
-              "type": "line",
-              "properties": {
-                "enter": {
-                  "x": { "field": "x" },
-                  "y": { "field": "y" },
-                  "stroke": { "scale": "color", "field": "data.dir" },
-                  "strokeWidth": { "scale": "lw", "field": "data.size" },
-                  "strokeCap": { "value": "round" }
-                }
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "type": "symbol",
-      "from": { "data": "cities" },
-      "properties": {
-        "enter": {
-          "x": { "field": "x" },
-          "y": { "field": "y" },
-          "size": { "value": 25 },
-          "fill": { "value": "brown" },
-          "stroke": { "value": "#000" }
-        }
-      }
-    },
-    {
-      "type": "text",
-      "from": { "data": "cities" },
-      "properties": {
-        "enter": {
-          "x": { "field": "x", "offset": 1 },
-          "y": { "field": "y", "offset": -4 },
-          "fill": { "value": "#fff" },
-          "fillOpacity": { "value": 0.8 },
-          "text": { "field": "data.city" },
-          "align": { "value": "center" },
-          "baseline": { "value": "bottom" },
-          "font": { "value": "Georgia" },
-          "fontSize": { "value": 9 },
-          "fontStyle": { "value": "italic" }
-        }
-      }
-    },
-    {
-      "type": "text",
-      "from": { "data": "cities" },
-      "properties": {
-        "enter": {
-          "x": { "field": "x" },
-          "y": { "field": "y", "offset": -5 },
-          "fill": { "value": "#000" },
-          "text": { "field": "data.city" },
-          "align": { "value": "center" },
-          "baseline": { "value": "bottom" },
-          "font": { "value": "Georgia" },
-          "fontSize": { "value": 9 },
-          "fontStyle": { "value": "italic" }
-        }
-      }
-    }
-  ]
-}
-
-specs[12] = {
-  "width": 700,
-  "height": 400,
-  "data": [
-    {
-      "name": "cars",
-      "url": "data/cars.json"
-    },
-    {
-      "name": "fields",
-      "values": ["cyl", "dsp", "lbs", "hp", "acc", "mpg", "year"]
-    }
-  ],
-  "scales": [
-    {
-      "name": "ord",
-      "type": "ordinal",
-      "range": "width", "points": true,
-      "domain": { "data": "fields", "field": "data" }
-    },
-    {
-      "name": "cyl",
-      "range": "height", "zero": false, "nice": true,
-      "domain": { "data": "cars", "field": "data.cyl" }
-    },
-    {
-      "name": "dsp",
-      "range": "height", "zero": false, "nice": true,
-      "domain": { "data": "cars", "field": "data.dsp" }
-    },
-    {
-      "name": "lbs",
-      "range": "height", "zero": false, "nice": true,
-      "domain": { "data": "cars", "field": "data.lbs" }
-    },
-    {
-      "name": "hp",
-      "range": "height", "zero": false, "nice": true,
-      "domain": { "data": "cars", "field": "data.hp" }
-    },
-    {
-      "name": "acc",
-      "range": "height", "zero": false, "nice": true,
-      "domain": { "data": "cars", "field": "data.acc" }
-    },
-    {
-      "name": "mpg",
-      "range": "height", "zero": false, "nice": true,
-      "domain": { "data": "cars", "field": "data.mpg" }
-    },
-    {
-      "name": "year",
-      "range": "height", "zero": false, "nice": true,
-      "domain": { "data": "cars", "field": "data.year" }
-    }
-  ],
-  "axes": [
-    { "type": "y", "scale": "cyl", "offset": { "scale": "ord", "value": "cyl" } },
-    { "type": "y", "scale": "dsp", "offset": { "scale": "ord", "value": "dsp" } },
-    { "type": "y", "scale": "lbs", "offset": { "scale": "ord", "value": "lbs" } },
-    { "type": "y", "scale": "hp", "offset": { "scale": "ord", "value": "hp" } },
-    { "type": "y", "scale": "acc", "offset": { "scale": "ord", "value": "acc" } },
-    { "type": "y", "scale": "mpg", "offset": { "scale": "ord", "value": "mpg" } },
-    { "type": "y", "scale": "year", "offset": { "scale": "ord", "value": "year" } }
-  ],
-  "marks": [
-    {
-      "type": "group",
-      "from": { "data": "cars" },
-      "marks": [
-        {
-          "type": "line",
-          "from": { "data": "fields" },
-          "properties": {
-            "enter": {
-              "x": { "scale": "ord", "field": "data" },
-              "y": { "scale": { "field": "data" }, "group": "data", "field": "data" },
-              "stroke": { "value": "steelblue" },
-              "strokeWidth": { "value": 1 },
-              "strokeOpacity": { "value": 0.3 }
-            }
-          }
-        }
-      ]
-    },
-    {
-      "type": "text",
-      "from": { "data": "fields" },
-      "properties": {
-        "enter": {
-          "x": { "scale": "ord", "field": "data", "offset": -8 },
-          "y": { "group": "height", "offset": 6 },
-          "fontWeight": { "value": "bold" },
-          "fill": { "value": "black" },
-          "text": { "field": "data" },
-          "align": { "value": "right" },
-          "baseline": { "value": "top" }
-        }
-      }
-    }
-  ]
-}
-
-specs[13] = {
-  "width": 700,
-  "height": 400,
-  "padding": { "top": 0, "left": 0, "bottom": 20, "right": 0 },
-  "data": [
-    {
-      "name": "pop2000",
-      "url": "data/population.json",
-      "transform": [
-        { "type": "filter", "test": "d.data.year == 2000" }
-      ]
-    }
-  ],
-  "scales": [
-    {
-      "name": "g",
-      "domain": [0, 1],
-      "range": [340, 10]
-    },
-    {
-      "name": "y",
-      "type": "ordinal",
-      "range": "height",
-      "reverse": true,
-      "domain": { "data": "pop2000", "field": "data.age" }
-    },
-    {
-      "name": "c",
-      "type": "ordinal",
-      "domain": [1, 2],
-      "range": ["#1f77b4", "#e377c2"]
-    }
-  ],
-  "marks": [
-    {
-      "type": "text",
-      "interactive": false,
-      "from": {
-        "data": "pop2000",
-        "transform": [{ "type": "unique", "field": "data.age", "as": "age" }]
-      },
-      "properties": {
-        "enter": {
-          "x": { "value": 325 },
-          "y": { "scale": "y", "field": "age", "offset": 11 },
-          "text": { "field": "age" },
-          "baseline": { "value": "middle" },
-          "align": { "value": "center" },
-          "fill": { "value": "#000" }
-        }
-      }
-    },
-    {
-      "type": "group",
-      "from": {
-        "data": "pop2000",
-        "transform": [
-          { "type": "facet", "keys": ["data.sex"] }
-        ]
-      },
-      "properties": {
-        "update": {
-          "x": { "scale": "g", "field": "index" },
-          "y": { "value": 0 },
-          "width": { "value": 300 },
-          "height": { "group": "height" }
-        }
-      },
-      "scales": [
-        {
-          "name": "x",
-          "type": "linear",
-          "range": "width",
-          "reverse": true,
-          "nice": true,
-          "domain": { "data": "pop2000", "field": "data.people" }
-        }
-      ],
-      "axes": [
-        { "type": "x", "scale": "x", "format": "s" }
-      ],
-      "marks": [
-        {
-          "type": "rect",
-          "properties": {
-            "enter": {
-              "x": { "scale": "x", "field": "data.people" },
-              "x2": { "scale": "x", "value": 0 },
-              "y": { "scale": "y", "field": "data.age" },
-              "height": { "scale": "y", "band": true, "offset": -1 },
-              "fillOpacity": { "value": 0.6 },
-              "fill": { "scale": "c", "field": "data.sex" }
-            }
-          }
-        }
-      ]
-    }
-  ]
-}
-
-specs[14] = {
-  "width": 200,
-  "height": 200,
-  "data": [
-    {
-      "name": "iris",
-      "url": "data/iris.json"
-    }
-  ],
-  "scales": [
-    {
-      "name": "x",
-      "nice": true,
-      "range": "width",
-      "domain": { "data": "iris", "field": "data.sepalWidth" }
-    },
-    {
-      "name": "y",
-      "nice": true,
-      "range": "height",
-      "domain": { "data": "iris", "field": "data.petalLength" }
-    },
-    {
-      "name": "c",
-      "type": "ordinal",
-      "domain": { "data": "iris", "field": "data.species" },
-      "range": ["#800", "#080", "#008"]
-    }
-  ],
-  "axes": [
-    { "type": "x", "scale": "x", "offset": 5, "ticks": 5, "title": "Sepal Width" },
-    { "type": "y", "scale": "y", "offset": 5, "ticks": 5, "title": "Petal Length" }
-  ],
-  "legends": [
-    {
-      "fill": "c",
-      "title": "Species",
-      "offset": 0,
-      "properties": {
-        "symbols": {
-          "fillOpacity": { "value": 0.5 },
-          "stroke": { "value": "transparent" }
-        }
-      }
-    }
-  ],
-  "marks": [
-    {
-      "type": "symbol",
-      "from": { "data": "iris" },
-      "properties": {
-        "enter": {
-          "x": { "scale": "x", "field": "data.sepalWidth" },
-          "y": { "scale": "y", "field": "data.petalLength" },
-          "fill": { "scale": "c", "field": "data.species" },
-          "fillOpacity": { "value": 0.5 }
-        },
-        "update": {
-          "size": { "value": 100 },
-          "stroke": { "value": "transparent" }
-        },
-        "hover": {
-          "size": { "value": 300 },
-          "stroke": { "value": "white" }
-        }
-      }
-    }
-  ]
-}
-
-specs[15] = {
-  "width": 600,
-  "height": 600,
-  "data": [
-    {
-      "name": "iris",
-      "url": "data/iris.json"
-    },
-    {
-      "name": "fields",
-      "values": ["petalLength", "petalWidth", "sepalWidth", "sepalLength"]
-    }
-  ],
-  "scales": [
-    {
-      "name": "gx",
-      "type": "ordinal",
-      "range": "width",
-      "round": true,
-      "domain": { "data": "fields", "field": "data" }
-    },
-    {
-      "name": "gy",
-      "type": "ordinal",
-      "range": "height",
-      "round": true,
-      "domain": { "data": "fields", "field": "data" }
-    },
-    {
-      "name": "c",
-      "type": "ordinal",
-      "domain": { "data": "iris", "field": "data.species" },
-      "range": ["#800", "#080", "#008"]
-    }
-  ],
-  "legends": [
-    {
-      "fill": "c",
-      "title": "Species",
-      "offset": 10,
-      "properties": {
-        "symbols": {
-          "fillOpacity": { "value": 0.5 },
-          "stroke": { "value": "transparent" }
-        }
-      }
-    }
-  ],
-  "marks": [
-    {
-      "type": "group",
-      "from": {
-        "data": "fields",
-        "transform": [{ "type": "cross" }]
-      },
-      "properties": {
-        "enter": {
-          "x": { "scale": "gx", "field": "a.data" },
-          "y": { "scale": "gy", "field": "b.data" },
-          "width": { "scale": "gx", "band": true, "offset": -35 },
-          "height": { "scale": "gy", "band": true, "offset": -35 },
-          "stroke": { "value": "#ddd" }
-        }
-      },
-      "scales": [
-        {
-          "name": "x",
-          "range": "width",
-          "zero": false,
-          "round": true,
-          "domain": { "data": "iris", "field": { "group": "a.data" } }
-        },
-        {
-          "name": "y",
-          "range": "height",
-          "zero": false,
-          "round": true,
-          "domain": { "data": "iris", "field": { "group": "b.data" } }
-        }
-      ],
-      "axes": [
-        { "type": "x", "scale": "x", "ticks": 5 },
-        { "type": "y", "scale": "y", "ticks": 5 }
-      ],
-      "marks": [
-        {
-          "type": "symbol",
-          "from": { "data": "iris" },
-          "properties": {
-            "enter": {
-              "x": { "scale": "x", "field": { "group": "a.data" } },
-              "y": { "scale": "y", "field": { "group": "b.data" } },
-              "fill": { "scale": "c", "field": "data.spec[0]ies" },
-              "fillOpacity": { "value": 0.5 }
-            },
-            "update": {
-              "size": { "value": 36 },
-              "stroke": { "value": "transparent" }
-            },
-            "hover": {
-              "size": { "value": 100 },
-              "stroke": { "value": "white" }
-            }
-          }
-        }
-      ]
-    }
-  ]
-}
-
-specs[16] = {
-  "width": 500,
-  "height": 200,
-  "padding": { "top": 10, "left": 30, "bottom": 30, "right": 10 },
-  "data": [
-    {
-      "name": "table",
-      "values": [
-        { "x": 0, "y": 28, "c": 0 }, { "x": 0, "y": 55, "c": 1 },
-        { "x": 1, "y": 43, "c": 0 }, { "x": 1, "y": 91, "c": 1 },
-        { "x": 2, "y": 81, "c": 0 }, { "x": 2, "y": 53, "c": 1 },
-        { "x": 3, "y": 19, "c": 0 }, { "x": 3, "y": 87, "c": 1 },
-        { "x": 4, "y": 52, "c": 0 }, { "x": 4, "y": 48, "c": 1 },
-        { "x": 5, "y": 24, "c": 0 }, { "x": 5, "y": 49, "c": 1 },
-        { "x": 6, "y": 87, "c": 0 }, { "x": 6, "y": 66, "c": 1 },
-        { "x": 7, "y": 17, "c": 0 }, { "x": 7, "y": 27, "c": 1 },
-        { "x": 8, "y": 68, "c": 0 }, { "x": 8, "y": 16, "c": 1 },
-        { "x": 9, "y": 49, "c": 0 }, { "x": 9, "y": 15, "c": 1 }
-      ]
-    },
-    {
-      "name": "stats",
-      "source": "table",
-      "transform": [
-        { "type": "facet", "keys": ["data.x"] },
-        { "type": "stats", "value": "data.y" }
-      ]
-    }
-  ],
-  "scales": [
-    {
-      "name": "x",
-      "type": "linear",
-      "range": "width",
-      "zero": false,
-      "domain": { "data": "table", "field": "data.x" }
-    },
-    {
-      "name": "y",
-      "type": "linear",
-      "range": "height",
-      "nice": true,
-      "domain": { "data": "stats", "field": "sum" }
-    },
-    {
-      "name": "color",
-      "type": "ordinal",
-      "range": "category10"
-    }
-  ],
-  "axes": [
-    { "type": "x", "scale": "x" },
-    { "type": "y", "scale": "y" }
-  ],
-  "marks": [
-    {
-      "type": "group",
-      "from": {
-        "data": "table",
-        "transform": [
-          { "type": "facet", "keys": ["data.c"] },
-          { "type": "stack", "point": "data.x", "height": "data.y" }
-        ]
-      },
-      "marks": [
-        {
-          "type": "area",
-          "properties": {
-            "enter": {
-              "interpolate": { "value": "monotone" },
-              "x": { "scale": "x", "field": "data.x" },
-              "y": { "scale": "y", "field": "y" },
-              "y2": { "scale": "y", "field": "y2" },
-              "fill": { "scale": "color", "field": "data.c" }
-            },
-            "update": {
-              "fillOpacity": { "value": 1 }
-            },
-            "hover": {
-              "fillOpacity": { "value": 0.5 }
-            }
-          }
-        }
-      ]
-    }
-  ]
-}
-
-specs[17] = {
-  "width": 500,
-  "height": 200,
-  "padding": { "top": 10, "left": 30, "bottom": 30, "right": 10 },
-  "data": [
-    {
-      "name": "table",
-      "values": [
-        { "x": 0, "y": 28, "c": 0 }, { "x": 0, "y": 55, "c": 1 },
-        { "x": 1, "y": 43, "c": 0 }, { "x": 1, "y": 91, "c": 1 },
-        { "x": 2, "y": 81, "c": 0 }, { "x": 2, "y": 53, "c": 1 },
-        { "x": 3, "y": 19, "c": 0 }, { "x": 3, "y": 87, "c": 1 },
-        { "x": 4, "y": 52, "c": 0 }, { "x": 4, "y": 48, "c": 1 },
-        { "x": 5, "y": 24, "c": 0 }, { "x": 5, "y": 49, "c": 1 },
-        { "x": 6, "y": 87, "c": 0 }, { "x": 6, "y": 66, "c": 1 },
-        { "x": 7, "y": 17, "c": 0 }, { "x": 7, "y": 27, "c": 1 },
-        { "x": 8, "y": 68, "c": 0 }, { "x": 8, "y": 16, "c": 1 },
-        { "x": 9, "y": 49, "c": 0 }, { "x": 9, "y": 15, "c": 1 }
-      ]
-    },
-    {
-      "name": "stats",
-      "source": "table",
-      "transform": [
-        { "type": "facet", "keys": ["data.x"] },
-        { "type": "stats", "value": "data.y" }
-      ]
-    }
-  ],
-  "scales": [
-    {
-      "name": "x",
-      "type": "ordinal",
-      "range": "width",
-      "domain": { "data": "table", "field": "data.x" }
-    },
-    {
-      "name": "y",
-      "type": "linear",
-      "range": "height",
-      "nice": true,
-      "domain": { "data": "stats", "field": "sum" }
-    },
-    {
-      "name": "color",
-      "type": "ordinal",
-      "range": "category10"
-    }
-  ],
-  "axes": [
-    { "type": "x", "scale": "x" },
-    { "type": "y", "scale": "y" }
-  ],
-  "marks": [
-    {
-      "type": "group",
-      "from": {
-        "data": "table",
-        "transform": [
-          { "type": "facet", "keys": ["data.c"] },
-          { "type": "stack", "point": "data.x", "height": "data.y" }
-        ]
-      },
-      "marks": [
-        {
-          "type": "rect",
-          "properties": {
-            "enter": {
-              "x": { "scale": "x", "field": "data.x" },
-              "width": { "scale": "x", "band": true, "offset": -1 },
-              "y": { "scale": "y", "field": "y" },
-              "y2": { "scale": "y", "field": "y2" },
-              "fill": { "scale": "color", "field": "data.c" }
-            },
-            "update": {
-              "fillOpacity": { "value": 1 }
-            },
-            "hover": {
-              "fillOpacity": { "value": 0.5 }
-            }
-          }
-        }
-      ]
-    }
-  ]
-}
-
-specs[18] = {
-  "width": 500,
-  "height": 200,
-  "data": [
-    {
-      "name": "stocks",
-      "url": "data/stocks.csv",
-      "format": { "type": "csv", "parse": { "price": "number", "date": "date" } }
-    }
-  ],
-  "scales": [
-    {
-      "name": "x",
-      "type": "time",
-      "range": "width",
-      "domain": { "data": "stocks", "field": "data.date" }
-    },
-    {
-      "name": "y",
-      "type": "linear",
-      "range": "height",
-      "nice": true,
-      "domain": { "data": "stocks", "field": "data.price" }
-    },
-    {
-      "name": "color", "type": "ordinal", "range": "category10"
-    }
-  ],
-  "axes": [
-    { "type": "x", "scale": "x", "tickSizeEnd": 0 },
-    { "type": "y", "scale": "y" }
-  ],
-  "marks": [
-    {
-      "type": "group",
-      "from": {
-        "data": "stocks",
-        "transform": [{ "type": "facet", "keys": ["data.symbol"] }]
-      },
-      "marks": [
-        {
-          "type": "line",
-          "properties": {
-            "enter": {
-              "x": { "scale": "x", "field": "data.date" },
-              "y": { "scale": "y", "field": "data.price" },
-              "stroke": { "scale": "color", "field": "data.symbol" },
-              "strokeWidth": { "value": 2 }
-            }
-          }
-        },
-        {
-          "type": "text",
-          "from": {
-            "transform": [{ "type": "filter", "test": "index==data.length-1" }]
-          },
-          "properties": {
-            "enter": {
-              "x": { "scale": "x", "field": "data.date", "offset": 2 },
-              "y": { "scale": "y", "field": "data.price" },
-              "fill": { "scale": "color", "field": "data.symbol" },
-              "text": { "field": "data.symbol" },
-              "baseline": { "value": "middle" }
-            }
-          }
-        }
-      ]
-    }
-  ]
-}
-
-specs[19] = {
-  "name": "treemap",
-  "width": 960,
-  "height": 500,
-  "padding": 2.5,
-  "data": [
-    {
-      "name": "tree",
-      "url": "data/flare.json",
-      "format": { "type": "treejson" },
-      "transform": [
-        { "type": "treemap", "value": "data.size" }
-      ]
-    }
-  ],
-  "scales": [
-    {
-      "name": "color",
-      "type": "ordinal",
-      "range": [
-        "#3182bd", "#6baed6", "#9ecae1", "#c6dbef", "#e6550d",
-        "#fd8d3c", "#fdae6b", "#fdd0a2", "#31a354", "#74c476",
-        "#a1d99b", "#c7e9c0", "#756bb1", "#9e9ac8", "#bcbddc",
-        "#dadaeb", "#636363", "#969696", "#bdbdbd", "#d9d9d9"
-      ]
-    },
-    {
-      "name": "size",
-      "type": "ordinal",
-      "domain": [0, 1, 2, 3],
-      "range": [256, 28, 20, 14]
-    },
-    {
-      "name": "opacity",
-      "type": "ordinal",
-      "domain": [0, 1, 2, 3],
-      "range": [0.15, 0.5, 0.8, 1.0]
-    }
-  ],
-  "marks": [
-    {
-      "type": "rect",
-      "from": {
-        "data": "tree",
-        "transform": [{ "type": "filter", "test": "d.values" }]
-      },
-      "interactive": false,
-      "properties": {
-        "enter": {
-          "x": { "field": "x" },
-          "y": { "field": "y" },
-          "width": { "field": "width" },
-          "height": { "field": "height" },
-          "fill": { "scale": "color", "field": "data.name" }
-        }
-      }
-    },
-    {
-      "type": "rect",
-      "from": {
-        "data": "tree",
-        "transform": [{ "type": "filter", "test": "!d.values" }]
-      },
-      "properties": {
-        "enter": {
-          "x": { "field": "x" },
-          "y": { "field": "y" },
-          "width": { "field": "width" },
-          "height": { "field": "height" },
-          "stroke": { "value": "#fff" }
-        },
-        "update": {
-          "fill": { "value": "rgba(0,0,0,0)" }
-        },
-        "hover": {
-          "fill": { "value": "red" }
-        }
-      }
-    },
-    {
-      "type": "text",
-      "from": {
-        "data": "tree",
-        "transform": [{ "type": "filter", "test": "d.values" }]
-      },
-      "interactive": false,
-      "properties": {
-        "enter": {
-          "x": { "field": "x" },
-          "y": { "field": "y" },
-          "dx": { "field": "width", "mult": 0.5 },
-          "dy": { "field": "height", "mult": 0.5 },
-          "font": { "value": "Helvetica Neue" },
-          "fontSize": { "scale": "size", "field": "depth" },
-          "align": { "value": "center" },
-          "baseline": { "value": "middle" },
-          "fill": { "value": "#000" },
-          "fillOpacity": { "scale": "opacity", "field": "depth" },
-          "text": { "field": "data.name" }
-        }
-      }
-    }
-  ]
-}
-
-specs[20] = {
-  "width": 250,
-  "height": 200,
-  "data": [
-    {
-      "name": "weather",
-      "url": "data/weather.json"
-    }
-  ],
-  "scales": [
-    {
-      "name": "x",
-      "type": "ordinal",
-      "range": "width",
-      "padding": 0.1, "round": true,
-      "domain": { "data": "weather", "field": "index" }
-    },
-    {
-      "name": "y",
-      "range": "height",
-      "nice": true, "zero": false, "round": true,
-      "domain": {
-        "data": "weather",
-        "field": ["data.record.low", "data.record.high"]
-      }
-    }
-  ],
-  "axes": [
-    {
-      "type": "y", "scale": "y", "ticks": 3, "tickSize": 0,
-      "orient": "right", "grid": true,
-      "properties": {
-        "grid": { "stroke": { "value": "white" }, "strokeWidth": { "value": 2 } },
-        "axis": { "stroke": { "value": "transparent" } }
-      }
-    }
-  ],
-  "marks": [
-    {
-      "type": "text",
-      "from": { "data": "weather" },
-      "properties": {
-        "enter": {
-          "x": { "scale": "x", "field": "index" },
-          "dx": { "scale": "x", "band": true, "mult": 0.5 },
-          "y": { "value": 0 },
-          "fill": { "value": "#000" },
-          "text": { "field": "data.day" },
-          "align": { "value": "center" },
-          "baseline": { "value": "bottom" }
-        }
-      }
-    },
-    {
-      "type": "rect",
-      "from": { "data": "weather" },
-      "properties": {
-        "enter": {
-          "x": { "scale": "x", "field": "index" },
-          "width": { "scale": "x", "band": true, "offset": -1 },
-          "y": { "scale": "y", "field": "data.record.low" },
-          "y2": { "scale": "y", "field": "data.record.high" },
-          "fill": { "value": "#ccc" }
-        }
-      }
-    },
-    {
-      "type": "rect",
-      "from": { "data": "weather" },
-      "properties": {
-        "enter": {
-          "x": { "scale": "x", "field": "index" },
-          "width": { "scale": "x", "band": true, "offset": -1 },
-          "y": { "scale": "y", "field": "data.normal.low" },
-          "y2": { "scale": "y", "field": "data.normal.high" },
-          "fill": { "value": "#999" }
-        }
-      }
-    },
-    {
-      "type": "rect",
-      "from": {
-        "data": "weather",
-        "transform": [{ "type": "filter", "test": "d.data.actual" }]
-      },
-      "properties": {
-        "enter": {
-          "x": { "scale": "x", "field": "index", "offset": 4 },
-          "width": { "scale": "x", "band": true, "offset": -8 },
-          "y": { "scale": "y", "field": "data.actual.low" },
-          "y2": { "scale": "y", "field": "data.actual.high" },
-          "fill": { "value": "#000" }
-        }
-      }
-    },
-    {
-      "type": "rect",
-      "from": {
-        "data": "weather",
-        "transform": [{ "type": "filter", "test": "d.data.forecast" }]
-      },
-      "properties": {
-        "enter": {
-          "x": { "scale": "x", "field": "index", "offset": 9 },
-          "width": { "scale": "x", "band": true, "offset": -18 },
-          "y": { "scale": "y", "field": "data.forecast.low.low" },
-          "y2": { "scale": "y", "field": "data.forecast.high.high" },
-          "fill": { "value": "#000" }
-        }
-      }
-    },
-    {
-      "type": "rect",
-      "from": {
-        "data": "weather",
-        "transform": [{ "type": "filter", "test": "d.data.forecast" }]
-      },
-      "properties": {
-        "enter": {
-          "x": { "scale": "x", "field": "index", "offset": 4 },
-          "width": { "scale": "x", "band": true, "offset": -8 },
-          "y": { "scale": "y", "field": "data.forecast.low.low" },
-          "y2": { "scale": "y", "field": "data.forecast.low.high" },
-          "fill": { "value": "#000" }
-        }
-      }
-    },
-    {
-      "type": "rect",
-      "from": {
-        "data": "weather",
-        "transform": [{ "type": "filter", "test": "d.data.forecast" }]
-      },
-      "properties": {
-        "enter": {
-          "x": { "scale": "x", "field": "index", "offset": 4 },
-          "width": { "scale": "x", "band": true, "offset": -8 },
-          "y": { "scale": "y", "field": "data.forecast.high.low" },
-          "y2": { "scale": "y", "field": "data.forecast.high.high" },
-          "fill": { "value": "#000" }
-        }
-      }
-    }
-  ]
-}
-
-const hoverFill21: Vega.ValueRefs = [{
-  "test": "datum.value < 30",
-  "value": "#f00"
-}, {
-  "value": "#f55"
-}];
-
-specs[21] = {
-  "name": "wordcloud",
-  "width": 400,
-  "height": 400,
-  "padding": { "top": 0, "bottom": 0, "left": 0, "right": 0 },
-  "data": [
-    {
-      "name": "table",
-      "values": [
-        { "text": "poem", "value": 80 },
-        { "text": "peom", "value": 44 },
-        { "text": "moep", "value": 40 },
-        { "text": "meop", "value": 36 },
-        { "text": "emop", "value": 32 },
-        { "text": "epom", "value": 28 },
-        { "text": "opem", "value": 24 },
-        { "text": "omep", "value": 20 },
-        { "text": "mope", "value": 56 },
-        { "text": "mepo", "value": 12 },
-        { "text": "pemo", "value": 10 },
-        { "text": "pome", "value": 10 }
-      ],
-      "transform": [
-        {
-          "type": "wordcloud",
-          "text": "data.text",
-          "font": "Helvetica Neue",
-          "fontSize": "data.value",
-          "rotate": { "random": [-60, -30, 0, 30, 60] }
-        }
-      ]
-    }
-  ],
-  "marks": [
-    {
-      "type": "text",
-      "from": { "data": "table" },
-      "properties": {
-        "enter": {
-          "x": { "field": "x" },
-          "y": { "field": "y" },
-          "angle": { "field": "angle" },
-          "align": { "value": "center" },
-          "baseline": { "value": "alphabetic" },
-          "font": { "field": "font" },
-          "fontSize": { "field": "fontSize" },
-          "text": { "field": "data.text" }
-        },
-        "update": {
-          "fill": [{
-            "test": "datum.value < 30",
-            "value": "steelblue"
-          }, {
-            "value": "blue"
-          }]
-        },
-        "hover": {
-          "fill": hoverFill21
-        }
-      }
-    }
-  ]
-}
-
-specs.forEach(spec => {
-  vg.parse.spec(spec, chart => {
-  chart({el:"#vis"}).update();
-  });
-});

From c3f0ee0d5d9765ac9fe65da8c75e477a71e398ca Mon Sep 17 00:00:00 2001
From: Jake Boone <jakeboone02@gmail.com>
Date: Tue, 27 Nov 2018 11:55:08 -0700
Subject: [PATCH 366/836] [react-datepicker] fix v2 tests

---
 types/react-datepicker/react-datepicker-tests.tsx | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/types/react-datepicker/react-datepicker-tests.tsx b/types/react-datepicker/react-datepicker-tests.tsx
index 1414672684..4a3fd93cac 100644
--- a/types/react-datepicker/react-datepicker-tests.tsx
+++ b/types/react-datepicker/react-datepicker-tests.tsx
@@ -1,17 +1,16 @@
 import * as React from 'react';
-import * as moment from 'moment';
 import DatePicker from 'react-datepicker';
 
 <DatePicker
-	selected={moment()}
-	onChange={(date: moment.Moment | null) => {}}
-	onYearChange={(date: moment.Moment) => {}}
+	selected={new Date()}
+	onChange={(date: Date | null) => {}}
+	onYearChange={(date: Date) => {}}
 	popperModifiers={{
 		flip: {
 			enabled: false
 		}
 	}}
-	includeTimes={[moment()]}
+	includeTimes={[new Date()]}
 >
 	<div/>
 	<span/>

From 994038d60cacf827c189629a44abf00b3e07ace2 Mon Sep 17 00:00:00 2001
From: Ron Buckton <ron.buckton@microsoft.com>
Date: Thu, 15 Nov 2018 15:21:20 -0800
Subject: [PATCH 367/836] Remove node dependencies from react

---
 types/react-dom/server/index.d.ts |  8 +++++++-
 types/react/test/index.ts         | 17 +++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/types/react-dom/server/index.d.ts b/types/react-dom/server/index.d.ts
index 53bbca7250..ef42606717 100644
--- a/types/react-dom/server/index.d.ts
+++ b/types/react-dom/server/index.d.ts
@@ -1,4 +1,10 @@
-/// <reference types="node" />
+// forward declarations
+declare global {
+    namespace NodeJS {
+        // tslint:disable-next-line:no-empty-interface
+        interface ReadableStream {}
+    }
+}
 
 import { ReactElement } from 'react';
 
diff --git a/types/react/test/index.ts b/types/react/test/index.ts
index 97d61118b9..0b747edd66 100644
--- a/types/react/test/index.ts
+++ b/types/react/test/index.ts
@@ -14,6 +14,23 @@ import update = require("react-addons-update");
 import createReactClass = require("create-react-class");
 import * as DOM from "react-dom-factories";
 
+// forward declarations (avoids an unnecessary dependency on NodeJS)
+declare global {
+    interface Console {
+        log(message?: any, ...optionalParams: any[]): void;
+    }
+    var console: Console;
+
+    function setInterval(callback: (...args: any[]) => void, ms: number, ...args: any[]): NodeJS.Timeout;
+    function clearInterval(intervalId: NodeJS.Timeout): void;
+
+    namespace NodeJS {
+        // tslint:disable-next-line:no-empty-interface
+        interface Timer {}
+        interface Timeout extends Timer {}
+    }
+}
+
 interface Props extends React.Attributes {
     hello: string;
     world?: string | null;

From f961f35307f3c2e2d085dde65fc46484efd2150d Mon Sep 17 00:00:00 2001
From: Ron Buckton <ron.buckton@microsoft.com>
Date: Fri, 16 Nov 2018 12:48:36 -0800
Subject: [PATCH 368/836] Remove node dependencies from react

---
 types/react/test/index.ts     | 46 ++++++++++++-----------------------
 types/react/v15/test/index.ts | 29 ++++++++++++----------
 2 files changed, 32 insertions(+), 43 deletions(-)

diff --git a/types/react/test/index.ts b/types/react/test/index.ts
index 0b747edd66..672de32b37 100644
--- a/types/react/test/index.ts
+++ b/types/react/test/index.ts
@@ -14,23 +14,6 @@ import update = require("react-addons-update");
 import createReactClass = require("create-react-class");
 import * as DOM from "react-dom-factories";
 
-// forward declarations (avoids an unnecessary dependency on NodeJS)
-declare global {
-    interface Console {
-        log(message?: any, ...optionalParams: any[]): void;
-    }
-    var console: Console;
-
-    function setInterval(callback: (...args: any[]) => void, ms: number, ...args: any[]): NodeJS.Timeout;
-    function clearInterval(intervalId: NodeJS.Timeout): void;
-
-    namespace NodeJS {
-        // tslint:disable-next-line:no-empty-interface
-        interface Timer {}
-        interface Timeout extends Timer {}
-    }
-}
-
 interface Props extends React.Attributes {
     hello: string;
     world?: string | null;
@@ -103,7 +86,7 @@ declare const container: Element;
         render() { return null; }
         componentDidMount() {
             // $ExpectError -> this will be true in next BC release where state is gonna be `null | Readonly<S>`
-            console.log(this.state.inputValue);
+            this.state.inputValue;
         }
         mutateState() {
             // $ExpectError
@@ -184,7 +167,7 @@ class ModernComponent extends React.Component<Props, State, Snapshot>
                 value: this.state.inputValue ? this.state.inputValue : undefined
             }),
             DOM.input({
-                onChange: event => console.log(event.target)
+                onChange: event => event.target
             }));
     }
 
@@ -518,17 +501,20 @@ class Timer extends React.Component<{}, TimerState> {
     state = {
         secondsElapsed: 0
     };
-    private _interval: NodeJS.Timer;
+    // NOTE: creates unnecessary dependency on 'node'. leaving for reference purposes
+    // private _interval: NodeJS.Timer;
     tick() {
         this.setState((prevState, props) => ({
             secondsElapsed: prevState.secondsElapsed + 1
         }));
     }
     componentDidMount() {
-        this._interval = setInterval(() => this.tick(), 1000);
+        // NOTE: creates unnecessary dependency on 'node'. leaving for reference purposes
+        // this._interval = setInterval(() => this.tick(), 1000);
     }
     componentWillUnmount() {
-        clearInterval(this._interval);
+        // NOTE: creates unnecessary dependency on 'node'. leaving for reference purposes
+        // clearInterval(this._interval);
     }
     render() {
         return DOM.div(
@@ -615,14 +601,14 @@ Perf.printExclusive();
 Perf.printWasted();
 Perf.printOperations();
 
-console.log(Perf.getExclusive());
-console.log(Perf.getInclusive());
-console.log(Perf.getWasted());
-console.log(Perf.getOperations());
-console.log(Perf.getExclusive(measurements));
-console.log(Perf.getInclusive(measurements));
-console.log(Perf.getWasted(measurements));
-console.log(Perf.getOperations(measurements));
+Perf.getExclusive();
+Perf.getInclusive();
+Perf.getWasted();
+Perf.getOperations();
+Perf.getExclusive(measurements);
+Perf.getInclusive(measurements);
+Perf.getWasted(measurements);
+Perf.getOperations(measurements);
 
 // Renamed to printOperations().  Please use it instead.
 Perf.printDOM(measurements);
diff --git a/types/react/v15/test/index.ts b/types/react/v15/test/index.ts
index 30dd3bd75d..42ca5999a8 100644
--- a/types/react/v15/test/index.ts
+++ b/types/react/v15/test/index.ts
@@ -120,7 +120,7 @@ class ModernComponent extends React.Component<Props, State>
                 value: this.state.inputValue
             }),
             React.DOM.input({
-                onChange: event => console.log(event.target)
+                onChange: event => event.target
             }));
     }
 
@@ -342,7 +342,7 @@ const htmlAttr: React.HTMLProps<HTMLElement> = {
         event.stopPropagation();
     },
     onAnimationStart: event => {
-        console.log(event.currentTarget.className);
+        event.currentTarget.className;
     },
     dangerouslySetInnerHTML: {
         __html: "<strong>STRONG</strong>"
@@ -505,17 +505,20 @@ class Timer extends React.Component<{}, TimerState> {
     state = {
         secondsElapsed: 0
     };
-    private _interval: NodeJS.Timer;
+    // NOTE: creates unnecessary dependency on 'node'. leaving for reference purposes
+    // private _interval: NodeJS.Timer;
     tick() {
         this.setState((prevState, props) => ({
             secondsElapsed: prevState.secondsElapsed + 1
         }));
     }
     componentDidMount() {
-        this._interval = setInterval(() => this.tick(), 1000);
+        // NOTE: creates unnecessary dependency on 'node'. leaving for reference purposes
+        // this._interval = setInterval(() => this.tick(), 1000);
     }
     componentWillUnmount() {
-        clearInterval(this._interval);
+        // NOTE: creates unnecessary dependency on 'node'. leaving for reference purposes
+        // clearInterval(this._interval);
     }
     render() {
         return React.DOM.div(
@@ -602,14 +605,14 @@ Perf.printExclusive();
 Perf.printWasted();
 Perf.printOperations();
 
-console.log(Perf.getExclusive());
-console.log(Perf.getInclusive());
-console.log(Perf.getWasted());
-console.log(Perf.getOperations());
-console.log(Perf.getExclusive(measurements));
-console.log(Perf.getInclusive(measurements));
-console.log(Perf.getWasted(measurements));
-console.log(Perf.getOperations(measurements));
+Perf.getExclusive();
+Perf.getInclusive();
+Perf.getWasted();
+Perf.getOperations();
+Perf.getExclusive(measurements);
+Perf.getInclusive(measurements);
+Perf.getWasted(measurements);
+Perf.getOperations(measurements);
 
 // Renamed to printOperations().  Please use it instead.
 Perf.printDOM(measurements);

From 48eba801e2af7ea945f8f4cd06d247b2890889ac Mon Sep 17 00:00:00 2001
From: Ron Buckton <ron.buckton@microsoft.com>
Date: Fri, 16 Nov 2018 14:17:11 -0800
Subject: [PATCH 369/836] Fix lint errors due to new lint rules

---
 types/meteor/test/globals/meteor-tests.ts | 16 ++++++++--------
 types/meteor/test/meteor-tests.ts         | 16 ++++++++--------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/types/meteor/test/globals/meteor-tests.ts b/types/meteor/test/globals/meteor-tests.ts
index 782701086f..e3a3e750bb 100644
--- a/types/meteor/test/globals/meteor-tests.ts
+++ b/types/meteor/test/globals/meteor-tests.ts
@@ -371,19 +371,19 @@ Comments.find({ viewNumber: { $gt: 100 } });
 Comments.find({ viewNumber: { $not: { $lt: 100, $gt: 1000 } } });
 Comments.find({ tags: { $in: [ "tag-1", "tag-2", "tag-3" ] } });
 Comments.find({ $or: [ { text: "hello" }, { text: "world" } ] });
-Comments.find({ $or: [ 
-    { text: "hello" }, 
-    { text: "world", viewNumber: { $gt: 0 } } 
+Comments.find({ $or: [
+    { text: "hello" },
+    { text: "world", viewNumber: { $gt: 0 } }
 ], authorId: "test-author-id" });
-Comments.find({ $and: [ 
-    { $or: [{ authorId: "author-id-1" }, { authorId: "author-id-2" }] }, 
+Comments.find({ $and: [
+    { $or: [{ authorId: "author-id-1" }, { authorId: "author-id-2" }] },
     { $or: [{ tags: "tag-1" }, { tags: "tag-2" }] }
 ]});
 
 Comments.find({ $query: {inlineLinks: { $exists: true, $type: "array" } } });
-Comments.find({ inlineLinks: { $elemMatch: { 
-    objectType: InlineObjectType.Image, 
-    objectUrl: { $regex: "https://(www\.?)youtube\.com" } 
+Comments.find({ inlineLinks: { $elemMatch: {
+    objectType: InlineObjectType.Image,
+    objectUrl: { $regex: "https://(www\.?)youtube\.com" }
 } } });
 Comments.find({ "inlineLinks.objectType": InlineObjectType.Person });
 Comments.find({ tags: "tag-1" });
diff --git a/types/meteor/test/meteor-tests.ts b/types/meteor/test/meteor-tests.ts
index b45284df52..63f83ef79d 100644
--- a/types/meteor/test/meteor-tests.ts
+++ b/types/meteor/test/meteor-tests.ts
@@ -383,19 +383,19 @@ Comments.find({ viewNumber: { $gt: 100 } });
 Comments.find({ viewNumber: { $not: { $lt: 100, $gt: 1000 } } });
 Comments.find({ tags: { $in: [ "tag-1", "tag-2", "tag-3" ] } });
 Comments.find({ $or: [ { text: "hello" }, { text: "world" } ] });
-Comments.find({ $or: [ 
-    { text: "hello" }, 
-    { text: "world", viewNumber: { $gt: 0 } } 
+Comments.find({ $or: [
+    { text: "hello" },
+    { text: "world", viewNumber: { $gt: 0 } }
 ], authorId: "test-author-id" });
-Comments.find({ $and: [ 
-    { $or: [{ authorId: "author-id-1" }, { authorId: "author-id-2" }] }, 
+Comments.find({ $and: [
+    { $or: [{ authorId: "author-id-1" }, { authorId: "author-id-2" }] },
     { $or: [{ tags: "tag-1" }, { tags: "tag-2" }] }
 ]});
 
 Comments.find({ $query: { inlineLinks: { $exists: true, $type: "array" } } });
-Comments.find({ inlineLinks: { $elemMatch: { 
-    objectType: InlineObjectType.Image, 
-    objectUrl: { $regex: "https://(www\.?)youtube\.com" } 
+Comments.find({ inlineLinks: { $elemMatch: {
+    objectType: InlineObjectType.Image,
+    objectUrl: { $regex: "https://(www\.?)youtube\.com" }
 } } });
 Comments.find({ "inlineLinks.objectType": InlineObjectType.Person });
 Comments.find({ tags: "tag-1" });

From f8a87d07b3253029c217f25002f3ff4e8f05a1a8 Mon Sep 17 00:00:00 2001
From: Ron Buckton <ron.buckton@microsoft.com>
Date: Tue, 27 Nov 2018 11:24:21 -0800
Subject: [PATCH 370/836] Address PR feedback

---
 types/react/test/index.ts     | 37 ++++++++++++++++++++---------------
 types/react/v15/test/index.ts | 37 ++++++++++++++++++++---------------
 2 files changed, 42 insertions(+), 32 deletions(-)

diff --git a/types/react/test/index.ts b/types/react/test/index.ts
index 672de32b37..8a4a2bd89b 100644
--- a/types/react/test/index.ts
+++ b/types/react/test/index.ts
@@ -14,6 +14,14 @@ import update = require("react-addons-update");
 import createReactClass = require("create-react-class");
 import * as DOM from "react-dom-factories";
 
+// NOTE: forward declarations for tests
+declare function setInterval(...args: any[]): any;
+declare function clearInterval(...args: any[]): any;
+declare var console: Console;
+interface Console {
+    log(...args: any[]): void;
+}
+
 interface Props extends React.Attributes {
     hello: string;
     world?: string | null;
@@ -86,7 +94,7 @@ declare const container: Element;
         render() { return null; }
         componentDidMount() {
             // $ExpectError -> this will be true in next BC release where state is gonna be `null | Readonly<S>`
-            this.state.inputValue;
+            console.log(this.state.inputValue);
         }
         mutateState() {
             // $ExpectError
@@ -167,7 +175,7 @@ class ModernComponent extends React.Component<Props, State, Snapshot>
                 value: this.state.inputValue ? this.state.inputValue : undefined
             }),
             DOM.input({
-                onChange: event => event.target
+                onChange: event => console.log(event.target)
             }));
     }
 
@@ -501,20 +509,17 @@ class Timer extends React.Component<{}, TimerState> {
     state = {
         secondsElapsed: 0
     };
-    // NOTE: creates unnecessary dependency on 'node'. leaving for reference purposes
-    // private _interval: NodeJS.Timer;
+    private _interval: number;
     tick() {
         this.setState((prevState, props) => ({
             secondsElapsed: prevState.secondsElapsed + 1
         }));
     }
     componentDidMount() {
-        // NOTE: creates unnecessary dependency on 'node'. leaving for reference purposes
-        // this._interval = setInterval(() => this.tick(), 1000);
+        this._interval = setInterval(() => this.tick(), 1000);
     }
     componentWillUnmount() {
-        // NOTE: creates unnecessary dependency on 'node'. leaving for reference purposes
-        // clearInterval(this._interval);
+        clearInterval(this._interval);
     }
     render() {
         return DOM.div(
@@ -601,14 +606,14 @@ Perf.printExclusive();
 Perf.printWasted();
 Perf.printOperations();
 
-Perf.getExclusive();
-Perf.getInclusive();
-Perf.getWasted();
-Perf.getOperations();
-Perf.getExclusive(measurements);
-Perf.getInclusive(measurements);
-Perf.getWasted(measurements);
-Perf.getOperations(measurements);
+console.log(Perf.getExclusive());
+console.log(Perf.getInclusive());
+console.log(Perf.getWasted());
+console.log(Perf.getOperations());
+console.log(Perf.getExclusive(measurements));
+console.log(Perf.getInclusive(measurements));
+console.log(Perf.getWasted(measurements));
+console.log(Perf.getOperations(measurements));
 
 // Renamed to printOperations().  Please use it instead.
 Perf.printDOM(measurements);
diff --git a/types/react/v15/test/index.ts b/types/react/v15/test/index.ts
index 42ca5999a8..79d05ac8d0 100644
--- a/types/react/v15/test/index.ts
+++ b/types/react/v15/test/index.ts
@@ -11,6 +11,14 @@ import * as TestUtils from "react-addons-test-utils";
 import TransitionGroup = require("react-addons-transition-group");
 import update = require("react-addons-update");
 
+// NOTE: forward declarations for tests
+declare function setInterval(...args: any[]): any;
+declare function clearInterval(...args: any[]): any;
+declare var console: Console;
+interface Console {
+    log(...args: any[]): void;
+}
+
 interface Props extends React.Attributes {
     hello: string;
     world?: string;
@@ -120,7 +128,7 @@ class ModernComponent extends React.Component<Props, State>
                 value: this.state.inputValue
             }),
             React.DOM.input({
-                onChange: event => event.target
+                onChange: event => console.log(event.target)
             }));
     }
 
@@ -342,7 +350,7 @@ const htmlAttr: React.HTMLProps<HTMLElement> = {
         event.stopPropagation();
     },
     onAnimationStart: event => {
-        event.currentTarget.className;
+        console.log(event.currentTarget.className);
     },
     dangerouslySetInnerHTML: {
         __html: "<strong>STRONG</strong>"
@@ -505,20 +513,17 @@ class Timer extends React.Component<{}, TimerState> {
     state = {
         secondsElapsed: 0
     };
-    // NOTE: creates unnecessary dependency on 'node'. leaving for reference purposes
-    // private _interval: NodeJS.Timer;
+    private _interval: number;
     tick() {
         this.setState((prevState, props) => ({
             secondsElapsed: prevState.secondsElapsed + 1
         }));
     }
     componentDidMount() {
-        // NOTE: creates unnecessary dependency on 'node'. leaving for reference purposes
-        // this._interval = setInterval(() => this.tick(), 1000);
+        this._interval = setInterval(() => this.tick(), 1000);
     }
     componentWillUnmount() {
-        // NOTE: creates unnecessary dependency on 'node'. leaving for reference purposes
-        // clearInterval(this._interval);
+        clearInterval(this._interval);
     }
     render() {
         return React.DOM.div(
@@ -605,14 +610,14 @@ Perf.printExclusive();
 Perf.printWasted();
 Perf.printOperations();
 
-Perf.getExclusive();
-Perf.getInclusive();
-Perf.getWasted();
-Perf.getOperations();
-Perf.getExclusive(measurements);
-Perf.getInclusive(measurements);
-Perf.getWasted(measurements);
-Perf.getOperations(measurements);
+console.log(Perf.getExclusive());
+console.log(Perf.getInclusive());
+console.log(Perf.getWasted());
+console.log(Perf.getOperations());
+console.log(Perf.getExclusive(measurements));
+console.log(Perf.getInclusive(measurements));
+console.log(Perf.getWasted(measurements));
+console.log(Perf.getOperations(measurements));
 
 // Renamed to printOperations().  Please use it instead.
 Perf.printDOM(measurements);

From 0226045de5e8db79594af54dbab3f5b77b972d3c Mon Sep 17 00:00:00 2001
From: Cameron Martin <cameronmartin123@gmail.com>
Date: Tue, 27 Nov 2018 20:42:30 +0000
Subject: [PATCH 371/836] Implemented all changes outlined in the comments in
 pull request #30862.

---
 .../babel__traverse/babel__traverse-tests.ts  | 37 +++++++++++++++++++
 types/babel__traverse/index.d.ts              | 14 +++----
 2 files changed, 44 insertions(+), 7 deletions(-)

diff --git a/types/babel__traverse/babel__traverse-tests.ts b/types/babel__traverse/babel__traverse-tests.ts
index 974831dbca..772b392b63 100644
--- a/types/babel__traverse/babel__traverse-tests.ts
+++ b/types/babel__traverse/babel__traverse-tests.ts
@@ -112,3 +112,40 @@ const BindingKindTest: Visitor = {
         // kind === 'anythingElse';
     },
 };
+
+interface SomeVisitorState { someState: string; }
+
+const VisitorStateTest: Visitor<SomeVisitorState> = {
+    enter(path, state) {
+        // $ExpectType SomeVisitorState
+        state;
+        // $ExpectType SomeVisitorState
+        this;
+    },
+    exit(path, state) {
+        // $ExpectType SomeVisitorState
+        state;
+        // $ExpectType SomeVisitorState
+        this;
+    },
+    Identifier(path, state) {
+        // $ExpectType SomeVisitorState
+        state;
+        // $ExpectType SomeVisitorState
+        this;
+    },
+    FunctionDeclaration: {
+        enter(path, state) {
+            // $ExpectType SomeVisitorState
+            state;
+            // $ExpectType SomeVisitorState
+            this;
+        },
+        exit(path, state) {
+            // $ExpectType SomeVisitorState
+            state;
+            // $ExpectType SomeVisitorState
+            this;
+        }
+    }
+};
diff --git a/types/babel__traverse/index.d.ts b/types/babel__traverse/index.d.ts
index 740f5f4429..a0a3730057 100644
--- a/types/babel__traverse/index.d.ts
+++ b/types/babel__traverse/index.d.ts
@@ -138,17 +138,17 @@ export class Binding {
     constantViolations: NodePath[];
 }
 
-export type Visitor<S = Node> = VisitNodeObject<Node> & {
-    [P in Node["type"]]?: VisitNode<S, Extract<Node, { type: P; }>>;
+export type Visitor<S = {}> = VisitNodeObject<S, Node> & {
+    [Type in Node["type"]]?: VisitNode<S, Extract<Node, { type: Type; }>>;
 };
 
-export type VisitNode<T, P> = VisitNodeFunction<T, P> | VisitNodeObject<P>;
+export type VisitNode<S, P> = VisitNodeFunction<S, P> | VisitNodeObject<S, P>;
 
-export type VisitNodeFunction<T, P> = (this: T, path: NodePath<P>, state: any) => void;
+export type VisitNodeFunction<S, P> = (this: S, path: NodePath<P>, state: S) => void;
 
-export interface VisitNodeObject<T> {
-    enter?(path: NodePath<T>, state: any): void;
-    exit?(path: NodePath<T>, state: any): void;
+export interface VisitNodeObject<S, P> {
+    enter?: VisitNodeFunction<S, P>;
+    exit?: VisitNodeFunction<S, P>;
 }
 
 export class NodePath<T = Node> {

From 6edec833a26d69eb5982014628fbd7cec28d1188 Mon Sep 17 00:00:00 2001
From: Pavel <pppaaawel@gmail.com>
Date: Tue, 27 Nov 2018 22:41:31 +0100
Subject: [PATCH 372/836] Add new Expo type definitions from official docs

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

diff --git a/types/expo/expo-tests.tsx b/types/expo/expo-tests.tsx
index 5bb6b5abc4..75dee784de 100644
--- a/types/expo/expo-tests.tsx
+++ b/types/expo/expo-tests.tsx
@@ -145,7 +145,8 @@ Audio.setAudioModeAsync({
     playsInSilentModeIOS: true,
     interruptionModeIOS: 2,
     interruptionModeAndroid: 1,
-    allowsRecordingIOS: true
+    allowsRecordingIOS: true,
+    playThroughEarpieceAndroid: false
 });
 Audio.setIsEnabledAsync(true);
 
diff --git a/types/expo/index.d.ts b/types/expo/index.d.ts
index b406b4e8ec..ad94eb38ed 100644
--- a/types/expo/index.d.ts
+++ b/types/expo/index.d.ts
@@ -12,6 +12,7 @@
 //                 Nathan Phillip Brink <https://github.com/binki>
 //                 Martin Olsson <https://github.com/mo>
 //                 Levan Basharuli <https://github.com/levansuper>
+//                 Pavel Ihm <https://github.com/ihmpavel>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 
@@ -405,6 +406,9 @@ export namespace Audio {
 
         /** an enum selecting how your experience’s audio should interact with the audio from other apps on Android: */
         interruptionModeAndroid: InterruptionModeAndroid;
+
+        /** Boolean selecting if audio should go to earpiece (only on Android).*/
+        playThroughEarpieceAndroid: boolean;
     }
 
     function setIsEnabledAsync(value: boolean): Promise<void>;
@@ -566,7 +570,7 @@ export interface PlaybackStatusToSet {
     volume?: number;
 }
 
-export type PlaybackSource = RequireSource | { uri: string } | Asset;
+export type PlaybackSource = RequireSource | { uri: string, headers?: { [string]: string }, overrideFileExtensionAndroid?: string } | Asset;
 
 export class PlaybackObject {
     /**
@@ -2355,7 +2359,7 @@ export namespace Calendar {
         /** Name for the account that owns this calendar */
         ownerAccount?: string; // Android
 
-        /** Time zone for the calendar	 */
+        /** Time zone for the calendar */
         timeZone?: string; // Android
 
         /** Alarm methods that this calendar supports */
@@ -2398,7 +2402,7 @@ export namespace Calendar {
         /** Visible name of the event */
         title?: string;
 
-        /** Location field of the event	 */
+        /** Location field of the event */
         location?: string;
 
         /** Date when the event record was created */

From 675bc38625d0e0767639d7423ffcada9f3d67574 Mon Sep 17 00:00:00 2001
From: Pavel <pppaaawel@gmail.com>
Date: Tue, 27 Nov 2018 23:03:24 +0100
Subject: [PATCH 373/836] Fix build errors

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

diff --git a/types/expo/index.d.ts b/types/expo/index.d.ts
index ad94eb38ed..9e48e391d8 100644
--- a/types/expo/index.d.ts
+++ b/types/expo/index.d.ts
@@ -407,7 +407,7 @@ export namespace Audio {
         /** an enum selecting how your experience’s audio should interact with the audio from other apps on Android: */
         interruptionModeAndroid: InterruptionModeAndroid;
 
-        /** Boolean selecting if audio should go to earpiece (only on Android).*/
+        /** Boolean selecting if audio should go to earpiece (only on Android). */
         playThroughEarpieceAndroid: boolean;
     }
 
@@ -570,7 +570,7 @@ export interface PlaybackStatusToSet {
     volume?: number;
 }
 
-export type PlaybackSource = RequireSource | { uri: string, headers?: { [string]: string }, overrideFileExtensionAndroid?: string } | Asset;
+export type PlaybackSource = RequireSource | { uri: string, headers?: { [header: string]: string }, overrideFileExtensionAndroid?: string } | Asset;
 
 export class PlaybackObject {
     /**

From 00f1245e599f463b2ea16b4e77e85bf73f9cbca5 Mon Sep 17 00:00:00 2001
From: piotr rotynski <rotynski@gmail.com>
Date: Tue, 27 Nov 2018 23:22:07 +0100
Subject: [PATCH 374/836] Adding withArgs method to Spy interface as per
 Jasmine's docs for v3.3

---
 types/jasmine/index.d.ts       |  1 +
 types/jasmine/jasmine-tests.ts | 34 ++++++++++++++++++++++++++++++++++
 2 files changed, 35 insertions(+)

diff --git a/types/jasmine/index.d.ts b/types/jasmine/index.d.ts
index e9dba1e2cd..a87b8b3a86 100644
--- a/types/jasmine/index.d.ts
+++ b/types/jasmine/index.d.ts
@@ -639,6 +639,7 @@ declare namespace jasmine {
         calls: Calls;
         mostRecentCall: { args: any[]; };
         argsForCall: any[];
+        withArgs(...args: any[]): Spy;
     }
 
     type SpyObj<T> = T & {
diff --git a/types/jasmine/jasmine-tests.ts b/types/jasmine/jasmine-tests.ts
index ba8763ce3d..92f9a21db8 100644
--- a/types/jasmine/jasmine-tests.ts
+++ b/types/jasmine/jasmine-tests.ts
@@ -469,6 +469,40 @@ describe("A spy, when configured with an alternate implementation", () => {
     });
 });
 
+describe("A spy, when configured with alternate implementations for specified arguments", () => {
+    var foo: any, bar: any, fetchedBar: any;
+
+    beforeEach(() => {
+        foo = {
+            setBar: (value: any) => {
+                bar = value;
+            },
+            getBar: () => {
+                return bar;
+            }
+        };
+
+        spyOn(foo, "getBar")
+            .withArgs(1, "2")
+            .and.callFake(() => 1002);
+
+        foo.setBar(123);
+        fetchedBar = foo.getBar(1, "2");
+    });
+
+    it("tracks that the spy was called", () => {
+        expect(foo.getBar).toHaveBeenCalled();
+    });
+
+    it("should not effect other functions", () => {
+        expect(bar).toEqual(123);
+    });
+
+    it("when called returns the requested value", () => {
+        expect(fetchedBar).toEqual(1002);
+    });
+});
+
 describe("A spy, when configured to throw a value", () => {
     var foo: any, bar: any;
 

From c63de7c41921667f3bc0723d6206c78bae4ae230 Mon Sep 17 00:00:00 2001
From: timhwang21 <timhwang21@gmail.com>
Date: Tue, 27 Nov 2018 18:03:50 -0500
Subject: [PATCH 375/836] [bip39] Add Buffer as valid argument for
 entropyToMnemonic

The function accepts either string or buffer.
---
 types/bip39/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/bip39/index.d.ts b/types/bip39/index.d.ts
index a5d58cf961..6894ac3b30 100644
--- a/types/bip39/index.d.ts
+++ b/types/bip39/index.d.ts
@@ -17,7 +17,7 @@ export const wordlists: {
     spanish: string[];
 };
 
-export function entropyToMnemonic(entropyHex: string, wordlist?: string[]): string;
+export function entropyToMnemonic(entropyHex: Buffer | string, wordlist?: string[]): string;
 
 export function generateMnemonic(strength?: number, rng?: (size: number) => Buffer, wordlist?: string[]): string;
 

From 797f19a5eb36bdf78d82e52ff5651a020b192e48 Mon Sep 17 00:00:00 2001
From: James Ide <ide@expo.io>
Date: Tue, 27 Nov 2018 14:50:09 -0800
Subject: [PATCH 376/836] [react-native] Update type definition for
 requireNativeComponent for 0.57.x

requireNativeComponent now only takes a string and returns a string. See the definition here: https://github.com/facebook/react-native/blob/1151c096dab17e5d9a6ac05b61aacecd4305f3db/Libraries/ReactNative/requireNativeComponent.js#L24-L27.

The return type here is specified as `React.ReactType`, which is a union type that includes strings. We can't use `string` because TypeScript treats it as an intrinsic element like `div` and thinks it has no props.

Updated the corresponding test code too.
---
 types/react-native/index.d.ts     | 29 +++++------------------------
 types/react-native/test/index.tsx |  7 +------
 2 files changed, 6 insertions(+), 30 deletions(-)

diff --git a/types/react-native/index.d.ts b/types/react-native/index.d.ts
index 9e68e283a9..6e54b6d7c9 100644
--- a/types/react-native/index.d.ts
+++ b/types/react-native/index.d.ts
@@ -9030,34 +9030,15 @@ export const Platform: PlatformStatic;
 export const PlatformIOS: PlatformIOSStatic;
 export const PixelRatio: PixelRatioStatic;
 
-export interface ComponentInterface<P> {
-    name?: string;
-    displayName?: string;
-    propTypes: PropTypes.ValidationMap<P>;
-}
-
 /**
- * Used to create React components that directly wrap native component
- * implementations.  Config information is extracted from data exported from the
- * UIManager module.  You should also wrap the native component in a
- * hand-written component with full propTypes definitions and other
- * documentation - pass the hand-written component in as `componentInterface` to
- * verify all the native props are documented via `propTypes`.
+ * Creates values that can be used like React components which represent native
+ * view managers. You should create JavaScript modules that wrap these values so
+ * that the results are memoized. Example:
  *
- * If some native props shouldn't be exposed in the wrapper interface, you can
- * pass null for `componentInterface` and call `verifyPropTypes` directly
- * with `nativePropsToIgnore`;
+ *   const View = requireNativeComponent('RCTView');
  *
- * Common types are lined up with the appropriate prop differs with
- * `TypeToDifferMap`.  Non-scalar types not in the map default to `deepDiffer`.
  */
-export function requireNativeComponent<P, NP = {}>(
-    viewName: string,
-    componentInterface?: ComponentInterface<P>,
-    extraConfig?: { nativeOnly?: NP }
-): React.ComponentClass<
-    Partial<PropTypes.InferProps<PropTypes.ValidationMap<P>>> & { [K in keyof NP]?: any}
->;
+export function requireNativeComponent(viewName: string): React.ReactType;
 
 export function findNodeHandle(
     componentOrHandle: null | number | React.Component<any, any> | React.ComponentClass<any>
diff --git a/types/react-native/test/index.tsx b/types/react-native/test/index.tsx
index 56d6b7035b..b5d7a5faeb 100644
--- a/types/react-native/test/index.tsx
+++ b/types/react-native/test/index.tsx
@@ -822,12 +822,7 @@ class BridgedComponentTest extends React.Component {
     }
 }
 
-const NativeBridgedComponent = requireNativeComponent("NativeBridgedComponent", BridgedComponentTest, {
-    nativeOnly: {
-        nativeProp: true,
-    }
-});
-
+const NativeBridgedComponent = requireNativeComponent("NativeBridgedComponent");
 
 const SwitchColorTest = () => (
     <Switch trackColor={{ true: 'pink', false: 'red'}} />

From 53771da91e57c816f8f1899c2e4e072a9bcf97f8 Mon Sep 17 00:00:00 2001
From: Chris Arnesen <chris.arnesen@gmail.com>
Date: Wed, 28 Nov 2018 14:15:24 +0700
Subject: [PATCH 377/836] Add options arg to "find-versions"

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

diff --git a/types/find-versions/find-versions-tests.ts b/types/find-versions/find-versions-tests.ts
index 81ea6ca974..e92e6d9848 100644
--- a/types/find-versions/find-versions-tests.ts
+++ b/types/find-versions/find-versions-tests.ts
@@ -1,3 +1,4 @@
 import findVersions = require('find-versions');
 
-findVersions('node v1.0.0');
+findVersions('node v1.0.0'); // $ExpectType string[]
+findVersions('1.0', { loose: true }); // $ExpectType string[]
diff --git a/types/find-versions/index.d.ts b/types/find-versions/index.d.ts
index 449c5a45c3..f22e3796e2 100644
--- a/types/find-versions/index.d.ts
+++ b/types/find-versions/index.d.ts
@@ -3,5 +3,5 @@
 // Definitions by: Leonid Logvinov <https://github.com/LogvinovLeon>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare function findVersions(version: string): string[];
+declare function findVersions(version: string, options?: { loose: boolean }): string[];
 export = findVersions;

From 95b52bea5276fb948958f3d8e4929954b27fd39c Mon Sep 17 00:00:00 2001
From: Chris Arnesen <chris.arnesen@gmail.com>
Date: Wed, 28 Nov 2018 14:22:42 +0700
Subject: [PATCH 378/836] Update metadata

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

diff --git a/types/find-versions/index.d.ts b/types/find-versions/index.d.ts
index f22e3796e2..7151227fb2 100644
--- a/types/find-versions/index.d.ts
+++ b/types/find-versions/index.d.ts
@@ -1,6 +1,7 @@
-// Type definitions for find-versions 2.0
+// Type definitions for find-versions 3.0
 // Project: https://github.com/sindresorhus/find-versions
 // Definitions by: Leonid Logvinov <https://github.com/LogvinovLeon>
+//                 Chris Arnesen <https://github.com/carnesen
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 declare function findVersions(version: string, options?: { loose: boolean }): string[];

From 83ac5c88348de8b402427c18997d321a0aa2f1f2 Mon Sep 17 00:00:00 2001
From: Glen <glen.84@gmail.com>
Date: Wed, 28 Nov 2018 09:36:59 +0200
Subject: [PATCH 379/836] Make sitekey optional in Parameters

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

diff --git a/types/grecaptcha/grecaptcha-tests.ts b/types/grecaptcha/grecaptcha-tests.ts
index 288836d6b3..970660cc6c 100644
--- a/types/grecaptcha/grecaptcha-tests.ts
+++ b/types/grecaptcha/grecaptcha-tests.ts
@@ -18,11 +18,15 @@ const badge1: ReCaptchaV2.Badge = "bottomleft";
 const badge2: ReCaptchaV2.Badge = "bottomright";
 const badge3: ReCaptchaV2.Badge = "inline";
 
-const invisibleParams: ReCaptchaV2.Parameters = {
+const invisibleParams1: ReCaptchaV2.Parameters = {
   sitekey: "siteKey",
   badge: badge1,
 };
 
+const invisibleParams2: ReCaptchaV2.Parameters = {
+  badge: badge2,
+};
+
 const id1: number = grecaptcha.render("foo");
 const id2: number = grecaptcha.render("foo", params);
 const id3: number = grecaptcha.render(document.getElementById("foo"));
diff --git a/types/grecaptcha/index.d.ts b/types/grecaptcha/index.d.ts
index c9dedbfb74..4430aa90e9 100644
--- a/types/grecaptcha/index.d.ts
+++ b/types/grecaptcha/index.d.ts
@@ -46,7 +46,7 @@ declare namespace ReCaptchaV2 {
     /**
      * Your sitekey.
      */
-    sitekey: string;
+    sitekey?: string;
     /**
      * Optional. The color theme of the widget.
      * Accepted values: "light", "dark"

From 8ceca9db8f12523151c437f28b885c15686c510f Mon Sep 17 00:00:00 2001
From: Chris Arnesen <chris.arnesen@gmail.com>
Date: Wed, 28 Nov 2018 15:29:38 +0700
Subject: [PATCH 380/836] Update types/find-versions/index.d.ts

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

diff --git a/types/find-versions/index.d.ts b/types/find-versions/index.d.ts
index 7151227fb2..9531c1628f 100644
--- a/types/find-versions/index.d.ts
+++ b/types/find-versions/index.d.ts
@@ -1,7 +1,7 @@
 // Type definitions for find-versions 3.0
 // Project: https://github.com/sindresorhus/find-versions
 // Definitions by: Leonid Logvinov <https://github.com/LogvinovLeon>
-//                 Chris Arnesen <https://github.com/carnesen
+//                 Chris Arnesen <https://github.com/carnesen>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 declare function findVersions(version: string, options?: { loose: boolean }): string[];

From e8b63b0bdafe5b3f86c1f2eb062e77aef9fe99c6 Mon Sep 17 00:00:00 2001
From: Mathieu Ghennassia <mathieu.ghennassia@gmail.com>
Date: Wed, 28 Nov 2018 11:52:15 +0100
Subject: [PATCH 381/836] mongodb: Type parameter update of method
 findOneAndUpdate

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

diff --git a/types/mongodb/index.d.ts b/types/mongodb/index.d.ts
index ab4d2f4c02..f994ade210 100644
--- a/types/mongodb/index.d.ts
+++ b/types/mongodb/index.d.ts
@@ -79,7 +79,7 @@ export interface ClientSession extends EventEmitter {
     /** The server id associated with this session */
     id: any;
     /**
-     * Aborts the currently active transaction in this session. 
+     * Aborts the currently active transaction in this session.
      * @param {MongoCallback<void>} [cb] Optional callback for completion of this operation
      */
     abortTransaction(cb?: MongoCallback<void>): Promise<void>;
@@ -89,7 +89,7 @@ export interface ClientSession extends EventEmitter {
      */
     advanceOperationTime(operamtionTime: Timestamp): void;
     /**
-     * Commits the currently active transaction in this session. 
+     * Commits the currently active transaction in this session.
      * @param {MongoCallback<void>} [cb] Optional callback for completion of this operation
      */
     commitTransaction(cb?: MongoCallback<void>): Promise<void>;
@@ -110,7 +110,7 @@ export interface ClientSession extends EventEmitter {
      * Used to determine if this session equals another
      *
      * @param {ClientSession} session A class representing a client session on the server
-     * @returns {boolean} if the sessions are equal 
+     * @returns {boolean} if the sessions are equal
      */
     equals(session: ClientSession): boolean;
 
@@ -118,13 +118,13 @@ export interface ClientSession extends EventEmitter {
     incrementTransactionNumber(): void;
 
     /**
-     * @returns {boolean} this session is currently in a transaction or not 
+     * @returns {boolean} this session is currently in a transaction or not
      */
     inTransaction(): boolean;
 
     /**
      * Starts a new transaction with the given options.
-     * @param {TransactionOptions} options 
+     * @param {TransactionOptions} options
      * @memberof ClientSession
      */
     startTransaction(options?: TransactionOptions): void;
@@ -219,10 +219,10 @@ export class MongoError extends Error {
      * client/user (eg. "Email address must be unique" instead of "Both email
      * address and username must be unique") - which caters for a better (app)
      * user experience.
-     * 
+     *
      * Details: https://github.com/Automattic/mongoose/issues/2129 (issue for
      * mongoose, but the same applies for the native mongodb driver)
-     * 
+     *
      * Note that in mongoose (the link above) the prop in question is called
      * 'message' while in mongodb it is called 'errmsg'. This can be seen in
      * multiple places in the source code, for example here:
@@ -706,9 +706,9 @@ export interface Collection<TSchema = Default> {
     findOneAndReplace(filter: FilterQuery<TSchema>, replacement: Object, options?: FindOneAndReplaceOption): Promise<FindAndModifyWriteOpResultObject<TSchema>>;
     findOneAndReplace(filter: FilterQuery<TSchema>, replacement: Object, options: FindOneAndReplaceOption, callback: MongoCallback<FindAndModifyWriteOpResultObject<TSchema>>): void;
     /** http://mongodb.github.io/node-mongodb-native/3.1/api/Collection.html#findOneAndUpdate */
-    findOneAndUpdate(filter: FilterQuery<TSchema>, update: Object, callback: MongoCallback<FindAndModifyWriteOpResultObject<TSchema>>): void;
-    findOneAndUpdate(filter: FilterQuery<TSchema>, update: Object, options?: FindOneAndUpdateOption): Promise<FindAndModifyWriteOpResultObject<TSchema>>;
-    findOneAndUpdate(filter: FilterQuery<TSchema>, update: Object, options: FindOneAndUpdateOption, callback: MongoCallback<FindAndModifyWriteOpResultObject<TSchema>>): void;
+    findOneAndUpdate(filter: FilterQuery<TSchema>, update: UpdateQuery<TSchema> | TSchema, callback: MongoCallback<FindAndModifyWriteOpResultObject<TSchema>>): void;
+    findOneAndUpdate(filter: FilterQuery<TSchema>, update: UpdateQuery<TSchema> | TSchema, options?: FindOneAndUpdateOption): Promise<FindAndModifyWriteOpResultObject<TSchema>>;
+    findOneAndUpdate(filter: FilterQuery<TSchema>, update: UpdateQuery<TSchema> | TSchema, options: FindOneAndUpdateOption, callback: MongoCallback<FindAndModifyWriteOpResultObject<TSchema>>): void;
     /** http://mongodb.github.io/node-mongodb-native/3.1/api/Collection.html#geoHaystackSearch */
     geoHaystackSearch(x: number, y: number, callback: MongoCallback<any>): void;
     geoHaystackSearch(x: number, y: number, options?: GeoHaystackSearchOptions): Promise<any>;

From 1bec72c66668b0fd21dc7b23d7a9deae265ffa59 Mon Sep 17 00:00:00 2001
From: Adam Misiorny <adam.misiorny@gmail.com>
Date: Wed, 28 Nov 2018 12:56:06 +0100
Subject: [PATCH 382/836] [rosie] Fix sequence definition with builder argument

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

diff --git a/types/rosie/index.d.ts b/types/rosie/index.d.ts
index 1078b53573..e66e9855eb 100644
--- a/types/rosie/index.d.ts
+++ b/types/rosie/index.d.ts
@@ -163,7 +163,7 @@ declare namespace rosie {
      * @param {function(number): *=} builder
      * @return {Factory}
      */
-    sequence(name: keyof T, dependenciesOrBuilder?: () => any | keyof T[], builder?: Function) : IFactory<T>;
+    sequence(name: keyof T, dependenciesOrBuilder?: (i: number) => any | keyof T[], builder?: Function) : IFactory<T>;
 
     /**
      * Sets a post-processor callback that will receive built objects and the
diff --git a/types/rosie/rosie-tests.ts b/types/rosie/rosie-tests.ts
index 6c2152a9e7..86dd049732 100644
--- a/types/rosie/rosie-tests.ts
+++ b/types/rosie/rosie-tests.ts
@@ -19,6 +19,7 @@ resultObj = Factory.build('some');
 Factory.define('coach')
   .option('buildPlayer', false)
   .sequence('id')
+  .sequence('name', (i: number) => `Coach${i}`)
   .attr('players', ['id', 'buildPlayer'], function(id: any, buildPlayer: boolean) {
     if (buildPlayer) {
       return [Factory.build('player', {coach_id: id})];

From 6b8b4cb0b3461847d8b3dc5fa15e7d31ea1a575d Mon Sep 17 00:00:00 2001
From: Geir Sagberg <geir.sagberg@gmail.com>
Date: Wed, 28 Nov 2018 12:58:49 +0100
Subject: [PATCH 383/836] [redux-first-router] Update definitions for Options
 for 2.1

---
 types/redux-first-router/index.d.ts           | 101 ++++++++++++++++--
 .../redux-first-router-tests.ts               |  82 ++++++++------
 2 files changed, 140 insertions(+), 43 deletions(-)

diff --git a/types/redux-first-router/index.d.ts b/types/redux-first-router/index.d.ts
index 2184deed0b..1cf954b69f 100644
--- a/types/redux-first-router/index.d.ts
+++ b/types/redux-first-router/index.d.ts
@@ -6,6 +6,7 @@
 //                 corydeppen <https://github.com/corydeppen>
 //                 jscinoz <https://github.com/jscinoz>
 //                 surgeboris <https://github.com/surgeboris>
+//                 geirsagberg <https://github.com/geirsagberg>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.4
 
@@ -194,25 +195,107 @@ export interface NavigatorsConfig<TKeys = {}, TState = any> {
         };
 }
 
+export interface Bag {
+    action: ReceivedAction | Action;
+    extra: any;
+}
+
 export interface Options<TKeys = {}, TState = any> {
-    title?: string | SelectTitleState<TState>;
+    /**
+     * A prefix that will be prepended to the URL. For example, using a basename of '/playground',
+     * a route with the path '/home' would correspond to the URL path '/playground/home'.
+     */
+    basename?: string;
+    /**
+     *  Whether or not a trailing delimiter is allowed when matching path.
+     */
+    strict?: boolean;
+    /**
+     * The name of the state key or a selector function to specify where in your Redux state tree
+     * Redux First Router should expect your page location reducer to be attached to.
+     */
     location?: string | SelectLocationState<TKeys, TState>;
-    notFoundPath?: string;
-    scrollTop?: boolean;
-    onBeforeChange?(dispatch: Dispatch<any>, getState: StateGetter<TState>): void;
-    onAfterChange?(dispatch: Dispatch<any>, getState: StateGetter<TState>): void;
-    onBackNext?(dispatch: Dispatch<any>, getState: StateGetter<TState>): void;
-    restoreScroll?(history: History): ScrollBehavior;
+    /**
+     * The name of the state key or a selector function to specify where in your Redux state tree
+     * Redux First Router should expect your page title reducer to be attached to.
+     * This can be omitted if you attach the reducer at state.title.
+     */
+    title?: string | SelectTitleState<TState>;
+    /**
+     * Can be set to false to bypass the initial dispatch, so you can do it manually, perhaps after running sagas.
+     */
     initialDispatch?: boolean;
-    querySerializer?: QuerySerializer;
-    navigators?: NavigatorsConfig<TKeys, TState>;
+    /**
+     * An array of entries to initialise history object. Useful for server side rendering and tests.
+     */
     initialEntries?: HistoryEntries;
+    /**
+     * An object with parse and stringify methods, such as the `query-string` or `qs` libraries (or anything handmade).
+     * This will be used to handle querystrings. Without this option, query strings are ignored silently.
+     */
+    querySerializer?: QuerySerializer;
+    /**
+     * The path where users may be redirected in 2 situations: when you dispatch an action with no matching path,
+     *  or if you manually call dispatch(redirect({ type: NOT_FOUND })), where NOT_FOUND is an export from this package.
+     *  The type in actions and state will be NOT_FOUND, which you can use to show a 404 page.
+     */
+    notFoundPath?: string;
+    /**
+     * Whether or not window.scrollTo(0, 0) should be run on route changes so the user starts each page at the top.
+     */
+    scrollTop?: boolean;
+    /**
+     * A function to update window/elements scroll position.
+     */
+    restoreScroll?(history: History): ScrollBehavior;
+    /**
+     * A simple function that will be called before the routes change.
+     * It's passed your standard `dispatch` and `getState` arguments like a thunk,
+     * as well as the `bag` object as a third parameter, which contains the dispatched `action` and the configured `extra` value.
+     */
+    onBeforeChange?(dispatch: Dispatch<any>, getState: StateGetter<TState>, bag: Bag): void;
+    /**
+     * A simple function that will be called after the routes change.
+     * It's passed your standard `dispatch` and `getState` arguments like a thunk,
+     * as well as the `bag` object as a third parameter, which contains the dispatched `action` and the configured `extra` value.
+     */
+    onAfterChange?(dispatch: Dispatch<any>, getState: StateGetter<TState>, bag: Bag): void;
+    /**
+     * A simple function that will be called whenever the user uses the browser back/next buttons.
+     * It's passed your standard `dispatch` and `getState` arguments like a thunk,
+     * as well as the `bag` object as a third parameter, which contains the dispatched `action`
+     * and the configured `extra` value. Actions with kinds `back`, `next`, and `pop` trigger this.
+     */
+    onBackNext?(dispatch: Dispatch<any>, getState: StateGetter<TState>, bag: Bag): void;
+    /**
+     * A function receiving `message` and `callback` when navigation is blocked with `confirmLeave`.
+     * The message is the return value from `confirmLeave`.
+     * The callback can be called with `true` to unblock the navigation, or with `false` to cancel the navigation.
+     */
+    displayConfirmLeave?: DisplayConfirmLeave;
+    /**
+     * A function returning a history object compatible with the popular `history` package.
+     */
     createHistory?(): History;
+    /**
+     * A map of of your Redux state keys to _React Navigation_ navigators.
+     */
+    navigators?: NavigatorsConfig<TKeys, TState>;
+    /**
+     * An optional value that will be passed as part of the third `bag` argument to all options callbacks and routes thunk.
+     * It works much like the `withExtraArgument` feature of `redux-thunk` or the `context` argument of GraphQL resolvers.
+     * You can use it to pass any required context to your thunks without having to tightly couple them to it.
+     * For example, you could pass an instance of an API client initialised with authentication cookies,
+     * or a function `addReducer` to inject new code split reducers into the store.
+     */
+    extra?: any;
 }
 
 export type Params = object;
 export type Payload = object;
 
+export type DisplayConfirmLeave = (message: string, callback: (unblock: boolean) => void) => void;
+
 export type ScrollUpdater = (performedByUser: boolean) => void;
 
 export const NOT_FOUND: '@@redux-first-router/NOT_FOUND';
diff --git a/types/redux-first-router/redux-first-router-tests.ts b/types/redux-first-router/redux-first-router-tests.ts
index 5297be4175..0439f551c7 100644
--- a/types/redux-first-router/redux-first-router-tests.ts
+++ b/types/redux-first-router/redux-first-router-tests.ts
@@ -7,21 +7,24 @@ import {
     redirect,
     Action as ReduxFirstRouterAction,
     QuerySerializer,
-    pathToAction
+    pathToAction,
+    StateGetter,
+    Bag,
+    Navigators,
+    NavigationAction,
+    Nullable,
+    Route
 } from 'redux-first-router';
 import {
-    AnyAction,
     createStore,
     applyMiddleware,
     Middleware,
-    MiddlewareAPI,
-    Store,
     Dispatch,
     compose,
-    Action,
-    StoreEnhancer,
     StoreEnhancerStoreCreator,
-    combineReducers
+    combineReducers,
+    AnyAction,
+    Store
 } from 'redux';
 import { History } from 'history';
 
@@ -52,28 +55,40 @@ const routesMap: RoutesMap<Keys, State> = {
     }
 };
 
-const {
-    reducer,
-    middleware,
-    enhancer,
-    initialDispatch,
-    thunk,
-} = connectRoutes(routesMap, {
-        initialDispatch: false,
-        onBeforeChange: (dispatch, getState) => {
-            dispatch; // $ExpectType Dispatch<any>
-            getState; // $ExpectType StateGetter<State>
+const { reducer, middleware, enhancer, initialDispatch, thunk } = connectRoutes(routesMap, {
+    basename: '/base',
+    strict: false,
+    location: state => {
+        const locationState = state.location; // $ExpectType LocationState<Keys, State>
+        return locationState;
+    },
+    title: state => {
+        const title = state.location.pathname; // $ExpectType string
+        return title;
+    },
+    initialDispatch: false,
+    initialEntries: [],
+    querySerializer: {
+        stringify: queryString => {
+            queryString; // $ExpectType object
+            return '';
         },
-        location: state => {
-            const locationState = state.location; // $ExpectType LocationState<Keys, State>
-            return locationState;
-        },
-        title: state => {
-            const title = state.location.pathname; // $ExpectType string
-            return title;
-        },
-        createHistory: () => history,
-    });
+        parse: params => {
+            params; // $ExpectType string
+            return {};
+        }
+    },
+    notFoundPath: 'not-found',
+    scrollTop: true,
+    restoreScroll: (history: History) => {
+        return {};
+    },
+    onBeforeChange: (dispatch: Dispatch, getState: StateGetter<State>, bag: Bag) => { },
+    onAfterChange: (dispatch: Dispatch, getState: StateGetter<State>, bag: Bag) => { },
+    onBackNext: (dispatch: Dispatch, getState: StateGetter<State>, bag: Bag) => { },
+    displayConfirmLeave: (message: string, callback: (unblock: boolean) => void) => { },
+    createHistory: (options?: any) => history
+});
 
 const dumbMiddleware: Middleware = store => next => action => next(action);
 
@@ -89,10 +104,9 @@ const combined = combineReducers<State>({ location: reducer });
 const store = createStore(combined, storeEnhancer);
 
 // Test that `thunk()` has correct state types now that `store` is defined
-thunk(store)
-    .then((t) => {
-        t = t!; // $ExpectType RouteThunk<State>
-    });
+thunk(store).then(t => {
+    t = t!; // $ExpectType RouteThunk<State>
+});
 
 const receivedAction: ReceivedAction = {
     type: 'HOME',
@@ -102,8 +116,8 @@ actionToPath(receivedAction, routesMap); // $ExpectType string
 pathToAction('/', routesMap); // $ExpectType ReceivedAction
 
 const querySerializer: QuerySerializer = {
-    stringify: (params) => '',
-    parse: (queryString) => ({})
+    stringify: params => '',
+    parse: queryString => ({})
 };
 actionToPath(receivedAction, routesMap, querySerializer); // $ExpectType string
 pathToAction('/', routesMap, querySerializer); // $ExpectType ReceivedAction

From 843aa82f3d1921ee5a6fbd52196efb3307bc0349 Mon Sep 17 00:00:00 2001
From: Alexander Sidko <alexander.sidko@revjet.com>
Date: Wed, 28 Nov 2018 14:01:24 +0200
Subject: [PATCH 384/836] Use pino-pretty options as PrettyOptions

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

diff --git a/types/pino/index.d.ts b/types/pino/index.d.ts
index bea9987832..8efaa85d33 100644
--- a/types/pino/index.d.ts
+++ b/types/pino/index.d.ts
@@ -5,6 +5,7 @@
 //                 Christian Rackerseder <https://github.com/screendriver>
 //                 GP <https://github.com/paambaati>
 //                 Alex Ferrando <https://github.com/alferpal>
+//                 Oleksandr Sidko <https://github.com/mortiy>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -243,13 +244,12 @@ declare namespace P {
 
     interface PrettyOptions {
         /**
-         * If set to true, it will only covert the unix timestamp to ISO 8601 date format, and reserialize the JSON (equivalent to pino -t).
+         * Translate the epoch time value into a human readable date and time string.
+         * This flag also can set the format string to apply when translating the date to human readable format.
+         * The default format is yyyy-mm-dd HH:MM:ss.l o in UTC.
+         * For a list of available pattern letters see the {@link https://www.npmjs.com/package/dateformat|dateformat documentation}.
          */
-        timeTransOnly?: boolean;
-        /**
-         * A custom function to format the line, is passed the JSON object as an argument and should return a string value.
-         */
-        formatter?(log: LogDescriptor): string;
+        translateTime?: boolean | string;
         /**
          * If set to true, it will print the name of the log level as the first field in the log line. Default: `false`.
          */
@@ -261,7 +261,24 @@ declare namespace P {
         /**
          * If set to true, will add color information to the formatted output message. Default: `false`.
          */
-        forceColor?: boolean;
+        colorize?: boolean;
+        /**
+         * Appends carriage return and line feed, instead of just a line feed, to the formatted log line.
+         */
+        crlf?: boolean;
+        /**
+         * Define the log keys that are associated with error like objects. Default: ["err", "error"]
+         */
+        errorLikeObjectKeys?: string[];
+        /**
+         *  When formatting an error object, display this list of properties.
+         *  The list should be a comma separated list of properties. Default: ''
+         */
+        errorProps?: string;
+        /**
+         * Specify a search pattern according to {@link http://jmespath.org|jmespath}
+         */
+        search?: string;
     }
 
     type Level = 'fatal' | 'error' | 'warn' | 'info' | 'debug' | 'trace';
diff --git a/types/pino/pino-tests.ts b/types/pino/pino-tests.ts
index d3203b5dd4..56b28d284c 100644
--- a/types/pino/pino-tests.ts
+++ b/types/pino/pino-tests.ts
@@ -123,3 +123,16 @@ anotherRedacted.info({
     msg: 'another logged with redacted properties',
     anotherPath: 'Not shown'
 });
+
+const pretty = pino({
+	prettyPrint: {
+		colorize: true,
+		crlf: false,
+		errorLikeObjectKeys: ['err', 'error'],
+		errorProps: '',
+		levelFirst: false,
+		messageKey: 'msg',
+		translateTime: 'UTC:h:MM:ss TT Z',
+		search: 'foo == `bar`'
+	}
+})

From a821fb106f90a104a262a335b67718554a636ced Mon Sep 17 00:00:00 2001
From: Geir Sagberg <geir.sagberg@gmail.com>
Date: Wed, 28 Nov 2018 13:25:07 +0100
Subject: [PATCH 385/836] [redux-first-router] Update RouteObject

---
 types/redux-first-router/index.d.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/types/redux-first-router/index.d.ts b/types/redux-first-router/index.d.ts
index 1cf954b69f..13b4578322 100644
--- a/types/redux-first-router/index.d.ts
+++ b/types/redux-first-router/index.d.ts
@@ -25,6 +25,8 @@ export type StateGetter<TState = any> = () => TState;
 
 export type RouteString = string;
 
+export type ConfirmLeave = (state: object, action: object) => Nullable<string>;
+
 export type RouteThunk<TState = any> = (
     dispatch: Dispatch<any>,
     getState: StateGetter<TState>,
@@ -37,6 +39,9 @@ export type RouteObject<TKeys = {}, TState = any> = TKeys & {
     thunk?: RouteThunk<TState>;
     fromPath?(path: string, key?: string): string;
     toPath?(param: string, key?: string): string;
+    coerceNumbers?: boolean;
+    confirmLeave?: ConfirmLeave;
+    meta?: Meta;
 };
 
 export type Route<TKeys = {}, TState = any> = RouteString | RouteObject<TKeys, TState>;

From d0081bef8b40ab5d104694063131acc928e5f78b Mon Sep 17 00:00:00 2001
From: HarikiRito <35214929+HarikiRito@users.noreply.github.com>
Date: Wed, 28 Nov 2018 19:41:26 +0700
Subject: [PATCH 386/836] Export Interface

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

diff --git a/types/react-lottie/index.d.ts b/types/react-lottie/index.d.ts
index 8e4f3b717b..a57da91307 100644
--- a/types/react-lottie/index.d.ts
+++ b/types/react-lottie/index.d.ts
@@ -7,7 +7,7 @@
 
 import * as React from 'react';
 
-interface Options {
+export interface Options {
     /**
      * Defines if the animation should play only once or repeatedly in an endless loop
      */
@@ -41,7 +41,7 @@ interface Options {
     };
 }
 
-interface EventListener {
+export interface EventListener {
     /**
      * The event sent by Lottie
      */
@@ -61,7 +61,7 @@ interface EventListener {
     callback: () => void;
 }
 
-interface LottieProps {
+export interface LottieProps {
     /**
      * Object representing animation settings
      */

From 0bdba525bac419a9a946a0f4753742a73a0d828d Mon Sep 17 00:00:00 2001
From: Alexander Sidko <alexander.sidko@revjet.com>
Date: Wed, 28 Nov 2018 14:42:24 +0200
Subject: [PATCH 387/836] Fix pino tests

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

diff --git a/types/pino/pino-tests.ts b/types/pino/pino-tests.ts
index 56b28d284c..3a6283c3e4 100644
--- a/types/pino/pino-tests.ts
+++ b/types/pino/pino-tests.ts
@@ -135,4 +135,4 @@ const pretty = pino({
 		translateTime: 'UTC:h:MM:ss TT Z',
 		search: 'foo == `bar`'
 	}
-})
+});

From 422ae215527764ce90c03fe262b401bdae07c17d Mon Sep 17 00:00:00 2001
From: Kamontat Chantrachirathumrong <kamontat.c@hotmail.com>
Date: Wed, 28 Nov 2018 15:06:11 +0100
Subject: [PATCH 388/836] Update index.d.ts

---
 types/wikidata-sdk/index.d.ts | 243 ++++++++++++++++++++++++++--------
 1 file changed, 185 insertions(+), 58 deletions(-)

diff --git a/types/wikidata-sdk/index.d.ts b/types/wikidata-sdk/index.d.ts
index 5810bcc9de..79620ac623 100644
--- a/types/wikidata-sdk/index.d.ts
+++ b/types/wikidata-sdk/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for wikidata-sdk 5.15
+// Type definitions for wikidata-sdk 5.15.9
 // Project: https://github.com/maxlath/wikidata-sdk
 // Definitions by: Kamontat Chantrachirathumrong <https://github.com/kamontat>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -7,20 +7,36 @@
 import { WikidataLanguage } from "./def/type/language";
 import { WikidataProperty } from "./def/type/property";
 import { WikidataSite } from "./def/type/site";
+import { WikidataSiteLink, WikidataSiteLinkSimplify, WikidataSiteLinkWithUrlSimplify } from "./def/object/sitelink";
 import { UrlResultFormat } from "./def/type/format";
+import {
+  WikidataLanguageBaseString,
+  WikidataLanguageBaseStringSimplify,
+  WikidataLanguageBaseArrayString,
+  WikidataLanguageBaseArrayStringSimplify
+} from "wikidata-sdk/def/object/language-base-string";
 
-import { Claim, MainSnak, TimeDataValue, EntityDataValue } from "./def/object/claim";
+import { WikidataClaim, WikidataMainSnak, WikidataTimeDataValue, WikidataEntityDataValue } from "./def/object/claim";
 
-export type WikidataLanguage = WikidataLanguage;
-export type WikidataProperty = WikidataProperty;
-export type WikidataSite = WikidataSite;
+// ----------------------------------- //
+// Export session                      //
+// ----------------------------------- //
 
-export type UrlResultFormat = UrlResultFormat;
+export { WikidataLanguage, WikidataProperty, WikidataSite };
 
-export type Claim = Claim;
-export type MainSnak = MainSnak;
-export type TimeDataValue = TimeDataValue;
-export type EntityDataValue = EntityDataValue;
+export {
+  WikidataLanguageBaseString,
+  WikidataLanguageBaseStringSimplify,
+  WikidataLanguageBaseArrayString,
+  WikidataLanguageBaseArrayStringSimplify,
+  WikidataSiteLink,
+  WikidataSiteLinkSimplify,
+  WikidataSiteLinkWithUrlSimplify
+};
+
+export { UrlResultFormat };
+
+export { WikidataClaim, WikidataMainSnak, WikidataTimeDataValue, WikidataEntityDataValue };
 
 export as namespace sdk;
 
@@ -42,22 +58,22 @@ export as namespace sdk;
  * @see {@link https://www.wikidata.org/w/api.php?action=help&modules=wbsearchentities | Wikidata[wbsearchentities] }
  */
 export function searchEntities(
-    search: string,
-    language?: WikidataLanguage,
-    limit?: string | number,
-    format?: UrlResultFormat,
-    uselang?: WikidataLanguage
+  search: string,
+  language?: WikidataLanguage,
+  limit?: string | number,
+  format?: UrlResultFormat,
+  uselang?: WikidataLanguage
 ): string;
 
 /**
  * @alias searchEntities
  */
 export function searchEntities(opt: {
-    search: string;
-    language?: WikidataLanguage;
-    limit?: string | number;
-    format?: UrlResultFormat;
-    uselang?: WikidataLanguage;
+  search: string;
+  language?: WikidataLanguage;
+  limit?: string | number;
+  format?: UrlResultFormat;
+  uselang?: WikidataLanguage;
 }): string;
 
 /* **********
@@ -79,20 +95,20 @@ export function searchEntities(opt: {
  * @see {@link https://www.wikidata.org/w/api.php?action=help&modules=wbgetentities | Wikidata[wbgetentities] }
  */
 export function getEntities(
-    ids: string | string[],
-    languages?: WikidataLanguage | WikidataLanguage[],
-    props?: WikidataProperty | WikidataProperty[],
-    format?: UrlResultFormat
+  ids: string | string[],
+  languages?: WikidataLanguage | WikidataLanguage[],
+  props?: WikidataProperty | WikidataProperty[],
+  format?: UrlResultFormat
 ): string;
 
 /**
  * @alias getEntities
  */
 export function getEntities(a: {
-    ids: string | string[];
-    languages?: WikidataLanguage | WikidataLanguage[];
-    props?: WikidataProperty | WikidataProperty[];
-    format?: UrlResultFormat;
+  ids: string | string[];
+  languages?: WikidataLanguage | WikidataLanguage[];
+  props?: WikidataProperty | WikidataProperty[];
+  format?: UrlResultFormat;
 }): string;
 
 /**
@@ -101,20 +117,20 @@ export function getEntities(a: {
  * Without id limitation and return the array of url instead.
  */
 export function getManyEntities(
-    ids: string | string[],
-    languages?: WikidataLanguage | WikidataLanguage[],
-    props?: WikidataProperty | WikidataProperty[],
-    format?: UrlResultFormat
+  ids: string | string[],
+  languages?: WikidataLanguage | WikidataLanguage[],
+  props?: WikidataProperty | WikidataProperty[],
+  format?: UrlResultFormat
 ): string[];
 
 /**
  * @alias getManyEntities
  */
 export function getManyEntities(a: {
-    ids: string | string[];
-    languages?: WikidataLanguage | WikidataLanguage[];
-    props?: WikidataProperty | WikidataProperty[];
-    format?: UrlResultFormat;
+  ids: string | string[];
+  languages?: WikidataLanguage | WikidataLanguage[];
+  props?: WikidataProperty | WikidataProperty[];
+  format?: UrlResultFormat;
 }): string[];
 
 /**
@@ -131,22 +147,22 @@ export function getManyEntities(a: {
  * @see {@link https://github.com/maxlath/wikidata-sdk/blob/6b0673b9bf0fcaab19db65e2cc77e33c901ef35d/docs/get_entities.md#by-wikipedia-titles | Github[get_entities.md#by-wikipedia-titles] }
  */
 export function getWikidataIdsFromWikipediaTitles(
-    titles: string | string[],
-    sites?: string,
-    languages?: WikidataLanguage | WikidataLanguage[],
-    props?: WikidataProperty | WikidataProperty[],
-    format?: UrlResultFormat
+  titles: string | string[],
+  sites?: WikidataSite,
+  languages?: WikidataLanguage | WikidataLanguage[],
+  props?: WikidataProperty | WikidataProperty[],
+  format?: UrlResultFormat
 ): string;
 
 /**
  * @alias getWikidataIdsFromWikipediaTitles
  */
 export function getWikidataIdsFromWikipediaTitles(a: {
-    titles: string | string[];
-    sites?: string;
-    languages?: WikidataLanguage | WikidataLanguage[];
-    props?: WikidataProperty | WikidataProperty[];
-    format?: UrlResultFormat;
+  titles: string | string[];
+  sites?: WikidataSite;
+  languages?: WikidataLanguage | WikidataLanguage[];
+  props?: WikidataProperty | WikidataProperty[];
+  format?: UrlResultFormat;
 }): string;
 
 /**
@@ -167,13 +183,13 @@ export function getWikidataIdsFromWikipediaTitles(a: {
  * {@link https://github.com/maxlath/wikidata-sdk/blob/6b0673b9bf0fcaab19db65e2cc77e33c901ef35d/docs/get_entities_reverse_claims.md#get-entities-reverse-claims | Github[get-entities-reverse-claims] }
  */
 export function getReverseClaims(
-    property: string | string[],
-    value: string | string[],
-    options?: {
-        limit?: number;
-        keepProperties?: boolean;
-        caseInsensitive?: boolean;
-    }
+  property: string | string[],
+  value: string | string[],
+  options?: {
+    limit?: number;
+    keepProperties?: boolean;
+    caseInsensitive?: boolean;
+  }
 ): string;
 
 /**
@@ -241,7 +257,7 @@ export function truthyClaims(claims: object): object;
  *
  * @see {@link https://www.mediawiki.org/wiki/Wikibase/Indexing/RDF_Dump_Format#Truthy_statements | Truthy}
  */
-export function truthyPropertyClaims(claims: Claim[]): Claim[];
+export function truthyPropertyClaims(claims: WikidataClaim[]): WikidataClaim[];
 
 /**
  * This will get the link that represent the site of the title.
@@ -252,16 +268,16 @@ export function truthyPropertyClaims(claims: Claim[]): Claim[];
  *
  * @see {@link https://github.com/maxlath/wikidata-sdk/blob/6b0673b9bf0fcaab19db65e2cc77e33c901ef35d/docs/general_helpers.md#getsitelinkurl | Github[getsitelinkurl] }
  */
-export function getSitelinkUrl(site: string, title: string): string;
+export function getSitelinkUrl(site: WikidataSite, title: string): string;
 
 /**
  * @alias getSitelinkUrl
  */
-export function getSitelinkUrl(a: { site: string; title: string }): string;
+export function getSitelinkUrl(a: { site: WikidataSite; title: string }): string;
 
 export interface SitelinkData {
-    lang: string;
-    project: string;
+  lang: string;
+  project: string;
 }
 /**
  * Get the sitelink on english language and the lang of it.
@@ -335,3 +351,114 @@ export function wikidataTimeToSimpleDay(a: string | object): string;
  * @returns URL from a wikimedia commons filename
  */
 export function getImageUrl(a: string, width?: number): string;
+
+export type SimplifyOption = {
+  // claims
+  entityPrefix?: string;
+  propertyPrefix?: string;
+  keepRichValues?: boolean;
+  keepQualifiers?: boolean;
+  keepReferences?: boolean;
+  keepIds?: boolean;
+  keepHashes?: boolean;
+  keepNonTruthy?: boolean;
+  // sitelinks
+  addUrl?: boolean;
+};
+
+/**
+ * Helper method, for simplify result object more reasonable
+ */
+export namespace simplify {
+  /**
+   * Applying all simplifiers at once: labels, descriptions, aliases, claims, sitelinks. See next sections for details.
+   * You can also pass options as a second argument, that will then be passed the subfunctions:
+   *
+   * @param entity the entity that receive from {@link getEntities} APIs
+   * @param opt simlify option. currently only simplify claims and simplify sitelinks.
+   *
+   * @see {@link https://github.com/maxlath/wikidata-sdk/blob/master/docs/simplify_entities_data.md#simplify-entity | Github[simplify-entity]}
+   */
+  export function entity<T>(entity: T, opt?: SimplifyOption): T;
+
+  /**
+   * This is a same of {@link entity} method except this input as multiple array of entities.
+   *
+   * @param entities entities from {@link getEntities} APIs
+   * @param opt simlify option. currently only simplify claims and simplify sitelinks.
+   *
+   * @see {@link https://github.com/maxlath/wikidata-sdk/blob/master/docs/simplify_entities_data.md#simplify-entities | Github[simplify-entities]}
+   */
+  export function entities<T>(entities: T[], opt?: SimplifyOption): T[];
+
+  /**
+   * Make label simplifier and easier to understand
+   *
+   * @param labels label object, you will receive this from getEntities method
+   *
+   * @example
+   *
+   * const label = simplify.labels("{ pl: { language: 'pl', value: 'książka' } }");
+   * console.log(label) // { pl: 'książka' }
+   *
+   * @see {@link https://github.com/maxlath/wikidata-sdk/blob/master/docs/simplify_entities_data.md#simplify-labels | Github[simplify-labels]}
+   */
+  export function labels(labels: WikidataLanguageBaseString): WikidataLanguageBaseStringSimplify;
+
+  /**
+   * Make description simplifier and easier to understand
+   *
+   * @param descriptions description object, you will receive this from getEntities method
+   *
+   * @example
+   *
+   * const desc = simplify.descriptions("{ pl: { language: 'pl', value: 'dokument piśmienniczy [...]' } }");
+   * console.log(desc) // { pl: 'dokument piśmienniczy [...]' }
+   *
+   * @see {@link https://github.com/maxlath/wikidata-sdk/blob/master/docs/simplify_entities_data.md#simplify-descriptions | Github[simplify-descriptions]}
+   */
+  export function descriptions(descriptions: WikidataLanguageBaseString): WikidataLanguageBaseStringSimplify;
+
+  /**
+   * Make alias simplifier and easier to understand
+   *
+   * @param aliases alias object, you will receive this from getEntities method
+   *
+   * @example
+   *
+   * const alias = simplify.aliases("{ pl: [ { language: 'pl', value: 'Tom' }, { language: 'pl', value: 'Tomik' } ] }");
+   * console.log(alias) // { pl: [ 'Tom', 'Tomik' ] }
+   *
+   * @see {@link https://github.com/maxlath/wikidata-sdk/blob/master/docs/simplify_entities_data.md#simplify-aliases | Github[simplify-aliases]}
+   */
+  export function aliases(aliases: WikidataLanguageBaseArrayString): WikidataLanguageBaseArrayStringSimplify;
+
+  /**
+   * Make sitelink simplifier and easier to understand
+   *
+   * @param sitelinks sitelink object, you will receive this from getEntities method
+   *
+   * @example
+   *
+   * const site = simplify.sitelinks("{ plwiki: { site: 'plwiki', title: 'Książka', badges: [] } }");
+   * console.log(site) // { plwiki: 'Książka' }
+   *
+   * @see {@link https://github.com/maxlath/wikidata-sdk/blob/master/docs/simplify_entities_data.md#simplify-sitelinks | Github[simplify-sitelinks]}
+   */
+  export function sitelinks(sitelinks: WikidataSiteLink): WikidataSiteLinkSimplify;
+
+  /**
+   * Make sitelink simplifier and easier to understand. include URL in the result.
+   *
+   * @param sitelinks sitelink object, you will receive this from getEntities method
+   * @param options add url to a result
+   *
+   * @example
+   *
+   * const site = simplify.sitelinks("{ plwiki: { site: 'plwiki', title: 'Książka', badges: [] } }", {addUrl: true});
+   * console.log(site) // { plwiki: { title: 'Książka', url: 'https://pl.wikipedia.org/wiki/Książka' } }
+   *
+   * @see {@link https://github.com/maxlath/wikidata-sdk/blob/master/docs/simplify_entities_data.md#add-sitelinks-urls | Github[simplify-sitelinks-with-url]}
+   */
+  export function sitelinks(sitelinks: WikidataSiteLink, options: { addUrl: true }): WikidataSiteLinkWithUrlSimplify;
+}

From d284105dcadcce897d96a1d38a5040e396095f35 Mon Sep 17 00:00:00 2001
From: Kamontat Chantrachirathumrong <kamontat.c@hotmail.com>
Date: Wed, 28 Nov 2018 15:08:33 +0100
Subject: [PATCH 389/836] Update claim name

---
 types/wikidata-sdk/def/object/claim.d.ts | 54 ++++++++++++------------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/types/wikidata-sdk/def/object/claim.d.ts b/types/wikidata-sdk/def/object/claim.d.ts
index c397fcb0df..99ed8bf52c 100644
--- a/types/wikidata-sdk/def/object/claim.d.ts
+++ b/types/wikidata-sdk/def/object/claim.d.ts
@@ -1,34 +1,34 @@
-export interface TimeDataValue {
-    type: "time";
-    value: {
-        time: string;
-        timezone: number;
-        before: number;
-        after: number;
-        precision: number;
-        calendermodel: string;
-    };
+export interface WikidataTimeDataValue {
+  type: "time";
+  value: {
+    time: string;
+    timezone: number;
+    before: number;
+    after: number;
+    precision: number;
+    calendermodel: string;
+  };
 }
 
-export interface EntityDataValue {
-    type: "wikibase-entityid";
-    value: {
-        "numeric-id": number;
-        "entity-type": string;
-    };
+export interface WikidataEntityDataValue {
+  type: "wikibase-entityid";
+  value: {
+    "numeric-id": number;
+    "entity-type": string;
+  };
 }
 
-export interface MainSnak {
-    datatype: string;
-    snaktype: string;
-    property: string;
-    hash: string;
-    datavalue: TimeDataValue | EntityDataValue;
+export interface WikidataMainSnak {
+  datatype: string;
+  snaktype: string;
+  property: string;
+  hash: string;
+  datavalue: WikidataTimeDataValue | WikidataEntityDataValue;
 }
 
-export interface Claim {
-    rank: string;
-    id: string;
-    type: string;
-    mainsnak: MainSnak;
+export interface WikidataClaim {
+  rank: string;
+  id: string;
+  type: string;
+  mainsnak: WikidataMainSnak;
 }

From d5acd49750e454a5ab7f35a452a2f2cd61ea12ea Mon Sep 17 00:00:00 2001
From: Kamontat Chantrachirathumrong <kamontat.c@hotmail.com>
Date: Wed, 28 Nov 2018 15:09:17 +0100
Subject: [PATCH 390/836] Add language base string object type

---
 .../def/object/language-base-string.d.ts      | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 types/wikidata-sdk/def/object/language-base-string.d.ts

diff --git a/types/wikidata-sdk/def/object/language-base-string.d.ts b/types/wikidata-sdk/def/object/language-base-string.d.ts
new file mode 100644
index 0000000000..9f35d4bd8e
--- /dev/null
+++ b/types/wikidata-sdk/def/object/language-base-string.d.ts
@@ -0,0 +1,19 @@
+import { WikidataLanguage } from "wikidata-sdk";
+
+export type WikidataLanguageBaseString = {
+  [Key in WikidataLanguage]?: {
+    language: Key;
+    value: string;
+  }
+};
+
+export type WikidataLanguageBaseStringSimplify = { [key in WikidataLanguage]?: string };
+
+export type WikidataLanguageBaseArrayString = {
+  [Key in WikidataLanguage]: {
+    language: Key;
+    value: string;
+  }[]
+};
+
+export type WikidataLanguageBaseArrayStringSimplify = { [key in WikidataLanguage]: string[] };

From 22e936663027c8f82280ce4a3883fe42ea30e8ee Mon Sep 17 00:00:00 2001
From: Kamontat Chantrachirathumrong <kamontat.c@hotmail.com>
Date: Wed, 28 Nov 2018 15:09:40 +0100
Subject: [PATCH 391/836] Add sitelink object

---
 types/wikidata-sdk/def/object/sitelink.d.ts | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 types/wikidata-sdk/def/object/sitelink.d.ts

diff --git a/types/wikidata-sdk/def/object/sitelink.d.ts b/types/wikidata-sdk/def/object/sitelink.d.ts
new file mode 100644
index 0000000000..4b6aeee23d
--- /dev/null
+++ b/types/wikidata-sdk/def/object/sitelink.d.ts
@@ -0,0 +1,12 @@
+import { WikidataSite } from "wikidata-sdk";
+
+export type WikidataSiteLink = { [Key in WikidataSite]: { site: Key; title: string; badges: string[] } };
+
+export type WikidataSiteLinkSimplify = { [key in WikidataSite]: string };
+
+export type WikidataSiteLinkWithUrlSimplify = {
+  [key in WikidataSite]: {
+    title: string;
+    url: string;
+  }
+};

From 3e65f7972871d987b69b60a2b63587a89e5dbb6f Mon Sep 17 00:00:00 2001
From: feinoujc <feinoujc@users.noreply.github.com>
Date: Wed, 28 Nov 2018 09:10:50 -0500
Subject: [PATCH 392/836] [@pollyjs/core] updates for 1.3 config options

---
 types/pollyjs__core/index.d.ts             | 28 +++++----
 types/pollyjs__core/pollyjs__core-tests.ts | 69 +++++++++++++++++++++-
 2 files changed, 83 insertions(+), 14 deletions(-)

diff --git a/types/pollyjs__core/index.d.ts b/types/pollyjs__core/index.d.ts
index 83b6b933b9..4f6d308d0d 100644
--- a/types/pollyjs__core/index.d.ts
+++ b/types/pollyjs__core/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for @pollyjs/core 1.2
+// Type definitions for @pollyjs/core 1.3
 // Project: https://github.com/netflix/pollyjs/tree/master/packages/@pollyjs/core
 // Definitions by: feinoujc <https://github.com/feinoujc>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -12,8 +12,10 @@ export const Timing: {
 	fixed(ms: number): () => Promise<void>;
 	relative(ratio: number): (ms: number) => Promise<void>;
 };
+
+export type MatchBy<T = string, R = T> = (input: T) => R;
 export interface PollyConfig {
-	mode?: MODES;
+	mode?: MODES | string;
 
 	adapters?: Array<string | typeof Adapter>;
 	adapterOptions?: any;
@@ -34,20 +36,20 @@ export interface PollyConfig {
 	timing?: ((ms: number) => Promise<void>) | (() => Promise<void>);
 
 	matchRequestsBy?: {
-		method?: boolean;
-		headers?: any;
-		body?: boolean;
+		method?: boolean | MatchBy;
+		headers?: boolean | { exclude: string[] } | MatchBy<Record<string, string>>;
+		body?: boolean | MatchBy<any>;
 		order?: boolean;
 
 		url?: {
-			protocol?: boolean;
-			username?: boolean;
-			password?: boolean;
-			hostname?: boolean;
-			port?: boolean;
-			pathname?: boolean;
-			query?: boolean;
-			hash?: boolean;
+			protocol?: boolean | MatchBy;
+			username?: boolean | MatchBy;
+			password?: boolean | MatchBy;
+			hostname?: boolean | MatchBy;
+			port?: boolean | MatchBy<number>;
+			pathname?: boolean | MatchBy;
+			query?: boolean | MatchBy<any>;
+			hash?: boolean | MatchBy;
 		};
 	};
 }
diff --git a/types/pollyjs__core/pollyjs__core-tests.ts b/types/pollyjs__core/pollyjs__core-tests.ts
index 22f5516646..0644eff7f4 100644
--- a/types/pollyjs__core/pollyjs__core-tests.ts
+++ b/types/pollyjs__core/pollyjs__core-tests.ts
@@ -6,7 +6,74 @@ const polly = new Polly('test recording', {
 	recordFailedRequests: true,
 	adapters: ['xhr', 'fetch'],
 	persister: 'rest',
-	timing: Timing.relative(3)
+	timing: Timing.relative(3),
+	matchRequestsBy: {
+		method: true,
+		headers: true,
+		body: true,
+		order: true,
+
+		url: {
+		  protocol: true,
+		  username: true,
+		  password: true,
+		  hostname: true,
+		  port: true,
+		  pathname: true,
+		  query: true,
+		  hash: false
+		}
+	  }
+});
+
+new Polly('test recording', {
+	mode: 'replay',
+	recordFailedRequests: true,
+	adapters: ['xhr', 'fetch'],
+	persister: 'rest',
+	timing: Timing.relative(3),
+	matchRequestsBy: {
+		method(method) {
+			return method.toLowerCase();
+		},
+		headers: 1 === 1 ? { exclude: ['X-Auth'] } : (headers) => {
+			delete headers['X-Auth'];
+			return headers;
+		},
+		body(body) {
+			const json = JSON.parse(body);
+
+			delete json.email;
+			return JSON.stringify(json);
+		},
+
+		url: {
+			protocol(protocol) {
+				return protocol === 'http' ? 'https:' : protocol;
+			},
+			username(username) {
+				return username === 'johndoe' ? 'username' : username;
+			},
+			password(password) {
+				return password || 'password';
+			},
+			hostname(hostname) {
+				return hostname.replace('.com', '.net');
+			},
+			port(port) {
+				return port > 80 ? 3000 : 433;
+			},
+			pathname(pathname) {
+				return pathname.replace('/api/v1', '/api');
+			},
+			query(query) {
+				return { ...query, token: '' };
+			},
+			hash(hash) {
+				return hash.replace(/token=[0-9]+/, '');
+			}
+		}
+	}
 });
 
 function log(_: string) {

From 091bd02a320f8984ff9b7045efab32737d631b93 Mon Sep 17 00:00:00 2001
From: Kamontat Chantrachirathumrong <kamontat.c@hotmail.com>
Date: Wed, 28 Nov 2018 15:14:48 +0100
Subject: [PATCH 393/836] Fix error

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

diff --git a/types/wikidata-sdk/index.d.ts b/types/wikidata-sdk/index.d.ts
index 79620ac623..98eb893d0c 100644
--- a/types/wikidata-sdk/index.d.ts
+++ b/types/wikidata-sdk/index.d.ts
@@ -14,7 +14,7 @@ import {
   WikidataLanguageBaseStringSimplify,
   WikidataLanguageBaseArrayString,
   WikidataLanguageBaseArrayStringSimplify
-} from "wikidata-sdk/def/object/language-base-string";
+} from "./def/object/language-base-string";
 
 import { WikidataClaim, WikidataMainSnak, WikidataTimeDataValue, WikidataEntityDataValue } from "./def/object/claim";
 

From 19d012663d76ff38c8ade084095cfef40556fad2 Mon Sep 17 00:00:00 2001
From: Dmitriy <divideby@yandex.ru>
Date: Wed, 28 Nov 2018 17:25:18 +0300
Subject: [PATCH 394/836] add on-initial-draw-complete-support

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

diff --git a/types/vis/index.d.ts b/types/vis/index.d.ts
index 0f4a4f0f4e..9967c35061 100644
--- a/types/vis/index.d.ts
+++ b/types/vis/index.d.ts
@@ -11,6 +11,7 @@
 //                 Oleksii Kachura <https://github.com/alex-kachura>
 //                 dcop <https://github.com/dcop>
 //                 Avraham Essoudry <https://github.com/avrahamcool>
+//                 Dmitriy Trifonov <https://github.com/divideby>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 import { MomentInput, MomentFormatSpecification, Moment } from 'moment';
@@ -244,6 +245,7 @@ export interface TimelineOptions {
   multiselectPerGroup?: boolean;
   onAdd?: TimelineOptionsItemCallbackFunction;
   onAddGroup?: TimelineOptionsGroupCallbackFunction;
+  onInitialDrawComplete?: () => void;
   onUpdate?: TimelineOptionsItemCallbackFunction;
   onMove?: TimelineOptionsItemCallbackFunction;
   onMoveGroup?: TimelineOptionsGroupCallbackFunction;

From 265766df3dfefc749ecd229354e8ca884c8cf818 Mon Sep 17 00:00:00 2001
From: Kamontat Chantrachirathumrong <kamontat.c@hotmail.com>
Date: Wed, 28 Nov 2018 15:32:28 +0100
Subject: [PATCH 395/836] [fix] Fix a lot of linter error

---
 .../def/object/language-base-string.d.ts      |  18 +-
 types/wikidata-sdk/def/object/sitelink.d.ts   |  10 +-
 types/wikidata-sdk/index.d.ts                 | 320 +++++++++---------
 3 files changed, 176 insertions(+), 172 deletions(-)

diff --git a/types/wikidata-sdk/def/object/language-base-string.d.ts b/types/wikidata-sdk/def/object/language-base-string.d.ts
index 9f35d4bd8e..8f9606dbb1 100644
--- a/types/wikidata-sdk/def/object/language-base-string.d.ts
+++ b/types/wikidata-sdk/def/object/language-base-string.d.ts
@@ -1,19 +1,19 @@
-import { WikidataLanguage } from "wikidata-sdk";
+import { WikidataLanguage } from "../type/language";
 
 export type WikidataLanguageBaseString = {
-  [Key in WikidataLanguage]?: {
-    language: Key;
-    value: string;
-  }
+    [Key in WikidataLanguage]?: {
+        language: Key;
+        value: string;
+    }
 };
 
 export type WikidataLanguageBaseStringSimplify = { [key in WikidataLanguage]?: string };
 
 export type WikidataLanguageBaseArrayString = {
-  [Key in WikidataLanguage]: {
-    language: Key;
-    value: string;
-  }[]
+    [Key in WikidataLanguage]: Array<{
+        language: Key;
+        value: string;
+    }>
 };
 
 export type WikidataLanguageBaseArrayStringSimplify = { [key in WikidataLanguage]: string[] };
diff --git a/types/wikidata-sdk/def/object/sitelink.d.ts b/types/wikidata-sdk/def/object/sitelink.d.ts
index 4b6aeee23d..d0eea713e5 100644
--- a/types/wikidata-sdk/def/object/sitelink.d.ts
+++ b/types/wikidata-sdk/def/object/sitelink.d.ts
@@ -1,12 +1,12 @@
-import { WikidataSite } from "wikidata-sdk";
+import { WikidataSite } from "../type/site";
 
 export type WikidataSiteLink = { [Key in WikidataSite]: { site: Key; title: string; badges: string[] } };
 
 export type WikidataSiteLinkSimplify = { [key in WikidataSite]: string };
 
 export type WikidataSiteLinkWithUrlSimplify = {
-  [key in WikidataSite]: {
-    title: string;
-    url: string;
-  }
+    [key in WikidataSite]: {
+        title: string;
+        url: string;
+    }
 };
diff --git a/types/wikidata-sdk/index.d.ts b/types/wikidata-sdk/index.d.ts
index 98eb893d0c..6ed81883cc 100644
--- a/types/wikidata-sdk/index.d.ts
+++ b/types/wikidata-sdk/index.d.ts
@@ -1,8 +1,8 @@
-// Type definitions for wikidata-sdk 5.15.9
+// Type definitions for wikidata-sdk 5.15
 // Project: https://github.com/maxlath/wikidata-sdk
 // Definitions by: Kamontat Chantrachirathumrong <https://github.com/kamontat>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.1
 
 import { WikidataLanguage } from "./def/type/language";
 import { WikidataProperty } from "./def/type/property";
@@ -10,10 +10,10 @@ import { WikidataSite } from "./def/type/site";
 import { WikidataSiteLink, WikidataSiteLinkSimplify, WikidataSiteLinkWithUrlSimplify } from "./def/object/sitelink";
 import { UrlResultFormat } from "./def/type/format";
 import {
-  WikidataLanguageBaseString,
-  WikidataLanguageBaseStringSimplify,
-  WikidataLanguageBaseArrayString,
-  WikidataLanguageBaseArrayStringSimplify
+    WikidataLanguageBaseString,
+    WikidataLanguageBaseStringSimplify,
+    WikidataLanguageBaseArrayString,
+    WikidataLanguageBaseArrayStringSimplify
 } from "./def/object/language-base-string";
 
 import { WikidataClaim, WikidataMainSnak, WikidataTimeDataValue, WikidataEntityDataValue } from "./def/object/claim";
@@ -25,19 +25,23 @@ import { WikidataClaim, WikidataMainSnak, WikidataTimeDataValue, WikidataEntityD
 export { WikidataLanguage, WikidataProperty, WikidataSite };
 
 export {
-  WikidataLanguageBaseString,
-  WikidataLanguageBaseStringSimplify,
-  WikidataLanguageBaseArrayString,
-  WikidataLanguageBaseArrayStringSimplify,
-  WikidataSiteLink,
-  WikidataSiteLinkSimplify,
-  WikidataSiteLinkWithUrlSimplify
+    WikidataLanguageBaseString,
+    WikidataLanguageBaseStringSimplify,
+    WikidataLanguageBaseArrayString,
+    WikidataLanguageBaseArrayStringSimplify,
+    WikidataSiteLink,
+    WikidataSiteLinkSimplify,
+    WikidataSiteLinkWithUrlSimplify
 };
 
 export { UrlResultFormat };
 
 export { WikidataClaim, WikidataMainSnak, WikidataTimeDataValue, WikidataEntityDataValue };
 
+export interface Json {
+    [key: string]: any;
+}
+
 export as namespace sdk;
 
 /* **********
@@ -58,22 +62,22 @@ export as namespace sdk;
  * @see {@link https://www.wikidata.org/w/api.php?action=help&modules=wbsearchentities | Wikidata[wbsearchentities] }
  */
 export function searchEntities(
-  search: string,
-  language?: WikidataLanguage,
-  limit?: string | number,
-  format?: UrlResultFormat,
-  uselang?: WikidataLanguage
+    search: string,
+    language?: WikidataLanguage,
+    limit?: string | number,
+    format?: UrlResultFormat,
+    uselang?: WikidataLanguage
 ): string;
 
 /**
  * @alias searchEntities
  */
 export function searchEntities(opt: {
-  search: string;
-  language?: WikidataLanguage;
-  limit?: string | number;
-  format?: UrlResultFormat;
-  uselang?: WikidataLanguage;
+    search: string;
+    language?: WikidataLanguage;
+    limit?: string | number;
+    format?: UrlResultFormat;
+    uselang?: WikidataLanguage;
 }): string;
 
 /* **********
@@ -95,20 +99,20 @@ export function searchEntities(opt: {
  * @see {@link https://www.wikidata.org/w/api.php?action=help&modules=wbgetentities | Wikidata[wbgetentities] }
  */
 export function getEntities(
-  ids: string | string[],
-  languages?: WikidataLanguage | WikidataLanguage[],
-  props?: WikidataProperty | WikidataProperty[],
-  format?: UrlResultFormat
+    ids: string | string[],
+    languages?: WikidataLanguage | WikidataLanguage[],
+    props?: WikidataProperty | WikidataProperty[],
+    format?: UrlResultFormat
 ): string;
 
 /**
  * @alias getEntities
  */
 export function getEntities(a: {
-  ids: string | string[];
-  languages?: WikidataLanguage | WikidataLanguage[];
-  props?: WikidataProperty | WikidataProperty[];
-  format?: UrlResultFormat;
+    ids: string | string[];
+    languages?: WikidataLanguage | WikidataLanguage[];
+    props?: WikidataProperty | WikidataProperty[];
+    format?: UrlResultFormat;
 }): string;
 
 /**
@@ -117,20 +121,20 @@ export function getEntities(a: {
  * Without id limitation and return the array of url instead.
  */
 export function getManyEntities(
-  ids: string | string[],
-  languages?: WikidataLanguage | WikidataLanguage[],
-  props?: WikidataProperty | WikidataProperty[],
-  format?: UrlResultFormat
+    ids: string | string[],
+    languages?: WikidataLanguage | WikidataLanguage[],
+    props?: WikidataProperty | WikidataProperty[],
+    format?: UrlResultFormat
 ): string[];
 
 /**
  * @alias getManyEntities
  */
 export function getManyEntities(a: {
-  ids: string | string[];
-  languages?: WikidataLanguage | WikidataLanguage[];
-  props?: WikidataProperty | WikidataProperty[];
-  format?: UrlResultFormat;
+    ids: string | string[];
+    languages?: WikidataLanguage | WikidataLanguage[];
+    props?: WikidataProperty | WikidataProperty[];
+    format?: UrlResultFormat;
 }): string[];
 
 /**
@@ -147,22 +151,22 @@ export function getManyEntities(a: {
  * @see {@link https://github.com/maxlath/wikidata-sdk/blob/6b0673b9bf0fcaab19db65e2cc77e33c901ef35d/docs/get_entities.md#by-wikipedia-titles | Github[get_entities.md#by-wikipedia-titles] }
  */
 export function getWikidataIdsFromWikipediaTitles(
-  titles: string | string[],
-  sites?: WikidataSite,
-  languages?: WikidataLanguage | WikidataLanguage[],
-  props?: WikidataProperty | WikidataProperty[],
-  format?: UrlResultFormat
+    titles: string | string[],
+    sites?: WikidataSite,
+    languages?: WikidataLanguage | WikidataLanguage[],
+    props?: WikidataProperty | WikidataProperty[],
+    format?: UrlResultFormat
 ): string;
 
 /**
  * @alias getWikidataIdsFromWikipediaTitles
  */
 export function getWikidataIdsFromWikipediaTitles(a: {
-  titles: string | string[];
-  sites?: WikidataSite;
-  languages?: WikidataLanguage | WikidataLanguage[];
-  props?: WikidataProperty | WikidataProperty[];
-  format?: UrlResultFormat;
+    titles: string | string[];
+    sites?: WikidataSite;
+    languages?: WikidataLanguage | WikidataLanguage[];
+    props?: WikidataProperty | WikidataProperty[];
+    format?: UrlResultFormat;
 }): string;
 
 /**
@@ -183,13 +187,13 @@ export function getWikidataIdsFromWikipediaTitles(a: {
  * {@link https://github.com/maxlath/wikidata-sdk/blob/6b0673b9bf0fcaab19db65e2cc77e33c901ef35d/docs/get_entities_reverse_claims.md#get-entities-reverse-claims | Github[get-entities-reverse-claims] }
  */
 export function getReverseClaims(
-  property: string | string[],
-  value: string | string[],
-  options?: {
-    limit?: number;
-    keepProperties?: boolean;
-    caseInsensitive?: boolean;
-  }
+    property: string | string[],
+    value: string | string[],
+    options?: {
+        limit?: number;
+        keepProperties?: boolean;
+        caseInsensitive?: boolean;
+    }
 ): string;
 
 /**
@@ -248,7 +252,7 @@ export function isSitelinkKey(a: string): boolean;
  *
  * @see {@link https://www.mediawiki.org/wiki/Wikibase/Indexing/RDF_Dump_Format#Truthy_statements | Truthy}
  */
-export function truthyClaims(claims: object): object;
+export function truthyClaims(claims: WikidataClaim): WikidataClaim;
 
 /**
  * Filter-out non-truthy claims from an entity.claims[prop] array
@@ -276,8 +280,8 @@ export function getSitelinkUrl(site: WikidataSite, title: string): string;
 export function getSitelinkUrl(a: { site: WikidataSite; title: string }): string;
 
 export interface SitelinkData {
-  lang: string;
-  project: string;
+    lang: string;
+    project: string;
 }
 /**
  * Get the sitelink on english language and the lang of it.
@@ -340,7 +344,7 @@ export function wikidataTimeToDateObject(a: string): Date;
  * @see {@link https://github.com/maxlath/wikidata-sdk/blob/6b0673b9bf0fcaab19db65e2cc77e33c901ef35d/docs/general_helpers.md#wikidatatimetosimpleday | Github[wikidatatimetosimpleday] }
  *
  */
-export function wikidataTimeToSimpleDay(a: string | object): string;
+export function wikidataTimeToSimpleDay(a: string | Json): string;
 
 /**
  * Get an image URL from a Wikimedia Commons filename
@@ -352,113 +356,113 @@ export function wikidataTimeToSimpleDay(a: string | object): string;
  */
 export function getImageUrl(a: string, width?: number): string;
 
-export type SimplifyOption = {
-  // claims
-  entityPrefix?: string;
-  propertyPrefix?: string;
-  keepRichValues?: boolean;
-  keepQualifiers?: boolean;
-  keepReferences?: boolean;
-  keepIds?: boolean;
-  keepHashes?: boolean;
-  keepNonTruthy?: boolean;
-  // sitelinks
-  addUrl?: boolean;
-};
+export interface SimplifyOption {
+    // claims
+    entityPrefix?: string;
+    propertyPrefix?: string;
+    keepRichValues?: boolean;
+    keepQualifiers?: boolean;
+    keepReferences?: boolean;
+    keepIds?: boolean;
+    keepHashes?: boolean;
+    keepNonTruthy?: boolean;
+    // sitelinks
+    addUrl?: boolean;
+}
 
 /**
  * Helper method, for simplify result object more reasonable
  */
 export namespace simplify {
-  /**
-   * Applying all simplifiers at once: labels, descriptions, aliases, claims, sitelinks. See next sections for details.
-   * You can also pass options as a second argument, that will then be passed the subfunctions:
-   *
-   * @param entity the entity that receive from {@link getEntities} APIs
-   * @param opt simlify option. currently only simplify claims and simplify sitelinks.
-   *
-   * @see {@link https://github.com/maxlath/wikidata-sdk/blob/master/docs/simplify_entities_data.md#simplify-entity | Github[simplify-entity]}
-   */
-  export function entity<T>(entity: T, opt?: SimplifyOption): T;
+    /**
+     * Applying all simplifiers at once: labels, descriptions, aliases, claims, sitelinks. See next sections for details.
+     * You can also pass options as a second argument, that will then be passed the subfunctions:
+     *
+     * @param entity the entity that receive from {@link getEntities} APIs
+     * @param opt simlify option. currently only simplify claims and simplify sitelinks.
+     *
+     * @see {@link https://github.com/maxlath/wikidata-sdk/blob/master/docs/simplify_entities_data.md#simplify-entity | Github[simplify-entity]}
+     */
+    function entity<T>(entity: T, opt?: SimplifyOption): T;
 
-  /**
-   * This is a same of {@link entity} method except this input as multiple array of entities.
-   *
-   * @param entities entities from {@link getEntities} APIs
-   * @param opt simlify option. currently only simplify claims and simplify sitelinks.
-   *
-   * @see {@link https://github.com/maxlath/wikidata-sdk/blob/master/docs/simplify_entities_data.md#simplify-entities | Github[simplify-entities]}
-   */
-  export function entities<T>(entities: T[], opt?: SimplifyOption): T[];
+    /**
+     * This is a same of {@link entity} method except this input as multiple array of entities.
+     *
+     * @param entities entities from {@link getEntities} APIs
+     * @param opt simlify option. currently only simplify claims and simplify sitelinks.
+     *
+     * @see {@link https://github.com/maxlath/wikidata-sdk/blob/master/docs/simplify_entities_data.md#simplify-entities | Github[simplify-entities]}
+     */
+    function entities<T>(entities: T[], opt?: SimplifyOption): T[];
 
-  /**
-   * Make label simplifier and easier to understand
-   *
-   * @param labels label object, you will receive this from getEntities method
-   *
-   * @example
-   *
-   * const label = simplify.labels("{ pl: { language: 'pl', value: 'książka' } }");
-   * console.log(label) // { pl: 'książka' }
-   *
-   * @see {@link https://github.com/maxlath/wikidata-sdk/blob/master/docs/simplify_entities_data.md#simplify-labels | Github[simplify-labels]}
-   */
-  export function labels(labels: WikidataLanguageBaseString): WikidataLanguageBaseStringSimplify;
+    /**
+     * Make label simplifier and easier to understand
+     *
+     * @param labels label object, you will receive this from getEntities method
+     *
+     * @example
+     *
+     * const label = simplify.labels("{ pl: { language: 'pl', value: 'książka' } }");
+     * console.log(label) // { pl: 'książka' }
+     *
+     * @see {@link https://github.com/maxlath/wikidata-sdk/blob/master/docs/simplify_entities_data.md#simplify-labels | Github[simplify-labels]}
+     */
+    function labels(labels: WikidataLanguageBaseString): WikidataLanguageBaseStringSimplify;
 
-  /**
-   * Make description simplifier and easier to understand
-   *
-   * @param descriptions description object, you will receive this from getEntities method
-   *
-   * @example
-   *
-   * const desc = simplify.descriptions("{ pl: { language: 'pl', value: 'dokument piśmienniczy [...]' } }");
-   * console.log(desc) // { pl: 'dokument piśmienniczy [...]' }
-   *
-   * @see {@link https://github.com/maxlath/wikidata-sdk/blob/master/docs/simplify_entities_data.md#simplify-descriptions | Github[simplify-descriptions]}
-   */
-  export function descriptions(descriptions: WikidataLanguageBaseString): WikidataLanguageBaseStringSimplify;
+    /**
+     * Make description simplifier and easier to understand
+     *
+     * @param descriptions description object, you will receive this from getEntities method
+     *
+     * @example
+     *
+     * const desc = simplify.descriptions("{ pl: { language: 'pl', value: 'dokument piśmienniczy [...]' } }");
+     * console.log(desc) // { pl: 'dokument piśmienniczy [...]' }
+     *
+     * @see {@link https://github.com/maxlath/wikidata-sdk/blob/master/docs/simplify_entities_data.md#simplify-descriptions | Github[simplify-descriptions]}
+     */
+    function descriptions(descriptions: WikidataLanguageBaseString): WikidataLanguageBaseStringSimplify;
 
-  /**
-   * Make alias simplifier and easier to understand
-   *
-   * @param aliases alias object, you will receive this from getEntities method
-   *
-   * @example
-   *
-   * const alias = simplify.aliases("{ pl: [ { language: 'pl', value: 'Tom' }, { language: 'pl', value: 'Tomik' } ] }");
-   * console.log(alias) // { pl: [ 'Tom', 'Tomik' ] }
-   *
-   * @see {@link https://github.com/maxlath/wikidata-sdk/blob/master/docs/simplify_entities_data.md#simplify-aliases | Github[simplify-aliases]}
-   */
-  export function aliases(aliases: WikidataLanguageBaseArrayString): WikidataLanguageBaseArrayStringSimplify;
+    /**
+     * Make alias simplifier and easier to understand
+     *
+     * @param aliases alias object, you will receive this from getEntities method
+     *
+     * @example
+     *
+     * const alias = simplify.aliases("{ pl: [ { language: 'pl', value: 'Tom' }, { language: 'pl', value: 'Tomik' } ] }");
+     * console.log(alias) // { pl: [ 'Tom', 'Tomik' ] }
+     *
+     * @see {@link https://github.com/maxlath/wikidata-sdk/blob/master/docs/simplify_entities_data.md#simplify-aliases | Github[simplify-aliases]}
+     */
+    function aliases(aliases: WikidataLanguageBaseArrayString): WikidataLanguageBaseArrayStringSimplify;
 
-  /**
-   * Make sitelink simplifier and easier to understand
-   *
-   * @param sitelinks sitelink object, you will receive this from getEntities method
-   *
-   * @example
-   *
-   * const site = simplify.sitelinks("{ plwiki: { site: 'plwiki', title: 'Książka', badges: [] } }");
-   * console.log(site) // { plwiki: 'Książka' }
-   *
-   * @see {@link https://github.com/maxlath/wikidata-sdk/blob/master/docs/simplify_entities_data.md#simplify-sitelinks | Github[simplify-sitelinks]}
-   */
-  export function sitelinks(sitelinks: WikidataSiteLink): WikidataSiteLinkSimplify;
+    /**
+     * Make sitelink simplifier and easier to understand
+     *
+     * @param sitelinks sitelink object, you will receive this from getEntities method
+     *
+     * @example
+     *
+     * const site = simplify.sitelinks("{ plwiki: { site: 'plwiki', title: 'Książka', badges: [] } }");
+     * console.log(site) // { plwiki: 'Książka' }
+     *
+     * @see {@link https://github.com/maxlath/wikidata-sdk/blob/master/docs/simplify_entities_data.md#simplify-sitelinks | Github[simplify-sitelinks]}
+     */
+    function sitelinks(sitelinks: WikidataSiteLink): WikidataSiteLinkSimplify;
 
-  /**
-   * Make sitelink simplifier and easier to understand. include URL in the result.
-   *
-   * @param sitelinks sitelink object, you will receive this from getEntities method
-   * @param options add url to a result
-   *
-   * @example
-   *
-   * const site = simplify.sitelinks("{ plwiki: { site: 'plwiki', title: 'Książka', badges: [] } }", {addUrl: true});
-   * console.log(site) // { plwiki: { title: 'Książka', url: 'https://pl.wikipedia.org/wiki/Książka' } }
-   *
-   * @see {@link https://github.com/maxlath/wikidata-sdk/blob/master/docs/simplify_entities_data.md#add-sitelinks-urls | Github[simplify-sitelinks-with-url]}
-   */
-  export function sitelinks(sitelinks: WikidataSiteLink, options: { addUrl: true }): WikidataSiteLinkWithUrlSimplify;
+    /**
+     * Make sitelink simplifier and easier to understand. include URL in the result.
+     *
+     * @param sitelinks sitelink object, you will receive this from getEntities method
+     * @param options add url to a result
+     *
+     * @example
+     *
+     * const site = simplify.sitelinks("{ plwiki: { site: 'plwiki', title: 'Książka', badges: [] } }", {addUrl: true});
+     * console.log(site) // { plwiki: { title: 'Książka', url: 'https://pl.wikipedia.org/wiki/Książka' } }
+     *
+     * @see {@link https://github.com/maxlath/wikidata-sdk/blob/master/docs/simplify_entities_data.md#add-sitelinks-urls | Github[simplify-sitelinks-with-url]}
+     */
+    function sitelinks(sitelinks: WikidataSiteLink, options: { addUrl: true }): WikidataSiteLinkWithUrlSimplify;
 }

From b53181d81ab75724f19b0f1fb242525639c1f96f Mon Sep 17 00:00:00 2001
From: Dmitriy <divideby@yandex.ru>
Date: Wed, 28 Nov 2018 17:36:58 +0300
Subject: [PATCH 396/836] change void function type

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

diff --git a/types/vis/index.d.ts b/types/vis/index.d.ts
index 9967c35061..84ff769270 100644
--- a/types/vis/index.d.ts
+++ b/types/vis/index.d.ts
@@ -245,7 +245,7 @@ export interface TimelineOptions {
   multiselectPerGroup?: boolean;
   onAdd?: TimelineOptionsItemCallbackFunction;
   onAddGroup?: TimelineOptionsGroupCallbackFunction;
-  onInitialDrawComplete?: () => void;
+  onInitialDrawComplete?: (() => void);
   onUpdate?: TimelineOptionsItemCallbackFunction;
   onMove?: TimelineOptionsItemCallbackFunction;
   onMoveGroup?: TimelineOptionsGroupCallbackFunction;

From 0f51eb8eeab7859c7eafbc3506f5ab65d3cfc267 Mon Sep 17 00:00:00 2001
From: Dimitri Benin <dimitri.benin@gmail.com>
Date: Wed, 28 Nov 2018 16:23:49 +0100
Subject: [PATCH 397/836] Add types for mustache-express

---
 types/mustache-express/index.d.ts             | 23 +++++++++++++++++++
 .../mustache-express-tests.ts                 | 10 ++++++++
 types/mustache-express/tsconfig.json          | 23 +++++++++++++++++++
 types/mustache-express/tslint.json            |  1 +
 4 files changed, 57 insertions(+)
 create mode 100644 types/mustache-express/index.d.ts
 create mode 100644 types/mustache-express/mustache-express-tests.ts
 create mode 100644 types/mustache-express/tsconfig.json
 create mode 100644 types/mustache-express/tslint.json

diff --git a/types/mustache-express/index.d.ts b/types/mustache-express/index.d.ts
new file mode 100644
index 0000000000..ff40de42d7
--- /dev/null
+++ b/types/mustache-express/index.d.ts
@@ -0,0 +1,23 @@
+// Type definitions for mustache-express 1.2
+// Project: https://github.com/bryanburgers/node-mustache-express#readme
+// Definitions by: BendingBender <https://github.com/BendingBender>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+import { Cache } from 'lru-cache';
+
+export = mustacheExpress;
+
+declare function mustacheExpress(
+    partialsPath?: string,
+    partialsExt?: string
+): mustacheExpress.ExpessEngine;
+
+declare namespace mustacheExpress {
+    interface ExpessEngine {
+        (path: string, options: any, cb: (...args: any[]) => any): any;
+        cache: TemplateCache;
+    }
+
+    type TemplateCache = Cache<string, { name: string; data: string; partials: string[] }>;
+}
diff --git a/types/mustache-express/mustache-express-tests.ts b/types/mustache-express/mustache-express-tests.ts
new file mode 100644
index 0000000000..9157798c7b
--- /dev/null
+++ b/types/mustache-express/mustache-express-tests.ts
@@ -0,0 +1,10 @@
+import express = require('express');
+import mustacheExpress = require('mustache-express');
+
+const app = express();
+app.engine('mustache', mustacheExpress());
+app.engine('mustache', mustacheExpress('/partials'));
+app.engine('mustache', mustacheExpress('/partials', '.mst'));
+
+// $ExpectType Cache<string, { name: string; data: string; partials: string[]; }>
+mustacheExpress().cache;
diff --git a/types/mustache-express/tsconfig.json b/types/mustache-express/tsconfig.json
new file mode 100644
index 0000000000..9afb989b62
--- /dev/null
+++ b/types/mustache-express/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "mustache-express-tests.ts"
+    ]
+}
diff --git a/types/mustache-express/tslint.json b/types/mustache-express/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/mustache-express/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 3d022d90e85f41d0fc5914b5f7a034a4da3ff2d9 Mon Sep 17 00:00:00 2001
From: Alan Plum <me@pluma.io>
Date: Wed, 28 Nov 2018 17:00:57 +0100
Subject: [PATCH 398/836] Add Collection#name()

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

diff --git a/types/arangodb/arangodb-tests.ts b/types/arangodb/arangodb-tests.ts
index e049a2374d..c2ade4d0bb 100644
--- a/types/arangodb/arangodb-tests.ts
+++ b/types/arangodb/arangodb-tests.ts
@@ -16,6 +16,9 @@ coll.save({ username: "user" });
 const doc = coll.any();
 console.log(doc.username);
 
+const coll2 = db._collection(coll.name());
+console.log(coll2 === coll);
+
 const users = coll as ArangoDB.Collection<User>;
 const admin = users.firstExample({ username: "admin" })!;
 users.update(admin, { password: md5("hunter2") });
diff --git a/types/arangodb/index.d.ts b/types/arangodb/index.d.ts
index 238cea2379..c5e83a1cfc 100644
--- a/types/arangodb/index.d.ts
+++ b/types/arangodb/index.d.ts
@@ -619,6 +619,7 @@ declare namespace ArangoDB {
 
     interface Collection<T extends object = any> {
         // Collection
+        name(): string;
         checksum(
             withRevisions?: boolean,
             withData?: boolean
@@ -1503,16 +1504,7 @@ declare module "@arangodb/foxx/queues" {
     function deleteQueue(name: string): boolean;
     function get(name: string): Queue;
 
-    export {
-        createQueue as create,
-        deleteQueue as delete,
-        get,
-        JobOptions,
-        Job,
-        Queue,
-        QueueItem,
-        Script,
-    };
+    export { createQueue as create, deleteQueue as delete, get, JobOptions, Job, Queue, QueueItem, Script, };
 }
 
 declare module "@arangodb/foxx/graphql" {

From 793d709fb22bb195371fd52fa0a8d50a39e4accf Mon Sep 17 00:00:00 2001
From: Lucas Motta <mail@lucasmotta.com>
Date: Wed, 28 Nov 2018 16:16:54 +0000
Subject: [PATCH 399/836] Include missing type for the method readFile

---
 types/ssh2-streams/index.d.ts | 24 ++++++++++++++++++++++++
 types/ssh2/index.d.ts         | 20 ++++++++++++++++++++
 2 files changed, 44 insertions(+)

diff --git a/types/ssh2-streams/index.d.ts b/types/ssh2-streams/index.d.ts
index a780273591..3eaca56f6f 100644
--- a/types/ssh2-streams/index.d.ts
+++ b/types/ssh2-streams/index.d.ts
@@ -1,6 +1,7 @@
 // Type definitions for ssh2-streams v0.1.9
 // Project: https://github.com/mscdex/ssh2-streams
 // Definitions by: Ron Buckton <https://github.com/rbuckton>
+// Definitions by: Ron Buckton <https://github.com/lucasmotta>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="node" />
@@ -1044,6 +1045,24 @@ export class SFTPStream extends stream.Transform {
      */
     fastPut(localPath: string, remotePath: string, callback: (err: any) => void): void;
 
+    /**
+     * (Client-only)
+     * Reads a file in memory and returns its contents
+     */
+    readFile(remotePath: string, options: ReadFileOptions, callback: (err: any, handle: Buffer) => void): void;
+
+    /**
+     * (Client-only)
+     * Reads a file in memory and returns its contents
+     */
+    readFile(remotePath: string, encoding: string, callback: (err: any, handle: Buffer) => void): void;
+
+    /**
+     * (Client-only)
+     * Reads a file in memory and returns its contents
+     */
+    readFile(remotePath: string, callback: (err: any, handle: Buffer) => void): void;
+
     /**
      * (Client-only)
      * Returns a new readable stream for `path`.
@@ -1612,6 +1631,11 @@ export interface TransferOptions {
     step?: (total_transferred: number, chunk: number, total: number) => void;
 }
 
+export interface ReadFileOptions {
+    encoding?: string
+    flag?: string
+}
+
 export interface ReadStreamOptions {
     flags?: string;
     encoding?: string;
diff --git a/types/ssh2/index.d.ts b/types/ssh2/index.d.ts
index 25bcfef52e..cf88fff5f1 100644
--- a/types/ssh2/index.d.ts
+++ b/types/ssh2/index.d.ts
@@ -3,6 +3,7 @@
 // Definitions by: Qubo <https://github.com/tkQubo>
 //                 Ron Buckton <https://github.com/rbuckton>
 //                 Will Boyce <https://github.com/wrboyce>
+//                 Lucas Motta <https://github.com/lucasmotta>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="node" />
@@ -21,6 +22,7 @@ import {
     Attributes,
     Stats,
     TransferOptions,
+    ReadFileOptions,
     ReadStreamOptions,
     WriteStreamOptions,
     FileEntry
@@ -1273,6 +1275,24 @@ export interface SFTPWrapper extends events.EventEmitter {
      */
     fastPut(localPath: string, remotePath: string, callback: (err: any) => void): void;
 
+    /**
+     * (Client-only)
+     * Reads a file in memory and returns its contents
+     */
+    readFile(remotePath: string, options: ReadFileOptions, callback: (err: any, handle: Buffer) => void): void;
+
+    /**
+     * (Client-only)
+     * Reads a file in memory and returns its contents
+     */
+    readFile(remotePath: string, encoding: string, callback: (err: any, handle: Buffer) => void): void;
+
+    /**
+     * (Client-only)
+     * Reads a file in memory and returns its contents
+     */
+    readFile(remotePath: string, callback: (err: any, handle: Buffer) => void): void;
+
     /**
      * (Client-only)
      * Returns a new readable stream for `path`.

From f857ba9d66d2f430fb2ff06b7e4579fbf61b7673 Mon Sep 17 00:00:00 2001
From: Erik Christensen <erikchristensen@comcast.net>
Date: Wed, 28 Nov 2018 11:17:01 -0500
Subject: [PATCH 400/836] Added CollationDocument type in a couple places that
 were missed

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

diff --git a/types/mongodb/index.d.ts b/types/mongodb/index.d.ts
index a217b0a605..3de97daf60 100644
--- a/types/mongodb/index.d.ts
+++ b/types/mongodb/index.d.ts
@@ -526,7 +526,7 @@ export interface CollectionCreateOptions extends CommonOptions {
     indexOptionDefaults?: object;
     viewOn?: string;
     pipeline?: any[];
-    collation?: object;
+    collation?: CollationDocument;
 }
 
 /** http://mongodb.github.io/node-mongodb-native/3.1/api/Db.html#collection */
@@ -563,7 +563,7 @@ export interface IndexOptions extends CommonOptions {
     name?: string;
     // Creates a partial index based on the given filter object (MongoDB 3.2 or higher)
     partialFilterExpression?: any;
-    collation?: Object;
+    collation?: CollationDocument;
     default_language?: string
 }
 

From b2133e941c8646b7a5c0581453123054314c2602 Mon Sep 17 00:00:00 2001
From: Lucas Motta <mail@lucasmotta.com>
Date: Wed, 28 Nov 2018 16:26:08 +0000
Subject: [PATCH 401/836] Fix credit name

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

diff --git a/types/ssh2-streams/index.d.ts b/types/ssh2-streams/index.d.ts
index 3eaca56f6f..e80e529ced 100644
--- a/types/ssh2-streams/index.d.ts
+++ b/types/ssh2-streams/index.d.ts
@@ -1,7 +1,7 @@
 // Type definitions for ssh2-streams v0.1.9
 // Project: https://github.com/mscdex/ssh2-streams
 // Definitions by: Ron Buckton <https://github.com/rbuckton>
-// Definitions by: Ron Buckton <https://github.com/lucasmotta>
+// Definitions by: Lucas Motta <https://github.com/lucasmotta>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="node" />

From 5cc01bba1447d578d0c0c8b4fe80d599638b9dc0 Mon Sep 17 00:00:00 2001
From: Erik Christensen <erikchristensen@comcast.net>
Date: Wed, 28 Nov 2018 11:37:45 -0500
Subject: [PATCH 402/836] Fixed incorrect type for caseFirst in
 CollationDocument

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

diff --git a/types/mongodb/index.d.ts b/types/mongodb/index.d.ts
index 3de97daf60..ef7b7768d8 100644
--- a/types/mongodb/index.d.ts
+++ b/types/mongodb/index.d.ts
@@ -1786,7 +1786,7 @@ export interface CollationDocument {
     locale: string;
     strength?: number;
     caseLevel?: boolean;
-    caseFirst?: boolean;
+    caseFirst?: string;
     numericOrdering?: boolean;
     alternate?: string;
     maxVariable?: string;

From 1748c8d191505ad7a17165f5078dd45ee8575e9b Mon Sep 17 00:00:00 2001
From: Joe Flateau <joe@joeflateau.net>
Date: Wed, 28 Nov 2018 12:14:34 -0500
Subject: [PATCH 403/836] Update types/node-forge/index.d.ts

Co-Authored-By: timhwang21 <timhwang21@users.noreply.github.com>
---
 types/node-forge/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

From 99db723f07aec0b37f34137ea71b4c6fc7dd7d01 Mon Sep 17 00:00:00 2001
From: Daniel Hritzkiv <daniel.hritzkiv@gmail.com>
Date: Wed, 28 Nov 2018 12:34:36 -0500
Subject: [PATCH 404/836] Fix error type in backoffStrategies interface

change `typeof Error` (resolves to `ErrorConstructor`) to just `Error`.

This allows accessing actual error instance properties (message, etc.)
---
 types/bull/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/bull/index.d.ts b/types/bull/index.d.ts
index 6096d98145..dd5723f2d2 100644
--- a/types/bull/index.d.ts
+++ b/types/bull/index.d.ts
@@ -92,7 +92,7 @@ declare namespace Bull {
      * Define a custom backoff strategy
      */
     backoffStrategies?: {
-      [key: string]: (attemptsMade: number, err: typeof Error) => number;
+      [key: string]: (attemptsMade: number, err: Error) => number;
     };
 
     /**

From be8aa4618958d2c663438aab7fbc28fc1160e8c3 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <293473+sandersn@users.noreply.github.com>
Date: Wed, 28 Nov 2018 10:11:58 -0800
Subject: [PATCH 405/836] Add status badges

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

diff --git a/README.md b/README.md
index 9a31d73da1..0f8ba84c27 100644
--- a/README.md
+++ b/README.md
@@ -2,6 +2,9 @@
 
 [![Join the chat at https://gitter.im/borisyankov/DefinitelyTyped](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/borisyankov/DefinitelyTyped?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
+[![Build Status](https://typescript.visualstudio.com/TypeScript/_apis/build/status/sandersn.typescript-bot-watchdog)](https://typescript.visualstudio.com/TypeScript/_build/latest?definitionId=14) Are packages being published to npm in less than 10,000 seconds on average?
+[![Build Status](https://typescript.visualstudio.com/TypeScript/_apis/build/status/sandersn.types-publisher-watchdog)](https://typescript.visualstudio.com/TypeScript/_build/latest?definitionId=13) Has typescript-bot been active on DefinitelyTyped in the last two hours?
+
 > The repository for *high quality* TypeScript type definitions.
 
 Also see the [definitelytyped.org](http://definitelytyped.org) website, although information in this README is more up-to-date.

From 2b17e0bbf1d0c973856be1911ca89615230f163a Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <293473+sandersn@users.noreply.github.com>
Date: Wed, 28 Nov 2018 10:13:52 -0800
Subject: [PATCH 406/836] Move badges to bottom

---
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 0f8ba84c27..129762bd9b 100644
--- a/README.md
+++ b/README.md
@@ -2,9 +2,6 @@
 
 [![Join the chat at https://gitter.im/borisyankov/DefinitelyTyped](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/borisyankov/DefinitelyTyped?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
-[![Build Status](https://typescript.visualstudio.com/TypeScript/_apis/build/status/sandersn.typescript-bot-watchdog)](https://typescript.visualstudio.com/TypeScript/_build/latest?definitionId=14) Are packages being published to npm in less than 10,000 seconds on average?
-[![Build Status](https://typescript.visualstudio.com/TypeScript/_apis/build/status/sandersn.types-publisher-watchdog)](https://typescript.visualstudio.com/TypeScript/_build/latest?definitionId=13) Has typescript-bot been active on DefinitelyTyped in the last two hours?
-
 > The repository for *high quality* TypeScript type definitions.
 
 Also see the [definitelytyped.org](http://definitelytyped.org) website, although information in this README is more up-to-date.
@@ -339,3 +336,6 @@ This project is licensed under the MIT license.
 Copyrights on the definition files are respective of each contributor listed at the beginning of each definition file.
 
 [![Analytics](https://ga-beacon.appspot.com/UA-47495295-4/borisyankov/DefinitelyTyped)](https://github.com/igrigorik/ga-beacon)
+
+[![Build Status](https://typescript.visualstudio.com/TypeScript/_apis/build/status/sandersn.typescript-bot-watchdog)](https://typescript.visualstudio.com/TypeScript/_build/latest?definitionId=14) Are packages being published to npm in less than 10,000 seconds on average?
+[![Build Status](https://typescript.visualstudio.com/TypeScript/_apis/build/status/sandersn.types-publisher-watchdog)](https://typescript.visualstudio.com/TypeScript/_build/latest?definitionId=13) Has typescript-bot been active on DefinitelyTyped in the last two hours?

From 64e8c6d752ddc75d26fcfed5478e2b5eb0a863f4 Mon Sep 17 00:00:00 2001
From: Dimitri Benin <dimitri.benin@gmail.com>
Date: Wed, 28 Nov 2018 19:36:59 +0100
Subject: [PATCH 407/836] Add types for timing-safe-equal

---
 types/timing-safe-equal/index.d.ts            | 10 ++++++++
 .../timing-safe-equal-tests.ts                |  5 ++++
 types/timing-safe-equal/tsconfig.json         | 23 +++++++++++++++++++
 types/timing-safe-equal/tslint.json           |  1 +
 4 files changed, 39 insertions(+)
 create mode 100644 types/timing-safe-equal/index.d.ts
 create mode 100644 types/timing-safe-equal/timing-safe-equal-tests.ts
 create mode 100644 types/timing-safe-equal/tsconfig.json
 create mode 100644 types/timing-safe-equal/tslint.json

diff --git a/types/timing-safe-equal/index.d.ts b/types/timing-safe-equal/index.d.ts
new file mode 100644
index 0000000000..e1bf8f16d8
--- /dev/null
+++ b/types/timing-safe-equal/index.d.ts
@@ -0,0 +1,10 @@
+// Type definitions for timing-safe-equal 1.0
+// Project: https://github.com/crypto-browserify/timing-safe-equal
+// Definitions by: BendingBender <https://github.com/BendingBender>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+export = timingSafeEqual;
+
+declare function timingSafeEqual(a: Buffer, b: Buffer): boolean;
diff --git a/types/timing-safe-equal/timing-safe-equal-tests.ts b/types/timing-safe-equal/timing-safe-equal-tests.ts
new file mode 100644
index 0000000000..cc8069de3b
--- /dev/null
+++ b/types/timing-safe-equal/timing-safe-equal-tests.ts
@@ -0,0 +1,5 @@
+import timingSafeEqual = require('timing-safe-equal');
+
+const buffer: Buffer = new Buffer([1, 2, 3, 4, 5]);
+// $ExpectType boolean
+timingSafeEqual(buffer, buffer);
diff --git a/types/timing-safe-equal/tsconfig.json b/types/timing-safe-equal/tsconfig.json
new file mode 100644
index 0000000000..f12ec7b09e
--- /dev/null
+++ b/types/timing-safe-equal/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "timing-safe-equal-tests.ts"
+    ]
+}
diff --git a/types/timing-safe-equal/tslint.json b/types/timing-safe-equal/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/timing-safe-equal/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From a6cc14597d068d6312f7434fcf93cdb6b2cd8282 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <293473+sandersn@users.noreply.github.com>
Date: Wed, 28 Nov 2018 11:09:56 -0800
Subject: [PATCH 408/836] Swap types-publisher/typescript-bot status badge
 links

The links were backward, but not the images.
---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 129762bd9b..9062f4ea00 100644
--- a/README.md
+++ b/README.md
@@ -337,5 +337,5 @@ Copyrights on the definition files are respective of each contributor listed at
 
 [![Analytics](https://ga-beacon.appspot.com/UA-47495295-4/borisyankov/DefinitelyTyped)](https://github.com/igrigorik/ga-beacon)
 
-[![Build Status](https://typescript.visualstudio.com/TypeScript/_apis/build/status/sandersn.typescript-bot-watchdog)](https://typescript.visualstudio.com/TypeScript/_build/latest?definitionId=14) Are packages being published to npm in less than 10,000 seconds on average?
-[![Build Status](https://typescript.visualstudio.com/TypeScript/_apis/build/status/sandersn.types-publisher-watchdog)](https://typescript.visualstudio.com/TypeScript/_build/latest?definitionId=13) Has typescript-bot been active on DefinitelyTyped in the last two hours?
+[![Build Status](https://typescript.visualstudio.com/TypeScript/_apis/build/status/sandersn.typescript-bot-watchdog)](https://typescript.visualstudio.com/TypeScript/_build/latest?definitionId=13) Are packages being published to npm in less than 10,000 seconds on average?
+[![Build Status](https://typescript.visualstudio.com/TypeScript/_apis/build/status/sandersn.types-publisher-watchdog)](https://typescript.visualstudio.com/TypeScript/_build/latest?definitionId=14) Has typescript-bot been active on DefinitelyTyped in the last two hours?

From 01972623953bfefc9378b829bf1afd21a550d504 Mon Sep 17 00:00:00 2001
From: Dimitri Benin <dimitri.benin@gmail.com>
Date: Wed, 28 Nov 2018 20:27:35 +0100
Subject: [PATCH 409/836] Add types for diffie-hellman

---
 types/diffie-hellman/diffie-hellman-tests.ts | 48 ++++++++++++++++++++
 types/diffie-hellman/index.d.ts              |  8 ++++
 types/diffie-hellman/tsconfig.json           | 23 ++++++++++
 types/diffie-hellman/tslint.json             |  1 +
 4 files changed, 80 insertions(+)
 create mode 100644 types/diffie-hellman/diffie-hellman-tests.ts
 create mode 100644 types/diffie-hellman/index.d.ts
 create mode 100644 types/diffie-hellman/tsconfig.json
 create mode 100644 types/diffie-hellman/tslint.json

diff --git a/types/diffie-hellman/diffie-hellman-tests.ts b/types/diffie-hellman/diffie-hellman-tests.ts
new file mode 100644
index 0000000000..645ebc23bd
--- /dev/null
+++ b/types/diffie-hellman/diffie-hellman-tests.ts
@@ -0,0 +1,48 @@
+import * as dh from 'diffie-hellman';
+
+const dh1 = dh.getDiffieHellman('modp1');
+// $ExpectType DiffieHellman
+dh1;
+// $ExpectType Buffer
+dh1.generateKeys();
+// $ExpectType string
+dh1.generateKeys('hex');
+// $ExpectType Buffer
+dh1.getPrime();
+// $ExpectType string
+dh1.getPrime('hex');
+// $ExpectType Buffer
+dh1.getGenerator();
+// $ExpectType string
+dh1.getGenerator('hex');
+const pk = dh1.getPublicKey();
+// $ExpectType Buffer
+pk;
+// $ExpectType string
+dh1.getPublicKey('hex');
+// $ExpectType Buffer
+dh1.getPrivateKey();
+// $ExpectType string
+dh1.getPrivateKey('hex');
+// $ExpectType Buffer
+dh1.computeSecret(pk);
+// $ExpectType Buffer
+dh1.computeSecret(pk.toString('hex'), 'hex');
+// $ExpectType string
+dh1.computeSecret(pk.toString('hex'), 'hex', 'hex');
+
+const dh2 = dh.createDiffieHellman(new Buffer([5]));
+// $ExpectType DiffieHellman
+dh2;
+dh.createDiffieHellman('prime', 'hex');
+dh.createDiffieHellman('prime', 'hex', new Buffer([5]));
+dh.createDiffieHellman('prime', 'hex', 5);
+dh.createDiffieHellman('prime', 'hex', 'generator', 'hex');
+dh.createDiffieHellman(1);
+dh.createDiffieHellman(1, 1);
+dh.createDiffieHellman(1, new Buffer([5]));
+
+dh2.setPublicKey(pk);
+dh2.setPublicKey(pk.toString('hex'), 'hex');
+dh2.setPrivateKey(pk);
+dh2.setPrivateKey(pk.toString('hex'), 'hex');
diff --git a/types/diffie-hellman/index.d.ts b/types/diffie-hellman/index.d.ts
new file mode 100644
index 0000000000..7b59cf9182
--- /dev/null
+++ b/types/diffie-hellman/index.d.ts
@@ -0,0 +1,8 @@
+// Type definitions for diffie-hellman 5.0
+// Project: https://github.com/crypto-browserify/diffie-hellman
+// Definitions by: BendingBender <https://github.com/BendingBender>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+export { createDiffieHellman, getDiffieHellman, DiffieHellman } from 'crypto';
diff --git a/types/diffie-hellman/tsconfig.json b/types/diffie-hellman/tsconfig.json
new file mode 100644
index 0000000000..743c9eea4c
--- /dev/null
+++ b/types/diffie-hellman/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "diffie-hellman-tests.ts"
+    ]
+}
diff --git a/types/diffie-hellman/tslint.json b/types/diffie-hellman/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/diffie-hellman/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 154a76cccee50c2b789fbff0a60b124d84668f9f Mon Sep 17 00:00:00 2001
From: Dominik Moritz <domoritz@gmail.com>
Date: Wed, 28 Nov 2018 11:30:48 -0800
Subject: [PATCH 410/836] Add Vega entry to notNeededPackages.json

---
 notNeededPackages.json | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/notNeededPackages.json b/notNeededPackages.json
index cf5c9449d7..53ff6a7124 100644
--- a/notNeededPackages.json
+++ b/notNeededPackages.json
@@ -1656,6 +1656,12 @@
             "sourceRepoURL": "https://github.com/ansman/validate.js",
             "asOfVersion": "0.11.0"
         },
+        {
+            "libraryName": "vega",
+            "typingsPackageName": "vega",
+            "sourceRepoURL": "https://github.com/vega/vega",
+            "asOfVersion": "3.2.0"
+        },
         {
             "libraryName": "vso-node-api",
             "typingsPackageName": "vso-node-api",

From 35b4230318e66ec0851fa81f425ce23ccdc4d0f4 Mon Sep 17 00:00:00 2001
From: Cameron Martin <cameronmartin123@gmail.com>
Date: Wed, 28 Nov 2018 19:32:27 +0000
Subject: [PATCH 411/836] [@babel/traverse]: Added null to
 Scope#getFunctionParent return type.

See https://github.com/babel/babel/blob/3fda01b185bfe2a54eb00aaae6b8314ca867df0f/packages/babel-traverse/src/scope/index.js#L845
---
 types/babel__traverse/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/babel__traverse/index.d.ts b/types/babel__traverse/index.d.ts
index 93c768a913..e35b12780f 100644
--- a/types/babel__traverse/index.d.ts
+++ b/types/babel__traverse/index.d.ts
@@ -99,7 +99,7 @@ export class Scope {
 
     getProgramParent(): Scope;
 
-    getFunctionParent(): Scope;
+    getFunctionParent(): Scope | null;
 
     getBlockParent(): Scope;
 

From ebb848491a767717f82c852b21af81df56ad8b80 Mon Sep 17 00:00:00 2001
From: Bradley Hill <brad.hill@jostens.com>
Date: Wed, 28 Nov 2018 13:37:09 -0600
Subject: [PATCH 412/836] fabric - update the TextBox.getSelectionStyles
 signature to latest fabricjs

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

diff --git a/types/fabric/fabric-impl.d.ts b/types/fabric/fabric-impl.d.ts
index 485a603966..39b3e45757 100644
--- a/types/fabric/fabric-impl.d.ts
+++ b/types/fabric/fabric-impl.d.ts
@@ -3467,7 +3467,7 @@ export class IText extends Object {
 	 * @param [endIndex] End index to get styles at
 	 * @return styles Style object at a specified (or current) index
 	 */
-	getSelectionStyles(startIndex: number, endIndex: number): any;
+	getSelectionStyles(startIndex: number, endIndex: number, complete?: boolean): any;
 	/**
 	 * Sets style of a current selection
 	 * @param [styles] Styles object

From eba6a5aa15795302ece5ad2016ef095dc1310ced Mon Sep 17 00:00:00 2001
From: Gerhard Stoebich <18708370+Flarna@users.noreply.github.com>
Date: Wed, 28 Nov 2018 21:32:20 +0100
Subject: [PATCH 413/836] [node] Add missing alpnProtocol and createConnection

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

diff --git a/types/node/index.d.ts b/types/node/index.d.ts
index 0f6698035d..ee51a5fd0f 100644
--- a/types/node/index.d.ts
+++ b/types/node/index.d.ts
@@ -6258,6 +6258,13 @@ declare module "tls" {
          * May be used to distinguish TLS sockets from regular ones.
          */
         encrypted: boolean;
+
+        /**
+         * String containing the selected ALPN protocol.
+         * When ALPN has no selected protocol, tlsSocket.alpnProtocol equals false.
+         */
+        alpnProtocol?: string;
+
         /**
          * Returns an object representing the cipher name and the SSL/TLS protocol version of the current connection.
          * @returns Returns an object representing the cipher name
@@ -8303,6 +8310,7 @@ declare module "http2" {
         peerMaxConcurrentStreams?: number;
         selectPadding?: (frameLen: number, maxFrameLen: number) => number;
         settings?: Settings;
+        createConnection?: (option: SessionOptions) => stream.Duplex;
     }
 
     export type ClientSessionOptions = SessionOptions;

From 6a96d327accc0e3de24bcc3db0a1ab38eaf9b47b Mon Sep 17 00:00:00 2001
From: Alex Jerabek <aljerabe@microsoft.com>
Date: Wed, 28 Nov 2018 13:59:00 -0800
Subject: [PATCH 414/836] Add DialogOptions.promptBeforeOpen

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

diff --git a/types/office-js/index.d.ts b/types/office-js/index.d.ts
index ceb6f2263b..dc4d0c2cb4 100644
--- a/types/office-js/index.d.ts
+++ b/types/office-js/index.d.ts
@@ -1157,6 +1157,13 @@ declare namespace Office {
          * This is best for user experience and performance.
          */
         displayInIframe?: boolean
+        /**
+         * Determines if the pop-up blocker dialog will be shown to the user. Defaults to true.
+         * 
+         * `true` - The framework displays a pop-up to trigger the navigation and avoid the browser's pop-up blocker.
+         * `false` - The dialog will not be shown and the developer will handle pop-ups (usually by providing a user artifact to trigger the navigation).
+         */
+        promptBeforeOpen?: boolean;
         /**
          * A user-defined item of any type that is returned, unchanged, in the asyncContext property of the AsyncResult object that is passed to a callback.
          */

From 75cbccb548c1778e72b848ae6c818aabbb145129 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <293473+sandersn@users.noreply.github.com>
Date: Wed, 28 Nov 2018 14:02:28 -0800
Subject: [PATCH 415/836] Nope, the images were backward too

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 9062f4ea00..eba170c493 100644
--- a/README.md
+++ b/README.md
@@ -337,5 +337,5 @@ Copyrights on the definition files are respective of each contributor listed at
 
 [![Analytics](https://ga-beacon.appspot.com/UA-47495295-4/borisyankov/DefinitelyTyped)](https://github.com/igrigorik/ga-beacon)
 
-[![Build Status](https://typescript.visualstudio.com/TypeScript/_apis/build/status/sandersn.typescript-bot-watchdog)](https://typescript.visualstudio.com/TypeScript/_build/latest?definitionId=13) Are packages being published to npm in less than 10,000 seconds on average?
-[![Build Status](https://typescript.visualstudio.com/TypeScript/_apis/build/status/sandersn.types-publisher-watchdog)](https://typescript.visualstudio.com/TypeScript/_build/latest?definitionId=14) Has typescript-bot been active on DefinitelyTyped in the last two hours?
+[![Build Status](https://typescript.visualstudio.com/TypeScript/_apis/build/status/sandersn.types-publisher-watchdog)](https://typescript.visualstudio.com/TypeScript/_build/latest?definitionId=13) Are packages being published to npm in less than 10,000 seconds on average?
+[![Build Status](https://typescript.visualstudio.com/TypeScript/_apis/build/status/sandersn.typescript-bot-watchdog)](https://typescript.visualstudio.com/TypeScript/_build/latest?definitionId=14) Has typescript-bot been active on DefinitelyTyped in the last two hours?

From eccc7f9c6d6fd7b06165aa588252703c6fde6b06 Mon Sep 17 00:00:00 2001
From: Alex Jerabek <aljerabe@microsoft.com>
Date: Wed, 28 Nov 2018 14:09:42 -0800
Subject: [PATCH 416/836] Grammar fix

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

diff --git a/types/office-js/index.d.ts b/types/office-js/index.d.ts
index dc4d0c2cb4..7c637c3ccc 100644
--- a/types/office-js/index.d.ts
+++ b/types/office-js/index.d.ts
@@ -1161,7 +1161,7 @@ declare namespace Office {
          * Determines if the pop-up blocker dialog will be shown to the user. Defaults to true.
          * 
          * `true` - The framework displays a pop-up to trigger the navigation and avoid the browser's pop-up blocker.
-         * `false` - The dialog will not be shown and the developer will handle pop-ups (usually by providing a user artifact to trigger the navigation).
+         * `false` - The dialog will not be shown and the developer must handle pop-ups (by providing a user interface artifact to trigger the navigation).
          */
         promptBeforeOpen?: boolean;
         /**

From e228d2d09b79adfcdb8992735644e6d447bc2914 Mon Sep 17 00:00:00 2001
From: Alex Jerabek <aljerabe@microsoft.com>
Date: Wed, 28 Nov 2018 14:38:39 -0800
Subject: [PATCH 417/836] Remove redundant text

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

diff --git a/types/office-js/index.d.ts b/types/office-js/index.d.ts
index ceb6f2263b..1390c616cc 100644
--- a/types/office-js/index.d.ts
+++ b/types/office-js/index.d.ts
@@ -50829,7 +50829,7 @@ declare namespace Word {
         getRange(rangeLocation?: "Whole" | "Start" | "End" | "Before" | "After" | "Content"): Word.Range;
         /**
          *
-         * Inserts a break at the specified location in the main document. The insertLocation value can be 'Before' or 'After'.
+         * Inserts a break at the specified location in the main document. 
          *
          * [Api set: WordApi 1.2]
          *
@@ -50839,7 +50839,7 @@ declare namespace Word {
         insertBreak(breakType: Word.BreakType, insertLocation: Word.InsertLocation): void;
         /**
          *
-         * Inserts a break at the specified location in the main document. The insertLocation value can be 'Before' or 'After'.
+         * Inserts a break at the specified location in the main document. 
          *
          * [Api set: WordApi 1.2]
          *
@@ -50856,7 +50856,7 @@ declare namespace Word {
         insertContentControl(): Word.ContentControl;
         /**
          *
-         * Inserts a document at the specified location. The insertLocation value can be 'Before' or 'After'.
+         * Inserts a document at the specified location. 
          *
          * [Api set: WordApi 1.2]
          *
@@ -50866,7 +50866,7 @@ declare namespace Word {
         insertFileFromBase64(base64File: string, insertLocation: Word.InsertLocation): Word.Range;
         /**
          *
-         * Inserts a document at the specified location. The insertLocation value can be 'Before' or 'After'.
+         * Inserts a document at the specified location. 
          *
          * [Api set: WordApi 1.2]
          *
@@ -50876,7 +50876,7 @@ declare namespace Word {
         insertFileFromBase64(base64File: string, insertLocation: "Before" | "After" | "Start" | "End" | "Replace"): Word.Range;
         /**
          *
-         * Inserts HTML at the specified location. The insertLocation value can be 'Before' or 'After'.
+         * Inserts HTML at the specified location. 
          *
          * [Api set: WordApi 1.2]
          *
@@ -50886,7 +50886,7 @@ declare namespace Word {
         insertHtml(html: string, insertLocation: Word.InsertLocation): Word.Range;
         /**
          *
-         * Inserts HTML at the specified location. The insertLocation value can be 'Before' or 'After'.
+         * Inserts HTML at the specified location. 
          *
          * [Api set: WordApi 1.2]
          *
@@ -50916,7 +50916,7 @@ declare namespace Word {
         insertInlinePictureFromBase64(base64EncodedImage: string, insertLocation: "Before" | "After" | "Start" | "End" | "Replace"): Word.InlinePicture;
         /**
          *
-         * Inserts OOXML at the specified location.  The insertLocation value can be 'Before' or 'After'.
+         * Inserts OOXML at the specified location.  
          *
          * [Api set: WordApi 1.2]
          *
@@ -50926,7 +50926,7 @@ declare namespace Word {
         insertOoxml(ooxml: string, insertLocation: Word.InsertLocation): Word.Range;
         /**
          *
-         * Inserts OOXML at the specified location.  The insertLocation value can be 'Before' or 'After'.
+         * Inserts OOXML at the specified location.  
          *
          * [Api set: WordApi 1.2]
          *
@@ -50936,7 +50936,7 @@ declare namespace Word {
         insertOoxml(ooxml: string, insertLocation: "Before" | "After" | "Start" | "End" | "Replace"): Word.Range;
         /**
          *
-         * Inserts a paragraph at the specified location. The insertLocation value can be 'Before' or 'After'.
+         * Inserts a paragraph at the specified location. 
          *
          * [Api set: WordApi 1.2]
          *
@@ -50946,7 +50946,7 @@ declare namespace Word {
         insertParagraph(paragraphText: string, insertLocation: Word.InsertLocation): Word.Paragraph;
         /**
          *
-         * Inserts a paragraph at the specified location. The insertLocation value can be 'Before' or 'After'.
+         * Inserts a paragraph at the specified location. 
          *
          * [Api set: WordApi 1.2]
          *
@@ -50956,7 +50956,7 @@ declare namespace Word {
         insertParagraph(paragraphText: string, insertLocation: "Before" | "After" | "Start" | "End" | "Replace"): Word.Paragraph;
         /**
          *
-         * Inserts text at the specified location. The insertLocation value can be 'Before' or 'After'.
+         * Inserts text at the specified location. 
          *
          * [Api set: WordApi 1.2]
          *
@@ -50966,7 +50966,7 @@ declare namespace Word {
         insertText(text: string, insertLocation: Word.InsertLocation): Word.Range;
         /**
          *
-         * Inserts text at the specified location. The insertLocation value can be 'Before' or 'After'.
+         * Inserts text at the specified location. 
          *
          * [Api set: WordApi 1.2]
          *
@@ -51777,7 +51777,7 @@ declare namespace Word {
         getTextRanges(endingMarks: string[], trimSpacing?: boolean): Word.RangeCollection;
         /**
          *
-         * Inserts a break at the specified location in the main document. The insertLocation value can be 'Before' or 'After'.
+         * Inserts a break at the specified location in the main document. 
          *
          * [Api set: WordApi 1.1]
          *
@@ -51787,7 +51787,7 @@ declare namespace Word {
         insertBreak(breakType: Word.BreakType, insertLocation: Word.InsertLocation): void;
         /**
          *
-         * Inserts a break at the specified location in the main document. The insertLocation value can be 'Before' or 'After'.
+         * Inserts a break at the specified location in the main document. 
          *
          * [Api set: WordApi 1.1]
          *
@@ -51884,7 +51884,7 @@ declare namespace Word {
         insertOoxml(ooxml: string, insertLocation: "Before" | "After" | "Start" | "End" | "Replace"): Word.Range;
         /**
          *
-         * Inserts a paragraph at the specified location. The insertLocation value can be 'Before' or 'After'.
+         * Inserts a paragraph at the specified location. 
          *
          * [Api set: WordApi 1.1]
          *
@@ -51894,7 +51894,7 @@ declare namespace Word {
         insertParagraph(paragraphText: string, insertLocation: Word.InsertLocation): Word.Paragraph;
         /**
          *
-         * Inserts a paragraph at the specified location. The insertLocation value can be 'Before' or 'After'.
+         * Inserts a paragraph at the specified location. 
          *
          * [Api set: WordApi 1.1]
          *
@@ -51904,7 +51904,7 @@ declare namespace Word {
         insertParagraph(paragraphText: string, insertLocation: "Before" | "After" | "Start" | "End" | "Replace"): Word.Paragraph;
         /**
          *
-         * Inserts a table with the specified number of rows and columns. The insertLocation value can be 'Before' or 'After'.
+         * Inserts a table with the specified number of rows and columns. 
          *
          * [Api set: WordApi 1.3]
          *
@@ -51916,7 +51916,7 @@ declare namespace Word {
         insertTable(rowCount: number, columnCount: number, insertLocation: Word.InsertLocation, values?: string[][]): Word.Table;
         /**
          *
-         * Inserts a table with the specified number of rows and columns. The insertLocation value can be 'Before' or 'After'.
+         * Inserts a table with the specified number of rows and columns. 
          *
          * [Api set: WordApi 1.3]
          *
@@ -52355,7 +52355,7 @@ declare namespace Word {
         getTextRanges(endingMarks: string[], trimSpacing?: boolean): Word.RangeCollection;
         /**
          *
-         * Inserts a break at the specified location in the main document. The insertLocation value can be 'Before' or 'After'.
+         * Inserts a break at the specified location in the main document. 
          *
          * [Api set: WordApi 1.1]
          *
@@ -52365,7 +52365,7 @@ declare namespace Word {
         insertBreak(breakType: Word.BreakType, insertLocation: Word.InsertLocation): void;
         /**
          *
-         * Inserts a break at the specified location in the main document. The insertLocation value can be 'Before' or 'After'.
+         * Inserts a break at the specified location in the main document. 
          *
          * [Api set: WordApi 1.1]
          *
@@ -52462,7 +52462,7 @@ declare namespace Word {
         insertOoxml(ooxml: string, insertLocation: "Before" | "After" | "Start" | "End" | "Replace"): Word.Range;
         /**
          *
-         * Inserts a paragraph at the specified location. The insertLocation value can be 'Before' or 'After'.
+         * Inserts a paragraph at the specified location. 
          *
          * [Api set: WordApi 1.1]
          *
@@ -52472,7 +52472,7 @@ declare namespace Word {
         insertParagraph(paragraphText: string, insertLocation: Word.InsertLocation): Word.Paragraph;
         /**
          *
-         * Inserts a paragraph at the specified location. The insertLocation value can be 'Before' or 'After'.
+         * Inserts a paragraph at the specified location. 
          *
          * [Api set: WordApi 1.1]
          *
@@ -52482,7 +52482,7 @@ declare namespace Word {
         insertParagraph(paragraphText: string, insertLocation: "Before" | "After" | "Start" | "End" | "Replace"): Word.Paragraph;
         /**
          *
-         * Inserts a table with the specified number of rows and columns. The insertLocation value can be 'Before' or 'After'.
+         * Inserts a table with the specified number of rows and columns. 
          *
          * [Api set: WordApi 1.3]
          *
@@ -52494,7 +52494,7 @@ declare namespace Word {
         insertTable(rowCount: number, columnCount: number, insertLocation: Word.InsertLocation, values?: string[][]): Word.Table;
         /**
          *
-         * Inserts a table with the specified number of rows and columns. The insertLocation value can be 'Before' or 'After'.
+         * Inserts a table with the specified number of rows and columns. 
          *
          * [Api set: WordApi 1.3]
          *
@@ -53357,7 +53357,7 @@ declare namespace Word {
         insertContentControl(): Word.ContentControl;
         /**
          *
-         * Inserts a paragraph at the specified location. The insertLocation value can be 'Before' or 'After'.
+         * Inserts a paragraph at the specified location. 
          *
          * [Api set: WordApi 1.3]
          *
@@ -53367,7 +53367,7 @@ declare namespace Word {
         insertParagraph(paragraphText: string, insertLocation: Word.InsertLocation): Word.Paragraph;
         /**
          *
-         * Inserts a paragraph at the specified location. The insertLocation value can be 'Before' or 'After'.
+         * Inserts a paragraph at the specified location. 
          *
          * [Api set: WordApi 1.3]
          *
@@ -53377,7 +53377,7 @@ declare namespace Word {
         insertParagraph(paragraphText: string, insertLocation: "Before" | "After" | "Start" | "End" | "Replace"): Word.Paragraph;
         /**
          *
-         * Inserts a table with the specified number of rows and columns. The insertLocation value can be 'Before' or 'After'.
+         * Inserts a table with the specified number of rows and columns. 
          *
          * [Api set: WordApi 1.3]
          *
@@ -53389,7 +53389,7 @@ declare namespace Word {
         insertTable(rowCount: number, columnCount: number, insertLocation: Word.InsertLocation, values?: string[][]): Word.Table;
         /**
          *
-         * Inserts a table with the specified number of rows and columns. The insertLocation value can be 'Before' or 'After'.
+         * Inserts a table with the specified number of rows and columns. 
          *
          * [Api set: WordApi 1.3]
          *

From c0f3e556bb8b958a337c691d6fb9962b130b93dd Mon Sep 17 00:00:00 2001
From: Alex Jerabek <aljerabe@microsoft.com>
Date: Wed, 28 Nov 2018 15:10:50 -0800
Subject: [PATCH 418/836] Clarify formula behavior for data validation rules

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

diff --git a/types/office-js/index.d.ts b/types/office-js/index.d.ts
index ceb6f2263b..7dd1437b13 100644
--- a/types/office-js/index.d.ts
+++ b/types/office-js/index.d.ts
@@ -21758,18 +21758,19 @@ declare namespace Excel {
     interface BasicDataValidation {
         /**
          *
-         * Gets or sets the Formula1, i.e. minimum value or value depending of the operator.
-            When setting the value, it can be passed in as a number, a range object, or a string formula (where the string is either a stringified number, a cell reference like "=A1", or a formula like "=MIN(A1, B1)").
-            When retrieving the value, it will always be returned as a string formula, for example: "=10", "=A1", "=SUM(A1:B5)", etc.
+         * Specifies the right-hand operand when the operator property is set to a binary operator such as GreaterThan (the left-hand operand is the value the user tries to enter in the cell). With the ternary operators Between and NotBetween, specifies the lower bound operand. 
+         * For example, setting formula1 to 10 and operator to GreaterThan means that valid data for the range must be greater than 10.
+         * When setting the value, it can be passed in as a number, a range object, or a string formula (where the string is either a stringified number, a cell reference like "=A1", or a formula like "=MIN(A1, B1)").
+         * When retrieving the value, it will always be returned as a string formula, for example: "=10", "=A1", "=SUM(A1:B5)", etc.
          *
          * [Api set: ExcelApi 1.8]
          */
         formula1: string | number | Range;
         /**
          *
-         * Gets or sets the Formula2, i.e. maximum value or value depending of the operator.
-            When setting the value, it can be passed in as a number, a range object, or a string formula (where the string is either a stringified number, a cell reference like "=A1", or a formula like "=MIN(A1, B1)").
-            When retrieving the value, it will always be returned as a string formula, for example: "=10", "=A1", "=SUM(A1:B5)", etc.
+         * With the ternary operators Between and NotBetween, specifies the upper bound operand. Is not used with the binary operators, such as GreaterThan. 
+         * When setting the value, it can be passed in as a number, a range object, or a string formula (where the string is either a stringified number, a cell reference like "=A1", or a formula like "=MIN(A1, B1)").
+         * When retrieving the value, it will always be returned as a string formula, for example: "=10", "=A1", "=SUM(A1:B5)", etc.
          *
          * [Api set: ExcelApi 1.8]
          */
@@ -21791,18 +21792,18 @@ declare namespace Excel {
     interface DateTimeDataValidation {
         /**
          *
-         * Gets or sets the Formula1, i.e. minimum value or value depending of the operator.
-            When setting the value, it can be passed in as a Date, a Range object, or a string formula (where the string is either a stringified date/time in ISO8601 format, a cell reference like "=A1", or a formula like "=MIN(A1, B1)").
-            When retrieving the value, it will always be returned as a string formula, for example: "=10", "=A1", "=SUM(A1:B5)", etc.
+         * Specifies the right-hand operand when the operator property is set to a binary operator such as GreaterThan (the left-hand operand is the value the user tries to enter in the cell). With the ternary operators Between and NotBetween, specifies the lower bound operand. 
+         * When setting the value, it can be passed in as a Date, a Range object, or a string formula (where the string is either a stringified date/time in ISO8601 format, a cell reference like "=A1", or a formula like "=MIN(A1, B1)").
+         * When retrieving the value, it will always be returned as a string formula, for example: "=10", "=A1", "=SUM(A1:B5)", etc.
          *
          * [Api set: ExcelApi 1.8]
          */
         formula1: string | Date | Range;
         /**
          *
-         * Gets or sets the Formula2, i.e. maximum value or value depending of the operator.
-            When setting the value, it can be passed in as a Date, a Range object, or a string (where the string is either a stringified date/time in ISO8601 format, a cell reference like "=A1", or a formula like "=MIN(A1, B1)").
-            When retrieving the value, it will always be returned as a string formula, for example: "=10", "=A1", "=SUM(A1:B5)", etc.
+         * With the ternary operators Between and NotBetween, specifies the upper bound operand. Is not used with the binary operators, such as GreaterThan. 
+         * When setting the value, it can be passed in as a Date, a Range object, or a string (where the string is either a stringified date/time in ISO8601 format, a cell reference like "=A1", or a formula like "=MIN(A1, B1)").
+         * When retrieving the value, it will always be returned as a string formula, for example: "=10", "=A1", "=SUM(A1:B5)", etc.
          *
          * [Api set: ExcelApi 1.8]
          */

From 7ea37092f0ef3fea36ce5730a02e468ff9abf91a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20D=C3=BCfel?= <christian@duefel.de>
Date: Thu, 29 Nov 2018 00:03:42 +0100
Subject: [PATCH 419/836] Callbacks have to return Promise

---
 types/bull/bull-tests.tsx |   8 ++-
 types/bull/index.d.ts     | 121 +++++++++++---------------------------
 2 files changed, 40 insertions(+), 89 deletions(-)

diff --git a/types/bull/bull-tests.tsx b/types/bull/bull-tests.tsx
index dd484ce1d1..46c146272e 100644
--- a/types/bull/bull-tests.tsx
+++ b/types/bull/bull-tests.tsx
@@ -98,11 +98,17 @@ const pdfQueue = new Queue('pdf transcoding', {
 //
 //////////////////////////////////////////////////////////////////////////////////
 
-pdfQueue.process((job) => {
+pdfQueue.process((job: Queue.Job) => {
     // Processors can also return promises instead of using the done callback
     return Promise.resolve();
 });
 
+async function pfdPromise(job: Queue.Job) {
+    return Promise.resolve();
+}
+
+pdfQueue.process(1, pfdPromise);
+
 videoQueue.add({ video: 'http://example.com/video1.mov' }, { jobId: 1 })
 .then((video1Job) => {
     // When job has successfully be placed in the queue the job is returned
diff --git a/types/bull/index.d.ts b/types/bull/index.d.ts
index dd5723f2d2..c08048f1d7 100644
--- a/types/bull/index.d.ts
+++ b/types/bull/index.d.ts
@@ -12,6 +12,7 @@
 //                 Alec Brunelle <https://github.com/aleccool213>
 //                 Dan Manastireanu <https://github.com/danmana>
 //                 Kjell-Morten Bratsberg Thorsen <https://github.com/kjellmorten>
+//                 Christian D. <https://github.com/pc-jedi>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 
@@ -342,50 +343,39 @@ declare namespace Bull {
      * The callback is called everytime a job is placed in the queue.
      * It is passed an instance of the job as first argument.
      *
+     * If the callback signature contains the second optional done argument,
+     * the callback will be passed a done callback to be called after the job has been completed.
      * The done callback can be called with an Error instance, to signal that the job did not complete successfully,
-     * or with a result as second argument as second argument (e.g.: done(null, result);) when the job is successful.
-     * Errors will be passed as a second argument to the "failed" event;
-     * results, as a second argument to the "completed" event.
-     */
-    process(callback: (job: Job<T>, done: DoneCallback) => void): void;
-
-    /**
-     * Defines a processing function for the jobs placed into a given Queue.
+     * or with a result as second argument (e.g.: done(null, result);) when the job is successful.
+     * Errors will be passed as a second argument to the "failed" event; results, as a second argument to the "completed" event.
      *
-     * The callback is called everytime a job is placed in the queue.
-     * It is passed an instance of the job as first argument.
-     * The callback can also be defined as the string path to a module
-     * exporting the callback function. Using a path has several advantages:
-     * - The process is sandboxed so if it crashes it does not affect the worker.
-     * - You can run blocking code without affecting the queue (jobs will not stall).
-     * - Much better utilization of multi-core CPUs.
-     * - Less connections to redis.
-     *
-     * A promise must be returned to signal job completion.
+     * If, however, the callback signature does not contain the done argument,
+     * a promise must be returned to signal job completion.
      * If the promise is rejected, the error will be passed as a second argument to the "failed" event.
      * If it is resolved, its value will be the "completed" event's second argument.
      */
-    process(callback: ((job: Job<T>) => void) | string): Promise<any>;
+    process(callback: ((job: Job<T>, done: DoneCallback) => void) | ((job: Job<T>) => Promise<any>) | string): void;
 
     /**
      * Defines a processing function for the jobs placed into a given Queue.
      *
      * The callback is called everytime a job is placed in the queue.
      * It is passed an instance of the job as first argument.
-     * The callback can also be defined as the string path to a module
-     * exporting the callback function. Using a path has several advantages:
-     * - The process is sandboxed so if it crashes it does not affect the worker.
-     * - You can run blocking code without affecting the queue (jobs will not stall).
-     * - Much better utilization of multi-core CPUs.
-     * - Less connections to redis.
      *
-     * A promise must be returned to signal job completion.
+     * If the callback signature contains the second optional done argument,
+     * the callback will be passed a done callback to be called after the job has been completed.
+     * The done callback can be called with an Error instance, to signal that the job did not complete successfully,
+     * or with a result as second argument (e.g.: done(null, result);) when the job is successful.
+     * Errors will be passed as a second argument to the "failed" event; results, as a second argument to the "completed" event.
+     *
+     * If, however, the callback signature does not contain the done argument,
+     * a promise must be returned to signal job completion.
      * If the promise is rejected, the error will be passed as a second argument to the "failed" event.
      * If it is resolved, its value will be the "completed" event's second argument.
      *
-     * @param concurrency Bull will then call you handler in parallel respecting this max number.
+     * @param concurrency Bull will then call your handler in parallel respecting this maximum value.
      */
-    process(concurrency: number, callback: ((job: Job<T>) => void) | string): Promise<any>;
+    process(concurrency: number, callback: ((job: Job<T>, done: DoneCallback) => void) | ((job: Job<T>) => Promise<any>) | string): void;
 
     /**
      * Defines a processing function for the jobs placed into a given Queue.
@@ -393,35 +383,21 @@ declare namespace Bull {
      * The callback is called everytime a job is placed in the queue.
      * It is passed an instance of the job as first argument.
      *
+     * If the callback signature contains the second optional done argument,
+     * the callback will be passed a done callback to be called after the job has been completed.
      * The done callback can be called with an Error instance, to signal that the job did not complete successfully,
-     * or with a result as second argument as second argument (e.g.: done(null, result);) when the job is successful.
-     * Errors will be passed as a second argument to the "failed" event;
-     * results, as a second argument to the "completed" event.
+     * or with a result as second argument (e.g.: done(null, result);) when the job is successful.
+     * Errors will be passed as a second argument to the "failed" event; results, as a second argument to the "completed" event.
      *
-     * @param concurrency Bull will then call you handler in parallel respecting this max number.
-     */
-    process(concurrency: number, callback: (job: Job<T>, done: DoneCallback) => void): void;
-
-    /**
-     * Defines a named processing function for the jobs placed into a given Queue.
-     *
-     * The callback is called everytime a job is placed in the queue.
-     * It is passed an instance of the job as first argument.
-     * The callback can also be defined as the string path to a module
-     * exporting the callback function. Using a path has several advantages:
-     * - The process is sandboxed so if it crashes it does not affect the worker.
-     * - You can run blocking code without affecting the queue (jobs will not stall).
-     * - Much better utilization of multi-core CPUs.
-     * - Less connections to redis.
-     *
-     * A promise must be returned to signal job completion.
+     * If, however, the callback signature does not contain the done argument,
+     * a promise must be returned to signal job completion.
      * If the promise is rejected, the error will be passed as a second argument to the "failed" event.
      * If it is resolved, its value will be the "completed" event's second argument.
      *
      * @param name Bull will only call the handler if the job name matches
      */
     // tslint:disable-next-line:unified-signatures
-    process(name: string, callback: ((job: Job<T>) => void) | string): Promise<any>;
+    process(name: string, callback: ((job: Job<T>, done: DoneCallback) => void) | ((job: Job<T>) => Promise<any>) | string): void;
 
     /**
      * Defines a processing function for the jobs placed into a given Queue.
@@ -429,52 +405,21 @@ declare namespace Bull {
      * The callback is called everytime a job is placed in the queue.
      * It is passed an instance of the job as first argument.
      *
+     * If the callback signature contains the second optional done argument,
+     * the callback will be passed a done callback to be called after the job has been completed.
      * The done callback can be called with an Error instance, to signal that the job did not complete successfully,
-     * or with a result as second argument as second argument (e.g.: done(null, result);) when the job is successful.
-     * Errors will be passed as a second argument to the "failed" event;
-     * results, as a second argument to the "completed" event.
+     * or with a result as second argument (e.g.: done(null, result);) when the job is successful.
+     * Errors will be passed as a second argument to the "failed" event; results, as a second argument to the "completed" event.
      *
-     * @param name Bull will only call the handler if the job name matches
-     */
-    // tslint:disable-next-line:unified-signatures
-    process(name: string, callback: (job: Job<T>, done: DoneCallback) => void): void;
-
-    /**
-     * Defines a named processing function for the jobs placed into a given Queue.
-     *
-     * The callback is called everytime a job is placed in the queue.
-     * It is passed an instance of the job as first argument.
-     * The callback can also be defined as the string path to a module
-     * exporting the callback function. Using a path has several advantages:
-     * - The process is sandboxed so if it crashes it does not affect the worker.
-     * - You can run blocking code without affecting the queue (jobs will not stall).
-     * - Much better utilization of multi-core CPUs.
-     * - Less connections to redis.
-     *
-     * A promise must be returned to signal job completion.
+     * If, however, the callback signature does not contain the done argument,
+     * a promise must be returned to signal job completion.
      * If the promise is rejected, the error will be passed as a second argument to the "failed" event.
      * If it is resolved, its value will be the "completed" event's second argument.
      *
      * @param name Bull will only call the handler if the job name matches
-     * @param concurrency Bull will then call you handler in parallel respecting this max number.
+     * @param concurrency Bull will then call your handler in parallel respecting this maximum value.
      */
-    process(name: string, concurrency: number, callback: ((job: Job<T>) => void) | string): Promise<any>;
-
-    /**
-     * Defines a processing function for the jobs placed into a given Queue.
-     *
-     * The callback is called everytime a job is placed in the queue.
-     * It is passed an instance of the job as first argument.
-     *
-     * The done callback can be called with an Error instance, to signal that the job did not complete successfully,
-     * or with a result as second argument as second argument (e.g.: done(null, result);) when the job is successful.
-     * Errors will be passed as a second argument to the "failed" event;
-     * results, as a second argument to the "completed" event.
-     *
-     * @param name Bull will only call the handler if the job name matches
-     * @param concurrency Bull will then call you handler in parallel respecting this max number.
-     */
-    process(name: string, concurrency: number, callback: (job: Job<T>, done: DoneCallback) => void): void;
+    process(name: string, concurrency: number, callback: ((job: Job<T>, done: DoneCallback) => void) | ((job: Job<T>) => Promise<any>) | string): void;
 
     /**
      * Creates a new job and adds it to the queue.

From 47a20469245d7c747192ac25ab769e8d23e2b5ac Mon Sep 17 00:00:00 2001
From: Elizabeth Craig <elcraig@microsoft.com>
Date: Wed, 28 Nov 2018 18:37:23 -0800
Subject: [PATCH 420/836] Add definitions for jju

---
 types/jju/index.d.ts    | 213 ++++++++++++++++++++++++++++++++++++++++
 types/jju/jju-tests.ts  |   4 +
 types/jju/tsconfig.json |  23 +++++
 types/jju/tslint.json   |   1 +
 4 files changed, 241 insertions(+)
 create mode 100644 types/jju/index.d.ts
 create mode 100644 types/jju/jju-tests.ts
 create mode 100644 types/jju/tsconfig.json
 create mode 100644 types/jju/tslint.json

diff --git a/types/jju/index.d.ts b/types/jju/index.d.ts
new file mode 100644
index 0000000000..46fbf2f77b
--- /dev/null
+++ b/types/jju/index.d.ts
@@ -0,0 +1,213 @@
+// Type definitions for jju 1.4
+// Project: https://github.com/rlidwka/jju
+// Definitions by: Elizabeth Craig <https://github.com/ecraig12345>
+//                 Alex Kocharin <https://github.com/rlidwka>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+// Disabling unified-signatures rule so different documentation can be provided for each signature.
+// tslint:disable:unified-signatures
+
+export interface ParseOptions {
+    /**
+     * What to do with reserved keys (default 'ignore').
+     * - "ignore" - ignore reserved keys
+     * - "throw" - throw SyntaxError in case of reserved keys
+     * - "replace" - replace reserved keys, this is the default JSON.parse behaviour, unsafe
+     */
+    reserved_keys?: 'ignore' | 'throw' | 'replace';
+
+    /**
+     * Create object as `Object.create(null)` instead of `{}`.
+     * - If reserved_keys != 'replace', default is false.
+     * - If reserved_keys == 'replace', default is true.
+     *
+     * It is usually unsafe and not recommended to change this option to false in the last case.
+     */
+    null_prototype?: boolean;
+
+    /**
+     * Reviver function (follows the JSON spec). This function is called for each member of the object.
+     * If a member contains nested objects, the nested objects are transformed before the parent object is.
+     */
+    reviver?: (key: any, value: any) => any;
+
+    /**
+     * Operation mode (default 'json5'). Set to 'json' if you want to throw on non-strict json files.
+     */
+    mode?: 'json5' | 'json' | 'cjson';
+}
+
+export interface StringifyOptions {
+    /**
+     * Output ascii only (default false).
+     * If this option is enabled, output will not have any characters except 0x20-0x7f.
+     */
+    ascii?: boolean;
+
+    /**
+     * This option follows JSON specification.
+     * @default '\t'
+     */
+    indent?: string | number | boolean;
+
+    /**
+     * Enquoting char.
+     * - If `mode` is 'json', default is "
+     * - Otherwise, default is '
+     */
+    quote?: '"' | "'";
+
+    /**
+     * Whether keys quoting in objects is required or not.
+     * If you want `{"q": 1}` instead of `{q: 1}`, set it to true.
+     * - If `mode` is 'json', default is true
+     * - Otherwise, default is false
+     */
+    quote_keys?: boolean;
+
+    /**
+     * Sort all keys while stringifying.
+     * By default sort order will depend on implementation--with v8 it's insertion order.
+     * If set to true, all keys (but not arrays) will be sorted alphabetically.
+     * You can provide your own sorting function as well.
+     * @default false
+     */
+    sort_keys?: boolean | ((a: any, b: any) => number);
+
+    /**
+     * Replacer function or array. This option follows JSON specification.
+     * If a function, used to transform the results.
+     * If an array, acts as a approved list for selecting the object properties that will be stringified.
+     */
+    replacer?: ((key: string, value: any) => any) | Array<number | string>;
+
+    /**
+     * Don't output trailing comma. If this option is set, arrays like `[1,2,3,]` will never be generated.
+     * Otherwise they may be generated for pretty printing.
+     * - If `mode` is JSON, default is true
+     * - Otherwise, default is false
+     */
+    no_trailing_comma?: boolean;
+
+    /**
+     * Operation mode. Set it to 'json' if you want correct json in the output.
+     * If it is 'json', following options are implied:
+     * - options.quote = '"'
+     * - options.no_trailing_comma = true
+     * - options.quote_keys = true
+     * - '\x' literals are not used
+     */
+    mode?: 'json' | 'json5' | 'cjson';
+}
+
+/**
+ * Represents a token in a JSON file.
+ */
+export interface Token {
+    /** Raw text of this token. If you join all raws, you will get the original document. */
+    raw: string;
+    /** Type of the token. */
+    type: 'whitespace' | 'comment' | 'key' | 'literal' | 'separator' | 'newline';
+    /** Path to the current token in the syntax tree. */
+    stack: string[];
+    /** Value of the token if token is a key or literal. */
+    value?: any;
+}
+
+/**
+ * Object defining a programming style in which the JSON document was written.
+ */
+export interface JsonStyle {
+    /** Preferred indentation. */
+    indent: string;
+    /** Preferred newline. */
+    newline: string;
+    /** " or ' depending on which quote is preferred. */
+    quote: string;
+    /** True if unquoted keys were used at least once. */
+    quote_keys: boolean;
+    /** True if input has a whitespace token. */
+    has_whitespace: boolean;
+    /** True if input has a comment token. */
+    has_comments: boolean;
+    /** True if input has a newline token. */
+    has_newlines: boolean;
+    /** True if input has at least one trailing comma. */
+    has_trailing_comma: boolean;
+}
+
+/**
+ * Parse json/json5 text and returns a javascript value it corresponds to.
+ * @param text Text to parse
+ * @param options Parser options
+ */
+export function parse(text: string, options?: ParseOptions): any;
+/**
+ * Compatibility syntax (follows JSON specification).
+ * Converts a JavaScript Object Notation (JSON) string into an object.
+ * @param text A valid JSON string.
+ * @param reviver A function that transforms the results. This function is called for each member of the object.
+ * If a member contains nested objects, the nested objects are transformed before the parent object is.
+ */
+export function parse(text: string, reviver?: (key: any, value: any) => any): any;
+
+/**
+ * Convert javascript value to an appropriate json/json5 text.
+ * @param value Value to serialize
+ * @param options Serializer options
+ */
+export function stringify(value: any, options?: StringifyOptions): string;
+/**
+ * Compatibility syntax (follows JSON specification).
+ * Converts a JavaScript value to a JavaScript Object Notation (JSON) string.
+ * @param value A JavaScript value, usually an object or array, to be converted.
+ * @param replacer A function that transforms the results.
+ * @param space Adds indentation, white space, and line break characters to the return-value JSON text to make it easier to read.
+ */
+export function stringify(value: any, replacer?: (key: string, value: any) => any, space?: string | number): string;
+/**
+ * Compatibility syntax (follows JSON specification).
+ * Converts a JavaScript value to a JavaScript Object Notation (JSON) string.
+ * @param value A JavaScript value, usually an object or array, to be converted.
+ * @param replacer An array of strings and numbers that acts as a approved list for selecting the object properties that will be stringified.
+ * @param space Adds indentation, white space, and line break characters to the return-value JSON text to make it easier to read.
+ */
+export function stringify(value: any, replacer?: Array<number | string> | null, space?: string | number): string;
+
+/**
+ * Parse json/json5 text and return an array of tokens it consists of.
+ * @param text Text to tokenize
+ * @param options Parser options
+ */
+export function tokenize(text: string, options?: ParseOptions): Token[];
+
+/**
+ * Parse json/json5 text and try to guess indentation, quoting style, etc.
+ * @param text Text to analyze
+ * @param options Parser options
+ */
+export function analyze(text: string, options?: ParseOptions): JsonStyle;
+
+/**
+ * Change json/json5 text, preserving original formatting as much as possible.
+ * @param text Original text
+ * @param new_value New value you want to set
+ * @param options Parser or stringifier options
+ *
+ * @example
+ * // here is your original JSON document:
+ * var input = '{"foo": "bar", "baz": 123}'
+ *
+ * // you need to parse it first:
+ * var json = jju.parse(input, {mode: 'json'})
+ * // json is { foo: 'bar', baz: 123 }
+ *
+ * // then you can change it as you like:
+ * json.foo = 'quux'
+ * json.hello = 'world'
+ *
+ * // then you run an update function to change the original json:
+ * var output = jju.update(input, json, {mode: 'json'})
+ * // output is '{"foo": "quux", "baz": 123, "hello": "world"}'
+ */
+export function update(text: string, new_value: any, options?: ParseOptions | StringifyOptions): string;
diff --git a/types/jju/jju-tests.ts b/types/jju/jju-tests.ts
new file mode 100644
index 0000000000..0de4d973b1
--- /dev/null
+++ b/types/jju/jju-tests.ts
@@ -0,0 +1,4 @@
+import * as jju from 'jju';
+
+jju.parse('{}'); // $ExpectType any
+jju.stringify({}); // $ExpectType string
diff --git a/types/jju/tsconfig.json b/types/jju/tsconfig.json
new file mode 100644
index 0000000000..08bb6638c7
--- /dev/null
+++ b/types/jju/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "jju-tests.ts"
+    ]
+}
diff --git a/types/jju/tslint.json b/types/jju/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/jju/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 5068c7952765e6d19337c6fedaa58dba6195ff9d Mon Sep 17 00:00:00 2001
From: Elizabeth Craig <elcraig@microsoft.com>
Date: Wed, 28 Nov 2018 20:29:55 -0800
Subject: [PATCH 421/836] Allow parse and stringify options for update()

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

diff --git a/types/jju/index.d.ts b/types/jju/index.d.ts
index 46fbf2f77b..f8bf96d639 100644
--- a/types/jju/index.d.ts
+++ b/types/jju/index.d.ts
@@ -192,7 +192,7 @@ export function analyze(text: string, options?: ParseOptions): JsonStyle;
  * Change json/json5 text, preserving original formatting as much as possible.
  * @param text Original text
  * @param new_value New value you want to set
- * @param options Parser or stringifier options
+ * @param options Parser and stringifier options
  *
  * @example
  * // here is your original JSON document:
@@ -210,4 +210,4 @@ export function analyze(text: string, options?: ParseOptions): JsonStyle;
  * var output = jju.update(input, json, {mode: 'json'})
  * // output is '{"foo": "quux", "baz": 123, "hello": "world"}'
  */
-export function update(text: string, new_value: any, options?: ParseOptions | StringifyOptions): string;
+export function update(text: string, new_value: any, options?: ParseOptions & StringifyOptions): string;

From 12b2403208f432eab01af6d45acd095fdcfb9ea6 Mon Sep 17 00:00:00 2001
From: Jessica <jessicamfranco3@gmail.com>
Date: Thu, 29 Nov 2018 13:57:50 +0900
Subject: [PATCH 422/836] Simplify css attribute declaration, add jsdoc

---
 types/styled-components/index.d.ts | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/types/styled-components/index.d.ts b/types/styled-components/index.d.ts
index ee64b37772..2f3b6b4ec5 100644
--- a/types/styled-components/index.d.ts
+++ b/types/styled-components/index.d.ts
@@ -454,6 +454,11 @@ declare module "react" {
         // nature of this declaration.
         // If you are writing this inline you already have access to all the attributes anyway,
         // no need for the extra indirection.
-        css?: import(".").CSSIntrinsicAttributeType; // tslint:disable-line whitespace
+        /**
+         * If present, this React element will be converted by
+         * `babel-plugin-styled-components` into a styled component
+         * with the given css as its styles.
+         */
+        css?: CSSIntrinsicAttributeType;
     }
 }

From e70908a9cd8d584fcb9374e8a772ee30e13da6aa Mon Sep 17 00:00:00 2001
From: muzea <mr.muzea@gmail.com>
Date: Thu, 29 Nov 2018 13:12:55 +0800
Subject: [PATCH 423/836] fix: lint error

---
 types/babel__core/babel__core-tests.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/types/babel__core/babel__core-tests.ts b/types/babel__core/babel__core-tests.ts
index eb19bc69b3..ba51ac21be 100644
--- a/types/babel__core/babel__core-tests.ts
+++ b/types/babel__core/babel__core-tests.ts
@@ -39,4 +39,3 @@ babel.transformFromAstAsync(parsedAst!, sourceCode, options).then(transformFromA
     const { code, map, ast } = transformFromAstAsyncResult!;
     const { body } = ast!.program;
 });
-

From f8a55ca2b6d82464c53dccbf01e75971ecdff5c0 Mon Sep 17 00:00:00 2001
From: taoqf <tao_qiufeng@126.com>
Date: Thu, 29 Nov 2018 13:48:15 +0800
Subject: [PATCH 424/836] add definition baidu-app

---
 types/baidu-app/baidu-app-tests.ts | 2007 ++++++++++++
 types/baidu-app/index.d.ts         | 4758 ++++++++++++++++++++++++++++
 types/baidu-app/tsconfig.json      |   24 +
 types/baidu-app/tslint.json        |    7 +
 4 files changed, 6796 insertions(+)
 create mode 100644 types/baidu-app/baidu-app-tests.ts
 create mode 100644 types/baidu-app/index.d.ts
 create mode 100644 types/baidu-app/tsconfig.json
 create mode 100644 types/baidu-app/tslint.json

diff --git a/types/baidu-app/baidu-app-tests.ts b/types/baidu-app/baidu-app-tests.ts
new file mode 100644
index 0000000000..9987a650ee
--- /dev/null
+++ b/types/baidu-app/baidu-app-tests.ts
@@ -0,0 +1,2007 @@
+(() => {
+	swan.request({
+		url: 'https://smartprogram.baidu.com/xxx', // 仅为示例，并非真实的接口地址
+		method: 'GET',
+		dataType: 'json',
+		data: {
+			key: 'value'
+		},
+		header: {
+			'content-type': 'application/json' // 默认值
+		},
+		success(res) {
+			console.log(res.data);
+		},
+		fail(err) {
+			console.log('错误码：' + err.errCode);
+			console.log('错误信息：' + err.errMsg);
+		}
+	});
+
+	const requestTask = swan.request({
+		url: 'test.php', // 仅为示例，并非真实的接口地址
+		data: {
+			x: '',
+			y: ''
+		},
+		header: {
+			'content-type': 'application/json'
+		},
+		success(res) {
+			console.log(res.data);
+		}
+	});
+	// 取消请求任务
+	requestTask.abort();
+})();
+
+(() => {
+	swan.chooseImage({
+		success(res) {
+			swan.uploadFile({
+				url: 'https://smartprogram.baidu.com/xxx', // 仅为示例，并非真实的接口地址
+				filePath: res.tempFilePaths[0], // 要上传文件资源的路径
+				name: 'myfile',
+				success(res) {
+					console.log(res.statusCode);
+				},
+				fail(err) {
+					console.log('错误码：' + err.errCode);
+					console.log('错误信息：' + err.errMsg);
+				}
+			});
+		}
+	});
+})();
+
+(() => {
+	const uploadTask = swan.uploadFile({
+		url: 'https://smartprogram.baidu.com/xxx', // 开发者服务器 url
+		filePath: '', // res.tempFilePaths[0], // 要上传文件资源的路径
+		name: 'myfile',
+		success(res) {
+			console.log(res.statusCode);
+		},
+		fail(err) {
+			console.log('错误码：' + err.errCode);
+			console.log('错误信息：' + err.errMsg);
+		}
+	});
+
+	uploadTask.onProgressUpdate(res => {
+		console.log('上传进度', res.progress);
+		console.log('已经上传的数据长度', res.totalBytesSent);
+		console.log('预期需要上传的数据总长度', res.totalBytesExpectedToSend);
+	});
+
+	uploadTask.abort(); // 取消上传任务
+})();
+
+(() => {
+	swan.downloadFile({
+		url: 'https://smartprogram.baidu.com/xxx', // 仅为示例，并非真实的资源
+		success(res) {
+			// 下载成功
+			if (res.statusCode === 200) {
+				console.log("临时文件路径" + res.tempFilePath);
+			}
+		},
+		fail(err) {
+			console.log('错误码：' + err.errCode);
+			console.log('错误信息：' + err.errMsg);
+		}
+	});
+})();
+
+(() => {
+	const downloadTask = swan.downloadFile({
+		url: 'https://smartprogram.baidu.com/xxx', // 仅为示例，并非真实的资源
+		success(res) {
+			console.log(res.tempFilePath);
+		},
+		fail(err) {
+			console.log('错误码：' + err.errCode);
+			console.log('错误信息：' + err.errMsg);
+		}
+	});
+
+	downloadTask.onProgressUpdate(res => {
+		console.log('下载进度', res.progress);
+		console.log('已经下载的数据长度', res.totalBytesWritten);
+		console.log('预期需要下载的数据总长度', res.totalBytesExpectedToWrite);
+	});
+
+	downloadTask.abort(); // 取消下载任务
+})();
+
+(() => {
+	swan.connectSocket({
+		url: 'wss://example.baidu.com'
+	});
+})();
+
+(() => {
+	swan.connectSocket({
+		url: 'wss://example.baidu.com'
+	});
+	swan.onSocketOpen((res) => {
+		console.log('WebSocket连接已打开！', res.header);
+	});
+})();
+
+(() => {
+	swan.connectSocket({
+		url: 'wss://example.baidu.com' // 仅为示例，并非真实的服务地址
+	});
+	swan.onSocketError((res) => {
+		console.log('WebSocket连接打开失败，请检查！');
+	});
+})();
+
+(() => {
+	swan.connectSocket({
+		url: 'wss://example.baidu.com'
+	});
+	swan.onSocketOpen(() => {
+		swan.sendSocketMessage({
+			data: 'baidu'
+		});
+	});
+})();
+
+(() => {
+	swan.connectSocket({
+		url: 'wss://example.baidu.com'
+	});
+	swan.onSocketOpen(() => {
+		swan.sendSocketMessage({
+			data: 'baidu'
+		});
+	});
+	swan.onSocketMessage((res) => {
+		console.log('收到服务器内容：', res.data);
+	});
+})();
+
+(() => {
+	swan.connectSocket({
+		url: 'wss://example.baidu.com',
+		success(res) {
+			swan.closeSocket();
+		}
+	});
+})();
+
+(() => {
+	swan.connectSocket({
+		url: 'wss://example.baidu.com'
+	});
+
+	swan.onSocketClose((res) => {
+		console.log('WebSocket 已关闭！');
+	});
+
+	swan.onSocketOpen(() => {
+		swan.closeSocket();
+	});
+})();
+
+(() => {
+	swan.chooseImage({
+		success(res) {
+			const image = res.tempFilePaths[0];
+			swan.ai.ocrIdCard({
+				image,
+				success(res) {
+					console.log(res.words_result);
+				}
+			});
+		}
+	});
+	swan.chooseImage({
+		success(res) {
+			const image = res.tempFilePaths[0];
+			swan.ai.ocrBankCard({
+				image,
+				success(res) {
+					console.log(res.result.bank_name);
+				}
+			});
+		}
+	});
+	swan.chooseImage({
+		success(res) {
+			const image = res.tempFilePaths[0];
+			swan.ai.ocrDrivingLicense({
+				image,
+				success(res) {
+					console.log(res.words_result);
+				}
+			});
+		}
+	});
+	swan.chooseImage({
+		success(res) {
+			const image = res.tempFilePaths[0];
+			swan.ai.ocrVehicleLicense({
+				image,
+				success(res) {
+					console.log(res.words_result);
+				}
+			});
+		}
+	});
+})();
+
+(() => {
+	swan.ai.textReview({
+		content: '',
+		success(res) {
+			console.log(res.result.spam); // 0 表示审核通过
+		}
+	});
+})();
+
+(() => {
+	swan.ai.textToAudio({
+		ctp: '1',
+		lan: 'zh',
+		tex: '这是一段测试文字',
+		success(res) {
+			console.log(res.filePath);
+		}
+	});
+})();
+
+(() => {
+	swan.chooseImage({
+		success(res) {
+			const image = res.tempFilePaths[0];
+			swan.ai.imageAudit({
+				image,
+				success(res) {
+					console.log(res.conclusionType); // 1 为合规
+				}
+			});
+		}
+	});
+})();
+
+(() => {
+	swan.chooseImage({
+		success(res) {
+			const image = res.tempFilePaths[0];
+			swan.ai.advancedGeneralIdentify({
+				image,
+				success(res) {
+					console.log(res.result);
+				}
+			});
+		}
+	});
+	swan.chooseImage({
+		success(res) {
+			const image = res.tempFilePaths[0];
+			swan.ai.objectDetectIdentify({
+				image,
+				success(res) {
+					console.log(res.result);
+				}
+			});
+		}
+	});
+	swan.chooseImage({
+		success(res) {
+			const image = res.tempFilePaths[0];
+			swan.ai.carClassify({
+				image,
+				success(res) {
+					console.log(res.result);
+				}
+			});
+		}
+	});
+	swan.chooseImage({
+		success(res) {
+			const image = res.tempFilePaths[0];
+			swan.ai.dishClassify({
+				image,
+				success(res) {
+					console.log(res.result);
+				}
+			});
+		}
+	});
+	swan.chooseImage({
+		success(res) {
+			const image = res.tempFilePaths[0];
+			swan.ai.logoClassify({
+				image,
+				success(res) {
+					console.log(res.result);
+				}
+			});
+		}
+	});
+	swan.chooseImage({
+		success(res) {
+			const image = res.tempFilePaths[0];
+			swan.ai.animalClassify({
+				image,
+				success(res) {
+					console.log(res.result);
+				}
+			});
+		}
+	});
+	swan.chooseImage({
+		success(res) {
+			const image = res.tempFilePaths[0];
+			swan.ai.plantClassify({
+				image,
+				success(res) {
+					console.log(res.result);
+				}
+			});
+		}
+	});
+})();
+
+(() => {
+	const voiceRecognizer = swan.ai.getVoiceRecognizer();
+
+	voiceRecognizer.onStart(() => {
+		console.log('voice start');
+	});
+	voiceRecognizer.onRecognize(res => {
+		console.log('voice recognize', res);
+	});
+	voiceRecognizer.onFinish(res => {
+		console.log('voice end', res);
+	});
+	voiceRecognizer.onError(err => {
+		console.log('voice error', err);
+	});
+
+	const options = {
+		mode: 'dnn',
+		longSpeech: false
+	};
+
+	voiceRecognizer.start(options);
+})();
+
+(() => {
+	swan.chooseImage({
+		count: 1,
+		sizeType: ['original', 'compressed'], // 可以指定是原图还是压缩图，默认二者都有
+		sourceType: ['album', 'camera'], // 可以指定来源是相册还是相机，默认二者都有
+		success(res) {
+			// 成功则返回图片的本地文件路径列表 tempFilePaths
+			console.log(res.tempFilePaths);
+			// 文件列表对象
+			console.log(res.tempFiles);
+		},
+		fail(err) {
+			console.log('错误码：' + err.errCode);
+			console.log('错误信息：' + err.errMsg);
+		}
+	});
+})();
+
+(() => {
+	swan.previewImage({
+		current: '', // 当前显示图片的http链接
+		urls: [], // 需要预览的图片http链接列表
+		fail(err) {
+			console.log('错误码：' + err.errCode);
+			console.log('错误信息：' + err.errMsg);
+		}
+	});
+
+	swan.getImageInfo({
+		src: '/xxx/xxx.jpg',
+		success(res) {
+			// 成功则返回图片高，宽，本地路径
+			console.log(res.width);
+			console.log(res.height);
+			console.log(res.path);
+		},
+		fail(err) {
+			console.log('错误码：' + err.errCode);
+			console.log('错误信息：' + err.errMsg);
+		}
+	});
+	swan.saveImageToPhotosAlbum({
+		filePath: '/xxx/xxx.jpg',
+		success(res) {
+			console.log(res);
+		},
+		fail(err) {
+			console.log('错误码：' + err.errCode);
+			console.log('错误信息：' + err.errMsg);
+		}
+	});
+})();
+
+(() => {
+	const recorderManager = swan.getRecorderManager();
+
+	recorderManager.onStart(() => {
+		// 开始录音事件
+		console.log('recorder start');
+	});
+	recorderManager.onPause(() => {
+		// 暂停录音事件
+		console.log('recorder pause');
+	});
+	recorderManager.onStop((res) => {
+		// 停止录音事件
+		console.log('recorder stop', res);
+		const { tempFilePath } = res;
+	});
+
+	const options = {
+		duration: 10000,
+		sampleRate: 44100,
+		numberOfChannels: 1,
+		encodeBitRate: 96000,
+		format: 'aac'
+	};
+
+	recorderManager.start(options);
+})();
+
+(() => {
+	const backgroundAudioManager = swan.getBackgroundAudioManager();
+
+	backgroundAudioManager.title = '此时此刻';
+	backgroundAudioManager.epname = '此时此刻';
+	backgroundAudioManager.singer = '许巍';
+	backgroundAudioManager.coverImgUrl = 'xxx';
+	backgroundAudioManager.src = 'xxx';
+})();
+
+(() => {
+	const innerAudioContext = swan.createInnerAudioContext();
+	innerAudioContext.src = 'xxx';
+	innerAudioContext.autoplay = true;
+	innerAudioContext.seek({
+		position: 10
+	});
+	innerAudioContext.onPlay((res) => {
+		console.log('开始播放');
+	});
+})();
+
+(() => {
+	Page({
+		data: {
+			sourceType: ['album', 'camera'],
+			compressed: false,
+			maxDuration: 60,
+			src: ''
+		},
+
+		chooseVideo() {
+			const self = this;
+			swan.chooseVideo({
+				sourceType: this.getData('sourceType'),
+				compressed: this.getData('compressed'),
+				maxDuration: this.getData('maxDuration'),
+				success(res) {
+					// 成功返回选定视频的临时文件路径
+					self.setData('src', res.tempFilePath);
+				},
+				fail(err) {
+					console.log('错误码：' + err.errCode);
+					console.log('错误信息：' + err.errMsg);
+				}
+			});
+		}
+	});
+	swan.saveVideoToPhotosAlbum({
+		filePath: 'bdfile://xxx',
+		success(res) {
+			console.log(res);
+		},
+		fail(err) {
+			console.log('错误码：' + err.errCode);
+			console.log('错误信息：' + err.errMsg);
+		}
+	});
+})();
+
+(() => {
+	const myVideo = swan.createVideoContext('myVideo');
+	myVideo.play();
+})();
+
+(() => {
+	swan.chooseImage({
+		count: 1,
+		success(res) {
+			const tempFilePaths = res.tempFilePaths;
+			swan.saveFile({
+				tempFilePath: tempFilePaths[0],
+				success(res) {
+					const savedFilePath = res.savedFilePath;
+				}
+			});
+		}
+	});
+	swan.getFileInfo({
+		filePath: 'bdfile://somefile',
+		success(res) {
+			console.log(res.size);
+			console.log(res.digest);
+		}
+	});
+	swan.getSavedFileList({
+		success(res) {
+			const fileList = res.fileList;
+		}
+	});
+	swan.getSavedFileInfo({
+		filePath: 'bdfile://somefile',
+		success(res) {
+			console.log(res.size);
+			console.log(res.createTime);
+		},
+		fail(err) {
+			console.log('错误码：' + err.errCode);
+			console.log('错误信息：' + err.errMsg);
+		}
+	});
+})();
+
+(() => {
+	swan.getSavedFileList({
+		success(res) {
+			if (res.fileList.length > 0) {
+				swan.removeSavedFile({
+					filePath: res.fileList[0].filePath,
+					success(res) {
+						console.log(res.filePath);
+					}
+				});
+			}
+		}
+	});
+})();
+
+(() => {
+	swan.downloadFile({
+		url: 'https://smartprogram.baidu.com/xxx.pdf',
+		success(res) {
+			const filePath = res.tempFilePath;
+			swan.openDocument({
+				filePath,
+				success(res) {
+					console.log('打开文档成功');
+				}
+			});
+		}
+	});
+})();
+
+(() => {
+	swan.setStorage({
+		key: 'key',
+		data: 'value'
+	});
+})();
+
+(() => {
+	try {
+		swan.setStorageSync('key', 'value');
+	} catch (e) {
+	}
+	swan.getStorage({
+		key: 'key',
+		success(res) {
+			console.log(res.data);
+		},
+		fail(err) {
+			console.log('错误码：' + err.errCode);
+			console.log('错误信息：' + err.errMsg);
+		}
+	});
+	try {
+		const result = swan.getStorageSync('key');
+	} catch (e) {
+	}
+	swan.getStorageInfo({
+		success(res) {
+			console.log(res.keys);
+		},
+		fail(err) {
+			console.log('错误码：' + err.errCode);
+			console.log('错误信息：' + err.errMsg);
+		}
+	});
+	try {
+		const result = swan.getStorageInfoSync();
+		console.log(result);
+	} catch (e) {
+	}
+})();
+
+(() => {
+	swan.removeStorage({
+		key: 'key',
+		success(res) {
+			console.log(res);
+		},
+		fail(err) {
+			console.log('错误码：' + err.errCode);
+			console.log('错误信息：' + err.errMsg);
+		}
+	});
+	try {
+		swan.removeStorageSync('key');
+	} catch (e) {
+	}
+	try {
+		swan.clearStorageSync();
+	} catch (e) {
+	}
+})();
+
+(() => {
+	swan.getLocation({
+		type: 'gcj02',
+		success(res) {
+			console.log('纬度：' + res.latitude);
+			console.log('经度：' + res.longitude);
+		},
+		fail(err) {
+			console.log('错误码：' + err.errCode);
+			console.log('错误信息：' + err.errMsg);
+		}
+	});
+})();
+
+(() => {
+	swan.getLocation({
+		type: 'gcj02',
+		success(res) {
+			swan.openLocation({
+				latitude: res.latitude,
+				longitude: res.longitude,
+				scale: 18
+			});
+		},
+		fail(err) {
+			console.log('错误码：' + err.errCode);
+			console.log('错误信息：' + err.errMsg);
+		}
+	});
+})();
+
+(() => {
+	let mapContext: swan.MapContext;
+	Page({
+		data: {
+			latitude: '40.042500',
+			longitude: '116.274040',
+		},
+		onReady() {
+			mapContext = swan.createMapContext('myMap');
+		},
+		getCenterLocation() {
+			mapContext.getCenterLocation({
+				success(res) {
+					console.log("经度" + res.longitude);
+					console.log("纬度" + res.latitude);
+				}
+			});
+		},
+		moveToLocation() {
+			mapContext.moveToLocation();
+		},
+		translateMarker() {
+			mapContext.translateMarker({
+				markerId: 0,
+				rotate: 90,
+				autoRotate: true,
+				duration: 1000,
+				destination: {
+					latitude: 23.10229,
+					longitude: 113.3345211,
+				},
+				animationEnd() {
+					console.log('animation end');
+				}
+			});
+		},
+		includePoints() {
+			mapContext.includePoints({
+				padding: [10],
+				points: [{
+					latitude: 23,
+					longitude: 113.33,
+				}, {
+					latitude: 23,
+					longitude: 113.3345211,
+				}]
+			});
+		},
+		getRegion() {
+			mapContext.getRegion({
+				success(res) {
+					console.log("西南角的经纬度" + res.southwest);
+					console.log("东北角的经纬度" + res.northeast);
+				}
+			});
+		}
+	});
+})();
+
+(() => {
+	Page({
+		onReady() {
+			const ctx = this.createCanvasContext('myCanvas');
+			ctx.setFillStyle('#ff0000');
+			ctx.arc(100, 100, 50, 0, 2 * Math.PI);
+			ctx.fill();
+			ctx.draw();
+		}
+	});
+	Page({
+		onReady() {
+			const ctx = this.createCanvasContext('myCanvas');
+		}
+	});
+	const ctx = swan.createCanvasContext('myCanvas');
+	ctx.setFillStyle('#ff0000');
+	ctx.arc(100, 100, 50, 0, 2 * Math.PI);
+	ctx.fill();
+
+	ctx.draw();
+
+	swan.canvasGetImageData({
+		canvasId: 'myCanvas',
+		x: 0,
+		y: 0,
+		width: 100,
+		height: 100,
+		success(res) {
+			console.log(res);
+		}
+	});
+	const data = new Uint8ClampedArray([255, 0, 0, 1]);
+	swan.canvasPutImageData({
+		canvasId: 'myCanvas',
+		data,
+		x: 0,
+		y: 0,
+		width: 1,
+		height: 2,
+		success(res) {
+			console.log('success');
+		}
+	});
+	swan.canvasToTempFilePath({
+		x: 100,
+		y: 200,
+		width: 50,
+		height: 50,
+		destWidth: 100,
+		destHeight: 100,
+		canvasId: 'myCanvas',
+		success(res) {
+			console.log(res.tempFilePath);
+		}
+	});
+})();
+
+(() => {
+	const ctx = swan.createCanvasContext('myCanvas');
+	ctx.setFillStyle('blue');
+	ctx.fillRect(30, 30, 150, 75);
+	ctx.draw();
+})();
+
+(() => {
+	const ctx = swan.createCanvasContext('myCanvas');
+	ctx.setFillStyle('blue');
+	ctx.setShadow(10, 50, 50, 'red');
+	ctx.fillRect(30, 30, 150, 75);
+	ctx.draw();
+})();
+
+(() => {
+	const ctx = swan.createCanvasContext('myCanvas');
+
+	// Create linear gradient
+	const grd = ctx.createLinearGradient(0, 0, 200, 0);
+	grd.addColorStop(0, 'blue');
+	grd.addColorStop(1, 'red');
+
+	// Fill with gradient
+	ctx.setFillStyle(grd);
+	ctx.fillRect(30, 30, 150, 80);
+	ctx.draw();
+})();
+
+(() => {
+	const ctx = swan.createCanvasContext('myCanvas');
+
+	// Create circular gradient
+	const grd = ctx.createCircularGradient(75, 50, 50);
+	grd.addColorStop(0, 'red');
+	grd.addColorStop(1, 'blue');
+
+	// Fill with gradient
+	ctx.setFillStyle(grd);
+	ctx.fillRect(30, 30, 150, 80);
+	ctx.draw();
+})();
+
+(() => {
+	const ctx = swan.createCanvasContext('myCanvas');
+
+	// Create circular gradient
+	const grd = ctx.createLinearGradient(30, 10, 120, 10);
+	grd.addColorStop(0, 'red');
+	grd.addColorStop(0.16, 'orange');
+	grd.addColorStop(0.33, 'yellow');
+	grd.addColorStop(0.5, 'green');
+	grd.addColorStop(0.66, 'cyan');
+	grd.addColorStop(0.83, 'blue');
+	grd.addColorStop(1, 'purple');
+
+	// Fill with gradient
+	ctx.setFillStyle(grd);
+	ctx.fillRect(30, 30, 150, 80);
+	ctx.draw();
+})();
+
+(() => {
+	const ctx = swan.createCanvasContext('myCanvas');
+	ctx.beginPath();
+	ctx.moveTo(30, 10);
+	ctx.lineTo(200, 10);
+	ctx.stroke();
+
+	ctx.beginPath();
+	ctx.setLineWidth(5);
+	ctx.moveTo(50, 30);
+	ctx.lineTo(200, 30);
+	ctx.stroke();
+
+	ctx.beginPath();
+	ctx.setLineWidth(10);
+	ctx.moveTo(70, 50);
+	ctx.lineTo(200, 50);
+	ctx.stroke();
+
+	ctx.beginPath();
+	ctx.setLineWidth(15);
+	ctx.moveTo(90, 70);
+	ctx.lineTo(200, 70);
+	ctx.stroke();
+
+	ctx.draw();
+})();
+
+(() => {
+	const ctx = swan.createCanvasContext('myCanvas');
+	ctx.beginPath();
+	ctx.moveTo(30, 10);
+	ctx.lineTo(200, 10);
+	ctx.stroke();
+
+	ctx.beginPath();
+	ctx.setLineCap('butt');
+	ctx.setLineWidth(10);
+	ctx.moveTo(50, 30);
+	ctx.lineTo(200, 30);
+	ctx.stroke();
+
+	ctx.beginPath();
+	ctx.setLineCap('round');
+	ctx.setLineWidth(10);
+	ctx.moveTo(70, 50);
+	ctx.lineTo(200, 50);
+	ctx.stroke();
+
+	ctx.beginPath();
+	ctx.setLineCap('square');
+	ctx.setLineWidth(10);
+	ctx.moveTo(90, 70);
+	ctx.lineTo(200, 70);
+	ctx.stroke();
+
+	ctx.draw();
+})();
+
+(() => {
+	const ctx = swan.createCanvasContext('myCanvas');
+	ctx.beginPath();
+	ctx.moveTo(10, 10);
+	ctx.lineTo(100, 50);
+	ctx.lineTo(10, 90);
+	ctx.stroke();
+
+	ctx.beginPath();
+	ctx.setLineJoin('bevel');
+	ctx.setLineWidth(10);
+	ctx.moveTo(50, 10);
+	ctx.lineTo(140, 50);
+	ctx.lineTo(50, 90);
+	ctx.stroke();
+
+	ctx.beginPath();
+	ctx.setLineJoin('round');
+	ctx.setLineWidth(10);
+	ctx.moveTo(90, 10);
+	ctx.lineTo(180, 50);
+	ctx.lineTo(90, 90);
+	ctx.stroke();
+
+	ctx.beginPath();
+	ctx.setLineJoin('miter');
+	ctx.setLineWidth(10);
+	ctx.moveTo(130, 10);
+	ctx.lineTo(220, 50);
+	ctx.lineTo(130, 90);
+	ctx.stroke();
+
+	ctx.draw();
+})();
+
+(() => {
+	const ctx = swan.createCanvasContext('myCanvas');
+	ctx.setLineDash([10, 20], 5);
+	ctx.beginPath();
+	ctx.moveTo(0, 100);
+	ctx.lineTo(400, 100);
+	ctx.stroke();
+	ctx.draw();
+})();
+
+(() => {
+	const ctx = swan.createCanvasContext('myCanvas');
+	ctx.beginPath();
+	ctx.setLineWidth(10);
+	ctx.setLineJoin('miter');
+	ctx.setMiterLimit(1);
+	ctx.moveTo(10, 10);
+	ctx.lineTo(100, 50);
+	ctx.lineTo(10, 90);
+	ctx.stroke();
+
+	ctx.beginPath();
+	ctx.setLineWidth(10);
+	ctx.setLineJoin('miter');
+	ctx.setMiterLimit(2);
+	ctx.moveTo(50, 10);
+	ctx.lineTo(140, 50);
+	ctx.lineTo(50, 90);
+	ctx.stroke();
+
+	ctx.beginPath();
+	ctx.setLineWidth(10);
+	ctx.setLineJoin('miter');
+	ctx.setMiterLimit(3);
+	ctx.moveTo(90, 10);
+	ctx.lineTo(180, 50);
+	ctx.lineTo(90, 90);
+	ctx.stroke();
+
+	ctx.beginPath();
+	ctx.setLineWidth(10);
+	ctx.setLineJoin('miter');
+	ctx.setMiterLimit(4);
+	ctx.moveTo(130, 10);
+	ctx.lineTo(220, 50);
+	ctx.lineTo(130, 90);
+	ctx.stroke();
+
+	ctx.draw();
+})();
+
+(() => {
+	const ctx = swan.createCanvasContext('myCanvas');
+	ctx.rect(30, 30, 150, 75);
+	ctx.setFillStyle('blue');
+	ctx.fill();
+	ctx.draw();
+})();
+
+(() => {
+	const ctx = swan.createCanvasContext('myCanvas');
+	ctx.setFillStyle('blue');
+	ctx.fillRect(30, 30, 150, 75);
+	ctx.draw();
+})();
+
+(() => {
+	const ctx = swan.createCanvasContext('myCanvas');
+	ctx.setStrokeStyle('blue');
+	ctx.strokeRect(30, 30, 150, 75);
+	ctx.draw();
+})();
+
+(() => {
+	const ctx = swan.createCanvasContext('myCanvas');
+	ctx.setFillStyle('red');
+	ctx.fillRect(0, 0, 150, 200);
+	ctx.setFillStyle('blue');
+	ctx.fillRect(150, 0, 150, 200);
+	ctx.clearRect(30, 30, 150, 75);
+	ctx.draw();
+})();
+
+(() => {
+	const ctx = swan.createCanvasContext('myCanvas');
+	ctx.moveTo(100, 100);
+	ctx.lineTo(10, 100);
+	ctx.lineTo(10, 10);
+	ctx.fill();
+	ctx.draw();
+})();
+
+(() => {
+	const ctx = swan.createCanvasContext('myCanvas');
+	ctx.moveTo(100, 100);
+	ctx.lineTo(10, 100);
+	ctx.lineTo(10, 10);
+	ctx.stroke();
+	ctx.draw();
+})();
+
+(() => {
+	const ctx = swan.createCanvasContext('myCanvas');
+	ctx.rect(10, 10, 100, 30);
+	ctx.setFillStyle('red');
+	ctx.fill();
+	ctx.beginPath();
+	ctx.rect(10, 40, 100, 30);
+	ctx.setFillStyle('blue');
+	ctx.fillRect(10, 70, 100, 30);
+	ctx.rect(10, 100, 100, 30);
+	ctx.setFillStyle('green');
+	ctx.fill();
+	ctx.draw();
+})();
+
+(() => {
+	const ctx = swan.createCanvasContext('myCanvas');
+	ctx.moveTo(100, 100);
+	ctx.lineTo(10, 100);
+	ctx.lineTo(10, 10);
+	ctx.closePath();
+	ctx.stroke();
+	ctx.draw();
+})();
+
+(() => {
+	const ctx = swan.createCanvasContext('myCanvas');
+	ctx.moveTo(10, 10);
+	ctx.lineTo(100, 10);
+	ctx.moveTo(10, 100);
+	ctx.lineTo(100, 100);
+	ctx.stroke();
+	ctx.draw();
+})();
+
+(() => {
+	const ctx = swan.createCanvasContext('myCanvas');
+	ctx.moveTo(10, 10);
+	ctx.rect(10, 10, 100, 50);
+	ctx.lineTo(110, 60);
+	ctx.stroke();
+	ctx.draw();
+})();
+
+(() => {
+	const ctx = swan.createCanvasContext('myCanvas');
+	ctx.arc(100, 75, 50, 0, 2 * Math.PI);
+	ctx.setFillStyle('blue');
+	ctx.fill();
+	ctx.draw();
+})();
+
+(() => {
+	const ctx = swan.createCanvasContext('myCanvas');
+
+	ctx.strokeRect(10, 10, 25, 15);
+	ctx.scale(2, 2);
+	ctx.strokeRect(10, 10, 25, 15);
+	ctx.scale(2, 2);
+	ctx.strokeRect(10, 10, 25, 15);
+
+	ctx.draw();
+})();
+
+(() => {
+	const ctx = swan.createCanvasContext('myCanvas');
+
+	ctx.strokeRect(100, 10, 150, 100);
+	ctx.rotate(20 * Math.PI / 180);
+	ctx.strokeRect(100, 10, 150, 100);
+	ctx.rotate(20 * Math.PI / 180);
+	ctx.strokeRect(100, 10, 150, 100);
+
+	ctx.draw();
+})();
+
+(() => {
+	const ctx = swan.createCanvasContext('myCanvas');
+
+	ctx.strokeRect(10, 10, 150, 100);
+	ctx.translate(20, 20);
+	ctx.strokeRect(10, 10, 150, 100);
+	ctx.translate(20, 20);
+	ctx.strokeRect(10, 10, 150, 100);
+
+	ctx.draw();
+})();
+
+(() => {
+	const ctx = swan.createCanvasContext('myCanvas');
+
+	swan.downloadFile({
+		url: 'https://b.bdstatic.com/searchbox/icms/searchbox/img/LOGO300x300.jpg',
+		success(res) {
+			ctx.save();
+			ctx.beginPath();
+			ctx.arc(50, 50, 25, 0, 2 * Math.PI);
+			ctx.clip();
+			ctx.drawImage(res.tempFilePath, 25, 25);
+			ctx.restore();
+			ctx.draw();
+		}
+	});
+})();
+
+(() => {
+	const ctx = swan.createCanvasContext('myCanvas');
+
+	ctx.setFontSize(20);
+	ctx.fillText('20', 20, 20);
+	ctx.setFontSize(30);
+	ctx.fillText('30', 40, 40);
+	ctx.setFontSize(40);
+	ctx.fillText('40', 60, 60);
+	ctx.setFontSize(50);
+	ctx.fillText('50', 90, 90);
+
+	ctx.draw();
+})();
+
+(() => {
+	const ctx = swan.createCanvasContext('myCanvas');
+
+	ctx.setFontSize(20);
+	ctx.fillText('Hello', 20, 20);
+	ctx.fillText('World', 100, 100);
+
+	ctx.draw();
+})();
+
+(() => {
+	const ctx = swan.createCanvasContext('myCanvas');
+
+	ctx.setStrokeStyle('red');
+	ctx.moveTo(150, 20);
+	ctx.lineTo(150, 170);
+	ctx.stroke();
+
+	ctx.setFontSize(15);
+	ctx.setTextAlign('left');
+	ctx.fillText('textAlign=left', 150, 60);
+
+	ctx.setTextAlign('center');
+	ctx.fillText('textAlign=center', 150, 80);
+
+	ctx.setTextAlign('right');
+	ctx.fillText('textAlign=right', 150, 100);
+
+	ctx.draw();
+})();
+
+(() => {
+	const ctx = swan.createCanvasContext('myCanvas');
+
+	ctx.setStrokeStyle('red');
+	ctx.moveTo(5, 75);
+	ctx.lineTo(295, 75);
+	ctx.stroke();
+
+	ctx.setFontSize(20);
+
+	ctx.setTextBaseline('top');
+	ctx.fillText('top', 5, 75);
+
+	ctx.setTextBaseline('middle');
+	ctx.fillText('middle', 50, 75);
+
+	ctx.setTextBaseline('bottom');
+	ctx.fillText('bottom', 120, 75);
+
+	ctx.setTextBaseline('normal');
+	ctx.fillText('normal', 200, 75);
+
+	ctx.draw();
+})();
+
+(() => {
+	const ctx = swan.createCanvasContext('myCanvas');
+
+	swan.chooseImage({
+		success(res) {
+			ctx.drawImage(res.tempFilePaths[0], 0, 0, 150, 100);
+			ctx.draw();
+		}
+	});
+})();
+
+(() => {
+	const ctx = swan.createCanvasContext('myCanvas');
+
+	ctx.setFillStyle('red');
+	ctx.fillRect(10, 10, 150, 100);
+	ctx.setGlobalAlpha(0.2);
+	ctx.setFillStyle('blue');
+	ctx.fillRect(50, 50, 150, 100);
+	ctx.setFillStyle('yellow');
+	ctx.fillRect(100, 100, 150, 100);
+
+	ctx.draw();
+})();
+
+(() => {
+	const ctx = swan.createCanvasContext('myCanvas');
+	ctx.font = 'italic bold 20px cursive';
+	const metrics = ctx.measureText('Hello World');
+	console.log(metrics.width);
+})();
+
+(() => {
+	const ctx = swan.createCanvasContext('myCanvas');
+	const pattern = ctx.createPattern('/path/to/image', 'repeat-x');
+	ctx.fillStyle = pattern;
+	ctx.fillRect(0, 0, 300, 150);
+	ctx.draw();
+})();
+
+(() => {
+	const ctx = swan.createCanvasContext('myCanvas');
+	// Draw quadratic curve
+	ctx.beginPath();
+	ctx.moveTo(20, 20);
+	ctx.bezierCurveTo(20, 100, 200, 100, 200, 20);
+	ctx.setStrokeStyle('black');
+	ctx.stroke();
+
+	ctx.draw();
+})();
+
+(() => {
+	const ctx = swan.createCanvasContext('myCanvas');
+	// Draw quadratic curve
+	ctx.beginPath();
+	ctx.moveTo(20, 20);
+	ctx.quadraticCurveTo(20, 100, 200, 20);
+	ctx.setStrokeStyle('blue');
+	ctx.stroke();
+
+	ctx.draw();
+})();
+
+(() => {
+	const ctx = swan.createCanvasContext('myCanvas');
+	// save the default fill style
+	ctx.save();
+	ctx.setFillStyle('blue');
+	ctx.fillRect(10, 10, 150, 100);
+
+	// restore to the previous saved state
+	ctx.restore();
+	ctx.fillRect(50, 50, 150, 100);
+
+	ctx.draw();
+})();
+
+(() => {
+	const ctx = swan.createCanvasContext('myCanvas');
+	// save the default fill style
+	ctx.save();
+	ctx.setFillStyle('blue');
+	ctx.fillRect(10, 10, 150, 100);
+
+	// restore to the previous saved state
+	ctx.restore();
+	ctx.fillRect(50, 50, 150, 100);
+
+	ctx.draw();
+})();
+
+(() => {
+	const ctx = swan.createCanvasContext('myCanvas');
+	ctx.setFillStyle('blue');
+	ctx.fillRect(10, 10, 150, 100);
+	ctx.draw();
+	ctx.fillRect(30, 30, 150, 100);
+	ctx.draw();
+})();
+
+(() => {
+	swan.showToast({
+		title: '我是标题',
+		icon: 'loading',
+		duration: 1000,
+	});
+	swan.showLoading({
+		title: '加载中',
+		mask: 'true'
+	});
+
+	setTimeout(() => {
+		swan.hideLoading();
+	}, 2000);
+
+	swan.showModal({
+		title: '提示',
+		content: '这是一个模态弹窗',
+		cancelColor: '#999999',
+		confirmColor: '#0099cc',
+		success(res) {
+			if (res.confirm) {
+				console.log('用户点击了确定');
+			} else if (res.cancel) {
+				console.log('用户点击了取消');
+			}
+		}
+	});
+	swan.showActionSheet({
+		itemList: ['同意', '一般', '不同意'],
+		success(res) {
+			console.log(`用户点击了第${(res.tapIndex + 1)}个按钮`);
+		}
+	});
+})();
+
+(() => {
+	swan.setNavigationBarTitle({
+		title: '我是页面标题'
+	});
+	swan.setNavigationBarColor({
+		frontColor: '#ffffff',
+		backgroundColor: '#ff0000',
+		animation: {
+			duration: 500,
+			timingFunc: 'linear'
+		}
+	});
+})();
+
+(() => {
+	swan.setTabBarBadge({
+		index: 0,
+		text: '文本'
+	});
+	swan.removeTabBarBadge({
+		index: 0
+	});
+	swan.showTabBarRedDot({
+		index: 0
+	});
+	swan.hideTabBarRedDot({
+		index: 0
+	});
+	swan.setTabBarStyle({
+		color: '#FFFFBD',
+		selectedColor: '#FFFFBD',
+		backgroundColor: '#FFFFBD',
+		borderStyle: 'white'
+	});
+	swan.setTabBarItem({
+		index: 0,
+		text: '文本',
+		// 图片路径
+		iconPath: '/images/component_normal.png',
+		// 选中图片路径
+		selectedIconPath: '/images/component_selected.png',
+	});
+	swan.showTabBar({
+		success(res) {
+			console.log(res);
+		},
+		fail(err) {
+			console.log('错误码：' + err.errCode);
+			console.log('错误信息：' + err.errMsg);
+		}
+	});
+	swan.hideTabBar({
+		success(res) {
+			console.log(res);
+		},
+		fail(err) {
+			console.log('错误码：' + err.errCode);
+			console.log('错误信息：' + err.errMsg);
+		}
+	});
+})();
+
+(() => {
+	swan.navigateTo({
+		// 此路径为相对路径；如需写为绝对地址，则可写为‘/example/xxx?key=valu’。
+		url: 'example/xxx?key=value'
+	});
+	swan.redirectTo({
+		// 此路径为相对路径；如需写为绝对地址，则可写为‘/example/xxx?key=valu’。
+		url: 'example/xxx?key=value'
+	});
+	swan.switchTab({
+		url: '/list',
+	});
+	// 注意：调用 navigateTo 跳转时，调用页面会被加入堆栈，而 redirectTo 方法则不会。见下方示例代码
+
+	// 当前是首页
+	swan.navigateTo({
+		url: 'list?key=value'
+	});
+
+	// 当前是列表页
+	swan.navigateTo({
+		url: 'detail?key=value'
+	});
+
+	// 在详情页内 navigateBack，将返回首页
+	swan.navigateBack({
+		delta: 2
+	});
+	swan.reLaunch({
+		// 此路径为相对路径；如需写为绝对地址，则可写为‘/example/xxx?key=valu’。
+		url: 'example/xxx?key=value'
+	});
+})();
+
+(() => {
+	const animation = swan.createAnimation({
+		transformOrigin: "50% 50%",
+		duration: 1000,
+		timingFunction: "ease",
+		delay: 0
+	});
+	Page({
+		data: {
+			animationData: {}
+		},
+		starttoanimate() {
+			const animation = swan.createAnimation();
+			animation.rotate(90).translateY(10).step();
+			animation.rotate(-90).translateY(-10).step();
+			this.setData({
+				animationData: animation.export()
+			});
+		}
+	});
+})();
+
+(() => {
+	swan.pageScrollTo({
+		scrollTop: 0,
+		duration: 300
+	});
+})();
+
+(() => {
+	Page({
+		onPullDownRefresh() {
+			// do something
+		}
+	});
+	swan.startPullDownRefresh();
+	swan.stopPullDownRefresh();
+})();
+
+(() => {
+	swan.createIntersectionObserver({} as any, {
+		selectAll: true
+	}).relativeTo('.container')
+		.observe('.ball', res => {
+			console.log(res.intersectionRect); // 相交区域
+			console.log(res.intersectionRect.left); // 相交区域的左边界坐标
+			console.log(res.intersectionRect.top); // 相交区域的上边界坐标
+			console.log(res.intersectionRect.width); // 相交区域的宽度
+			console.log(res.intersectionRect.height); // 相交区域的高度
+		});
+	Page({
+		queryMultipleNodes() {
+			const query = swan.createSelectorQuery();
+			query.select('#the-id').boundingClientRect();
+			query.selectViewport().scrollOffset();
+			query.exec((res) => {
+				// res[0].top,       // #the-id节点的上边界坐标
+				// res[1].scrollTop // 显示区域的竖直滚动位置
+			});
+		}
+	});
+	Component({
+		// queryMultipleNodes() {
+		// 	const query = swan.createSelectorQuery().in(this);
+		// 	query.select('#the-id').boundingClientRect((res) => {
+		// 		// res.top // 这个组件内 #the-id 节点的上边界坐标
+		// 	}).exec();
+		// }
+	});
+	Page({
+		getRect() {
+			swan.createSelectorQuery().select('#the-id').boundingClientRect((res) => {
+				const rect = res as swan.NodesRefRect;
+				rect.id;      // 节点的ID
+				rect.dataset; // 节点的dataset
+				rect.left;    // 节点的左边界坐标
+				rect.right;   // 节点的右边界坐标
+				rect.top;     // 节点的上边界坐标
+				rect.bottom;  // 节点的下边界坐标
+				rect.width;   // 节点的宽度
+				rect.height;  // 节点的高度
+			}).exec();
+		},
+		getAllRects() {
+			swan.createSelectorQuery().selectAll('.a-class').boundingClientRect((rects) => {
+				(rects as swan.NodesRefRect[]).forEach((rect) => {
+					rect.id;      // 节点的ID
+					rect.dataset; // 节点的dataset
+					rect.left;    // 节点的左边界坐标
+					rect.right;   // 节点的右边界坐标
+					rect.top;     // 节点的上边界坐标
+					rect.bottom;  // 节点的下边界坐标
+					rect.width;   // 节点的宽度
+					rect.height;  // 节点的高度
+				});
+			}).exec();
+		}
+	});
+	Page({
+		getScrollOffset() {
+			swan.createSelectorQuery().selectViewport().scrollOffset((res) => {
+				res.id;      // 节点的ID
+				res.dataset; // 节点的dataset
+				res.scrollLeft; // 节点的水平滚动位置
+				res.scrollTop;  // 节点的竖直滚动位置
+			}).exec();
+		}
+	});
+	Page({
+		getFields() {
+			swan.createSelectorQuery().select('#the-id').fields({
+				dataset: true,
+				size: true,
+				scrollOffset: true,
+				properties: ['scrollX', 'scrollY'],
+				computedStyle: ['margin', 'backgroundColor']
+			}, (res) => {
+				res.dataset;    // 节点的dataset
+				res.width;      // 节点的宽度
+				res.height;     // 节点的高度
+				res.scrollLeft; // 节点的水平滚动位置
+				res.scrollTop;  // 节点的竖直滚动位置
+				res.scrollX;    // 节点 scroll-x 属性的当前值
+				res.scrollY;    // 节点 scroll-y 属性的当前值
+				// 此处返回指定要返回的样式名
+				res.margin;
+				res.backgroundColor;
+			}).exec();
+		}
+	});
+})();
+
+(() => {
+	swan.getSystemInfo({
+		success(res) {
+			console.log(res.model);
+			console.log(res.pixelRatio);
+			console.log(res.windowWidth);
+			console.log(res.windowHeight);
+			console.log(res.language);
+			console.log(res.version);
+			console.log(res.platform);
+		}
+	});
+	try {
+		const res = swan.getSystemInfoSync();
+		console.log(res.model);
+		console.log(res.pixelRatio);
+		console.log(res.windowWidth);
+		console.log(res.windowHeight);
+		console.log(res.language);
+		console.log(res.version);
+		console.log(res.platform);
+	} catch (e) {
+		// Do something when catch error
+	}
+	try {
+		const res = swan.getEnvInfoSync();
+		console.log(res.appKey);
+		console.log(res.appName);
+		console.log(res.lastAppURL);
+		console.log(res.sdkVersion);
+		console.log(res.scheme);
+	} catch (e) {
+		// Do something when catch error
+	}
+	swan.canIUse('view.hover-class');
+	swan.canIUse('scroll-view.scroll-x');
+	swan.canIUse('cover-view');
+	swan.canIUse('button.size.default');
+	swan.canIUse('button.size.default');
+	swan.canIUse('request.object.success.data');
+	swan.canIUse('getSavedFileList');
+	swan.canIUse('getSavedFileList.object');
+	swan.canIUse('getSavedFileList.object.success');
+})();
+
+(() => {
+	swan.onMemoryWarning((res) => {
+		console.log('onMemoryWarningReceive');
+	});
+})();
+
+(() => {
+	swan.getNetworkType({
+		success(res) {
+			console.log(res.networkType);
+		}
+	});
+	swan.onNetworkStatusChange((res) => {
+		console.log(res.isConnected);
+		console.log(res.networkType);
+	});
+})();
+
+(() => {
+	swan.onAccelerometerChange((res) => {
+		console.log(res.x);
+		console.log(res.y);
+		console.log(res.z);
+	});
+	swan.startAccelerometer({
+		interval: 'ui'
+	});
+	swan.stopAccelerometer();
+})();
+
+(() => {
+	swan.onCompassChange((res) => {
+		console.log(res.direction);
+	});
+	swan.startCompass();
+	swan.stopCompass();
+})();
+
+(() => {
+	swan.scanCode({
+		success(res) {
+			console.log(res.result);
+			console.log(res.scanType);
+		}
+	});
+})();
+
+(() => {
+	swan.onUserCaptureScreen(() => {
+		console.log('用户截屏了');
+	});
+})();
+
+(() => {
+	swan.makePhoneCall({
+		phoneNumber: '000000' // 仅为示例，并非真实的电话号码
+	});
+})();
+
+(() => {
+	swan.setClipboardData({
+		data: 'baidu',
+		success(res) {
+			swan.getClipboardData({
+				success(res) {
+					console.log(res.data); // baidu
+				}
+			});
+		}
+	});
+	swan.getClipboardData({
+		success(res) {
+			console.log(res.data);
+		}
+	});
+})();
+
+(() => {
+	swan.getExtConfig({
+		success(res) {
+			console.log(res.extConfig);
+		}
+	});
+	const data = swan.getExtConfigSync();
+	console.log(data.extConfig);
+})();
+
+(() => {
+	swan.login({
+		success(res) {
+			swan.request({
+				url: 'https://xxx/xxx', // 开发者服务器地址
+				data: {
+					code: res.code
+				}
+			});
+		},
+		fail(err) {
+			console.log('login fail', err);
+		}
+	});
+	swan.checkSession({
+		success(res) {
+			console.log('登录态有效');
+			swan.getUserInfo({
+				success(res) {
+					console.log('用户名', res.userInfo.nickName);
+					swan.request({
+						url: "https://xxx/decrypt_user_data", // 开发者服务器地址，对 data 进行解密
+						data: {
+							data: res.data,
+							iv: res.iv
+						}
+					});
+				}
+			});
+		},
+		fail(err) {
+			console.log('登录态无效');
+			swan.login({
+				success(res) {
+					swan.request({
+						url: 'https://xxx/xxx', // 开发者服务器地址，用 code 换取 session_key
+						data: {
+							code: res.code
+						}
+					});
+				},
+				fail(err) {
+					console.log('登录失败', err);
+				}
+			});
+		}
+	});
+
+	try {
+		const result = swan.isLoginSync();
+		console.log('isLoginSync', result);
+	} catch (e) {
+		console.log('error', e);
+	}
+})();
+
+(() => {
+	swan.authorize({
+		scope: 'scope.userLocation',
+		success(res) {
+			// 用户已经同意智能小程序使用定位功能
+			swan.getLocation();
+		}
+	});
+})();
+
+(() => {
+	swan.getSwanId({
+		success(res) {
+			console.log(res.data.swanid);
+		}
+	});
+	swan.getUserInfo({
+		success(res) {
+			console.log('用户名', res.userInfo.nickName);
+		}
+	});
+})();
+
+(() => {
+	swan.openSetting({
+		success(res) {
+			console.log(res.authSetting['scope.userInfo']);
+			console.log(res.authSetting['scope.userLocation']);
+		}
+	});
+	swan.getSetting({
+		success(res) {
+			console.log(res.authSetting['scope.userInfo']);
+			console.log(res.authSetting['scope.userLocation']);
+		}
+	});
+})();
+
+(() => {
+	Page({
+		onShareAppMessage() {
+			return {
+				title: '智能小程序示例',
+				content: '世界很复杂，百度更懂你',
+				path: '/pages/openShare/openShare?key=value'
+			};
+		}
+	});
+	swan.openShare({
+		title: '智能小程序示例',
+		content: '世界很复杂，百度更懂你',
+		path: '/pages/openShare/openShare?key=value'
+	});
+})();
+
+(() => {
+	swan.chooseAddress({
+		success(res) {
+			console.log(res.userName);
+			console.log(res.postalCode);
+			console.log(res.provinceName);
+			console.log(res.cityName);
+			console.log(res.countyName);
+			console.log(res.detailInfo);
+			console.log(res.telNumber);
+		}
+	});
+})();
+
+(() => {
+	swan.requestPolymerPayment({
+		orderInfo: {
+			dealId: "470193086",
+			appKey: "MMMabc",
+			totalAmount: "1",
+			tpOrderId: "3028903626",
+			dealTitle: "智能小程序Demo支付测试",
+			signFieldsRange: 1,
+			rsaSign: '',
+			bizInfo: ''
+		},
+		success(res) {
+			swan.showToast({
+				title: '支付成功',
+				icon: 'success'
+			});
+		},
+		fail(err) {
+			swan.showToast({
+				title: JSON.stringify(err)
+			});
+			console.log('pay fail', err);
+		}
+	});
+})();
+
+(() => {
+	swan.chooseInvoiceTitle({
+		success(res) {
+			console.log(res.type);
+			console.log(res.title);
+			console.log(res.taxNumber);
+			console.log(res.companyAddress);
+			console.log(res.telephone);
+			console.log(res.bankName);
+			console.log(res.bankAccount);
+		}
+	});
+})();
+
+(() => {
+	swan.navigateToSmartProgram({
+		appKey: '4fecoAqgCIUtzIyA4FAPgoyrc4oUc25c', // 要打开的小程序 App Key
+		path: '', // 打开的页面路径，如果为空则打开首页
+		extraData: {
+			foo: 'baidu'
+		},
+		success(res) {
+			// 打开成功
+		}
+	});
+	swan.navigateBackSmartProgram({
+		extraData: {
+			foo: 'baidu'
+		},
+		success(res) {
+			// 返回成功
+		}
+	});
+})();
+
+(() => {
+	if (swan.setMetaDescription) {
+		swan.setMetaDescription({
+			content: '当前小程序页面描述信息',
+			success(res) {
+				console.log('设置成功');
+			},
+			fail(res) {
+				console.log('设置失败');
+			},
+			complete(res) {
+				console.log('设置失败');
+			}
+		});
+	}
+	if (swan.setMetaKeywords) {
+		swan.setMetaKeywords({
+			content: '小程序, 关键字',
+			success(res) {
+				console.log('设置成功');
+			},
+			fail(res) {
+				console.log('设置失败');
+			},
+			complete(res) {
+				console.log('设置失败');
+			}
+		});
+	}
+	if (swan.setDocumentTitle) {
+		swan.setDocumentTitle({
+			title: '我是页面标题'
+		});
+	}
+})();
+
+(() => {
+	swan.loadSubPackage({
+		root: 'subpackage',
+		success(res) {
+			console.log('下载成功', res);
+		},
+		fail(err) {
+			console.log('下载失败', err);
+		}
+	});
+})();
+
+(() => {
+	const updateManager = swan.getUpdateManager();
+
+	updateManager.onCheckForUpdate((res) => {
+		// 请求完新版本信息的回调
+		console.log(res.hasUpdate);
+	});
+
+	updateManager.onUpdateReady((res) => {
+		swan.showModal({
+			title: '更新提示',
+			content: '新版本已经准备好，是否重启应用？',
+			success(res) {
+				if (res.confirm) {
+					// 新的版本已经下载好，调用 applyUpdate 应用新版本并重启
+					updateManager.applyUpdate();
+				}
+			}
+		});
+	});
+
+	updateManager.onUpdateFailed((res) => {
+		// 新的版本下载失败
+	});
+})();
+
+(() => {
+	// 打开调试
+	swan.setEnableDebug({
+		enableDebug: true
+	});
+
+	// 关闭调试
+	swan.setEnableDebug({
+		enableDebug: false
+	});
+})();
+
+(() => {
+	swan.reportAnalytics('purchase', {
+		price: 120,
+		color: 'red'
+	});
+})();
diff --git a/types/baidu-app/index.d.ts b/types/baidu-app/index.d.ts
new file mode 100644
index 0000000000..244e9dd473
--- /dev/null
+++ b/types/baidu-app/index.d.ts
@@ -0,0 +1,4758 @@
+// Type definitions for swan-app 2.2
+// Project: https://smartprogram.baidu.com/docs/develop/tutorial/codedir/
+// Definitions by: taoqf <https://github.com/taoqf>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+// TypeScript Version: 2.8
+
+declare namespace swan {
+	// #region 基本参数
+	interface DataResponse {
+		/** 回调函数返回的内容 */
+		data: string | ArrayBuffer;
+		statusCode: number;
+		header: any;
+		result: string;
+	}
+	interface ErrMsgResponse {
+		/** 成功：ok，错误：详细信息 */
+		errMsg: "ok" | string;
+	}
+	interface TempFileResponse {
+		/** 文件的临时路径 */
+		tempFilePath: string;
+		/** 开发者服务器返回的 HTTP 状态码 */
+		statusCode: number;
+	}
+	interface BaseOptions<R = any, E = any> {
+		/** 接口调用成功的回调函数 */
+		success?(res: R): void;
+		/** 接口调用失败的回调函数 */
+		fail?(res: E): void;
+		/** 接口调用结束的回调函数（调用成功、失败都会执行） */
+		complete?(res: any): void;
+	}
+	interface ErrCodeResponse {
+		errCode: number;
+	}
+	// #endregion
+	// #region 网络API列表
+	// 发起请求
+	interface RequestHeader {
+		[key: string]: string;
+	}
+	interface RequestOptions extends BaseOptions<DataResponse> {
+		/** 开发者服务器接口地址 */
+		url: string;
+		/** 请求的参数 */
+		data?: string | object;
+		/** 设置请求的 header , header 中不能设置 Referer */
+		header?: RequestHeader;
+		/** 默认为 GET，有效值：OPTIONS, GET, HEAD, POST, PUT, DELETE, TRACE, CONNECT */
+		method?:
+		| "GET"
+		| "OPTIONS"
+		| "GET"
+		| "HEAD"
+		| "POST"
+		| "PUT"
+		| "DELETE";
+		/** 如果设为json，会尝试对返回的数据做一次 JSON.parse  默认值为json */
+		dataType?: string;
+		/**
+		 * 设置响应的数据类型。合法值：text、arraybuffer  默认值为text
+		 * @version 1.7.0
+		 */
+		responseType?: string;
+		/** 收到开发者服务成功返回的回调函数，res = {data: '开发者服务器返回的内容'} */
+		success?(res: DataResponse): void;
+		fail?(err: { errCode: number; errMsg: string; }): void;
+	}
+	/**
+	 * swan.request发起的是https请求。一个微信小程序，同时只能有5个网络请求连接。
+	 */
+	function request(options: RequestOptions): RequestTask;
+
+	/**
+	 * 返回一个 requestTask 对象，通过 requestTask，可中断请求任务。
+	 */
+	interface RequestTask {
+		abort(): void;
+	}
+
+	interface UploadTask {
+		/**
+		 * 监听上传进度变化
+		 * @version 1.4.0
+		 */
+		onProgressUpdate(
+			callback?: (
+				res: {
+					/** 上传进度百分比 */
+					progress: number;
+					/** 已经上传的数据长度，单位 Bytes */
+					totalBytesSent: number;
+					/** 预期需要上传的数据总长度，单位 Bytes */
+					totalBytesExpectedToSend: number;
+				}
+			) => void
+		): void;
+		/**
+		 * 中断下载任务
+		 * @version 1.4.0
+		 */
+		abort(): void;
+	}
+	// 上传下载
+	interface UploadFileOptions extends BaseOptions {
+		/** 开发者服务器 url */
+		url: string;
+		/** 要上传文件资源的路径 */
+		filePath: string;
+		/** 文件对应的 key , 开发者在服务器端通过这个 key 可以获取到文件二进制内容 */
+		name: string;
+		/** HTTP 请求 Header , header 中不能设置 Referer */
+		header?: RequestHeader;
+		/** HTTP 请求中其他额外的 form data */
+		formData?: any;
+	}
+	interface UploadFileResponse {
+		data: string; // 开发者服务器返回的数据
+		statusCode: number; // 开发者服务器返回的 HTTP 状态码
+	}
+	/**
+	 * 将本地资源上传到开发者服务器。
+	 * 如页面通过 swan.chooseImage 等接口获取到一个本地资源的临时文件路径后，
+	 * 可通过此接口将本地资源上传到指定服务器。
+	 * 客户端发起一个 HTTPS POST 请求，
+	 * 其中 Content-Type 为 multipart/form-data 。
+	 */
+	function uploadFile(options: UploadFileOptions): UploadTask;
+	interface DownloadTask {
+		/**
+		 * 监听下载进度变化
+		 * @version 1.4.0
+		 */
+		onProgressUpdate(
+			callback?: (
+				res: {
+					/** 下载进度百分比 */
+					progress: number;
+					/** 已经下载的数据长度，单位 Bytes */
+					totalBytesWritten: number;
+					/** 预期需要下载的数据总长度，单位 Bytes */
+					totalBytesExpectedToWrite: number;
+				}
+			) => void
+		): void;
+		/**
+		 * 中断下载任务
+		 * @version 1.4.0
+		 */
+		abort(): void;
+	}
+	interface DownloadFileOptions extends BaseOptions {
+		/** 下载资源的 url */
+		url: string;
+		/** HTTP 请求 Header */
+		header?: RequestHeader;
+		/** 下载成功后以 tempFilePath 的形式传给页面，res = {tempFilePath: '文件的临时路径'} */
+		success?(res: TempFileResponse): void;
+	}
+	/**
+	 * 下载文件资源到本地。客户端直接发起一个 HTTP GET 请求，
+	 * 把下载到的资源根据 type 进行处理，并返回文件的本地临时路径。
+	 */
+	function downloadFile(options: DownloadFileOptions): DownloadTask;
+	// WebSocket
+	interface ConnectSocketOptions extends BaseOptions {
+		/** 开发者服务器接口地址，必须是 HTTPS 协议，且域名必须是后台配置的合法域名 */
+		url: string;
+		/** HTTP Header , header 中不能设置 Referer */
+		header?: RequestHeader;
+		/** 默认是GET，有效值为： OPTIONS, GET, HEAD, POST, PUT, DELETE, TRACE, CONNECT */
+		method?: string;
+		/**
+		 * 子协议数组
+		 * @version 1.4.0
+		 */
+		protocols?: string[];
+	}
+	/**
+	 * 创建一个 WebSocket 连接；
+	 * 一个微信小程序同时只能有一个 WebSocket 连接，
+	 * 如果当前已存在一个 WebSocket 连接，
+	 * 会自动关闭该连接，并重新创建一个 WebSocket 连接。
+	 */
+	function connectSocket(options: ConnectSocketOptions): void;
+	/** 监听WebSocket连接打开事件。 */
+	function onSocketOpen(callback: (res: any) => void): void;
+	/** 监听WebSocket错误。 */
+	function onSocketError(callback: (error: any) => void): void;
+	interface SendSocketMessageOptions extends BaseOptions {
+		/** 需要发送的内容 */
+		data: string | ArrayBuffer;
+	}
+	/**
+	 * 通过 WebSocket 连接发送数据，需要先 swan.connectSocket，
+	 * 并在 swan.onSocketOpen 回调之后才能发送。
+	 */
+	function sendSocketMessage(options: SendSocketMessageOptions): void;
+	/**
+	 * 监听WebSocket接受到服务器的消息事件。
+	 */
+	function onSocketMessage(callback: (res: DataResponse) => void): void;
+	/**
+	 * 关闭WebSocket连接。
+	 */
+	interface CloseSocketOptions extends BaseOptions {
+		code?: number; // 一个数字值表示关闭连接的状态号，表示连接被关闭的原因。如果这个参数没有被指定，默认的取值是1000 （表示正常连接关闭）	1.4.0
+		reason?: string; // 一个可读的字符串，表示连接被关闭的原因。这个字符串必须是不长于123字节的UTF-8 文本（不是字符）
+	}
+
+	/**
+	 * 关闭WebSocket连接。
+	 */
+	function closeSocket(options?: CloseSocketOptions): void;
+	/** 监听WebSocket关闭。 */
+	function onSocketClose(callback: (res: any) => void): void;
+	/**
+	 * 在接入AI之前需要使用管理员权限操作详细情况官网
+	 * https://smartprogram.baidu.com/docs/develop/api/ai/
+	 */
+	// #region AI
+	namespace ai {
+		/**
+		 * 用户向服务请求识别身份证，身份证识别包括正面和背面。
+		 */
+		interface ocrIdCardOptions extends BaseOptions {
+			image: string; // 图片资源地址
+			detect_direction?: boolean; // 是否检测图像旋转，可检验图像的选装方向和旋转角度。true：检测旋转角度并矫正识别。针对摆放情况不可控制的情况建议本参数置为true; false: 不检测旋转角度，默认不检测。
+			id_card_side?: string; // front：身份证含照片的一面；back：身份证带国徽的一面。
+			detect_risk?: boolean; // 是否开启身份证风险类型(身份证复印件、临时身份证、身份证翻拍、修改过的身份证)功能，默认不开启，即：false。可选值:true-开启；false-不开启。
+			success?(res: ocrIdCardResponse): void;
+		}
+		/**
+		 * 识别银行卡并返回卡号、发卡行和卡片类型。
+		 */
+		interface ocrBankCardOptions extends BaseOptions {
+			image: string; // 图片资源地址
+			success?(res: ocrBankCardResponse): void;
+		}
+		/**
+		 * 对机动车驾驶证所有关键字段进行识别。
+		 */
+		interface ocrDrivingLicenseOptions extends BaseOptions {
+			image: string; // 图片资源地址
+			detect_direction?: boolean; // 是否检测图像旋转，可检验图像的选装方向和旋转角度。true：检测旋转角度并矫正识别。针对摆放情况不可控制的情况建议本参数置为true;false:不检测旋转角度，默认不检测。
+			unified_valid_period?: boolean; // true: 归一化格式输出;false 或无此参数按非归一化格式输出。
+			success?(res: ocrDrivingLicenseResponse): void;
+		}
+		/**
+		 * 对机动车行驶证正本所有关键字段进行识别
+		 */
+		interface ocrVehicleLicenseOptions extends BaseOptions {
+			image: string; // 图片资源地址
+			detect_direction?: boolean; // 是否检测图像旋转，可检验图像的选装方向和旋转角度。true：检测旋转角度并矫正识别。针对摆放情况不可控制的情况建议本参数置为true; false:不检测旋转角度，默认不检测。
+			accuracy?: string; // normal 使用快速服务，1200ms左右时延；缺省或其它值使用高精度服务，1600ms左右时延。
+			success?(res: ocrVehicleLicenseResponse): void;
+		}
+		interface ocrIdCardResponse {
+			direction: number; // 图像方向，当 detect_direction=true 时存在。-1: 未定义，0: 正向，1: 逆时针90度，2: 逆时针180度，3: 逆时针270度。
+			image_status: string; // normal-识别正常；reversed_side-身份证正反面颠倒；non_idcard-上传的图片中不包含身份证；blurred-身份证模糊；other_type_card-其他类型证照；over_exposure-身份证关键字段反光或过曝；unknown-未知状态。
+			risk_type: string; // 输入参数 detect_risk = true 时，则返回该字段识别身份证类型: normal-正常身份证；copy-复印件；temporary-临时身份证；screen-翻拍；unknown-其他未知情况。
+			edit_tool: string; // 如果参数 detect_risk = true 时，则返回此字段。如果检测身份证被编辑过，该字段指定编辑软件名称，如:Adobe Photoshop CC 2014 (Macintosh),如果没有被编辑过则返回值无此参数。
+			log_id: string; // 唯一的log id，用于问题定位。
+			words_result_num: number; // 识别结果数，表示words_result的元素个数。
+			words_result: { // 定位和识别结果
+				[key: string]: {
+					location: { // 位置数组（坐标0点为左上角）
+						left: number; // 表示定位位置的长方形左上顶点的水平坐标。
+						top: number; // 表示定位位置的长方形左上顶点的垂直坐标。
+						width: number; // 表示定位位置的长方形的宽度。
+						height: number; // 表示定位位置的长方形的高。
+					}
+					words: string; // 识别结果字符串
+				}
+			};
+		}
+		interface ocrBankCardResponse {
+			log_id: string; // 请求标识码，随机数，唯一。
+			result: { // 返回结果
+				bank_card_number: string; // 银行卡卡号
+				bank_name: string; // 银行名，不能识别时为空 。
+				bank_card_type: string; // 银行卡类型，0: 不能识别; 1: 借记卡; 2: 信用卡 。
+			};
+		}
+		interface ocrDrivingLicenseResponse {
+			log_id: string; // 唯一的log id，用于问题定位。
+			words_result_num: number; // 识别结果数，表示 words_result 的元素个数。
+			words_result: {
+				[key: string]: { words: string };
+			};
+		}
+		interface ocrVehicleLicenseResponse {
+			log_id: string; // 唯一的log id，用于问题定位。
+			words_result_num: number; // 识别结果数，表示 words_result 的元素个数。
+			words_result: {
+				[key: string]: { words: string };
+			};
+		}
+		/**
+		 * 用户向服务请求识别身份证，身份证识别包括正面和背面。
+		 */
+		function ocrIdCard(options: ocrIdCardOptions): void;
+		/**
+		 * 识别银行卡并返回卡号、发卡行和卡片类型。
+		 */
+		function ocrBankCard(options: ocrBankCardOptions): void;
+		/**
+		 * 对机动车驾驶证所有关键字段进行识别。
+		 */
+		function ocrDrivingLicense(options: ocrDrivingLicenseOptions): void;
+		/**
+		 * 对机动车行驶证正本所有关键字段进行识别
+		 */
+		function ocrVehicleLicense(options: ocrVehicleLicenseOptions): void;
+		/**
+		 * 运用业界领先的深度学习技术，判断一段文本内容是否符合网络发文规范，实现
+		 * 自动化、智能化的文本审核。
+		 */
+		interface textReviewOptions extends BaseOptions {
+			content: string; // 待审核文本，UTF-8，不可为空，不超过20000字节。
+			success?(res: textReviewResponse): void;
+		}
+		interface textReviewResponse {
+			log_id: string; // 唯一的log id，用于问题定位。
+			result: { // 审核结果详情
+				spam: number; // 请求中是否包含违禁，0表示非违禁，1表示违禁，2表示建议人工复审 。
+				reject: any[]; // 审核未通过的类别列表与详情
+				review: any[]; // 待人工复审的类别列表与详情
+				pass: Array<{ // 审核通过的类别列表与详情
+					label: number; // 请求中的违禁类型
+					score: number; // 违禁检测分，范围 0~1，数值从低到高代表风险程度的高低 。
+					hit: string[]; // 违禁类型对应命中的违禁词集合，可能为空 。
+				}>;
+			};
+			/**
+			 * 违禁labels类型说明:
+			 * 		值			说明
+			 * 		1		  暴恐违禁
+			 * 		2		  文本色情
+			 * 		3		  政治敏感
+			 * 		4		  恶意推广
+			 * 		5		  低俗辱骂
+			 */
+		}
+		/**
+		 * 运用业界领先的深度学习技术，判断一段文本内容是否符合网络发文规范，实现
+		 * 自动化、智能化的文本审核。
+		 */
+		function textReview(options: textReviewOptions): void;
+		/**
+		 * 将文本转换为可以播放的mp3文件。
+		 */
+		interface textToAudioOptions extends BaseOptions {
+			tex: string; // 合成的文本，使用UTF-8编码，小于512个中文字或者英文数字（文本在百度服务器内转换为GBK后，长度必须小于1024字节）。
+			ctp?: string | number; // 客户端类型选择，Web端填写固定值1。
+			lan?: string; // 固定值zh。语言选择,目前只有中英文混合模式，填写固定值zh。
+			spd?: string; // 语速，取值0-9，默认为5中语速。
+			pit?: string; // 音调，取值0-9，默认为5中语调。
+			vol?: string; // 音量，取值0-9，默认为5中音量。
+			per?: string; // 发音人选择, 0为普通女声，1为普通男生，3为情感合成-度逍遥，4为情感合成-度丫丫，默认为普通女声。
+			success?(res: textToAudioResponse): void;
+		}
+		interface textToAudioResponse {
+			filePath: string;
+		}
+		/**
+		 * 将文本转换为可以播放的mp3文件。
+		 */
+		function textToAudio(options: textToAudioOptions): void;
+		/**
+		 * 自定义图像审核。
+		 */
+		interface imageAuditOptions extends BaseOptions {
+			image: string; // 图像资源地址
+			imgUrl?: string; // 网图URL地址，以网图形式请求，图片Url需要做UrlEncode，不能与image并存。
+			success?(res: imageAuditResponse): void;
+		}
+		interface imageAuditResponse {
+			log_id: string; // 请求唯一id
+			conclusion: string; // 审核结果描述，成功才返回，失败不返回。
+			conclusionType: number; // 审核结果标识，成功才返回，失败不返回。
+			data: imageAuditdata[];
+			// 审核项详细信息，响应成功并且conclusion为疑似或不合规时才返回，响应失败或conclusion为合规是不返回。
+		}
+		interface imageAuditdata {
+			type: number;
+			msg: number;
+			probability: number;
+			stars: imageAuditdata[];
+			words: number;
+		}
+		/**
+		 * 自定义图像审核。
+		 */
+		function imageAudit(options: imageAuditOptions): void;
+		/**
+		 * 通用物体及场景识别，即对于输入的一张图片（可正常解码，且长宽比适宜），输出图片中的多个物体及场景标签。
+		 */
+		interface GeneralIdentifyOptions extends BaseOptions {
+			image: string; // 图像资源地址
+			success?(res: GeneralIdentifyResponse): void;
+		}
+		interface GeneralIdentifyResponse {
+			log_id: number; // 	唯一的log id，用于问题定位。
+			result_num: number; // 返回结果数目，及result数组中的元素个数。
+			result: Array<{ // 标签结果数组
+				keyword: string; // 图片中的物体或场景名称
+				score: number; // 置信度，0-1
+				root: string; // 识别结果的上层标签，有部分钱币、动漫、烟酒等tag无上层标签。
+			}>;
+		}
+		/**
+		 * 通用物体及场景识别，即对于输入的一张图片（可正常解码，且长宽比适宜），输出图片中的多个物体及场景标签。
+		 */
+		function advancedGeneralIdentify(options: GeneralIdentifyOptions): void;
+		/**
+		 * 用户向服务请求检测图像中的主体位置。
+		 */
+		interface DetectIdentifyOptions extends BaseOptions {
+			image: string; // 图像资源地址
+			with_face?: number; // 如果检测主体是人，主体区域是否带上人脸部分，0-不带人脸区域，其他-带人脸区域，裁剪类需求推荐带人脸，检索/识别类需求推荐不带人脸。默认取1，带人脸。
+			success?(res: DetectIdentifyResponse): void;
+		}
+		interface DetectIdentifyResponse {
+			log_id: number; // 	唯一的log id，用于问题定位。
+			result: { // 裁剪结果
+				left: number; // 表示定位位置的长方形左上顶点的水平坐标。
+				top: number; // 表示定位位置的长方形左上顶点的垂直坐标。
+				width: number; // 表示定位位置的长方形的宽度。
+				height: number; // 表示定位位置的长方形的高度。
+			};
+		}
+		/**
+		 * 用户向服务请求检测图像中的主体位置。
+		 */
+		function objectDetectIdentify(options: DetectIdentifyOptions): void;
+		/**
+		 * 用于检测一张车辆图片的具体车型，即对于输入的一张图片（可正常解码，且长
+		 * 宽比适宜），输出图片的车辆品牌及型号、颜色及年份、位置信息。
+		 */
+		interface carClassifyOptions extends BaseOptions {
+			image: string; // 图像资源地址
+			color_result?: string; // 颜色
+			top_num?: number; // 返回结果top n，默认5。
+			success?(res: carClassifyResponse): void;
+		}
+		interface carClassifyResponse {
+			log_id: number; // 	唯一的log id，用于问题定位。
+			result: Array<{
+				name: string; // 车型名称，示例：宝马x6
+				score: number; // 置信度，示例：0.5321
+				year: string; // 年份
+			}>;
+			location_result: { // 车在图片中的位置信息
+				left: number; // 左起像素位置
+				top: number; // 上起像素位置
+				width: number; // 像素宽
+				height: number; // 像素高
+			};
+		}
+		/**
+		 * 用于检测一张车辆图片的具体车型，即对于输入的一张图片（可正常解码，且长
+		 * 宽比适宜），输出图片的车辆品牌及型号、颜色及年份、位置信息。
+		 */
+		function carClassify(options: carClassifyOptions): void;
+		/**
+		 * 用于菜品识别，即对于输入的一张图片（可正常解码，且长宽比适宜），输出图
+		 * 片的菜品名称、卡路里信息、置信度。
+		 */
+		interface dishClassifyOptions extends BaseOptions {
+			image: string; // 图像资源地址
+			filter_threshold?: number; // 默认0.95，可以通过该参数调节识别效果，降低非菜识别率.
+			top_num?: number; // 返回结果top n，默认5。
+			success?(res: dishClassifyResponse): void;
+		}
+		interface dishClassifyResponse {
+			log_id: number; // 	唯一的log id，用于问题定位。
+			result_num: number; // 返回结果数目，及result数组中的元素个数。
+			result: Array<{ // 菜品识别结果数组
+				name: string; // 菜名，示例：鱼香肉丝。
+				calorie: number; // 卡路里，每100g的卡路里含量。
+				probability: number; // 识别结果中每一行的置信度值，0-1。
+			}>;
+		}
+		/**
+		 * 用于菜品识别，即对于输入的一张图片（可正常解码，且长宽比适宜），输出图
+		 * 片的菜品名称、卡路里信息、置信度。
+		 */
+		function dishClassify(options: dishClassifyOptions): void;
+		/**
+		 * 用于检测和识别图片中的品牌 LOGO 信息
+		 */
+		interface logoClassifyOptions extends BaseOptions {
+			image: string; // 图像资源地址
+			custom_lib?: boolean; // 是否只检索用户子库，true则只检索用户子库，false(默认)为检索底库+用户子库。
+			success?(res: logoClassifyResponse): void;
+		}
+		interface logoClassifyResponse {
+			log_id: number; // 	唯一的log id，用于问题定位。
+			result_num: number; // 识别结果数，标识返回结果数目。
+			result: Array<{ // 菜品识别结果数组
+				type: number; // type=0 为1千种高优商标识别结果；type=1 为2万类logo库的结果；其它type为自定义logo库结果。
+				name: number; // 识别的品牌名称
+				probability: number; // 分类结果置信度（0–1.0）
+				location: {
+					left: number; // 左起像素位置
+					top: number; // 上起像素位置
+					width: number; // 像素宽
+					height: number; // 像素高
+				}; // 位置信息（左起像素位置、上起像素位置、像素宽、像素高）
+			}>;
+		}
+		/**
+		 * 用于检测和识别图片中的品牌 LOGO 信息
+		 */
+		function logoClassify(options: logoClassifyOptions): void;
+		/**
+		 * 用于检测和识别图片中的动物信息
+		 */
+		interface animalClassifyOptions extends BaseOptions {
+			image: string; // 图像资源地址
+			top_num?: number; // 返回预测得分top结果数，默认为6
+			success?(res: animalClassifyResponse): void;
+		}
+		interface animalClassifyResponse {
+			log_id: number; // 	唯一的log id，用于问题定位。
+			result_num: number; // 识别结果数，标识返回结果数目。
+			result: Array<{ // 菜品识别结果数组
+				name: number; // 动物名称，示例：蒙古马。
+				score: number; // 置信度，示例：0.5321。
+			}>;
+		}
+		/**
+		 * 用于检测和识别图片中的动物信息
+		 */
+		function animalClassify(options: animalClassifyOptions): void;
+		/**
+		 * 用于检测和识别图片中的植物信息
+		 */
+		interface plantClassifyOptions extends BaseOptions {
+			image: string; // 图像资源地址
+			success?(res: plantClassifyResponse): void;
+		}
+		interface plantClassifyResponse {
+			log_id: number; // 	唯一的log id，用于问题定位。
+			result: Array<{ // 菜品识别结果数组
+				name: number; // 植物名称，示例：吉娃莲。
+				score: number; // 置信度，示例：0.5321。
+			}>;
+		}
+		/**
+		 * 用于检测和识别图片中的植物信息
+		 */
+		function plantClassify(options: plantClassifyOptions): void;
+
+		/**
+		 * 获取全局唯一的语音识别器voiceRecognizer。
+		 */
+		interface VoiceRecognizerStart {
+			mode?: string; // 听音模式，有效值dnn/touch
+			longSpeech?: boolean; // 是否开启长语音
+			context?: string; // 语音识别所用的场景值，有效值见下表格。
+		}
+		interface VoiceRecognizeResponse {
+			result: string; // 小程序语音识别过程中的返回内容
+		}
+		interface VoiceErrorResponse {
+			result: string; // 小程序语音识别过程中的返回内容
+		}
+		interface VoiceRecognizerTask {
+			start(options: VoiceRecognizerStart): void; // 开始;
+			stop(): void; // 停止;
+			cancel(): void; // 取消;
+			onStart(callback: () => void): void;  // 引擎准备就绪，可以开始说话;
+			onRecognize(callback: (res: VoiceRecognizeResponse) => void): void;  // ;有识别结果返回
+			onFinish(callback: (res: DataResponse) => void): void;  // 识别完成;
+			onError(callback: (res: VoiceErrorResponse) => void): void;  // 识别遇到错;误
+		}
+		/**
+		 * 获取全局唯一的语音识别器voiceRecognizer。
+		 */
+		function getVoiceRecognizer(): VoiceRecognizerTask;
+	}
+	// #endregion
+
+	// #endregion
+	// #region 媒体API列表
+	// 媒体-----图片
+	type ImageSizeType = "original" | "compressed";
+	type ImageSourceType = "album" | "camera";
+	type VideoSourceType = "album" | "camera";
+	type CameraDevice = "front" | "back";
+	interface TempFile {
+		/** 本地文件路径 */
+		path: string;
+		/** 本地文件大小，单位：B */
+		size: number;
+	}
+	interface TempFilesData {
+		/** 文件的临时路径 */
+		tempFilePaths: string;
+		/**
+		 * 图片的本地文件列表，每一项是一个 File 对象
+		 * @version 1.2.0
+		 */
+		tempFiles: TempFile[];
+	}
+	interface ChooseImageOptions extends BaseOptions {
+		/** 最多可以选择的图片张数，默认9 */
+		count?: number;
+		/** original 原图，compressed 压缩图，默认二者都有 */
+		sizeType?: ImageSizeType[];
+		/** album 从相册选图，camera 使用相机，默认二者都有 */
+		sourceType?: ImageSourceType[];
+		/** 成功则返回图片的本地文件路径列表 tempFilePaths */
+		success(res: TempFilesData): void;
+	}
+	/**
+	 * 从本地相册选择图片或使用相机拍照。
+	 */
+	function chooseImage(options: ChooseImageOptions): void;
+	interface PreviewImageOptions extends BaseOptions {
+		/** 当前显示图片的链接，不填则默认为 urls 的第一张 */
+		current?: string;
+		/** 需要预览的图片链接列表 */
+		urls: string[];
+	}
+	/**
+	 * 预览图片。
+	 */
+	function previewImage(options: PreviewImageOptions): void;
+	interface GetImageInfoOptions extends BaseOptions {
+		/**
+		 * 图片的路径，可以是相对路径，临时文件路径，存储文件路径，网络图片路径
+		 */
+		src: string;
+	}
+	/**
+	 * 获取图片信息
+	 */
+	function getImageInfo(options: GetImageInfoOptions): void;
+	interface SaveImageToPhotosAlbumOptions extends BaseOptions {
+		/**
+		 * 图片的路径，可以是相对路径，临时文件路径，存储文件路径，网络图片路径
+		 */
+		filePath: string;
+		success(res: { errMsg: string }): void;
+	}
+	/**
+	 * 保存图片到系统相册。
+	 * 需要用户授权 scope.writePhotosAlbum
+	 * @version 1.2.0
+	 */
+	function saveImageToPhotosAlbum(options: SaveImageToPhotosAlbumOptions): void;
+	// 媒体-----录音
+	interface StartRecordAudioOptions extends BaseOptions {
+		/** 录音成功后调用，返回录音文件的临时文件路径，res = {tempFilePath: '录音文件的临时路径'} */
+		success?(res: TempFileResponse): void;
+	}
+	/**
+	 * 开始录音。当主动调用swan.stopRecord，
+	 * 或者录音超过1分钟时自动结束录音，返回录音文件的临时文件路径。
+	 * 注：文件的临时路径，在小程序本次启动期间可以正常使用，
+	 * 如需持久保存，需在主动调用swan.saveFile，在小程序下次启动时才能访问得到。
+	 * @deprecated 1.6.0
+	 */
+	function startRecord(options: StartRecordAudioOptions): void;
+
+	interface StopRecordAudioOptions extends BaseOptions {
+		success?(res: TempFileResponse): void;
+	}
+	/**
+	 * 主动调用停止录音。
+	 */
+	function stopRecord(options?: StopRecordAudioOptions): void;
+	type EncodeBitRate =
+		| 8000
+		| 11025
+		| 12000
+		| 16000
+		| 22050
+		| 24000
+		| 32000
+		| 44100
+		| 48000;
+	interface RecorderManagerStartOptions {
+		/**
+		 * 指定录音的时长，单位 ms
+		 * 如果传入了合法的 duration
+		 * 在到达指定的 duration 后会自动停止录音，最大值 600000（10 分钟）,默认值 60000（1 分钟）
+		 */
+		duration?: number;
+		/**
+		 * 采样率，有效值 8000/16000/44100
+		 */
+		sampleRate?: number;
+		/**
+		 * 否 录音通道数，有效值 1/2
+		 */
+		numberOfChannels?: number;
+		/**
+		 * 编码码率
+		 * 采样率和码率有一定要求，具体有效值如下：
+		 * 采样率 编码码率
+		 * + 8000 16000 ~ 48000
+		 * + 11025 16000 ~ 48000
+		 * + 12000 24000 ~ 64000
+		 * + 16000 24000 ~ 96000
+		 * + 22050 32000 ~ 128000
+		 * + 24000 32000 ~ 128000
+		 * + 32000 48000 ~ 192000
+		 * + 44100 64000 ~ 320000
+		 * + 48000 64000 ~ 320000
+		 */
+		encodeBitRate: number;
+		/** 音频格式，有效值 aac/mp3 */
+		format: string;
+	}
+	interface OnRecorderManagerStopOptions {
+		tempFilePath: string;
+	}
+	interface OnFrameRecordedOptions {
+		/**  录音分片结果数据 */
+		frameBuffer: ArrayBuffer;
+		/** 当前帧是否正常录音结束前的最后一帧 */
+		isLastFrame: boolean;
+	}
+	interface RecorderManager {
+		/** 开始录音 */
+		start(options?: RecorderManagerStartOptions): void;
+		/** 暂停录音 */
+		pause(): void;
+		/** 继续录音 */
+		resume(): void;
+		/** 停止录音 */
+		stop(): void;
+		/** 录音开始事件 */
+		onStart(callback?: () => void): void;
+		/** 录音暂停事件 */
+		onPause(callback?: () => void): void;
+		/** 录音恢复事件 */
+		onResume(callback?: () => void): void;
+		/** 录音停止事件，会回调文件地址 */
+		onStop(callback?: (options: OnRecorderManagerStopOptions) => void): void;
+		/** 已录制完指定帧大小的文件，会回调录音分片结果数据。如果设置了 frameSize ，则会回调此事件 */
+		onFrameRecorded(callback?: (options: OnFrameRecordedOptions) => void): void;
+		/** 录音错误事件, 会回调错误信息 */
+		onError(callback?: (err: ErrMsgResponse) => void): void;
+	}
+	/**
+	 * 获取全局唯一的录音管理器 recorderManager
+	 * @version 1.6.0
+	 */
+	function getRecorderManager(): RecorderManager;
+	// 媒体-----音频播放控制
+	interface PlayVoiceOptions extends BaseOptions {
+		/** 需要播放的语音文件的文件路径 */
+		filePath: string;
+	}
+	/**
+	 * 开始播放语音，同时只允许一个语音文件正在播放，
+	 * 如果前一个语音文件还没播放完，将中断前一个语音播放。
+	 * @deprecated 1.6.0
+	 */
+	function playVoice(options: PlayVoiceOptions): void;
+	/**
+	 * 暂停正在播放的语音。
+	 * 再次调用swan.playVoice播放同一个文件时，会从暂停处开始播放。
+	 * 如果想从头开始播放，需要先调用 swan.stopVoice。
+	 * @deprecated 1.6.0
+	 */
+	function pauseVoice(): void;
+	/**
+	 * 结束播放语音。
+	 * @deprecated 1.6.0
+	 */
+	function stopVoice(): void;
+	// 媒体-----音乐播放控制
+	interface BackgroundAudioPlayerState {
+		/** 选定音频的长度（单位：s），只有在当前有音乐播放时返回 */
+		duration: number;
+		/** 选定音频的播放位置（单位：s），只有在当前有音乐播放时返回 */
+		currentPosition: number;
+		/** 播放状态（2：没有音乐在播放，1：播放中，0：暂停中） */
+		status: number;
+		/** 音频的下载进度（整数，80 代表 80%），只有在当前有音乐播放时返回 */
+		downloadPercent: number;
+		/** 歌曲数据链接，只有在当前有音乐播放时返回 */
+		dataUrl: string;
+	}
+	interface GetBackgroundAudioPlayerStateOptions extends BaseOptions {
+		/** 接口调用成功的回调函数 */
+		success?(state: BackgroundAudioPlayerState): void;
+		/** 接口调用失败的回调函数 */
+		fail?(): void;
+		/** 接口调用结束的回调函数（调用成功、失败都会执行） */
+		complete?(): void;
+	}
+	/**
+	 * 获取音乐播放状态。
+	 * @deprecated 1.2.0
+	 */
+	function getBackgroundAudioPlayerState(
+		options: GetBackgroundAudioPlayerStateOptions
+	): void;
+	interface PlayBackgroundAudioOptions extends BaseOptions {
+		/** 音乐链接 */
+		dataUrl: string;
+		/** 音乐标题 */
+		title?: string;
+		/** 封面URL */
+		coverImgUrl?: string;
+	}
+	/**
+	 * 播放音乐，同时只能有一首音乐正在播放。
+	 * @deprecated 1.2.0
+	 */
+	function playBackgroundAudio(options: PlayBackgroundAudioOptions): void;
+	/**
+	 * 暂停播放音乐。
+	 * @deprecated 1.2.0
+	 */
+	function pauseBackgroundAudio(options?: PlayBackgroundAudioOptions): void;
+	interface SeekBackgroundAudioOptions extends BaseOptions {
+		/** 音乐位置，单位：秒 */
+		position: number;
+	}
+	/**
+	 * 控制音乐播放进度。
+	 * @deprecated 1.2.0
+	 */
+	function seekBackgroundAudio(options: SeekBackgroundAudioOptions): void;
+	/**
+	 * 停止播放音乐。
+	 * @deprecated 1.2.0
+	 */
+	function stopBackgroundAudio(options?: PlayBackgroundAudioOptions): void;
+	/**
+	 * 监听音乐播放。
+	 * @deprecated 1.2.0
+	 */
+	function onBackgroundAudioPlay(callback: () => void): void;
+	/**
+	 * 监听音乐暂停。
+	 * @deprecated 1.2.0
+	 */
+	function onBackgroundAudioPause(callback: () => void): void;
+	/**
+	 * 监听音乐停止。
+	 * @deprecated 1.2.0
+	 */
+	function onBackgroundAudioStop(callback: () => void): void;
+	interface BackgroundAudioManager {
+		/** 当前音频的长度（单位：s），只有在当前有合法的 src 时返回 */
+		readonly duration: number;
+		/** 当前音频的播放位置（单位：s），只有在当前有合法的 src 时返回 */
+		readonly currentTime: number;
+		/** 当前是是否暂停或停止状态，true 表示暂停或停止，false 表示正在播放 */
+		readonly paused: boolean;
+		/** 音频的数据源，默认为空字符串，当设置了新的 src 时，会自动开始播放 ，目前支持的格式有 m4a, aac, mp3, wav */
+		src?: string;
+		/** 音频开始播放的位置（单位：s） */
+		startTime?: number;
+		/** 音频缓冲的时间点，仅保证当前播放时间点到此时间点内容已缓冲。 是 */
+		buffered: number;
+		/** 音频标题，用于做原生音频播放器音频标题。原生音频播放器中的分享功能，分享出去的卡片标题，也将使用该值。 */
+		title?: string;
+		/** 专辑名，原生音频播放器中的分享功能，分享出去的卡片简介，也将使用该值 */
+		epname?: string;
+		/** 歌手名，原生音频播放器中的分享功能，分享出去的卡片简介，也将使用该值 */
+		singer?: string;
+		/** 封面图url，用于做原生音频播放器背景图。原生音频播放器中的分享功能，分享出去的卡片配图及背景也将使用该图。 */
+		coverImgUrl?: string;
+		/** 播放 */
+		play(): void;
+		/** 暂停 */
+		pause(): void;
+		/** 停止 */
+		stop(): void;
+		/** 跳转到指定位置，单位 s */
+		seek(position: number): void;
+		/** 背景音频进入可以播放状态，但不保证后面可以流畅播放 */
+		onCanplay(callback: (res: ErrCodeResponse) => void): void;
+		/** 背景音频播放事件 */
+		onPlay(callback: (res: ErrCodeResponse) => void): void;
+		/** 背景音频暂停事件 */
+		onPause(callback: (res: ErrCodeResponse) => void): void;
+		/** 背景音频停止事件 */
+		onStop(callback: (res: ErrCodeResponse) => void): void;
+		/** 背景音频自然播放结束事件 */
+		onEnded(callback: (res: ErrCodeResponse) => void): void;
+		/** 背景音频播放进度更新事件 */
+		onTimeUpdate(callback: (res: ErrCodeResponse) => void): void;
+		/** 背景音频播放错误事件 */
+		onError(callback: (res: ErrCodeResponse) => void): void;
+		/** 音频加载中事件，当音频因为数据不足，需要停下来加载时会触发 */
+		onWaiting(callback: (res: ErrCodeResponse) => void): void;
+	}
+	/**
+	 * 获取全局唯一的背景音频管理器 backgroundAudioManager。
+	 * @version 1.2.0
+	 */
+	function getBackgroundAudioManager(): BackgroundAudioManager;
+	// 媒体-----音频组件控制
+	/**
+	 * audioContext 通过 audioId 跟一个 <audio/> 组件绑定，通过它可以操作对应的 <audio/> 组件。
+	 */
+	interface AudioContext {
+		/**
+		 * 音频的地址
+		 */
+		setSrc(src: string): void;
+		/**
+		 * 播放
+		 */
+		play(): void;
+		/**
+		 * 暂停
+		 */
+		pause(): void;
+		/**
+		 * 跳转到指定位置，单位 s
+		 */
+		seek(position: number): void;
+	}
+	interface InnerAudioContext {
+		/** 当前音频的长度（单位：s），只有在当前有合法的 src 时返 */
+		readonly duration: number;
+		/** 当前音频的播放位置（单位：s），只有在当前有合法的 src 时返回，时间不取整，保留小数点后 6  */
+		readonly currentTime: number;
+		/** 当前是是否暂停或停止状态，true 表示暂停或停止，false 表示正在播 */
+		readonly paused: boolean;
+		/** 音频的数据链接，用于直接播放。 */
+		src?: string;
+		/** 开始播放的位置（单位：s），默认 0 */
+		startTime?: number;
+		/** 是否自动开始播放，默认 false */
+		autoplay?: boolean;
+		/** 是否循环播放，默认 false */
+		loop?: boolean;
+		/** 是否遵循系统静音开关，当此参数为 false 时，即使用户打开了静音开关，也能继续发出声音，默认值 true */
+		obeyMuteSwitch?: boolean;
+		/** 音量，范围 0~1。 */
+		volume?: number;
+		/** 播放 */
+		play(): void;
+		/** 暂停 */
+		pause(): void;
+		/** 停止 */
+		stop(): void;
+		/** 跳转到指定位置，单位 s */
+		seek(options: { position: number; }): void;
+		/** 销毁当前实例 */
+		destroy(): void;
+		/** 音频进入可以播放状态，但不保证后面可以流畅播放 */
+		onCanplay(callback: (res: ErrCodeResponse) => void): void;
+		/** 音频播放事件 */
+		onPlay(callback: (res: ErrCodeResponse) => void): void;
+		/** 音频暂停事件 */
+		onPause(callback: (res: ErrCodeResponse) => void): void;
+		/** 音频停止事件 */
+		onStop(callback: (res: ErrCodeResponse) => void): void;
+		/** 音频自然播放结束事件 */
+		onEnded(callback: (res: ErrCodeResponse) => void): void;
+		/** 音频播放进度更新事件 */
+		onTimeUpdate(callback: (res: ErrCodeResponse) => void): void;
+		/** 音频播放错误事件 */
+		onError(callback: (res: ErrCodeResponse) => void): void;
+		/** 音频加载中事件，当音频因为数据不足，需要停下来加载时会触发 */
+		onWaiting(callback: (res: ErrCodeResponse) => void): void;
+		/** 音频进行 seek 操作事件 */
+		onSeeking(callback: (res: ErrCodeResponse) => void): void;
+		/** 音频完成 seek 操作事件 */
+		onSeeked(callback: (res: ErrCodeResponse) => void): void;
+		/** 取消监听 onCanplay 事件 */
+		offCanplay(callback: (res: ErrCodeResponse) => void): void;
+		/** 取消监听 onPlay 事件 */
+		offPlay(callback: (res: ErrCodeResponse) => void): void;
+		/** 取消监听 offPause 事件 */
+		offPause(callback: (res: ErrCodeResponse) => void): void;
+		/** 取消监听 onStop 事件 */
+		offStop(callback: (res: ErrCodeResponse) => void): void;
+		/** 取消监听 onEnded 事件 */
+		offEnded(callback: (res: ErrCodeResponse) => void): void;
+		/** 取消监听 onTimeUpdate 事件 */
+		offTimeUpdate(callback: (res: ErrCodeResponse) => void): void;
+		/** 取消监听 onError 事件 */
+		offError(callback: (res: ErrCodeResponse) => void): void;
+		/** 取消监听 onWaiting 事件 */
+		offWaiting(callback: (res: ErrCodeResponse) => void): void;
+		/** 取消监听 onSeeking  事件 */
+		offSeeking(callback: (res: ErrCodeResponse) => void): void;
+		/** 取消监听 onSeeked  事件 */
+		offSeeked(callback: (res: ErrCodeResponse) => void): void;
+	}
+	/**
+	 * 创建并返回内部 audio 上下文 innerAudioContext 对象。
+	 */
+	function createInnerAudioContext(): InnerAudioContext;
+	// 媒体-----视频
+	interface ChooseVideoOptions extends BaseOptions {
+		/** album 从相册选视频，camera 使用相机拍摄，默认为：['album', 'camera'] */
+		sourceType?: VideoSourceType[];
+		/** 是否压缩所选的视频源文件，默认值为true，需要压缩 */
+		compressed?: boolean;
+		/** 拍摄视频最长拍摄时间，单位秒。最长支持60秒 */
+		maxDuration?: number;
+		/** 前置或者后置摄像头，默认为前后都有，即：['front', 'back'] */
+		camera?: CameraDevice;
+		/** 接口调用成功，返回视频文件的临时文件路径，详见返回参数说明 */
+		success?(res: VideoData): void;
+	}
+	/**
+	 * 拍摄视频或从手机相册中选视频，返回视频的临时文件路径。
+	 */
+	function chooseVideo(options: ChooseVideoOptions): void;
+
+	interface SaveVideoOptions extends BaseOptions {
+		filePath: string; // 视频文件路径，可以是临时文件路径也可以是永久文件路径
+		success(errMsg: string): void;
+	}
+
+	/** 保存视频到系统相册。需要用户授权 scope.writePhotosAlbum */
+	function saveVideoToPhotosAlbum(options: SaveVideoOptions): void;
+	// 媒体-----视频组件控制
+	interface VideoContext {
+		/**
+		 * 播放
+		 */
+		play(): void;
+		/**
+		 * 暂停
+		 */
+		pause(): void;
+		/**
+		 * 跳转到指定位置，单位 s
+		 */
+		seek(position: number): void;
+		/**
+		 * 发送弹幕，danmu 包含两个属性 text, color。
+		 */
+		sendDanmu(danmu: { text: string; color: number | string }): void;
+		/**
+		 *  设置倍速播放，支持的倍率有 0.5/0.8/1.0/1.25/1.5
+		 */
+		playbackRate(rate: 0.5 | 0.8 | 1.0 | 1.25 | 1.5): void;
+		/**
+		 *  进入全屏
+		 */
+		requestFullScreen(): void; // 进入全屏;
+		/**
+		 * 退出全屏
+		 */
+		exitFullScreen(): void; // 退出全屏;
+		/**
+		 * 显示状态栏，仅在iOS全屏下有效
+		 */
+		showStatusBar(): void; // 显示状态栏，仅在iOS全屏下有效;
+		/**
+		 * 隐藏状态栏，仅在iOS全屏下有效
+		 */
+		hideStatusBar(): void; // 隐藏状态栏，仅在iOS全屏下有效;
+	}
+	interface VideoData {
+		/** 选定视频的临时文件路径 */
+		tempFilePath: string;
+		/** 选定视频的时间长度 */
+		duration: number;
+		/** 选定视频的数据量大小 */
+		size: number;
+		/** 返回选定视频的长 */
+		height: number;
+		/** 返回选定视频的宽 */
+		width: number;
+	}
+	/**
+	 * 创建并返回 video 上下文 videoContext 对象
+	 * @param videoId video标签id <video  src="{{src}}" id="myVideo" ></video>
+	 */
+	function createVideoContext(videoId: string): VideoContext;
+	interface TakePhotoOptions extends BaseOptions {
+		/** 成像质量，值为high, normal, low，默认normal */
+		quality?: string;
+		success?(res: { tempImagePath: string }): void;
+	}
+	interface RecordResponse {
+		tempThumbPath: string;
+		tempVideoPath: string;
+	}
+	interface StartRecordOptions extends BaseOptions {
+		/** 超过30s或页面onHide时会结束录像 */
+		timeoutCallback?(res: RecordResponse): void;
+	}
+	interface StopRecordOptions extends BaseOptions {
+		success?(res: RecordResponse): void;
+	}
+	interface CameraContext {
+		/** 拍照，可指定质量，成功则返回图片 */
+		takePhoto(options: TakePhotoOptions): void;
+		/** 开始录像 */
+		startRecord(options: StartRecordOptions): void;
+		/** 结束录像，成功则返回封面与视频 */
+		stopRecord(options: StopRecordOptions): void;
+	}
+	/**
+	 * 创建并返回 camera 上下文 cameraContext 对象
+	 * cameraContext 与页面的 camera 组件绑定
+	 * 一个页面只能有一个camera，通过它可以操作对应的 <camera/> 组件。
+	 * 在自定义组件下，第一个参数传入组件实例this，以操作组件内 <camera/> 组件
+	 * @version 1.6.0
+	 */
+	function createCameraContext(instance?: any): CameraContext;
+	interface RequestFullScreenOptions extends BaseOptions {
+		/** 有效值为 0（正常竖向）, 90（屏幕逆时针90度）, -90（屏幕顺时针90度） */
+		direction: number;
+	}
+	interface LivePlayerContext {
+		/** 播放 */
+		play(options: BaseOptions): void;
+		/** 停止 */
+		stop(options: BaseOptions): void;
+		/** 静音 */
+		mute(options: BaseOptions): void;
+		/** 暂停 */
+		pause(options: BaseOptions): void;
+		/** 回复 */
+		resume(options: BaseOptions): void;
+		/** 进入全屏 */
+		requestFullScreen(options: RequestFullScreenOptions): void;
+		/** 退出全屏 */
+		exitFullScreen(options: BaseOptions): void;
+	}
+	/**
+	 * 操作对应的 <live-player/> 组件。
+	 * 创建并返回 live-player 上下文 LivePlayerContext 对象。
+	 * 在自定义组件下，第二个参数传入组件实例this，以操作组件内 <live-player/> 组件
+	 * @version 1.7.0
+	 */
+	function createLivePlayerContext(
+		id: string,
+		instance: any
+	): LivePlayerContext;
+	// 文件
+	interface SavedFileData {
+		/** 文件的保存路径 */
+		savedFilePath: string;
+	}
+	interface SaveFileOptions extends BaseOptions {
+		/** 需要保存的文件的临时路径 */
+		tempFilePath: string;
+		/** 返回文件的保存路径，res = {savedFilePath: '文件的保存路径'} */
+		success?(res: SavedFileData): void;
+	}
+	/**
+	 * 保存文件到本地。
+	 * 本地文件存储的大小限制为 10M
+	 */
+	function saveFile(options: SaveFileOptions): void;
+	interface File {
+		/**
+		 * 文件的本地路径
+		 */
+		filePath: string;
+		/**
+		 * 文件的保存时的时间戳，从1970/01/01 08:00:00 到当前时间的秒数
+		 */
+		createTime: number;
+		/**
+		 * 文件大小，单位B
+		 */
+		size: number;
+	}
+	interface GetFileInfoOptions extends BaseOptions {
+		/** 本地文件路径 */
+		filePath: string;
+		/** 计算文件摘要的算法，默认值 md5，有效值：md5，sha1 */
+		digestAlgorithm?: string;
+		success?(options: GetFileInfoSuccess): void;
+	}
+	interface GetFileInfoSuccess {
+		/** 文件大小，单位：B */
+		size: number;
+		/** 按照传入的 digestAlgorithm 计算得出的的文件摘要 */
+		digest: string;
+	}
+	/**
+	 *  获取文件信息
+	 * @version 1.4.0
+	 */
+	function getFileInfo(options: GetFileInfoOptions): void;
+	interface GetSavedFileListData {
+		/**
+		 * 文件列表
+		 */
+		fileList: File[];
+	}
+	interface GetSavedFileListOptions extends BaseOptions {
+		/** 接口调用成功的回调函数 */
+		success?(res: GetSavedFileListData): void;
+	}
+	/**
+	 * 获取本地已保存的文件列表
+	 */
+	function getSavedFileList(options: GetSavedFileListOptions): void;
+	interface SavedFileInfoData {
+		// filePath: string;
+		size: number;
+		createTime: number;
+	}
+	interface GetSavedFileInfoOptions extends BaseOptions {
+		filePath: string;
+		/** 接口调用成功的回调函数 */
+		success?(res: SavedFileInfoData): void;
+	}
+	/**
+	 * 获取本地文件的文件信息
+	 */
+	function getSavedFileInfo(options: GetSavedFileInfoOptions): void;
+	interface RemoveSavedFileOptions extends BaseOptions {
+		filePath: string;
+		/** 接口调用成功的回调函数 */
+		success?(res: {
+			filePath: string;
+		}): void;
+	}
+	/**
+	 * 删除本地存储的文件
+	 */
+	function removeSavedFile(options: RemoveSavedFileOptions): void;
+	interface OpenDocumentOptions extends BaseOptions {
+		/**
+		 * 文件路径，可通过 downFile 获得
+		 */
+		filePath: string;
+		/**
+		 * 文件类型，指定文件类型打开文件，有效值 doc, xls, ppt, pdf, docx, xlsx, pptx
+		 */
+		fileType?: "doc" | "xls" | "ppt" | "pdf" | "docx" | "xlsx" | "pptx";
+	}
+	/**
+	 * 新开页面打开文档，支持格式：doc, xls, ppt, pdf, docx, xlsx, pptx
+	 */
+	function openDocument(options: OpenDocumentOptions): void;
+	// 数据缓存
+	interface SetStorageOptions extends BaseOptions {
+		/** 本地缓存中的指定的 key */
+		key: string;
+		/** 需要存储的内容 */
+		data: any;
+	}
+	/**
+	 * 将数据存储在本地缓存中指定的 key 中，
+	 * 会覆盖掉原来该 key 对应的内容，这是一个异步接口。
+	 */
+	function setStorage(options: SetStorageOptions): void;
+	/**
+	 * 将 data 存储在本地缓存中指定的 key 中，
+	 * 会覆盖掉原来该 key 对应的内容，这是一个同步接口。
+	 *
+	 * @param key 本地缓存中的指定的 key
+	 * @param data 需要存储的内容
+	 */
+	function setStorageSync(key: string, data: any): void;
+	interface GetStorageOptions extends BaseOptions {
+		/** 本地缓存中的指定的 key */
+		key: string;
+		/** 接口调用的回调函数,res = {data: key对应的内容} */
+		success(res: DataResponse): void;
+	}
+	/**
+	 * 从本地缓存中异步获取指定 key 对应的内容。
+	 */
+	function getStorage(options: GetStorageOptions): void;
+	/**
+	 * 从本地缓存中同步获取指定 key 对应的内容。
+	 *
+	 */
+	function getStorageSync(key: string): any;
+	interface StorageInfo {
+		/**
+		 * 当前storage中所有的key
+		 */
+		keys: string[];
+		/**
+		 * 当前占用的空间大小, 单位kb
+		 */
+		currentSize: number;
+		/**
+		 * 限制的空间大小，单位kb
+		 */
+		limitSize: number;
+	}
+	interface GetStorageInfoOptions extends BaseOptions {
+		success(res: StorageInfo): void;
+	}
+	/**
+	 * 异步获取当前storage的相关信息
+	 */
+	function getStorageInfo(options: GetStorageInfoOptions): void;
+	function getStorageInfoSync(): StorageInfo;
+	interface RemoveStorageOptions extends BaseOptions {
+		key: string;
+		success?(res: DataResponse): void;
+	}
+	function removeStorage(options: RemoveStorageOptions): void;
+	function removeStorageSync(key: string): DataResponse;
+	/**
+	 * 清理本地数据缓存。
+	 */
+	function clearStorage(): void;
+	/**
+	 * 同步清理本地数据缓存
+	 */
+	function clearStorageSync(): void;
+	// #endregion
+	// #region 位置API列表
+	// 位置-----获取位置
+	interface LocationData {
+		/** 纬度，浮点数，范围为-90~90，负数表示南纬 */
+		latitude: number;
+		/** 经度，浮点数，范围为-180~180，负数表示西经 */
+		longitude: number;
+		/** 速度，浮点数，单位m/s */
+		speed: number;
+		/** 位置的精确度 */
+		accuracy: number;
+	}
+	interface GetLocationOptions extends BaseOptions {
+		/** 默认为 wgs84 返回 gps 坐标，gcj02 返回可用于swan.openLocation的坐标 */
+		type?: "wgs84" | "gcj02";
+		altitude?: boolean; // 传入 true 会返回高度信息，由于获取高度需要较高精确度，会减慢接口返回速度
+		/** 接口调用成功的回调函数，返回内容详见返回参数说明。 */
+		success?(res: LocationData): void;
+	}
+	/**
+	 * 获取当前的地理位置、速度。
+	 */
+	function getLocation(options?: GetLocationOptions): void;
+	interface ChooseLocationData {
+		/**
+		 * 位置名称
+		 */
+		name: string;
+		/**
+		 * 详细地址
+		 */
+		address: string;
+		/**
+		 * 纬度，浮点数，范围为-90~90，负数表示南纬
+		 */
+		latitude: number;
+		/**
+		 * 经度，浮点数，范围为-180~180，负数表示西经
+		 */
+		longitude: number;
+	}
+	interface ChooseLocationOptions extends BaseOptions {
+		success(res: ChooseLocationData): void;
+	}
+	/**
+	 * 打开地图选择位置
+	 */
+	function chooseLocation(options: ChooseLocationOptions): void;
+	// 位置-----查看位置
+	interface OpenLocationOptions extends BaseOptions {
+		/** 纬度，范围为-90~90，负数表示南纬 */
+		latitude: number;
+		/** 经度，范围为-180~180，负数表示西经 */
+		longitude: number;
+		/** 缩放比例，范围1~28，默认为28 */
+		scale?: number;
+		/** 位置名 */
+		name?: string;
+		/** 地址的详细说明 */
+		address?: string;
+	}
+	/**
+	 * 使用微信内置地图查看位置
+	 */
+	function openLocation(options: OpenLocationOptions): void;
+	// 位置-----地图组件控制
+	interface GetCenterLocationOptions extends BaseOptions {
+		success(res: { longitude: number; latitude: number }): void;
+	}
+	interface TranslateMarkerOptions extends BaseOptions {
+		markerId: number;	// 指定 marker
+		destination: {
+			latitude: number;
+			longitude: number;
+		};	// 指定marker移动到的目标点
+		autoRotate: boolean;	// 移动过程中是否自动旋转 marker
+		rotate: number;	// marker 的旋转角度
+		duration?: number;	// 动画持续时长，默认值1000ms，平移与旋转分别计算。
+		animationEnd?(): void;
+	}
+	interface GetRegionOptions extends BaseOptions {
+		success(res: {
+			southwest: {
+				latitude: number;
+				longitude: number;
+			};
+			northeast: {
+				latitude: number;
+				longitude: number;
+			};
+		}): void;
+	}
+	/**
+	 * mapContext 通过 mapId 跟一个 <map/> 组件绑定，通过它可以操作对应的 <map/> 组件。
+	 */
+	interface MapContext {
+		/**
+		 * 获取当前地图中心的经纬度，返回的是 gcj02 坐标系，可以用于 swan.openLocation
+		 */
+		getCenterLocation(options: GetCenterLocationOptions): OpenLocationOptions;
+		/**
+		 * 将地图中心移动到当前定位点，需要配合map组件的show-location使用
+		 */
+		moveToLocation(): void;
+		translateMarker(options: TranslateMarkerOptions): void;
+		includePoints(options: {
+			points: Array<{ latitude: number; longitude: number; }>; // 要显示在可视区域内的坐标点列表，[{latitude, longitude}] 。
+			padding?: number[];	// 坐标点形成的矩形边缘到地图边缘的距离，单位像素。格式为[上,右,下,左]，安卓上只能识别数组第一项，上下左右的 padding 一致。开发者工具暂不支持 padding 参数。
+		}): void;
+		getRegion(options: GetRegionOptions): void;
+	}
+	/**
+	 * 创建并返回 map 上下文 mapContext 对象
+	 */
+	function createMapContext(mapId: string): MapContext;
+	// #endregion
+	// #region 设备API列表
+	// 设备-----系统信息
+	interface SystemInfo {
+		/** 手机品牌 */
+		brand: string;
+		/** 手机型号 */
+		model: string;
+		/** 设备像素比 */
+		pixelRatio: number;
+		/** 屏幕宽度 */
+		screenWidth: number;
+		/** 屏幕高度 */
+		screenHeight: number;
+		/** 窗口宽度 */
+		windowWidth: number;
+		/** 窗口高度 */
+		windowHeight: number;
+		/** 状态栏的高度 */
+		statusBarHeight: number;
+		/** 微信设置的语言 */
+		language: string;
+		/** 微信版本号 */
+		version: string;
+		/** 操作系统版本 */
+		system: string;
+		/** 客户端平台 */
+		platform: string;
+		/** 用户字体大小设置。以“我-设置-通用-字体大小”中的设置为准，单位 px。 */
+		fontSizeSetting: number;
+		/** 客户端基础库版本 */
+		SDKVersion: string;
+	}
+	interface GetSystemInfoOptions extends BaseOptions {
+		/** 成功获取系统信息的回调 */
+		success(res: SystemInfo): void;
+	}
+	/**
+	 * 获取系统信息。
+	 */
+	function getSystemInfo(options: GetSystemInfoOptions): void;
+	function getSystemInfoSync(): SystemInfo;
+	interface EnvInfo {
+		appKey: string;	// 智能小程序 App Key	2.0.28
+		appName: string;	// 智能小程序名称
+		lastAppURL: string;	// 智能小程序最近一次打开的调起协议
+		sdkVersion: string;	// 基础库版本
+		scheme: string;	// 调起协议的协议头
+	}
+	function getEnvInfoSync(): EnvInfo;
+	/**
+	 * 判断小程序的API，回调，参数，组件等是否在当前版本可用。
+	 * String参数说明：
+	 * 使用 ${API}.${method}.${param}.${options}
+	 * 或者 ${component}.${attribute}.${option}方式来调用
+	 * 例如：
+	 * ${API} 代表 API 名字
+	 * ${method} 代表调用方式，有效值为return, success, object, callback
+	 * ${param} 代表参数或者返回值
+	 * ${options} 代表参数的可选值
+	 * ${component} 代表组件名字
+	 * ${attribute} 代表组件属性
+	 * ${option} 代表组件属性的可选值
+	 */
+	function canIUse(api: string): boolean;
+	// 内存
+	function onMemoryWarning(callback: (res: {
+		/**
+		 * TRIM_MEMORY_RUNNING_MODERATE = 5
+		 * TRIM_MEMORY_RUNNING_LOW = 10
+		 * TRIM_MEMORY_RUNNING_CRITICAL = 15
+		 */
+		level: number;
+	}) => void): void;
+	// 设备-----网络状态
+	type networkType = "2g" | "3g" | "4g" | "wifi" | "unknown" | "none";
+	interface NetworkTypeData {
+		/** 返回网络类型2g，3g，4g，wifi */
+		networkType: networkType;
+	}
+	interface GetNetworkTypeOptions extends BaseOptions {
+		/** 接口调用成功，返回网络类型 networkType */
+		success(res: NetworkTypeData): void;
+	}
+	/**
+	 * 获取网络类型。
+	 */
+	function getNetworkType(options: GetNetworkTypeOptions): void;
+	/**
+	 * 监听网络状态变化。
+	 * 微信客户端 6.5.6 版本开始支持
+	 * @version 1.1.0
+	 */
+	function onNetworkStatusChange(
+		callback: (
+			res: {
+				isConnected: boolean;
+				networkType: networkType;
+			}
+		) => void
+	): void;
+	// 设备-----加速度计
+	interface AccelerometerData {
+		/** X 轴 */
+		x: number;
+		/** Y 轴 */
+		y: number;
+		/** Z 轴 */
+		z: number;
+	}
+	type AccelerometerChangeCallback = (res: AccelerometerData) => void;
+	/**
+	 * 监听重力感应数据，频率：5次/秒
+	 */
+	function onAccelerometerChange(callback: AccelerometerChangeCallback): void;
+	interface AccelerometerOptions extends BaseOptions {
+		interval: 'game' | 'ui' | 'normal';
+	}
+	/**
+	 * 开始监听加速度数据。
+	 * 微信客户端 6.5.6 版本开始支持
+	 * @version 1.1.0
+	 */
+	function startAccelerometer(options: AccelerometerOptions): void;
+	/**
+	 * 停止监听加速度数据。
+	 * 微信客户端 6.5.6 版本开始支持
+	 * @version 1.1.0
+	 */
+	function stopAccelerometer(options?: AccelerometerOptions): void;
+	// 设备-----罗盘
+	interface CompassData {
+		/** 面对的方向度数 */
+		direction: number;
+	}
+	type CompassChangeCallback = (res: CompassData) => void;
+	/**
+	 * 监听罗盘数据，频率：5次/秒，接口调用后会自动开始监听，可使用swan.stopCompass停止监听。
+	 */
+	function onCompassChange(callback: CompassChangeCallback): void;
+	type CompassOptions = BaseOptions;
+	/**
+	 * 开始监听罗盘数据。
+	 * 微信客户端 6.5.6 版本开始支持
+	 * @version 1.1.0
+	 */
+	function startCompass(options?: CompassOptions): void;
+	function stopCompass(options?: CompassOptions): void;
+	// 设备-----拨打电话
+	interface MakePhoneCallOptions extends BaseOptions {
+		/**
+		 * 需要拨打的电话号码
+		 */
+		phoneNumber: string;
+	}
+	/**
+	 * 拨打电话
+	 */
+	function makePhoneCall(options: MakePhoneCallOptions): void;
+	// 设备-----扫码
+	type scanType = "qrCode" | "barCode";
+	interface ScanCodeData {
+		/**
+		 * 所扫码的内容
+		 */
+		result: string;
+		/**
+		 * 所扫码的类型
+		 */
+		scanType: scanType;
+		/**
+		 * 所扫码的字符集
+		 */
+		charSet: string;
+		/**
+		 * 当所扫的码为当前小程序的合法二维码时，会返回此字段，内容为二维码携带的 path
+		 */
+		path: string;
+	}
+	interface ScanCodeOptions extends BaseOptions {
+		/**
+		 * 是否只能从相机扫码，不允许从相册选择图片
+		 * @version 1.2.0
+		 */
+		onlyFromCamera?: boolean;
+		/**
+		 * 扫码类型，参数类型是数组
+		 * 二维码是'qrCode'，一维码是'barCode'，DataMatrix是‘datamatrix’，pdf417是‘pdf417’。
+		 * @version 1.7.0
+		 */
+		scanType?: string[];
+		success(res: ScanCodeData): void;
+	}
+	/**
+	 * 调起客户端扫码界面，扫码成功后返回对应的结果
+	 */
+	function scanCode(options: ScanCodeOptions): void;
+	// 设备-----剪贴板
+	interface SetClipboardDataOptions extends BaseOptions {
+		data: string;
+	}
+	/**
+	 * 设置系统剪贴板的内容
+	 * 微信客户端 6.5.6 版本开始支持
+	 * @version 1.1.0
+	 */
+	function setClipboardData(options: SetClipboardDataOptions): void;
+	/**
+	 * 获取系统剪贴板内容
+	 * 微信客户端 6.5.6 版本开始支持
+	 * @version 1.1.0
+	 */
+	function getClipboardData(options: BaseOptions): void;
+	// 设备-----蓝牙
+	interface OpenBluetoothAdapterOptions extends BaseOptions {
+		success(res: any): void;
+	}
+	/**
+	 * 初始化蓝牙适配器
+	 * @version 1.1.0
+	 */
+	function openBluetoothAdapter(options: OpenBluetoothAdapterOptions): void;
+	interface CloseBluetoothAdapterOptions extends BaseOptions {
+		success(res: any): void;
+	}
+	/**
+	 * 关闭蓝牙模块。调用该方法将断开所有已建立的链接并释放系统资源
+	 * @version 1.1.0
+	 */
+	function closeBluetoothAdapter(options: CloseBluetoothAdapterOptions): void;
+	interface BluetoothAdapterState {
+		/**
+		 * 蓝牙适配器是否可用
+		 */
+		available: boolean;
+		/**
+		 * 蓝牙适配器是否处于搜索状态
+		 */
+		discovering: boolean;
+	}
+	interface BluetoothAdapterStateData extends ErrMsgResponse {
+		/**
+		 * 蓝牙适配器信息
+		 */
+		adapterState: BluetoothAdapterState;
+	}
+	interface GetBluetoothAdapterStateOptions extends BaseOptions {
+		success(res: BluetoothAdapterStateData): void;
+	}
+	/**
+	 * 获取本机蓝牙适配器状态
+	 * @version 1.1.0
+	 */
+	function getBluetoothAdapterState(
+		options: GetBluetoothAdapterStateOptions
+	): void;
+	/**
+	 * 监听蓝牙适配器状态变化事件
+	 * @version 1.1.0
+	 */
+	function onBluetoothAdapterStateChange(
+		callback: (res: BluetoothAdapterState) => void
+	): void;
+	interface StopBluetoothDevicesDiscoveryOptions extends BaseOptions {
+		success(res: ErrMsgResponse): void;
+	}
+	/**
+	 * 停止搜寻附近的蓝牙外围设备。请在确保找到需要连接的设备后调用该方法停止搜索。
+	 * @version 1.1.0
+	 */
+	function stopBluetoothDevicesDiscovery(
+		options: StopBluetoothDevicesDiscoveryOptions
+	): void;
+	/**
+	 * 蓝牙设备信息
+	 */
+	interface BluetoothDevice {
+		/**
+		 * 蓝牙设备名称，某些设备可能没有
+		 */
+		name: string;
+		/**
+		 * 用于区分设备的 id
+		 */
+		deviceId: string;
+		/**
+		 * int 当前蓝牙设备的信号强度
+		 */
+		RSSI: number;
+		/**
+		 * 当前蓝牙设备的广播内容
+		 */
+		advertisData: ArrayBuffer;
+	}
+	interface GetBluetoothDevicesOptions extends BaseOptions {
+		success(
+			res: {
+				devices: BluetoothDevice[];
+			} & ErrMsgResponse
+		): void;
+	}
+	/**
+	 * 获取所有已发现的蓝牙设备，包括已经和本机处于连接状态的设备
+	 */
+	function getBluetoothDevices(options: GetBluetoothDevicesOptions): void;
+	/**
+	 * 监听寻找到新设备的事件
+	 * @version 1.1.0
+	 */
+	function onBluetoothDeviceFound(
+		callback: (
+			res: {
+				devices: BluetoothDevice[];
+			}
+		) => void
+	): void;
+	interface GetConnectedBluetoothDevicesOptions extends BaseOptions {
+		services: string[];
+		success(
+			res: {
+				devices: BluetoothDevice[];
+			} & ErrMsgResponse
+		): void;
+	}
+	/**
+	 * 根据 uuid 获取处于已连接状态的设备
+	 * @version 1.1.0
+	 */
+	function getConnectedBluetoothDevices(
+		options: GetConnectedBluetoothDevicesOptions
+	): void;
+	interface CreateBLEConnectionOptions extends BaseOptions {
+		/**
+		 * 蓝牙设备 id，参考 getDevices 接口
+		 */
+		deviceId: string;
+		success(res: ErrMsgResponse): void;
+	}
+	/**
+	 * 低功耗蓝牙接口
+	 * @version 1.1.0
+	 */
+	function createBLEConnection(options: CreateBLEConnectionOptions): void;
+	interface CloseBLEConnectionOptions extends BaseOptions {
+		/**
+		 * 蓝牙设备 id，参考 getDevices 接口
+		 */
+		deviceId: string;
+		success(res: ErrMsgResponse): void;
+	}
+	/**
+	 * 断开与低功耗蓝牙设备的连接
+	 * @version 1.1.0
+	 */
+	function closeBLEConnection(options: CloseBLEConnectionOptions): void;
+	interface GetBLEDeviceServicesOptions extends BaseOptions {
+		/**
+		 * 蓝牙设备 id，参考 getDevices 接口
+		 */
+		deviceId: string;
+		/**
+		 * 成功则返回本机蓝牙适配器状态
+		 */
+		success(
+			res: {
+				services: Array<{
+					uuid: string;
+					isPrimary: boolean;
+				}>;
+			} & ErrMsgResponse
+		): void;
+	}
+	/**
+	 * 获取蓝牙设备所有 service（服务）
+	 */
+	function getBLEDeviceServices(options: GetBLEDeviceServicesOptions): void;
+	interface GetBLEDeviceCharacteristicsOptions extends BaseOptions {
+		/**
+		 * 蓝牙设备 id，参考 device 对象
+		 */
+		deviceId: string;
+		/**
+		 * 蓝牙服务 uuid
+		 */
+		serviceId: string;
+		/**
+		 * 成功则返回本机蓝牙适配器状态
+		 */
+		success(
+			res: {
+				characteristics: Array<{
+					uuid: string;
+					properties: Array<{
+						/**
+						 * 该特征值是否支持 read 操作
+						 */
+						read: boolean;
+						/**
+						 * 该特征值是否支持 write 操作
+						 */
+						write: boolean;
+						/**
+						 * 该特征值是否支持 notify 操作
+						 */
+						notify: boolean;
+						/**
+						 * 该特征值是否支持 indicate 操作
+						 */
+						indicate: boolean;
+					}>;
+				}>;
+			} & ErrMsgResponse
+		): void;
+	}
+	/**
+	 * 获取蓝牙设备所有 characteristic（特征值）
+	 */
+	function getBLEDeviceCharacteristics(
+		options: GetBLEDeviceCharacteristicsOptions
+	): void;
+
+	interface WriteBLECharacteristicValue extends BaseOptions {
+		/**
+		 * 蓝牙设备 id，参考 device 对象
+		 */
+		deviceId: string;
+		/**
+		 * 蓝牙特征值对应服务的 uuid
+		 */
+		serviceId: string;
+		/**
+		 * 蓝牙特征值的 uuid
+		 */
+		characteristicId: string;
+		/**
+		 * 蓝牙设备特征值对应的二进制值
+		 */
+		value: ArrayBuffer;
+		fail?(): void;
+		success(res: ErrMsgResponse): void;
+		complete?(): void;
+	}
+
+	interface NotifyBLECharacteristicValueChanged extends BaseOptions {
+		/**
+		 * 蓝牙设备 id，参考 device 对象
+		 */
+		deviceId: string;
+		/**
+		 * 蓝牙特征值对应服务的 uuid
+		 */
+		serviceId: string;
+		/**
+		 * 蓝牙特征值的 uuid
+		 */
+		characteristicId: string;
+		/**
+		 * true: 启用 notify; false: 停用 notify
+		 */
+		state: boolean;
+		success(res: ErrMsgResponse): void;
+	}
+
+	interface ReadBLECharacteristicValue extends BaseOptions {
+		/**
+		 * 蓝牙设备 id，参考 device 对象
+		 */
+		deviceId: string;
+		/**
+		 * 蓝牙特征值对应服务的 uuid
+		 */
+		serviceId: string;
+		/**
+		 * 蓝牙特征值的 uuid
+		 */
+		characteristicId: string;
+		success(
+			res: {
+				characteristic: {
+					/**
+					 * 蓝牙设备特征值的 uuid
+					 */
+					characteristicId: string;
+					/**
+					 * 蓝牙设备特征值对应服务的 uuid
+					 */
+					serviceId: string;
+					/**
+					 * 蓝牙设备特征值对应的二进制值
+					 */
+					value: ArrayBuffer;
+				};
+			} & ErrMsgResponse
+		): void;
+	}
+
+	/**
+	 * 读取低功耗蓝牙设备的特征值的二进制数据值。
+	 * 注意：必须设备的特征值支持read才可以成功调用，具体参照 characteristic 的 properties 属性
+	 */
+	function readBLECharacteristicValue(
+		options: ReadBLECharacteristicValue
+	): void;
+	/**
+	 * 向低功耗蓝牙设备特征值中写入二进制数据。
+	 * 注意：必须设备的特征值支持write才可以成功调用，具体参照 characteristic 的 properties 属性
+	 * tips: 并行调用多次读写接口存在读写失败的可能性
+	 */
+	function writeBLECharacteristicValue(
+		options: WriteBLECharacteristicValue
+	): void;
+	/**
+	 * 启用低功耗蓝牙设备特征值变化时的 notify 功能。
+	 * 注意：必须设备的特征值支持notify才可以成功调用，具体参照 characteristic 的 properties 属性
+	 * 另外，必须先启用notify才能监听到设备 characteristicValueChange 事件
+	 */
+	function notifyBLECharacteristicValueChanged(
+		options: NotifyBLECharacteristicValueChanged
+	): void;
+	/**
+	 * 监听低功耗蓝牙连接的错误事件，包括设备丢失，连接异常断开等等。
+	 */
+	function onBLEConnectionStateChanged(
+		callback: (
+			res: {
+				/**
+				 * 蓝牙设备 id，参考 device 对象
+				 */
+				deviceId: string;
+				/**
+				 * 连接目前的状态
+				 */
+				connected: boolean;
+			}
+		) => void
+	): void;
+	/**
+	 * 监听低功耗蓝牙设备的特征值变化。必须先启用notify接口才能接收到设备推送的notification。
+	 */
+	function onBLECharacteristicValueChange(
+		callback: (
+			res: {
+				/**
+				 * 蓝牙设备 id，参考 device 对象
+				 */
+				deviceId: string;
+				/**
+				 * 特征值所属服务 uuid
+				 */
+				serviceId: string;
+				/**
+				 * 特征值 uuid
+				 */
+				characteristicId: string;
+				/**
+				 * 特征值最新的值
+				 */
+				value: ArrayBuffer;
+			}
+		) => void
+	): void;
+	// #region iBeacon
+	interface StartBeaconDiscoveryOptions extends BaseOptions {
+		/**
+		 * iBeacon设备广播的 uuids
+		 */
+		uuids: string | string[];
+		success?(res: ErrMsgResponse): void;
+	}
+	interface StopBeaconDiscoveryOptions extends BaseOptions {
+		fail?(): void;
+		success?(res: ErrMsgResponse): void;
+		complete?(): void;
+	}
+	/**
+	 * 开始搜索附近的iBeacon设备
+	 * @version 1.2.0
+	 */
+	function startBeaconDiscovery(options: StartBeaconDiscoveryOptions): void;
+	/**
+	 * 停止搜索附近的iBeacon设备
+	 * @version 1.2.0
+	 */
+	function stopBeaconDiscovery(options: StopBeaconDiscoveryOptions): void;
+	interface Beacon {
+		/** iBeacon 设备广播的 uuid */
+		uuid: string;
+		/** iBeacon 设备的主 id */
+		major: string;
+		/** iBeacon 设备的次 id */
+		minor: string;
+		/** 表示设备距离的枚举值 */
+		proximity: number;
+		/** iBeacon 设备的距离 */
+		accuracy: number;
+		/** 表示设备的信号强度 */
+		rssi: number;
+	}
+	interface GetBeaconsSuccess {
+		beacons: Beacon[];
+		errMsg: string;
+	}
+	interface GetBeaconsOptions extends BaseOptions {
+		success?(options: GetBeaconsSuccess): void;
+	}
+	/**
+	 * 获取所有已搜索到的iBeacon设备
+	 * @version 1.2.0
+	 */
+	function getBeacons(options: GetBeaconsOptions): void;
+	/**
+	 * 监听 iBeacon 设备的更新事件
+	 * @version 1.2.0
+	 */
+	function onBeaconUpdate(callback?: (beacons: Beacon[]) => void): void;
+	/**
+	 * 监听 iBeacon 服务的状态变化
+	 * @version 1.2.0
+	 */
+	function onBeaconServiceChange(
+		callback?: (available: boolean, discovering: boolean) => void
+	): void;
+	// #endregion
+	// 设备-----屏幕亮度
+	interface SetScreenBrightnessOptions extends BaseOptions {
+		/** 屏幕亮度值，范围 0~1，0 最暗，1 最亮 */
+		value: number;
+	}
+	/**
+	 * 设置屏幕亮度
+	 * @version 1.2.0
+	 */
+	function setScreenBrightness(options: SetScreenBrightnessOptions): void;
+	interface GetScreenBrightnessOptions extends BaseOptions {
+		/** 屏幕亮度值，范围 0~1，0 最暗，1 最亮 */
+		success(value: number): void;
+	}
+	/**
+	 * 获取屏幕亮度
+	 * @version 1.2.0
+	 */
+	function getScreenBrightness(options?: GetScreenBrightnessOptions): void;
+	interface SetKeepScreenOnOptions extends BaseOptions {
+		/** 是否保持屏幕常亮 */
+		keepScreenOn: boolean;
+		success?(res: { errMsg: string }): void;
+	}
+	/**
+	 * 设置是否保持常亮状态。
+	 * 仅在当前小程序生效，离开小程序后设置失效。
+	 * @version 1.4.0
+	 */
+	function setKeepScreenOn(options?: SetKeepScreenOnOptions): void;
+	// 设备-----震动
+	/**
+	 * 使手机发生较长时间的振动（400ms）
+	 * @version 1.2.0
+	 */
+	function vibrateLong(options?: BaseOptions): void;
+	/**
+	 * 使手机发生较短时间的振动（15ms）
+	 * @version 1.2.0
+	 */
+	function vibrateShort(options?: BaseOptions): void;
+	/**
+	 * 监听用户主动截屏事件，用户使用系统截屏按键截屏时触发此事件
+	 * @version 1.4.0
+	 */
+	function onUserCaptureScreen(callback?: (res: any) => void): void;
+	// 设备-----手机联系人
+	interface PhoneContact extends BaseOptions {
+		/** 头像本地文件路径 */
+		photoFilePath?: string;
+		/** 昵称 */
+		nickName?: string;
+		/** 姓氏 */
+		lastName?: string;
+		/** 中间名 */
+		middleName?: string;
+		/** 名字 */
+		firstName: string;
+		/** 备注 */
+		remark?: string;
+		/** 手机号 */
+		mobilePhoneNumber?: string;
+		/** 微信号 */
+		weChatNumber?: string;
+		/** 联系地址国家 */
+		addressCountry?: string;
+		/** 联系地址省份 */
+		addressState?: string;
+		/** 联系地址城市 */
+		addressCity?: string;
+		/** 联系地址街道 */
+		addressStreet?: string;
+		/** 联系地址邮政编码 */
+		addressPostalCode?: string;
+		/** 公司 */
+		organization?: string;
+		/** 职位 */
+		title?: string;
+		/** 工作传真 */
+		workFaxNumber?: string;
+		/** 工作电话 */
+		workPhoneNumber?: string;
+		/** 公司电话 */
+		hostNumber?: string;
+		/** 电子邮件 */
+		email?: string;
+		/** 网站 */
+		url?: string;
+		/** 工作地址国家 */
+		workAddressCountry?: string;
+		/** 工作地址省份 */
+		workAddressState?: string;
+		/** 工作地址城市 */
+		workAddressCity?: string;
+		/** 工作地址街道 */
+		workAddressStreet?: string;
+		/** 工作地址邮政编码 */
+		workAddressPostalCode?: string;
+		/** 住宅传真 */
+		homeFaxNumber?: string;
+		/** 住宅电话 */
+		homePhoneNumber?: string;
+		/** 住宅地址国家 */
+		homeAddressCountry?: string;
+		/** 住宅地址省份 */
+		homeAddressState?: string;
+		/** 住宅地址城市 */
+		homeAddressCity?: string;
+		/** 住宅地址街道 */
+		homeAddressStreet?: string;
+		/** 住宅地址邮政编码 */
+		homeAddressPostalCode?: string;
+	}
+	/**
+	 * 增加 手机联系人
+	 * 调用后，用户可以选择将该表单以“新增联系人”或“添加到已有联系人”的方式
+	 * 写入手机系统通讯录
+	 * 完成手机通讯录联系人和联系方式的增加。
+	 * @version 1.2.0
+	 */
+	function addPhoneContact(options: PhoneContact): void;
+	// 设备-----Wi-Fi
+	/**
+	 * 初始化 Wi-Fi 模块。
+	 * @version 1.6.0
+	 */
+	function startWifi(options?: BaseOptions): void;
+	/**
+	 * 关闭 Wi-Fi 模块。
+	 * @version 1.6.0
+	 */
+	function stopWifi(options?: BaseOptions): void;
+	interface ConnectWiFiOptions extends BaseOptions {
+		/** Wi-Fi 设备ssid */
+		SSID: string;
+		/** Wi-Fi 设备bssid */
+		BSSID: string;
+		/** Wi-Fi 设备密码 */
+		password?: string;
+	}
+	/**
+	 * 连接 Wi-Fi。
+	 * 若已知 Wi-Fi 信息，可以直接利用该接口连接。
+	 * 仅 Android 与 iOS 11 以上版本支持。
+	 * @version 1.6.0
+	 */
+	function connectWifi(options?: ConnectWiFiOptions): void;
+	/**
+	 * 请求获取 Wi-Fi 列表
+	 * 在 onGetWifiList 注册的回调中返回 wifiList 数据。
+	 * iOS 将跳转到系统的 Wi-Fi 界面，Android 不会跳转。
+	 * iOS 11.0 及 iOS 11.1 两个版本因系统问题，该方法失效。但在 iOS 11.2 中已修复。
+	 * @version 1.6.0
+	 */
+	function getWifiList(options?: BaseOptions): void;
+	interface WiFi {
+		/** Wi-Fi 的SSID */
+		SSID: string;
+		/** Wi-Fi 的BSSID */
+		BSSID: string;
+		/** Wi-Fi 是否安全 */
+		secure: boolean;
+		/** Wi-Fi 信号强度 */
+		signalStrength: number;
+	}
+	interface GetWifiListOptions {
+		/** Wi-Fi 列表数据 */
+		wifiList: WiFi[];
+	}
+	/**
+	 * 监听在获取到 Wi-Fi 列表数据时的事件，在回调中将返回 wifiList。
+	 * @version 1.6.0
+	 */
+	function onGetWifiList(callback?: (res: GetWifiListOptions) => void): void;
+	interface SetWifiList {
+		/** Wi-Fi 设备ssid */
+		SSID: string;
+		/** Wi-Fi 设备bssid */
+		BSSID: string;
+		/** Wi-Fi 设备密码 */
+		password: string;
+	}
+	interface SetWifiListOptions extends BaseOptions {
+		/** 提供预设的 Wi-Fi 信息列表 */
+		wifiList: SetWifiList[];
+	}
+	/**
+	 * iOS特有接口 在 onGetWifiList 回调后，利用接口设置 wifiList 中 AP 的相关信息。
+	 * 注意：
+	 * + 该接口只能在 onGetWifiList 回调之后才能调用。
+	 * + 此时客户端会挂起，等待小程序设置 Wi-Fi 信息，请务必尽快调用该接口，若无数据请传入一个空数组。
+	 * + 有可能随着周边 Wi-Fi 列表的刷新，单个流程内收到多次带有存在重复的 Wi-Fi 列表的回调。
+	 * @version 1.6.0
+	 */
+	function setWifiList(options: SetWifiListOptions): void;
+	/**
+	 * 监听连接上 Wi-Fi 的事件。
+	 * @version 1.6.0
+	 */
+	function onWifiConnected(callback?: (wifi: WiFi) => void): void;
+	interface GetConnectedWifiOptions extends BaseOptions {
+		success(wifi: WiFi): void;
+	}
+	/**
+	 * 获取已连接中的 Wi-Fi 信息
+	 * @version 1.6.0
+	 */
+	function getConnectedWifi(options?: GetConnectedWifiOptions): void;
+	// #endregion
+	// #region 界面API列表
+	interface ToastOptions extends BaseOptions {
+		/**
+		 * 提示的内容
+		 */
+		title: string;
+		/**
+		 * 图标，只支持"success"、"loading"
+		 */
+		icon?: "success" | "loading";
+		/**
+		 * 自定义图标的本地路径，image 的优先级高于 icon
+		 */
+		image?: string;
+		/**
+		 * 提示的延迟时间，单位毫秒，默认：1500
+		 */
+		duration?: number;
+		/**
+		 * 是否显示透明蒙层，防止触摸穿透，默认：false
+		 */
+		mask?: boolean;
+	}
+	/**
+	 * 显示消息提示框
+	 */
+	function showToast(options: ToastOptions): void;
+	function hideToast(): void;
+	interface LoadingOptions extends BaseOptions {
+		/**
+		 * 提示的内容
+		 */
+		title: string;
+		/**
+		 * 是否显示透明蒙层，防止触摸穿透，默认：false
+		 */
+		mask?: boolean | 'true' | 'false';
+	}
+	/**
+	 * 显示 loading 提示框, 需主动调用 swan.hideLoading 才能关闭提示框
+	 */
+	function showLoading(options: LoadingOptions): void;
+	/**
+	 * 隐藏消息提示框
+	 */
+	function hideLoading(): void;
+	interface ModalOptions extends BaseOptions {
+		/**
+		 * 提示的标题
+		 */
+		title: string;
+		/**
+		 * 提示的内容
+		 */
+		content: string;
+		/**
+		 * 是否显示取消按钮，默认为 true
+		 */
+		showCancel?: boolean;
+		/**
+		 * 取消按钮的文字，默认为"取消"，最多 4 个字符
+		 */
+		cancelText?: string;
+		/**
+		 * 取消按钮的文字颜色，默认为"#000000"
+		 */
+		cancelColor?: string;
+		/**
+		 * 确定按钮的文字，默认为"确定"，最多 4 个字符
+		 */
+		confirmText?: string;
+		/**
+		 * 确定按钮的文字颜色，默认为"#3CC51F"
+		 */
+		confirmColor?: string;
+		success?(res: {
+			/**
+			 * 为 true 时，表示用户点击了确定按钮
+			 */
+			confirm: boolean;
+			/**
+			 * 为 true 时，表示用户点击了取消（用于 Android 系统区分点击蒙层关闭还是点击取消按钮关闭）
+			 */
+			cancel: boolean;
+		}): void;
+	}
+	/**
+	 * 显示模态弹窗
+	 */
+	function showModal(options: ModalOptions): void;
+	interface ActionSheetOptions extends BaseOptions {
+		/**
+		 * 按钮的文字数组，数组长度最大为6个
+		 */
+		itemList: string[];
+		/**
+		 * 按钮的文字颜色，默认为"#000000"
+		 */
+		itemColor?: string;
+		/**
+		 * 接口调用成功的回调函数
+		 */
+		success?(res: {
+			/**
+			 * 用户点击的按钮，从上到下的顺序，从0开始
+			 */
+			tapIndex: number;
+		}): void;
+	}
+	/**
+	 * 显示操作菜单
+	 */
+	function showActionSheet(options: ActionSheetOptions): void;
+	// 界面-----设置置顶信息
+	interface SetTopBarTextOptions extends BaseOptions {
+		/**
+		 * 置顶栏文字内容
+		 */
+		text: string;
+	}
+	/**
+	 * 动态设置置顶栏文字内容
+	 * 只有当前小程序被置顶时能生效，如果当前小程序没有被置顶，也能调用成功，但是不会立即生效
+	 * 只有在用户将这个小程序置顶后才换上设置的文字内容。
+	 * 注意：调用成功后，需间隔 5s 才能再次调用此接口，如果在 5s 内再次调用此接口，会回调
+	 * fail，errMsg："setTopBarText: fail invoke too frequently"
+	 * @version 1.4.3
+	 */
+	function setTopBarText(options?: SetTopBarTextOptions): void;
+	// 界面-----设置导航条
+	interface SetNavigationBarTitleOptions extends BaseOptions {
+		/** 页面标题 */
+		title: string;
+	}
+	/**
+	 * 动态设置当前页面的标题。
+	 * @version 1.4.3
+	 */
+	function setNavigationBarTitle(options: SetNavigationBarTitleOptions): void;
+
+	interface SetNavigationBarColorOptions extends BaseOptions {
+		/**
+		 * 前景颜色值，包括按钮、标题、状态栏的颜色，仅支持 #ffffff 和 #000000
+		 */
+		frontColor: "#ffffff" | "#000000";
+		/**
+		 * 背景颜色值，有效值为十六进制颜色
+		 */
+		backgroundColor: string;
+		/**
+		 * 动画效果
+		 */
+		animation?: {
+			// 动画变化时间，默认0，单位：毫秒
+			duration?: number;
+			/**
+			 * 动画变化方式，默认 linear
+			 * 值	说明
+			 * 有效值：
+			 * linear	动画从头到尾的速度是相同的。
+			 * easeIn	动画以低速开始
+			 * easeOut	动画以低速结束。
+			 * easeInOut	动画以低速开始和结束。
+			 */
+			timingFunc?: "linear" | "easeIn" | "easeOut" | "easeInOut";
+		};
+	}
+
+	/**
+	 * 设置导航颜色
+	 * @version 1.4.3
+	 */
+	function setNavigationBarColor(options: SetNavigationBarColorOptions): void;
+	/**
+	 * 在当前页面显示导航条加载动画。
+	 * @version 1.4.3
+	 */
+	function showNavigationBarLoading(): void;
+	/**
+	 * 隐藏导航条加载动画。
+	 * @version 1.4.3
+	 */
+	function hideNavigationBarLoading(): void;
+	interface SetTabBarBadgeOptions extends BaseOptions {
+		/**
+		 * tabBar的哪一项，从左边算起
+		 */
+		index: number;
+		/**
+		 * 显示的文本，超过 3 个字符则显示成“…”
+		 */
+		text: string;
+	}
+	// 界面-----设置tabBar
+	/**
+	 * 为 tabBar 某一项的右上角添加文本
+	 * @version 1.9.0
+	 */
+	function setTabBarBadge(options: SetTabBarBadgeOptions): void;
+	interface TabBarBadgeOptions extends BaseOptions {
+		/**
+		 * tabBar的哪一项，从左边算起
+		 */
+		index: number;
+	}
+	/**
+	 * 移除 tabBar 某一项右上角的文本
+	 * @version 1.9.0
+	 */
+	function removeTabBarBadge(options: TabBarBadgeOptions): void;
+	/**
+	 * 显示 tabBar 某一项的右上角的红点
+	 * @version 1.9.0
+	 */
+	function showTabBarRedDot(option: TabBarBadgeOptions): void;
+	/**
+	 * 隐藏 tabBar 某一项的右上角的红点
+	 * @version 1.9.0
+	 */
+	function hideTabBarRedDot(option: TabBarBadgeOptions): void;
+	interface SetTabBarStyleOptions extends BaseOptions {
+		/** tab 上的文字默认颜色 */
+		color: string;
+		/** tab 上的文字选中时的颜色 */
+		selectedColor: string;
+		/** tab 的背景色 */
+		backgroundColor: string;
+		/** tabbar上边框的颜色， 仅支持 black/white */
+		borderStyle: string;
+	}
+	/**
+	 * 动态设置 tabBar 的整体样式
+	 * @version 1.9.0
+	 */
+	function setTabBarStyle(options: SetTabBarStyleOptions): void;
+	interface SetTabBarItemOptions extends BaseOptions {
+		/** tabBar 的哪一项，从左边算起 */
+		index: number;
+		/** tab 上按钮文字 */
+		text?: string;
+		/**
+		 * 图片路径, icon 大小限制为40kb
+		 * 建议尺寸为 81px * 81px
+		 * 当 postion 为 top 时，此参数无效，不支持网络图片
+		 */
+		iconPath?: string;
+		/**
+		 * 选中时的图片路径
+		 * icon 大小限制为40kb，建议尺寸为 81px * 81px
+		 * 当 postion 为 top
+		 */
+		selectedIconPath?: string;
+	}
+	/**
+	 * 动态设置 tabBar 某一项的内容
+	 * @version 1.9.0
+	 */
+	function setTabBarItem(options: SetTabBarItemOptions): void;
+	interface ShowTabBarOptions extends BaseOptions {
+		/** 是否需要动画效果，默认无 */
+		aniamtion?: boolean;
+	}
+	/**
+	 * 显示 tabBar
+	 * @version 1.9.0
+	 */
+	function showTabBar(options: ShowTabBarOptions): void;
+	/**
+	 * 隐藏 tabBar
+	 * @version 1.9.0
+	 */
+	function hideTabBar(options: ShowTabBarOptions): void;
+	// 界面-----导航
+	interface NavigateToOptions extends BaseOptions {
+		/** 需要跳转的应用内页面的路径 */
+		url: string;
+	}
+	/**
+	 * 保留当前页面，跳转到应用内的某个页面，使用swan.navigateBack可以返回到原页面。
+	 *
+	 * 注意：为了不让用户在使用小程序时造成困扰，
+	 * 我们规定页面路径只能是五层，请尽量避免多层级的交互方式。
+	 */
+	function navigateTo(options: NavigateToOptions): void;
+	interface SwitchTabOptions extends BaseOptions {
+		/**
+		 * 需要跳转的 tabBar 页面的路径
+		 * （需在 app.json 的 tabBar 字段定义的页面），路径后不能带参数
+		 */
+		url: string;
+	}
+	/**
+	 * 跳转到 tabBar 页面，并关闭其他所有非 tabBar 页面
+	 */
+	function switchTab(options: SwitchTabOptions): void;
+	interface RedirectToOptions extends BaseOptions {
+		/** 需要跳转的应用内页面的路径 */
+		url: string;
+	}
+	/**
+	 * 关闭当前页面，跳转到应用内的某个页面。
+	 */
+	function redirectTo(options: RedirectToOptions): void;
+	interface NavigateBackOptions extends BaseOptions {
+		/** 返回的页面数，如果 delta 大于现有页面数，则返回到首页。 */
+		delta: number;
+	}
+	/**
+	 * 关闭当前页面，回退前一页面。
+	 */
+	function navigateBack(options?: NavigateBackOptions): void;
+	interface ReLaunchOptions extends BaseOptions {
+		/**
+		 * 需要跳转的应用内页面路径 , 路径后可以带参数。
+		 * 参数与路径之间使用?分隔，参数键与参数值用=相连，不同参数用&分隔
+		 * 如 'path?key=value&key2=value2'，如果跳转的页面路径是 tabBar 页面则不能带参数
+		 */
+		url: string;
+	}
+	/**
+	 * 关闭所有页面，打开到应用内的某个页面。
+	 * @version 1.1.0
+	 */
+	function reLaunch(options?: ReLaunchOptions): void;
+	// 界面-----动画
+	type TimingFunction =
+		| "linear"
+		| "ease"
+		| "ease-in"
+		| "ease-in-out"
+		| "ease-out"
+		| "step-start"
+		| "step-end";
+	interface CreateAnimationOptions {
+		/** 动画持续时间，单位ms，默认值 400 */
+		duration?: number;
+		/** 定义动画的效果，默认值"linear"，有效值："linear","ease","ease-in","ease-in-out","ease-out","step-start","step-end" */
+		timingFunction?: TimingFunction;
+		/** 动画持续时间，单位 ms，默认值 0 */
+		delay?: number;
+		/** 设置transform-origin，默认为"50% 50% 0" */
+		transformOrigin?: string;
+	}
+	interface Animator {
+		actions: AnimationAction[];
+	}
+	interface AnimationAction {
+		animates: Animate[];
+		option: AnimationActionOption;
+	}
+	interface AnimationActionOption {
+		transformOrigin: string;
+		transition: AnimationTransition;
+	}
+	interface AnimationTransition {
+		delay: number;
+		duration: number;
+		timingFunction: TimingFunction;
+	}
+	interface Animate {
+		type: string;
+		args: any[];
+	}
+	/**
+	 * 创建一个动画实例animation。调用实例的方法来描述动画。
+	 * 最后通过动画实例的export方法导出动画数据传递给组件的animation属性。
+	 *
+	 * 注意: export 方法每次调用后会清掉之前的动画操作
+	 */
+	function createAnimation(options?: CreateAnimationOptions): Animation;
+	/** 动画实例可以调用以下方法来描述动画，调用结束后会返回自身，支持链式调用的写法。 */
+	interface Animation {
+		/**
+		 * 调用动画操作方法后要调用 step() 来表示一组动画完成，
+		 * 可以在一组动画中调用任意多个动画方法，
+		 * 一组动画中的所有动画会同时开始，
+		 * 一组动画完成后才会进行下一组动画。
+		 * @param options 指定当前组动画的配置
+		 */
+		step(options?: CreateAnimationOptions): void;
+		/**
+		 * 导出动画操作
+		 *
+		 * 注意: export 方法每次调用后会清掉之前的动画操作
+		 */
+		export(): Animator;
+		/** 透明度，参数范围 0~1 */
+		opacity(value: number): Animation;
+		/** 颜色值 */
+		backgroundColor(color: string): Animation;
+		/** 长度值，如果传入 Number 则默认使用 px，可传入其他自定义单位的长度值 */
+		width(length: number): Animation;
+		/** 长度值，如果传入 Number 则默认使用 px，可传入其他自定义单位的长度值 */
+		height(length: number): Animation;
+		/** 长度值，如果传入 Number 则默认使用 px，可传入其他自定义单位的长度值 */
+		top(length: number): Animation;
+		/** 长度值，如果传入 Number 则默认使用 px，可传入其他自定义单位的长度值 */
+		left(length: number): Animation;
+		/** 长度值，如果传入 Number 则默认使用 px，可传入其他自定义单位的长度值 */
+		bottom(length: number): Animation;
+		/** 长度值，如果传入 Number 则默认使用 px，可传入其他自定义单位的长度值 */
+		right(length: number): Animation;
+		/** deg的范围-180~180，从原点顺时针旋转一个deg角度 */
+		rotate(deg: number): Animation;
+		/** deg的范围-180~180，在X轴旋转一个deg角度 */
+		rotateX(deg: number): Animation;
+		/** deg的范围-180~180，在Y轴旋转一个deg角度 */
+		rotateY(deg: number): Animation;
+		/** deg的范围-180~180，在Z轴旋转一个deg角度 */
+		rotateZ(deg: number): Animation;
+		/** 同transform-function rotate3d */
+		rotate3d(x: number, y: number, z: number, deg: number): Animation;
+		/**
+		 * 一个参数时，表示在X轴、Y轴同时缩放sx倍数；
+		 * 两个参数时表示在X轴缩放sx倍数，在Y轴缩放sy倍数
+		 */
+		scale(sx: number, sy?: number): Animation;
+		/** 在X轴缩放sx倍数 */
+		scaleX(sx: number): Animation;
+		/** 在Y轴缩放sy倍数 */
+		scaleY(sy: number): Animation;
+		/** 在Z轴缩放sy倍数 */
+		scaleZ(sz: number): Animation;
+		/** 在X轴缩放sx倍数，在Y轴缩放sy倍数，在Z轴缩放sz倍数 */
+		scale3d(sx: number, sy: number, sz: number): Animation;
+		/**
+		 * 一个参数时，表示在X轴偏移tx，单位px；
+		 * 两个参数时，表示在X轴偏移tx，在Y轴偏移ty，单位px。
+		 */
+		translate(tx: number, ty?: number): Animation;
+		/**
+		 * 在X轴偏移tx，单位px
+		 */
+		translateX(tx: number): Animation;
+		/**
+		 * 在Y轴偏移tx，单位px
+		 */
+		translateY(ty: number): Animation;
+		/**
+		 * 在Z轴偏移tx，单位px
+		 */
+		translateZ(tz: number): Animation;
+		/**
+		 * 在X轴偏移tx，在Y轴偏移ty，在Z轴偏移tz，单位px
+		 */
+		translate3d(tx: number, ty: number, tz: number): Animation;
+		/**
+		 * 参数范围-180~180；
+		 * 一个参数时，Y轴坐标不变，X轴坐标延顺时针倾斜ax度；
+		 * 两个参数时，分别在X轴倾斜ax度，在Y轴倾斜ay度
+		 */
+		skew(ax: number, ay?: number): Animation;
+		/** 参数范围-180~180；Y轴坐标不变，X轴坐标延顺时针倾斜ax度 */
+		skewX(ax: number): Animation;
+		/** 参数范围-180~180；X轴坐标不变，Y轴坐标延顺时针倾斜ay度 */
+		skewY(ay: number): Animation;
+		/**
+		 * 同transform-function matrix
+		 */
+		matrix(
+			a: number,
+			b: number,
+			c: number,
+			d: number,
+			tx: number,
+			ty: number
+		): Animation;
+		/** 同transform-function matrix3d */
+		matrix3d(
+			a1: number,
+			b1: number,
+			c1: number,
+			d1: number,
+			a2: number,
+			b2: number,
+			c2: number,
+			d2: number,
+			a3: number,
+			b3: number,
+			c3: number,
+			d3: number,
+			a4: number,
+			b4: number,
+			c4: number,
+			d4: number
+		): Animation;
+	}
+	// #region 位置API
+	interface PageScrollToOptions {
+		/** 滚动到页面的目标位置（单位px */
+		scrollTop: number;
+		/** 滚动动画的时长，默认300ms，单位 ms */
+		duration?: number;
+	}
+	function pageScrollTo(options: PageScrollToOptions): void;
+	/**
+	 * 返回一个SelectorQuery对象实例。
+	 * 可以在这个实例上使用select等方法选择节点，并使用boundingClientRect等方法选择需要查询的信息。
+	 * @version 1.4.0
+	 */
+	function createSelectorQuery(): SelectorQuery;
+
+	/**
+	 * swan节点布局相交状态
+	 */
+	interface CreateIntersectionObserverOption {
+		thresholds?: [number, number];
+		initialRatio?: number;
+		selectAll?: boolean;
+	}
+	interface Margins {
+		left?: number;
+		right?: number;
+		top?: number;
+		bottom?: number;
+	}
+
+	interface RectArea {
+		/** 节点的左边界坐标 */
+		left: number;
+		/** 节点的右边界坐标 */
+		right: number;
+		/** 节点的上边界坐标 */
+		top: number;
+		/** 节点的下边界坐标 */
+		bottom: number;
+		/** 节点的宽度 */
+		width: number;
+		/** 节点的高度 */
+		height: number;
+	}
+
+	interface ObserveResponse {
+		id: string;
+		dataset: any;
+		time: number;
+		intersectionRatio: number; // 相交区域占目标节点的布局区域的比例
+		boundingClientRect: RectArea;
+		intersectionRect: RectArea;
+		relativeRect: RectArea;
+	}
+
+	interface IntersectionObserver {
+		relativeTo(selector?: string, margins?: Margins): IntersectionObserver;
+		relativeToViewport(margins?: Margins): IntersectionObserver;
+		observe(
+			selector?: string,
+			callback?: (response: ObserveResponse) => void
+		): IntersectionObserver;
+		disconnect(): void;
+	}
+
+	function createIntersectionObserver(
+		context: Component<any, any>,
+		options?: CreateIntersectionObserverOption
+	): IntersectionObserver;
+
+	interface NodesRefRect extends RectArea {
+		/** 节点的ID */
+		id: string;
+		/** 节点的dataset */
+		dataset: any;
+	}
+	interface NodeRefOffset {
+		/** 节点的ID */
+		id: string;
+		/** 节点的dataset */
+		dataset: any;
+		/** 节点的水平滚动位置 */
+		scrollLeft: number;
+		/** 节点的竖直滚动位置 */
+		scrollTop: number;
+	}
+	interface NodeRefFieldsOptions {
+		/** 是否返回节点id */
+		id?: boolean;
+		/** 是否返回节点dataset */
+		dataset?: boolean;
+		/** 是否返回节点布局位置（left right top bottom */
+		rect?: boolean;
+		/** 是否返回节点尺寸（width height） */
+		size?: boolean;
+		/** 是否返回节点的 scrollLeft scrollTop ，节点必须是scroll-view或者viewport */
+		scrollOffset?: boolean;
+		/**
+		 * 指定属性名列表
+		 * 返回节点对应属性名的当前属性值（只能获得组件文档中标注的常规属性值， id class style 和事件绑定的属性值不可获取
+		 */
+		properties?: string[];
+		computedStyle?: string[];
+	}
+	interface NodeRefFieldsValue {
+		id: {
+			id: boolean;
+		};
+		dataset: {
+			dataset: string;
+		};
+		rect: {
+			left: number;
+			right: number;
+			top: number;
+			bottom: number;
+		};
+		size: {
+			width: number;
+			height: number;
+		};
+		scrollOffset: {
+			scrollLeft: number;
+			scrollTop: number;
+		};
+		properties: {
+			properties: any;
+		};
+	}
+	interface NodesRef {
+		/**
+		 * 添加节点的布局位置的查询请求，相对于显示区域，以像素为单位。
+		 * 其功能类似于DOM的getBoundingClientRect。
+		 * 返回值是nodesRef对应的selectorQuery。
+		 * 返回的节点信息中，每个节点的位置用
+		 * left、right、top、bottom、width、height字段描述。
+		 * 如果提供了callback回调函数，在执行selectQuery的exec方法后
+		 * 节点信息会在callback中返回。
+		 */
+		boundingClientRect(
+			callback?: (rect: NodesRefRect | NodesRefRect[]) => void
+		): SelectorQuery;
+		/**
+		 * 添加节点的滚动位置查询请求，以像素为单位。
+		 * 节点必须是scroll-view或者viewport。
+		 * 返回值是nodesRef对应的selectorQuery。
+		 * 返回的节点信息中，每个节点的滚动位置用scrollLeft、scrollHeight字段描述。
+		 * 如果提供了callback回调函数，在执行selectQuery的exec方法后，节点信息会在callback中返回。
+		 */
+		scrollOffset(callback?: (rect: NodeRefOffset) => void): SelectorQuery;
+		/**
+		 * 获取节点的相关信息，需要获取的字段在fields中指定。
+		 * 返回值是nodesRef对应的selectorQuery。
+		 */
+		fields(
+			fields: NodeRefFieldsOptions,
+			callback?: (result: any) => void
+		): SelectorQuery;
+	}
+	/**
+	 * SelectorQuery对象实例
+	 */
+	interface SelectorQuery {
+		/**
+		 * 将选择器的选取范围更改为自定义组件component内
+		 * （初始时，选择器仅选取页面范围的节点，不会选取任何自定义组件中的节点
+		 * @version 1.6.0
+		 */
+		in(component: Component<object, object>): SelectorQuery;
+		/**
+		 * 在当前页面下选择第一个匹配选择器selector的节点，返回一个NodesRef对象实例，可以用于获取节点信息。
+		 * selector类似于CSS的选择器，但仅支持下列语法。
+		 * + ID选择器：#the-id
+		 * + class选择器（可以连续指定多个）：.a-class.another-class
+		 * + 子元素选择器：.the-parent > .the-child
+		 * + 后代选择器：.the-ancestor .the-descendant
+		 * + 跨自定义组件的后代选择器：.the-ancestor >>> .the-descendant
+		 * + 多选择器的并集：#a-node, .some-other-nodes
+		 */
+		select(selector: string): NodesRef;
+		/**
+		 * 在当前页面下选择匹配选择器selector的节点，返回一个NodesRef对象实例。
+		 * 与selectorQuery.selectNode(selector)不同的是，它选择所有匹配选择器的节点。
+		 */
+		selectAll(selector: string): NodesRef;
+		/**
+		 * 选择显示区域，可用于获取显示区域的尺寸、滚动位置等信息
+		 * 返回一个NodesRef对象实例。
+		 */
+		selectViewport(): NodesRef;
+		/**
+		 * 执行所有的请求
+		 * 请求结果按请求次序构成数组，在callback的第一个参数中返回。
+		 */
+		exec(callback?: (result: any[]) => void): void;
+	}
+	// #endregion
+	// 界面-----绘图
+	interface CanvasAction {
+		method: string;
+		data: CanvasAction[] | Array<number | string>;
+	}
+	type LineCapType = "butt" | "round" | "square";
+	type LineJoinType = "bevel" | "round" | "miter";
+	interface CanvasGradient {
+		addColorStop(index: number, color: string): void;
+	}
+	interface Transformoptions {
+		scaleX: number; // 水平缩放
+		scaleY: number; // 垂直缩放
+		skewX: number; // 水平倾斜
+		skewY: number; // 垂直倾斜
+		translateX: number; // 水平移动
+		translateY: number; // 垂直移动
+	}
+	/**
+	 * context只是一个记录方法调用的容器，用于生成记录绘制行为的actions数组。context跟<canvas/>不存在对应关系，一个context生成画布的绘制动作数组可以应用于多个<canvas/>。
+	 */
+	interface CanvasContext {
+		font: string;
+		fillStyle: string;
+		/** 获取当前context上存储的绘图动作(不推荐使用) */
+		getActions(): CanvasAction[];
+		/** 清空当前的存储绘图动作(不推荐使用) */
+		clearActions(): void;
+		/**
+		 * 对横纵坐标进行缩放
+		 * 在调用scale方法后，之后创建的路径其横纵坐标会被缩放。
+		 * 多次调用scale，倍数会相乘。
+		 *
+		 * @param scaleWidth 横坐标缩放的倍数
+		 * @param scaleHeight 纵坐标轴缩放的倍数
+		 */
+		scale(scaleWidth: number, scaleHeight?: number): void;
+		/**
+		 * 对坐标轴进行顺时针旋转
+		 * 以原点为中心，原点可以用 translate方法修改。
+		 * 顺时针旋转当前坐标轴。多次调用rotate，旋转的角度会叠加。
+		 *
+		 * @param rotate 旋转角度，以弧度计。
+		 */
+		rotate(rotate: number): void;
+		/**
+		 * 对坐标原点进行缩放
+		 * 对当前坐标系的原点(0, 0)进行变换，默认的坐标系原点为页面左上角。
+		 *
+		 * @param x 水平坐标平移量
+		 * @param y 竖直坐标平移量
+		 */
+		translate(x: number, y: number): void;
+		/**
+		 * clip() 方法从原始画布中剪切任意形状和尺寸。一旦剪切了某个区域，则
+		 * 所有之后的绘图都会被限制在被剪切的区域内（不能访问画布上的其他区
+		 * 域）。可以在使用 clip() 方法前通过使用 save() 方法对当前画布区域
+		 * 进行保存，并在以后的任意时间对其进行恢复（通过 “restore()” 方法）
+		 */
+		clip(): void;
+		/**
+		 * 保存当前的绘图上下文。
+		 */
+		save(): void;
+		/**
+		 * 恢复之前保存的绘图上下文。
+		 */
+		restore(): void;
+		/**
+		 * 在给定的矩形区域内，清除画布上的像素
+		 * 清除画布上在该矩形区域内的内容。
+		 *
+		 * @param x 矩形区域左上角的x坐标
+		 * @param y 矩形区域左上角的y坐标
+		 * @param width 矩形区域的宽度
+		 * @param height 矩形区域的高度
+		 */
+		clearRect(x: number, y: number, width: number, height: number): void;
+		/**
+		 * 在画布上绘制被填充的文本
+		 *
+		 * @param text 在画布上输出的文本
+		 * @param x 绘制文本的左上角x坐标位置
+		 * @param y 绘制文本的左上角y坐标位置
+		 */
+		fillText(text: string, x: number, y: number): void;
+		/**
+		 * 用于设置文字的对齐
+		 */
+		setTextAlign(align: "left" | "center" | "right"): void;
+		/**
+		 * 用于设置文字的水平对齐
+		 */
+		setTextBaseline(textBaseline: "top" | "bottom" | "middle" | "normal"): void;
+		/**
+		 * 绘制图像，图像保持原始尺寸。
+		 * @param imageResource 所要绘制的图片资源, 通过chooseImage得到一个文件路径或者一个项目目录内的图片
+		 * @param dx            源图像的矩形选择框的左上角 X 坐标
+		 * @param dy            源图像的矩形选择框的左上角 Y 坐标
+		 */
+		drawImage(imageResource: string, dx: number, dy: number): void;
+		/**
+		 * 绘制图像，图像保持原始尺寸。
+		 * @param imageResource 所要绘制的图片资源, 通过chooseImage得到一个文件路径或者一个项目目录内的图片
+		 * @param dx            源图像的矩形选择框的左上角 X 坐标
+		 * @param dy            源图像的矩形选择框的左上角 Y 坐标
+		 * @param dWidth        源图像的矩形选择框的高度
+		 * @param dHeight       源图像的矩形选择框的高度
+		 */
+		drawImage(
+			imageResource: string,
+			dx: number,
+			dy: number,
+			dWidth: number,
+			dHeight: number
+		): void;
+		/**
+		 * 绘制图像，图像保持原始尺寸。
+		 * @param imageResource 所要绘制的图片资源, 通过chooseImage得到一个文件路径或者一个项目目录内的图片
+		 * @param sx            图像的左上角在目标canvas上 X 轴的位置
+		 * @param sy            图像的左上角在目标canvas上 Y 轴的位置
+		 * @param sWidth        在目标画布上绘制图像的宽度，允许对绘制的图像进行缩放
+		 * @param sHeight       在目标画布上绘制图像的高度，允许对绘制的图像进行缩放
+		 * @param dx            源图像的矩形选择框的左上角 X 坐标
+		 * @param dy            源图像的矩形选择框的左上角 Y 坐标
+		 * @param dWidth        源图像的矩形选择框的高度
+		 * @param dHeight       源图像的矩形选择框的高度
+		 * @version 1.9.0
+		 */
+		drawImage(
+			imageResource: string,
+			sx: number,
+			sy: number,
+			sWidth: number,
+			sHeight: number,
+			dx: number,
+			dy: number,
+			dWidth: number,
+			dHeight: number
+		): void;
+		/**
+		 * 设置全局画笔透明度。
+		 * @param alpha 0~1  透明度，0 表示完全透明，1 表示完全不透明
+		 */
+		setGlobalAlpha(alpha: number): void;
+		/**
+		 * 测量文本尺寸信息，目前仅返回文本宽度。同步接口。
+		 * @param text 要测量的文本
+		 */
+		measureText(text: string): { width: string };
+		/**
+		 * 根据控制点和半径绘制圆弧路径。
+		 * @param x1 第一个控制点的 x 轴坐标
+		 * @param y1 第一个控制点的 y 轴坐标
+		 * @param x2 第二个控制点的 x 轴坐标
+		 * @param y2 第二个控制点的 y 轴坐标
+		 * @param radius 圆弧的半径
+		 */
+		arcTo(x1: number, y1: number, x2: number, y2: number, radius: number): void;
+		/**
+		 * 给定的 (x, y) 位置绘制文本描边的方法。
+		 * @param text 要绘制的文本
+		 * @param x 文本起始点的 x 轴坐标
+		 * @param y 文本起始点的 y 轴坐标
+		 * @param maxWidth 需要绘制的最大宽度，可选
+		 */
+		strokeText(text: number, x: number, y: number, maxWidth?: number): void;
+		/**
+		 * 设置虚线偏移量的属性。
+		 * 偏移量，初始值为 0 。
+		 */
+		setLineDashOffset: number;
+		/**
+		 * 对指定的图像创建模式的方法，可在指定的方向上重复元图像。
+		 * @param image 重复的图像源，仅支持包内路径和临时路径
+		 * @param repetition 	指定如何重复图像，有效值有: repeat,
+		 * repeat-x, repeat-y, no-repeat。
+		 */
+		createPattern(image: string, repetition: string): string;
+		/**
+		 * 对当前路径进行填充
+		 */
+		fill(): void;
+		/**
+		 * 对当前路径进行描边
+		 */
+		stroke(): void;
+		/**
+		 * 开始创建一个路径，需要调用fill或者stroke才会使用路径进行填充或描边。
+		 * Tip: 在最开始的时候相当于调用了一次 beginPath()。
+		 * Tip: 同一个路径内的多次setFillStyle、setStrokeStyle、setLineWidth等设置，
+		 * 以最后一次设置为准。
+		 */
+		beginPath(): void;
+		/**
+		 * 关闭一个路径
+		 * Tip: 关闭路径会连接起点和终点。
+		 * Tip: 如果关闭路径后没有调用 fill() 或者 stroke() 并开启了新的路径，那之前的路径将不会被渲染。
+		 */
+		closePath(): void;
+		/**
+		 * 把路径移动到画布中的指定点，但不创建线条。
+		 *
+		 * @param x 目标位置的x坐标
+		 * @param y 目标位置的y坐标
+		 */
+		moveTo(x: number, y: number): void;
+		/**
+		 * 在当前位置添加一个新点，然后在画布中创建从该点到最后指定点的路径。
+		 *
+		 * @param x 目标位置的x坐标
+		 * @param y 目标位置的y坐标
+		 */
+		lineTo(x: number, y: number): void;
+		/**
+		 * 添加一个矩形路径到当前路径。
+		 *
+		 * @param x 矩形路径左上角的x坐标
+		 * @param y 矩形路径左上角的y坐标
+		 * @param width 矩形路径的宽度
+		 * @param height 矩形路径的高度
+		 */
+		rect(x: number, y: number, width: number, height: number): void;
+		/**
+		 * 填充一个矩形。
+		 * Tip: 用 setFillStyle() 设置矩形的填充色，如果没设置默认是黑色。
+		 * @param x 矩形路径左上角的x坐标
+		 * @param y 矩形路径左上角的y坐标
+		 * @param width 矩形路径的宽度
+		 * @param height 矩形路径的高度
+		 *
+		 */
+		fillRect(x: number, y: number, width: number, height: number): void;
+		/**
+		 * 画一个矩形(非填充)。
+		 * Tip: 用 setFillStroke() 设置矩形线条的颜色，如果没设置默认是黑色。
+		 * @param x 矩形路径左上角的x坐标
+		 * @param y 矩形路径左上角的y坐标
+		 * @param width 矩形路径的宽度
+		 * @param height 矩形路径的高度
+		 *
+		 */
+		strokeRect(x: number, y: number, width: number, height: number): void;
+		/**
+		 * 添加一个弧形路径到当前路径，顺时针绘制。
+		 *
+		 * @param x 圆的x坐标
+		 * @param y 圆的y坐标
+		 * @param radius 圆的半径
+		 * @param startAngle 起始弧度，单位弧度（在3点钟方向）
+		 * @param endAngle 终止弧度
+		 * @param counterclockwise 指定弧度的方向是逆时针还是顺时针。默认是false，即顺时针。
+		 */
+		arc(
+			x: number,
+			y: number,
+			radius: number,
+			startAngle: number,
+			endAngle: number,
+			counterclockwise?: boolean
+		): void;
+		/**
+		 * 创建二次方贝塞尔曲线
+		 *
+		 * @param cpx 贝塞尔控制点的x坐标
+		 * @param cpy 贝塞尔控制点的y坐标
+		 * @param x 结束点的x坐标
+		 * @param y 结束点的y坐标
+		 */
+		quadraticCurveTo(cpx: number, cpy: number, x: number, y: number): void;
+		/**
+		 * 创建三次方贝塞尔曲线
+		 *
+		 * @param cp1x 第一个贝塞尔控制点的 x 坐标
+		 * @param cp1y 第一个贝塞尔控制点的 y 坐标
+		 * @param cp2x 第二个贝塞尔控制点的 x 坐标
+		 * @param cp2y 第二个贝塞尔控制点的 y 坐标
+		 * @param x 结束点的x坐标
+		 * @param y 结束点的y坐标
+		 */
+		bezierCurveTo(
+			cp1x: number,
+			cp1y: number,
+			cp2x: number,
+			cp2y: number,
+			x: number,
+			y: number
+		): void;
+		/**
+		 * 设置填充样式
+		 *
+		 * @param color 设置为填充样式的颜色。'rgb(255, 0, 0)'或'rgba(255, 0, 0, 0.6)'或'#ff0000'格式的颜色字符串
+		 */
+		setFillStyle(color: string | CanvasGradient): void;
+		/**
+		 * 设置线条样式
+		 *
+		 * @param color 设置为填充样式的颜色。'rgb(255, 0, 0)'或'rgba(255, 0, 0, 0.6)'或'#ff0000'格式的颜色字符串
+		 */
+		setStrokeStyle(color: string | CanvasGradient): void;
+		/**
+		 * 设置阴影
+		 *
+		 * @param offsetX 阴影相对于形状在水平方向的偏移
+		 * @param offsetY 阴影相对于形状在竖直方向的偏移
+		 * @param blur 阴影的模糊级别，数值越大越模糊 0~100
+		 * @param color 阴影的颜色。 'rgb(255, 0, 0)'或'rgba(255, 0, 0, 0.6)'或'#ff0000'格式的颜色字符串
+		 */
+		setShadow(
+			offsetX: number,
+			offsetY: number,
+			blur: number,
+			color: string
+		): void;
+		/**
+		 * 创建一个线性的渐变颜色。
+		 * Tip: 需要使用 addColorStop() 来指定渐变点，至少要两个。
+		 * @param x0 起点的x坐标
+		 * @param y0 起点的y坐标
+		 * @param x1 终点的x坐标
+		 * @param y1 终点的y坐标
+		 */
+		createLinearGradient(
+			x0: number,
+			y0: number,
+			x1: number,
+			y1: number
+		): CanvasGradient;
+		/**
+		 * 创建一个颜色的渐变点。
+		 * Tip: 小于最小 stop 的部分会按最小 stop 的 color 来渲染，大于最大 stop 的部分会按最大 stop 的 color 来渲染。
+		 * Tip: 需要使用 addColorStop() 来指定渐变点，至少要两个。
+		 * @param stop (0-1)  表示渐变点在起点和终点中的位置
+		 * @param color 渐变点的颜色
+		 *
+		 */
+		addColorStop(stop: number, color: string): void;
+		/**
+		 * 创建一个圆形的渐变颜色。
+		 *
+		 * @param x 圆心的x坐标
+		 * @param y 圆心的y坐标
+		 * @param r 圆的半径
+		 *
+		 */
+		createCircularGradient(x: number, y: number, r: number): CanvasGradient;
+		/**
+		 * 设置字体大小
+		 *
+		 * @param fontSize 字体的字号
+		 */
+		setFontSize(fontSize: number): void;
+		/**
+		 * 设置线条端点的样式
+		 *
+		 * @param lineCap 线条的结束端点样式。 'butt'、'round'、'square'
+		 */
+		setLineCap(lineCap: LineCapType): void;
+		/**
+		 * 设置两线相交处的样式
+		 *  @param lineJoin 两条线相交时，所创建的拐角类型
+		 */
+		setLineJoin(lineJoin: LineJoinType): void;
+		/**
+		 * 设置线条的宽度
+		 *  @param pattern 一组描述交替绘制线段和间距（坐标空间单位）长度的数字。
+		 *  @param offset 虚线偏移量
+		 */
+		setLineDash(pattern: number[], offset: number): void;
+		/**
+		 * 设置线条宽度
+		 *
+		 * @param lineWidth 线条的宽度
+		 */
+		setLineWidth(lineWidth: number): void;
+		/**
+		 * 设置最大斜接长度，斜接长度指的是在两条线交汇处内角和外角之间的距离。
+		 * 当 setLineJoin为 miter 时才有效。
+		 * 超过最大倾斜长度的，连接处将以 lineJoin 为 bevel 来显示
+		 *
+		 * @param miterLimit 最大斜接长度
+		 */
+		setMiterLimit(miterLimit: number): void;
+		/**
+		 * 将之前在绘图上下文中的描述（路径、变形、样式）画到 canvas 中。
+		 * Tip: 绘图上下文需要由 swan.createCanvasContext(canvasId) 来创建。
+		 * @param [reserve] 非必填。本次绘制是否接着上一次绘制，即reserve参数为false，则在本次调用drawCanvas绘制之前native层应先清空画布再继续绘制；若reserver参数为true，则保留当前画布上的内容，本次调用drawCanvas绘制的内容覆盖在上面，默认 false
+		 *
+		 */
+		draw(reserve?: boolean): void;
+		/**
+		 * 使用矩阵重新设置（覆盖）当前变换的方法。
+		 */
+		setTransform(opt?: Transformoptions): void;
+	}
+	/**
+	 * 创建并返回绘图上下文context对象。
+	 * context只是一个记录方法调用的容器，
+	 * 用于生成记录绘制行为的actions数组。c
+	 * ontext跟<canvas/>不存在对应关系，
+	 * 一个context生成画布的绘制动作数组可以应用于多个<canvas/>。
+	 */
+	function createCanvasContext(selector: string): CanvasContext;
+	interface DrawCanvasOptions {
+		/** 画布标识，传入 <canvas/> 的 cavas-id */
+		canvasId: number | string;
+		/**
+		 * 绘图动作数组，由 swan.createCanvasContext 创建的 context，
+		 * 调用 getActions 方法导出绘图动作数组。
+		 */
+		actions: CanvasAction[];
+	}
+	/**
+	 * 绘制画布
+	 */
+	function drawCanvas(options: DrawCanvasOptions): void;
+	interface CanvasToTempFilePathOptions extends BaseOptions {
+		/**
+		 * 画布标识，传入 <canvas/> 的 cavas-id
+		 */
+		canvasId: string;
+		x?: number;	// 画布 x 轴起点（默认 0 ）
+		y?: number;	// 画布 y 轴起点（默认 0 ）
+		width?: number;	// 画布宽度（默认为 canvas 宽度 - x）
+		height?: number;	// 画布高度（默认为 canvas 高度 - y）
+		destWidth?: number;	// 输出图片宽度（默认为 width * 屏幕像素密度）
+		destHeight?: number;	// 输出图片高度（默认为 height * 屏幕像素密度）
+		fileType?: string;	// 目标文件的类型，只支持 ‘jpg’ 或 ‘png’，默认为 ‘png’ 。
+	}
+	/**
+	 * 把当前画布的内容导出生成图片，并返回文件路径
+	 */
+	function canvasToTempFilePath(options: Partial<CanvasToTempFilePathOptions>): void;
+	interface CanvasImageDataOptions extends BaseOptions {
+		/** 画布标识，传入 <canvas /> 的 canvas-id  */
+		canvasId: string;
+		/** 将要被提取的图像数据矩形区域的左上角 x 坐标 */
+		x: number;
+		/** 将要被提取的图像数据矩形区域的左上角 y 坐标 */
+		y: number;
+		/** 将要被提取的图像数据矩形区域的宽度 */
+		width: number;
+		/** 将要被提取的图像数据矩形区域的高度 */
+		height: number;
+	}
+	/**
+	 * 返回一个数组，用来描述 canvas 区域隐含的像素数据
+	 * @version 1.9.0
+	 */
+	function canvasGetImageData(options: CanvasImageDataOptions): void;
+	interface CanvasPutImageDataOptions extends CanvasImageDataOptions {
+		data: Uint8ClampedArray;
+	}
+	/**
+	 * 将像素数据绘制到画布的方法
+	 * @version 1.9.0
+	 */
+	function canvasPutImageData(options: CanvasPutImageDataOptions): void;
+	// 页面-----下拉刷新
+	/**
+	 * 开始下拉刷新，调用后触发下拉刷新动画，效果与用户手动下拉刷新一致
+	 * @version 1.5.0
+	 */
+	function startPullDownRefresh(options?: BaseOptions): void;
+	/**
+	 * 停止当前页面下拉刷新
+	 * @version 1.5.0
+	 */
+	function stopPullDownRefresh(options?: BaseOptions): void;
+	// #endregion
+	// #region 第三方平台
+	interface ExtConfig {
+		/** 第三方平台自定义的数据 */
+		extConfig: any;
+	}
+	interface GetExtConfigOptions extends BaseOptions {
+		success(
+			res: {
+				/* 调用结果 */
+				errMsg: string;
+			} & ExtConfig
+		): void;
+	}
+	/**
+	 * 获取第三方平台自定义的数据字段。
+	 * @version 1.1.0
+	 */
+	function getExtConfig(options?: GetExtConfigOptions): void;
+	/**
+	 * 获取第三方平台自定义的数据字段的同步接口。
+	 * @version 1.1.0
+	 */
+	function getExtConfigSync(): ExtConfig;
+	// #endregion
+	// #region 开放接口
+	// 开放接口-----签名加密
+	// [签名加密](https://smartprogram.baidu.com/docs/develop/api/open_log/#login/)
+	/**
+	 * 登录态维护
+	 * 通过 swan.login() 获取到用户登录态之后，需要维护登录态。
+	 * 开发者要注意不应该直接把 session_key、openid 等字段作为用户的标识
+	 * 或者 session 的标识，而应该自己派发一个 session 登录态（请参考登录时序图）。
+	 * 对于开发者自己生成的 session，应该保证其安全性且不应该设置较长的过期时间。
+	 * session 派发到小程序客户端之后，可将其存储在 storage ，用于后续通信使用。
+	 * 通过swan.checkSession() 检测用户登录态是否失效。并决定是否调用swan.login()
+	 * 重新获取登录态
+	 */
+	interface LoginResponse {
+		/** 调用结果 */
+		errMsg: string;
+		/**
+		 * 用户允许登录后，回调内容会带上 code（有效期五分钟），
+		 * 开发者需要将 code 发送到开发者服务器后台，
+		 * 使用code 换取 session_key api，
+		 * 将 code 换成 openid 和 session_key
+		 */
+		code: string;
+	}
+	interface LoginOptions extends BaseOptions {
+		/** 接口调用成功的回调函数 */
+		success?(res: LoginResponse): void;
+	}
+	/**
+	 * 调用接口获取登录凭证（code）进而换取用户登录态信息，
+	 * 包括用户的唯一标识（openid） 及本次登录的 会话密钥（session_key）。
+	 * 用户数据的加解密通讯需要依赖会话密钥完成。
+	 */
+	function login(option: LoginOptions): void;
+	type CheckSessionOption = BaseOptions;
+	/**
+	 * 调用接口 swan.login 获取 Authorization Code，智能小程序可以使用
+	 * swan.login()接口获取Authorization Code。
+	 */
+	function checkSession(options: CheckSessionOption): void;
+	/**
+	 * 获取手百登录状态。手百登录状态 true: 已登录，false: 未登录
+	 */
+	function isLoginSync(): boolean;
+	interface AuthorizeOptions extends BaseOptions {
+		scope: Scope;
+	}
+	/**
+	 * 提前向用户发起授权请求。
+	 * 调用后会立刻弹窗询问用户是否同意授权小程序使用某项功能或获取用户的某些数据，
+	 * 但不会实际调用对应接口。如果用户之前已经同意授权，则不会出现弹窗，直接返回成功。
+	 */
+	function authorize(options: AuthorizeOptions): void;
+	// 开放接口-----用户信息
+	interface UserInfo {
+		nickName: string;
+		avatarUrl: string;
+		gender: number;
+		province: string;
+		city: string;
+		country: string;
+	}
+	interface UserInfoResponse {
+		/** 用户信息对象，不包含 openid 等敏感信息 */
+		userInfo: UserInfo;
+		/** 不包括敏感信息的原始数据字符串，用于计算签名。 */
+		rawData: string;
+		/** 使用 sha1( rawData + sessionkey ) 得到字符串，用于校验用户信息。 */
+		signature: string;
+		/** 包括敏感数据在内的完整用户信息的加密数据，详细见加密数据解密算法 */
+		encryptData: string;
+		data: any;
+		iv: any;
+	}
+	interface GetUserInfoOptions extends BaseOptions {
+		withCredentials?: boolean; // 是否带上登录态信息
+		lang?: string; // 指定返回用户信息的语言，zh_CN 简体中文，zh_TW 繁体中文，en 英文。默认为en。
+		/** 接口调用成功的回调函数 */
+		success?(res: UserInfoResponse): void;
+	}
+	interface SwanIdOptions extends BaseOptions {
+		success?(res: SwanIdTask): void;
+	}
+	interface SwanIdTask {
+		errno: string;
+		data: {
+			swanid: string;
+		};
+	}
+	interface verifyOptions extends BaseOptions {
+		success?(res: verifyTask): void;
+	}
+	interface verifyTask {
+		errmsg: string;
+		errno: string;
+		data: {
+			result: boolean;
+		};
+	}
+	/**
+	 * 获取 swanid。
+	 */
+	function getSwanId(opt: SwanIdOptions): void;
+	/**
+	 * 获取用户信息，需要先调用 swan.login 接口。
+	 */
+	function getUserInfo(options: GetUserInfoOptions): void;
+	/**
+	 * swanid有效性校验接口：true表示有效，false表示无效。
+	 */
+	function verify(options: verifyOptions): void;
+	// 开放接口-----微信支付
+	type PaymentSignType = "MD5" | "HMAC-SHA256";
+	interface RequestPaymentOptions extends BaseOptions {
+		/** 时间戳从1970年1月1日00:00:00至今的秒数,即当前的时间 */
+		timeStamp: string | number;
+		/** 随机字符串，长度为32个字符以下。 */
+		nonceStr: string;
+		/** 统一下单接口返回的 prepay_id 参数值，提交格式如：prepay_id=* */
+		package: string;
+		/** 签名算法，默认为MD5，支持HMAC-SHA256和MD5 */
+		signType: PaymentSignType;
+		/** 签名,具体签名方案参见微信公众号支付帮助文档; */
+		paySign: string;
+	}
+	/**
+	 * 发起微信支付。
+	 */
+	function requestPayment(options: RequestPaymentOptions): void;
+	// 开放接口-----分享
+	interface ShareAppMessage extends BaseOptions {
+		/**
+		 * 分享标题  默认为当前小程序名称
+		 *
+		 */
+		title?: string;
+		/**
+		 * 分享描述, 默认为当前小程序名称
+		 */
+		desc?: string;
+		/**
+		 * 自定义图片路径，可以是本地文件路径、代码包文件路径或者网络图片路径，支持PNG及JPG
+		 * 不传入 imageUrl 则使用默认截图。显示图片长宽比是 5:4
+		 * @version 1.5.0
+		 */
+		imageUrl?: string;
+		/**
+		 * 分享路径  当默认为前页面 path ，
+		 * 必须是以 / 开头的完整路径
+		 *
+		 */
+		path?: string;
+		success?(res: {
+			/** 每一项是一个 shareTicket ，对应一个转发对象 */
+			shareTickets: string[];
+		}): void;
+	}
+
+	interface ShareMenuOptions extends BaseOptions {
+		withShareTicket?: boolean;
+	}
+	/**
+	 * 显示分享按钮
+	 *
+	 */
+	function showShareMenu(options?: ShareMenuOptions): void;
+
+	/**
+	 * 隐藏分享按钮
+	 * @version 1.1.0
+	 */
+	function hideShareMenu(options?: ShareMenuOptions): void;
+	interface UpdateShareMenuOptions extends BaseOptions {
+		/** 是否使用带 shareTicket 的转发详情 */
+		withShareTicket?: boolean;
+	}
+	/**
+	 * 更新转发属性
+	 * @version 1.2.0
+	 */
+	function updateShareMenu(options?: UpdateShareMenuOptions): void;
+	interface GetShareInfoOptions extends BaseOptions {
+		/** shareTicket */
+		shareTicket: string;
+		success(res: {
+			/** 错误信息 */
+			errMsg: string;
+			/** 包括敏感数据在内的完整转发信息的加密数据，详细见[加密数据解密算法](https://smartprogram.baidu.com/docs/develop/api/open_log/#login/) */
+			encryptedData: string;
+			/** 加密算法的初始向量，详细见[加密数据解密算法](https://smartprogram.baidu.com/docs/develop/api/open_log/#login/) */
+			iv: string;
+		}): void;
+	}
+	/**
+	 * 获取转发详细信息
+	 * @version 1.1.0
+	 */
+	function getShareInfo(options?: GetShareInfoOptions): void;
+	// 开放接口-----收货地址
+	interface ChooseAddressOptions extends BaseOptions {
+		success?(res: {
+			/**
+			 * 调用结果
+			 *
+			 */
+			errMsg: string;
+			/**
+			 * 收货人姓名
+			 *
+			 */
+			userName: string;
+			/**
+			 * 邮编
+			 *
+			 */
+			postalCode: string;
+			/**
+			 * 国标收货地址第一级地址
+			 *
+			 */
+			provinceName: string;
+			/**
+			 * 国标收货地址第二级地址
+			 *
+			 */
+			cityName: string;
+			/**
+			 * 国标收货地址第三级地址
+			 *
+			 */
+			countyName: string;
+			/**
+			 * 详细收货地址信息
+			 *
+			 */
+			detailInfo: string;
+			/**
+			 * 收货地址国家码
+			 *
+			 */
+			nationalCode: string;
+			/**
+			 * 收货人手机号码
+			 *
+			 */
+			telNumber: string;
+		}): void;
+	}
+	function chooseAddress(options: ChooseAddressOptions): void;
+	// 开放接口-----卡券
+	interface Card {
+		cardId: string;
+		cardExt: string;
+		code?: string;
+	}
+	interface CardOptions extends BaseOptions {
+		cardList: Card[];
+		fail?(): void;
+		success?(): void;
+		complete?(): void;
+	}
+	interface CardExe extends BaseOptions {
+		// 仅自定义 code 模式的卡券须填写，非自定义 code 模式卡券不可填写，详情
+		code?: string;
+		// 指定领取者的openid，只有该用户能领取。 bind_openid 字段为 true 的卡券必须填写，bind_openid 字段为 false 不可填写。
+		openid?: string;
+		// 时间戳，东八区时间,UTC+8，单位为秒
+		timestamp: number;
+		/**
+		 * 随机字符串，由开发者设置传入，加强安全性（若不填写可能被重放请求）。随机字符串，不长于 32 位。
+		 * 推荐使用大小写字母和数字，不同添加请求的 nonce_str 须动态生成，若重复将会导致领取失败。
+		 */
+		nonce_str?: string;
+		/**
+		 * 卡券在第三方系统的实际领取时间，为东八区时间戳（UTC+8,精确到秒）。
+		 * 当卡券的有效期类为 DATE_TYPE_FIX_TERM 时专用，标识卡券的实际生效时间，
+		 * 用于解决商户系统内起始时间和领取微信卡券时间不同步的问题。
+		 */
+		fixed_begintimestamp?: number;
+		// 领取渠道参数，用于标识本次领取的渠道值。
+		outer_str?: string;
+		// 签名，商户将接口列表中的参数按照指定方式进行签名,签名方式使用 SHA1，具体签名方案参见：卡券签名
+		signature: string;
+	}
+
+	/**
+	 * 批量添加卡券。
+	 */
+	function addCard(options: CardOptions): void;
+	interface OpenCardOptions extends BaseOptions {
+		cardList: Array<{
+			cardId: string;
+			code: string;
+		}>;
+	}
+
+	/**
+	 * 查看微信卡包中的卡券。
+	 *
+	 */
+	function openCard(options: OpenCardOptions): void;
+	// 开放接口-----设置
+	type Scope = "scope.userInfo" | "scope.userLocation" | "scope.address" | "scope.invoiceTitle" | "scope.werun" | "scope.record" | "scope.writePhotosAlbum";
+	interface AuthSetting {
+		"scope.userInfo": string;
+		"scope.userLocation": string;
+		"scope.address": string;
+		"scope.invoiceTitle": string;
+		"scope.werun": string;
+		"scope.record": string;
+		"scope.writePhotosAlbum": string;
+		success?(res: ErrMsgResponse): void;
+		fail?(): void;
+		complete?(): void;
+	}
+	interface OpenSettingOptions extends BaseOptions {
+		success?(res: { authSetting: AuthSetting }): void;
+	}
+	interface openShareOptions extends BaseOptions {
+		title?: string; // 分享标题
+		content?: string; // 分享内容
+		imageUrl?: string; // 分享图标
+		path?: string; // 页面 path,必须是以 / 开头的完整路径。
+		success?(res: { authSetting: AuthSetting }): void;
+	}
+	/**
+	 * 调起客户端小程序设置界面，返回用户设置的操作结果。
+	 * 注：设置界面只会出现小程序已经向用户请求过的权限。
+	 * @version 1.1.0
+	 */
+	function openSetting(options: OpenSettingOptions): void;
+	/**
+	 * 获取用户的当前设置。
+	 * 注：返回值中只会出现小程序已经向用户请求过的权限。
+	 * @version 1.2.0
+	 */
+	function getSetting(options: OpenSettingOptions): void;
+	/**
+	 * 调起分享面板。
+	 * bug : 百度App Android 客户端 10.13 以下版本，点击分享
+	 * 面板的取消时,不会执行 fail 回调。
+	 */
+	function openShare(options: openShareOptions): void;
+	/**
+	 * 百度收银台。
+	 * @version 1.8.5
+	 */
+	interface requestPolymerPaymentOptions extends BaseOptions {
+		orderInfo: orderInfoOptions; // 订单信息
+		/**
+		 * bannedChannels参数说明
+		 * Alipay	支付宝
+		 * BDWallet	百度钱包
+		 * WeChat	微信支付
+		 */
+		bannedChannels?: string[]; // 需要隐藏的支付方式
+		success?(res: { authSetting: AuthSetting }): void;
+	}
+	interface orderInfoOptions extends BaseOptions {
+		/**
+		 * 跳转百度收银台支付必带参数之一,是百度收银台的财务结算凭
+		 * 证,与账号绑定的结算协议一一对应,每笔交易将结算到dealId对
+		 * 应的协议主体。详见
+		 * https://dianshang.baidu.com/platform/doclist/index.html#!/doc/nuomiplus_1_guide/mini_program_cashier/parameter.md
+		 */
+		dealId: string;
+		/**
+		 * https://dianshang.baidu.com/platform/doclist/index.html#!/doc/nuomiplus_2_base/term_v2.md
+		 * 用以表示应用身份的唯一ID,在应用审
+		 * 核通过后进行分配,一经分配后不会发生更改,来唯一确定一个应
+		 * 用。详见核心参数
+		 * https://dianshang.baidu.com/platform/doclist/index.html#!/doc/nuomiplus_1_guide/mini_program_cashier/parameter.md
+		 */
+		appKey: string;
+		/**
+		 * 订单金额，单位为人民币分。
+		 */
+		totalAmount: string;
+		/**
+		 * 商户平台自己记录的订单ID，当支付状态发生变化时，会通过此订
+		 * 单ID通知商户。
+		 */
+		tpOrderId: string;
+		/**
+		 * 订单的名称
+		 */
+		dealTitle: string;
+		/**
+		 * 固定值1
+		 */
+		signFieldsRange: 1;
+		/**
+		 * 对appKey+dealId+tpOrderId+totalAmount进行RSA加密后的签
+		 * 名，防止订单被伪造。签名过程见 百度电商开放平台：https://dianshang.baidu.com/platform/doclist/index.html#!/doc/nuomiplus_2_base/sign_v2.md
+		 */
+		rsaSign: string;
+		/**
+		 * 订单详细信息，需要是一个可解析为JSON Object的字符串。字段
+		 * 内容见： https://dianshang.baidu.com/platform/doclist/index.html#!/doc/nuomiplus_1_guide/mini_program_cashier/parameter.md
+		 */
+		bizInfo: string;
+	}
+	/**
+	 * 百度收银台。
+	 * @version 1.8.5
+	 */
+	function requestPolymerPayment(options: requestPolymerPaymentOptions): void;
+
+	/**
+	 *  打开另一个小程序。(参数)
+	 */
+	interface navigateToSmartProgramOptions extends BaseOptions {
+		/**
+		 * 要打开的小程序App Key
+		 */
+		appKey: string;
+		/**
+		 * 打开的页面路径，如果为空则打开首页 。
+		 */
+		path?: string;
+		/**
+		 * 需要传递给目标小程序的数据，目标小程序可在 App.onLaunch()
+		 * App.onShow() 中获取到这份数据。
+		 */
+		extraData?: any;
+	}
+	/**
+	 *  返回上一个小程序(参数)
+	 */
+	interface navigateBackSmartProgramOptions extends BaseOptions {
+		/**
+		 * 需要返回给上一个小程序的数据，上一个小程序可在
+		 * App.onLaunch()，App.onShow() 中获取到这份数据。
+		 */
+		extraData?: any;
+	}
+	/**
+	 *  打开另一个小程序。
+	 */
+	function navigateToSmartProgram(options: navigateToSmartProgramOptions): void;
+	/**
+	 *  返回上一个小程序
+	 */
+	function navigateBackSmartProgram(options: navigateBackSmartProgramOptions): void;
+	interface MetaDescription extends BaseOptions {
+		content?: string;
+	}
+	/**
+	 * 设置 web 版小程序 description meta 信息。此方法为 web 版小
+	 * 程序专用方法，使用前需判断方法是否存在。
+	 */
+	function setMetaDescription(content?: MetaDescription): void;
+	interface MetaKeywords extends BaseOptions {
+		content?: string;
+	}
+	/**
+	 * 设置 web 版小程序 keywords meta 信息。此方法为 web 版小程序专
+	 * 用方法，使用前需判断方法是否存在。
+	 */
+	function setMetaKeywords(content?: MetaKeywords): void;
+	/**
+	 * 动态设置当前页面的标题。此方法为 web 版小程序专用方法，使用前需
+	 * 判断方法是否存在。
+	 */
+	function setDocumentTitle(options?: { title: string; }): void;
+	interface LoadSubPackageOptions extends BaseOptions {
+		root: string;
+	}
+	/**
+	 * 提前下载好子包的资源，目录结构配置参考(https://smartprogram.baidu.com/docs/develop/framework/subpackages/)。
+	 */
+	function loadSubPackage(options: LoadSubPackageOptions): void;
+	// #endregion
+	// #region 更新
+	interface UpdateManager {
+		onCheckForUpdate(callback: (res: { hasUpdate: boolean; }) => void): void;
+		onUpdateReady(callback: (res: { confirm: boolean; }) => void): void;
+		applyUpdate(): void;
+		onUpdateFailed(callback: (res: any) => void): void;
+	}
+	function getUpdateManager(): UpdateManager;
+	// #endregion
+	// #region
+	interface ChooseInvoiceTitleOptions extends BaseOptions {
+		success?(res: {
+			type: string; // 抬头类型（0：单位，1：个人）
+			title: string; // 抬头名称
+			taxNumber: string; // 抬头税号
+			companyAddress: string; // 单位地址
+			telephone: string; // 手机号码
+			bankName: string; // 银行名称
+			bankAccount: string; // 银行账号
+			errMsg: string; // 接口调用结果
+		}): void;
+	}
+	/**
+	 * 选择用户的发票抬头。
+	 */
+	function chooseInvoiceTitle(options: ChooseInvoiceTitleOptions): void;
+
+	interface NavigateToMiniProgramOptions extends BaseOptions {
+		appId: string; // 要打开的小程序 appId
+		path?: string; // 打开的页面路径，如果为空则打开首页
+		extraData?: any; // 包括 encrypt_card_id, outer_str, biz三个字段，须从 step3 中获得的链接中获取参数
+		envVersion?: string; // 要打开的小程序版本，有效值 develop（开发版），trial（体验版），release（正式版） ，仅在当前小程序为开发版或体验版时此参数有效；如果当前小程序是体验版或正式版，则打开的小程序必定是正式版。默认值 release
+		success?(res: { errMsg: string }): void;
+	}
+
+	/**
+	 * 打开同一公众号下关联的另一个小程序。
+	 */
+	function navigateToMiniProgram(options: NavigateToMiniProgramOptions): void;
+
+	interface NavigateBackMiniProgramOptions extends BaseOptions {
+		extraData?: any; // 需要返回给上一个小程序的数据，上一个小程序可在 App.onShow() 中获取到这份数据。详情
+		success?(res: { errMsg: string }): void;
+	}
+	/**
+	 * 返回到上一个小程序，只有在当前小程序是被其他小程序打开时可以调用成功
+	 */
+	function navigateBackMiniProgram(
+		options: NavigateBackMiniProgramOptions
+	): void;
+
+	// #endregion
+	// #region 拓展接口
+
+	/**
+	 * 将 ArrayBuffer 数据转成 Base64 字符串
+	 *
+	 */
+	function arrayBufferToBase64(arrayBuffer: ArrayBuffer): string;
+	/**
+	 * 将 Base64 字符串转成 ArrayBuffer 数据
+	 *
+	 */
+	function base64ToArrayBuffer(base64: string): ArrayBuffer;
+	/**
+	 * 收起键盘。
+	 */
+	function hideKeyboard(): void;
+
+	interface EventTarget {
+		id: string;
+		tagName: string;
+		dataset: { [name: string]: string };
+	}
+
+	type TouchEventType =
+		| "tap"
+		| "touchstart"
+		| "touchmove"
+		| "touchcancel"
+		| "touchend"
+		| "touchforcechange";
+
+	type TransitionEventType =
+		| "transitionend"
+		| "animationstart"
+		| "animationiteration"
+		| "animationend";
+
+	type EventType =
+		| "input"
+		| "form"
+		| "submit"
+		| "scroll"
+		| TouchEventType
+		| TransitionEventType
+		| "tap"
+		| "longpress";
+
+	interface BaseEvent<T extends string, Detail> {
+		type: T;
+		timeStamp: number;
+		currentTarget: EventTarget;
+		target: EventTarget;
+		detail: Detail;
+	}
+
+	interface BuiltInEvent<T extends EventType, Detail>
+		extends BaseEvent<T, Detail> { }
+
+	interface CustomEvent<T extends string, Detail>
+		extends BaseEvent<T, Detail> { }
+
+	/**
+	 * 指定focus时的光标位置
+	 * @version 1.5.0
+	 */
+	interface InputEvent
+		extends BuiltInEvent<
+		"input",
+		{
+			value: string;
+			cursor: number;
+		}
+		> { }
+
+	interface FormEvent
+		extends BuiltInEvent<
+		"form",
+		{
+			value: { [name: string]: string | boolean | number };
+		}
+		> { }
+
+	interface ScrollEvent extends BuiltInEvent<"scroll", {}> { }
+
+	interface Touch {
+		identifier: number;
+		pageX: number;
+		pageY: number;
+		clientX: number;
+		clientY: number;
+	}
+
+	interface TouchEvent<T extends TouchEventType>
+		extends BuiltInEvent<
+		T,
+		{
+			x: number;
+			y: number;
+		}
+		> {
+		touches: Touch[];
+		changedTouches: Touch[];
+	}
+
+	interface TapEvent extends TouchEvent<"tap"> {
+		// 手指触摸后马上离开
+	}
+
+	interface TouchStartEvent extends TouchEvent<"touchstart"> {
+		// 手指触摸动作开始
+	}
+
+	interface TouchEndEvent extends TouchEvent<"touchend"> {
+		// 手指触摸动作结束
+	}
+
+	interface TouchMoveEvent extends TouchEvent<"touchmove"> {
+		// 手指触摸后移动
+	}
+
+	interface TouchCancelEvent extends TouchEvent<"touchcancel"> {
+		// 手指触摸动作被打断，如来电提醒，弹窗
+	}
+
+	interface TouchForceChangeEvent extends TouchEvent<"touchforcechange"> {
+		// 在支持 3D Touch 的 iPhone 设备，重按时会触发
+	}
+	// #endregion
+	// #region 接口
+	interface Logger {
+		/**
+		 * 写log日志，可以提供任意个参数，每个参数的类型为Object/Array/Number/String，参数p1到pN的内容会写入日志
+		 */
+		log(...args: any[]): void;
+		/**
+		 * 写warn日志，参数同log方法
+		 */
+		warn(...args: any[]): void;
+		/**
+		 * 写debug日志，参数同log方法
+		 */
+		debug(...args: any[]): void;
+		/**
+		 * 写info日志，参数同log方法
+		 */
+		info(...args: any[]): void;
+	}
+
+	// #region LogManager
+	/**
+	 * 获取日志管理器 logManager 对象。logManager提供log、info、warn、debug四个方法写日志到文件，
+	 * 这四个方法接受任意个类型为Object/Array/Number/String的参数，
+	 * 每次调用的参数的总大小不超过100Kb。最多保存5M的日志内容，超过5M后，旧的日志内容会被删除。
+	 * 用户可以通过设置Button组件的open-type为feedback来上传打印的日志。
+	 * 用户上传的日志可以通过登录小程序管理后台后进入左侧菜单“客服反馈”页面获取到。
+	 */
+	function getLogManager(): Logger;
+
+	/**
+	 * 自定义业务数据监控上报接口。使用前，需要在小程序管理后台-运维中心-性能监控-业务数据监控中新建监控事件，
+	 * 配置监控描述与告警类型。每一个监控事件对应唯一的监控ID，开发者最多可以创建128个监控事件。
+	 * @param name 监控ID，在小程序管理后台新建数据指标后获得
+	 * @param value 上报数值，经处理后会在小程序管理后台上展示每分钟的上报总量
+	 */
+	function reportMonitor(name: string, value: number): void;
+
+	/**
+	 * 自定义分析数据上报接口。使用前，需要在小程序管理后台自定义分析中新建事件，配置好事件名与字段。
+	 *
+	 * @param eventName 事件名
+	 * @param data 上报的自定义数据
+	 */
+	function reportAnalytics(eventName: string, data: object): void;
+
+	/**
+	 * 用于延迟一部分操作到下一个时间片再执行（类似于 setTimeout）。
+	 * @param func
+	 * @version 2.2.3
+	 */
+	function nextTick(func: () => any): void;
+
+	function setEnableDebug(options: EnableDebugOptions): void;
+	// #endregion
+
+	// #endregion
+
+	interface EnableDebugOptions extends BaseOptions {
+		enableDebug: boolean;
+	}
+	// #region App里的onLaunch、onShow回调参数
+
+	// #region Account
+	interface AccountInfo {
+		/* 小程序账号信息 */
+		miniProgram: {
+			/*小程序 appId	 */
+			appId: string;
+		};
+		/* 插件账号信息（仅在插件中调用时包含这一项）	 */
+		plugin?: {
+			/* 插件 appId	 */
+			appId: string;
+			/* 插件版本号	 */
+			version: string;
+		};
+	}
+
+	/**
+	 * 获取当前账号信息
+	 * @version >= 2.2.2
+	 */
+	function getAccountInfoSync(): AccountInfo;
+	// #endregion
+
+	/**
+	 * App 实现的接口对象
+	 * 开发者可以添加任意的函数或数据到 Object 参数中，用 this 可以访问
+	 */
+	interface AppOptions {
+		/**
+		 * 监听小程序初始化。
+		 * 当小程序初始化完成时，会触发 onLaunch（全局只触发一次）
+		 * 生命周期函数
+		 */
+		onLaunch?: (option: LaunchOptions) => void;
+		/**
+		 * 监听小程序显示。
+		 * 当小程序启动，或从后台进入前台显示，会触发 onShow
+		 * 生命周期函数
+		 */
+		onShow?: (option: LaunchOptions) => void;
+		/**
+		 * 监听小程序隐藏。
+		 * 当小程序从前台进入后台，会触发 onHide
+		 * 生命周期函数
+		 */
+		onHide?: () => void;
+		/**
+		 * 错误监听函数
+		 * 当小程序发生脚本错误或者 api 调用失败时
+		 * 会触发 onError 并带上错误信息
+		 */
+		onError?: (msg: string) => void;
+		/**
+		 * 小程序退出时触发
+		 */
+		onUnlaunch?: () => void;
+		/**
+		 * 全局Data
+		 */
+		globalData?: object;
+	}
+	interface App {
+		/**
+		 * 获取当前页面
+		 */
+		getCurrentPage(): Page;
+	}
+	// #endregion
+
+	// #region Compontent组件
+
+	type DefaultData<V> = object | ((this: V) => object);
+
+	type DefaultProps = object | Record<string, any>;
+
+	type ExtendedComponent<
+		Instance extends Component<Data, Props>,
+		Data,
+		Methods,
+		Props
+		> = CombinedInstance<Instance, Data, Methods, Props> & Component<Data, Props>;
+
+	// CombinedInstance models the `this`, i.e. instance type for (user defined) component
+	type CombinedInstance<
+		Instance extends Component<Data, Props>,
+		Data,
+		Methods,
+		Props
+		> = Methods & Instance;
+
+	type Prop<T> = (() => T) | { new(...args: any[]): T & object };
+
+	type PropValidator<T> = PropOptions<T> | Prop<T> | Array<Prop<T>>;
+
+	interface DefaultMethods<V> {
+		[key: string]: (this: V, ...args: any[]) => any;
+	}
+
+	interface PropOptions<T = any> {
+		type?: Prop<T> | Array<Prop<T>>;
+		value?: T | null | (() => object);
+		// bug : 对于 type 为 Object 或 Array 的属性，如果通过该组件自身的 this.setData
+		// 来改变属性值的一个子字段，则依旧会触发属性 observer ，且 observer 接收到的 newVal 是变化的那个子字段的值，
+		// oldVal 为空， changedPath 包含子字段的字段名相关信息。
+		observer?(value: T, old: T, changedPath: string): void;
+	}
+
+	type RecordPropsDefinition<T> = { [K in keyof T]: PropValidator<T[K]> };
+
+	type ArrayPropsDefinition<T> = Array<keyof T>;
+
+	type PropsDefinition<T> = ArrayPropsDefinition<T> | RecordPropsDefinition<T>;
+
+	interface ComponentRelation<D = any, P = any> {
+		/** 目标组件的相对关系，可选的值为 parent 、 child 、 ancestor 、 descendant */
+		type: "parent" | "child" | "ancestor" | "descendant";
+		/** 如果这一项被设置，则它表示关联的目标节点所应具有的behavior，所有拥有这一behavior的组件节点都会被关联 */
+		target?: string;
+		/** 关系生命周期函数，当关系被建立在页面节点树中时触发，触发时机在组件attached生命周期之后 */
+		linked?: (target: Component<D, P>) => void;
+		/** 关系生命周期函数，当关系在页面节点树中发生改变时触发，触发时机在组件moved生命周期之后 */
+		linkChanged?: (target: Component<D, P>) => void;
+		/** 关系生命周期函数，当关系脱离页面节点树时触发，触发时机在组件detached生命周期之后 */
+		unlinked?: (target: Component<D, P>) => void;
+	}
+	type ThisTypedComponentOptionsWithRecordProps<
+		V extends Component<Data, Props>,
+		Data,
+		Methods,
+		Props
+		> = object &
+		ComponentOptions<V, Data | ((this: V) => Data), Methods, Props> &
+		ThisType<CombinedInstance<V, Data, Methods, Readonly<Props>>>;
+
+	interface ComponentRelation<D = any, P = any> {
+		/** 目标组件的相对关系，可选的值为 parent 、 child 、 ancestor 、 descendant */
+		type: "parent" | "child" | "ancestor" | "descendant";
+		/** 如果这一项被设置，则它表示关联的目标节点所应具有的behavior，所有拥有这一behavior的组件节点都会被关联 */
+		target?: string;
+		/** 关系生命周期函数，当关系被建立在页面节点树中时触发，触发时机在组件attached生命周期之后 */
+		linked?: (target: Component<D, P>) => void;
+		/** 关系生命周期函数，当关系在页面节点树中发生改变时触发，触发时机在组件moved生命周期之后 */
+		linkChanged?: (target: Component<D, P>) => void;
+		/** 关系生命周期函数，当关系脱离页面节点树时触发，触发时机在组件detached生命周期之后 */
+		unlinked?: (target: Component<D, P>) => void;
+	}
+
+	/**
+	 * 组件所在页面的生命周期声明对象，目前仅支持页面的show和hide两个生命周期
+	 */
+	interface PageLifetimes {
+		show(): void;
+
+		hide(): void;
+	}
+
+	/**
+	 * 组件生命周期声明对象，组件的生命周期：created、attached、ready、moved、detached将收归到lifetimes字段内进行声明，
+	 * 原有声明方式仍旧有效，如同时存在两种声明方式，则lifetimes字段内声明方式优先级最高
+	 */
+	interface Lifetimes {
+		/**
+		 * 组件生命周期函数，在组件实例进入页面节点树时执行
+		 * 注意此时不能调用 setData
+		 */
+		created(): void;
+		/**
+		 * 组件生命周期函数，在组件实例进入页面节点树时执行
+		 */
+		attached(): void;
+		/**
+		 * 组件生命周期函数，在组件布局完成后执行，此时可以获取节点信息
+		 * 使用 [SelectorQuery](https://smartprogram.baidu.com/docs/develop/api/show_query/)
+		 */
+		ready(): void;
+		/**
+		 * 组件生命周期函数，在组件实例被移动到节点树另一个位置时执行
+		 */
+		moved(): void;
+		/**
+		 * 组件生命周期函数，在组件实例被从页面节点树移除时执行
+		 */
+		detached(): void;
+	}
+
+	/**
+	 * Component组件参数
+	 */
+	interface ComponentOptions<
+		Instance extends Component<Data, Props>,
+		Data = DefaultData<Instance>,
+		Methods = DefaultMethods<Instance>,
+		Props = PropsDefinition<DefaultProps>
+		> extends Partial<Lifetimes> {
+		/**
+		 * 组件的对外属性，是属性名到属性设置的映射表
+		 * 属性设置中可包含三个字段:
+		 * type 表示属性类型、 value 表示属性初始值、 observer 表示属性值被更改时的响应函数
+		 */
+		properties?: Props;
+
+		/**
+		 * 组件的内部数据，和 properties 一同用于组件的模版渲染
+		 */
+		data?: Data;
+
+		/**
+		 * 组件的方法，包括事件响应函数和任意的自定义方法
+		 * 关于事件响应函数的使用
+		 * 参见[组件事件](https://smartprogram.baidu.com/docs/develop/framework/custom-component_cont/)
+		 */
+		methods?: Methods;
+
+		/**
+		 * 一些组件选项，请参见文档其他部分的说明
+		 */
+		options?: Partial<{
+			/**
+			 * 使用外部样式类可以让组件使用指定的组件外样式类，如果希望组件外样式类能够完全影响组件内部，
+			 * 可以将组件构造器中的options.addGlobalClass字段置为true。这个特性从小程序基础库版本 2.2.3 开始支持。
+			 *
+			 * @version 2.2.3
+			 */
+			addGlobalClass: boolean;
+			/**
+			 * 在组件的swan中可以包含 slot 节点，用于承载组件使用者提供的swan结构。
+			 * 默认情况下，一个组件的swan中只能有一个slot。需要使用多slot时，可以在组件js中声明启用。
+			 */
+			multipleSlots: boolean;
+		}>;
+
+		/**
+		 * 组件接受的外部样式类，参见 外部样式类
+		 *
+		 * 有时，组件希望接受外部传入的样式类（类似于 view 组件的 hover-class 属性）。
+		 * 此时可以在 Component 中用 externalClasses 定义段定义若干个外部样式类。这个特性从小程序基础库版本 1.9.90 开始支持。
+		 *
+		 * @version 1.9.90
+		 */
+		externalClasses?: string[];
+
+		/**
+		 * 类似于mixins和traits的组件间代码复用机制
+		 * 参见 [behaviors](https://smartprogram.baidu.com/docs/develop/framework/custom-component_behaviors/)
+		 */
+		behaviors?: Array<(ComponentOptions<Component<object, object>>) | string>;
+
+		/**
+		 * 组件生命周期声明对象，组件的生命周期：created、attached、ready、moved、detached将收归到lifetimes字段内进行声明，
+		 * 原有声明方式仍旧有效，如同时存在两种声明方式，则lifetimes字段内声明方式优先级最高
+		 */
+		lifetimes?: Partial<Lifetimes>;
+
+		/**
+		 * 组件所在页面的生命周期声明对象，目前仅支持页面的show和hide两个生命周期
+		 */
+		pageLifetimes?: Partial<PageLifetimes>;
+	}
+	/**
+	 * There are two valid ways to define the type of data / properties:
+	 *
+	 * 1. { name: valueType }
+	 * 2. { name: { type: valueType, value?: value } }
+	 *
+	 * and this conditional type will extract that out so the call-site will typecheck.
+	 *
+	 * Note this is different from PropOptions as it is the definitions you passed to Component function
+	 * whereas this type is for call-site.
+	 */
+	type DataValueType<Def> = Def extends {
+		type: (...args: any[]) => infer T;
+		value?: infer T;
+	}
+		? T
+		: Def extends (...args: any[]) => infer T
+		? T
+		: never;
+
+	/**
+	 * Component实例方法
+	 */
+	interface Component<D, P> {
+		/**
+		 * 组件的文件路径
+		 */
+		is: string;
+		/**
+		 * 节点id
+		 */
+		id: string;
+		/**
+		 * 节点dataset
+		 */
+		dataset: string;
+		/**
+		 * 组件数据，包括内部数据和属性值
+		 */
+		data: { [key in keyof (D & P)]: DataValueType<(D & P)[key]> };
+
+		/**
+		 * 组件数据，包括内部数据和属性值（与 data 一致）
+		 */
+		properties: { [key in keyof (D & P)]: DataValueType<(D & P)[key]> };
+		/**
+		 * 将数据从逻辑层发送到视图层，同时改变对应的 this.data 的值
+		 * 1. 直接修改 this.data 而不调用 this.setData 是无法改变页面的状态的，还会造成数据不一致。
+		 * 2. 单次设置的数据不能超过1024kB，请尽量避免一次设置过多的数据。
+		 * 3. 请不要把 data 中任何一项的 value 设为 undefined ，否则这一项将不被设置并可能遗留一些潜在问题
+		 * @param data object 以 key，value 的形式表示将 this.data 中的 key 对应的值改变成 value
+		 * @param [callback] callback 是一个回调函数，在这次setData对界面渲染完毕后调用
+		 */
+		setData(
+			key: string | {
+				[key in keyof D]?:
+				| string
+				| number
+				| boolean
+				| symbol
+				| object
+				| null
+				| any[]
+			},
+			value?: any,
+			callback?: () => void
+		): void;
+		getData(key: string): any;
+		/**
+		 * 检查组件是否具有 behavior
+		 * 检查时会递归检查被直接或间接引入的所有behavior
+		 */
+		hasBehavior(behavior: any): boolean;
+		/**
+		 * 触发事件，参见 [组件事件](https://smartprogram.baidu.com/docs/develop/framework/custom-component_cont/)
+		 */
+		triggerEvent(
+			name: string,
+			details?: any,
+			options?: Partial<{
+				bubbles: boolean;
+				composed: boolean;
+				capturePhase: boolean;
+			}>
+		): void;
+		/**
+		 * 创建一个 SelectorQuery 对象
+		 * 选择器选取范围为这个[组件实例](https://smartprogram.baidu.com/docs/develop/api/show_query/)内
+		 */
+		createSelectorQuery(): SelectorQuery;
+		/**
+		 * 节点布局交叉状态API可用于监听两个或多个组件节点在布局位置上的相交状态。这一组API常常可以用于推断某些节点是否可以被用户看见、有多大比例可以被用户看见。
+		 * https://smartprogram.baidu.com/docs/develop/api/show_query/
+		 */
+		createIntersectionObserver(
+			options?: CreateIntersectionObserverOption
+		): IntersectionObserver;
+		/**
+		 * 使用选择器选择组件实例节点
+		 * 返回匹配到的第一个组件实例对象
+		 */
+		selectComponent(selector: string): Component<any, any>;
+		/**
+		 * selector  使用选择器选择组件实例节点，返回匹配到的全部组件实例对象组成的数组
+		 */
+		selectAllComponents(selector: string): Array<Component<any, any>>;
+	}
+	// #endregion
+	// #region Page
+	interface PageShareAppMessageOptions {
+		/** 转发事件来源。button：页面内转发按钮；menu：右上角转发菜单 */
+		from: "button" | "menu";
+		/** 如果 from 值是 button，则 target 是触发这次转发事件的 button，否则为 undefined */
+		target: object | undefined;
+	}
+	/**
+	 * Page 实现的接口对象
+	 */
+	interface PageOptions {
+		/**
+		 * 页面的初始数据
+		 */
+		data?: any;
+		/**
+		 * 生命周期函数--监听页面加载
+		 * @param options 接收页面参数可以获取swan.navigateTo和swan.redirectTo及<navigator/>中的 query
+		 */
+		onLoad?: (options: object) => void;
+		/**
+		 * 生命周期函数--监听页面初次渲染完成
+		 */
+		onReady?: () => void;
+		/**
+		 * 生命周期函数--监听页面显示
+		 */
+		onShow?: () => void;
+		/**
+		 * 生命周期函数--监听页面隐藏
+		 */
+		onHide?: () => void;
+		/**
+		 * 生命周期函数--监听页面卸载
+		 */
+		onUnload?: () => void;
+		/**
+		 * 下拉刷新
+		 * 在 Page 中定义 onPullDownRefresh 处理函数，监听该页面用户下拉刷新事件。
+		 * 需要在 config 的window选项中开启 enablePullDownRefresh。
+		 * 当处理完数据刷新后，swan.stopPullDownRefresh可以停止当前页面的下拉刷新。
+		 */
+		onPullDownRefresh?: () => void;
+		/**
+		 * 页面上拉触底事件的处理函数
+		 * 监听用户上拉触底事件。
+		 * 可以在app.json的window选项中或页面配置中设置触发距离onReachBottomDistance。
+		 * 在触发距离内滑动期间，本事件只会被触发一次。
+		 */
+		onReachBottom?: () => void;
+		/**
+		 * 在 Page 中定义 onShareAppMessage 函数，设置该页面的转发信息。
+		 * + 只有定义了此事件处理函数，右上角菜单才会显示 “转发” 按
+		 * + 用户点击转发按钮的时候会调
+		 * + 此事件需要 return 一个 Object，用于自定义转发内容
+		 */
+		onShareAppMessage?: (
+			options?: PageShareAppMessageOptions
+		) => ShareAppMessage;
+		/**
+		 * 页面滚动触发事件的处理函数
+		 * 监听用户滑动页面事件。
+		 * 参数为 Object，包含以下字段：
+		 */
+		onPageScroll?: (option: { scrollTop: number }) => void;
+		/**
+		 * 当前是 tab 页时，点击 tab 时触发
+		 */
+		onTabItemTap?: (item: any) => void;
+	}
+
+	interface Page<D = object, P = object> extends Component<D, P> {
+		/**
+		 * data
+		 */
+		data: any;
+		/**
+		 * 强制更新
+		 */
+		forceUpdate(): void;
+		/**
+		 * 字段可以获取到当前页面的路径。
+		 */
+		route(): void;
+		/**
+		 * 更新
+		 */
+		update(): void;
+		/**
+		 * 将页面滚动到目标位置。
+		 *
+		 * scrollTop 滚动到页面的目标位置（单位px）
+		 * [duration] 滚动动画的时长，默认300ms，单位 ms
+		 * @version 1.4.0
+		 */
+		pageScrollTo(option?: PageScrollToOptions): void;
+		createCanvasContext(selector: string): CanvasContext;
+	}
+	// #endregion
+	// #region App里的onLaunch、onShow回调参数
+	interface LaunchOptions {
+		/**
+		 * 打开小程序的路径
+		 */
+		path: string;
+		/**
+		 * 打开小程序的query
+		 */
+		query: object;
+		/**
+		 * 打开小程序的[场景值](https://smartprogram.baidu.com/docs/data/scene/)
+		 */
+		scene: number;
+		/**
+		 * shareTicket，详见 获取更多[转发信息](https://smartprogram.baidu.com/docs/develop/api/open_share/)
+		 */
+		shareTicket: string;
+		/**
+		 * 当场景为由从另一个小程序或公众号或App打开时，返回此字段
+		 */
+		referrerInfo: {
+			/* 来源小程序或公众号或App的 appId，详见下方说明 */
+			appId: string;
+			/* 来源小程序传过来的数据，scene=1037或1038时支持 */
+			extraData: object;
+		};
+		// #endregion
+	}
+
+	// 云开发
+	// 文档：https://smartprogram.baidu.com/docs/develop/tutorial/codedir/
+	interface Cloud {
+		/**
+		 * 初始化方法（全局只需一次）
+		 */
+		init: (options: InitCloudOptions) => void;
+		/**
+		 * 接受一个可选对象参数 env：环境 ID，获取数据库的引用
+		 */
+		database: (options: { env: string }) => {};
+		/**
+		 * 接受一个 name 参数，指定需引用的集合名称
+		 */
+		collection: (name: string) => {};
+	}
+	/**
+	 * 定义了云开发的默认配置，该配置会作为之后调用其他所有云 API 的默认配置
+	 */
+	interface InitCloudOptions {
+		/**
+		 * 默认环境配置，传入字符串形式的环境 ID 可以指定所有服务的默认环境，传入对象 initCloudEnvOptions 可以分别指定各个服务的默认环境
+		 * 默认值： default
+		 */
+		env?: string | InitCloudEnvOptions;
+		/**
+		 * 是否在将用户访问记录到用户管理中，在控制台中可见
+		 * 默认值： false
+		 */
+		traceUser?: boolean;
+	}
+	/**
+	 * initCloudOptions 的 env 参数，可以指定各个服务的默认环境
+	 */
+	interface InitCloudEnvOptions {
+		/**
+		 * 数据库 API 默认环境配置
+		 * 默认值： default
+		 */
+		database?: string;
+		/**
+		 * 存储 API 默认环境配置
+		 * 默认值： default
+		 */
+		storage?: string;
+		/**
+		 * 云函数 API 默认环境配置
+		 * 默认值： default
+		 */
+		functions?: string;
+	}
+	// #region App 函数及参数
+}
+/**
+ * App() 函数用来注册一个小程序。
+ * 接受一个 object 参数，其指定小程序的生命周期函数等。
+ */
+declare function App<T extends swan.AppOptions>(
+	app: T & ThisType<T & swan.App>
+): void;
+/**
+ * 获取小程序实例
+ */
+declare function getApp(): swan.App;
+// #endregion
+// #region Compontent组件
+declare function Component<D, M, P>(
+	options?: swan.ThisTypedComponentOptionsWithRecordProps<
+		swan.Component<D, P>,
+		D,
+		M,
+		P
+		>
+): swan.ExtendedComponent<swan.Component<D, P>, D, M, P>;
+/**
+ * behaviors 是用于组件间代码共享的特性
+ * 类似于一些编程语言中的“mixins”或“traits”
+ * 每个 behavior 可以包含一组属性、数据、生命周期函数和方法
+ * 组件引用它时，它的属性、数据和方法会被合并到组件中，生命周期函数也会在对应时机被调用
+ * 每个组件可以引用多个 behavior
+ * behavior 也可以引用其他 behavior
+ */
+declare function Behavior<D, M, P>(
+	options?: swan.ThisTypedComponentOptionsWithRecordProps<
+		swan.Component<D, P>,
+		D,
+		M,
+		P
+		>
+): swan.ExtendedComponent<swan.Component<D, P>, D, M, P>;
+// #endregion
+// #region Page
+/**
+ * Page() 函数用来注册一个页面。
+ * 接受一个 object 参数，其指定页面的初始数据、生命周期函数、事件处理函数等。
+ */
+declare function Page<T extends swan.PageOptions & object>(
+	page: T & ThisType<T & swan.Page>
+): void;
+/**
+ * getCurrentPages() 函数用于获取当前页面栈的实例，
+ * 以数组形式按栈的顺序给出，第一个元素为首页，最后一个元素为当前页面。
+ */
+declare function getCurrentPages(): swan.Page[];
+// #endregion
diff --git a/types/baidu-app/tsconfig.json b/types/baidu-app/tsconfig.json
new file mode 100644
index 0000000000..f59d3e8a01
--- /dev/null
+++ b/types/baidu-app/tsconfig.json
@@ -0,0 +1,24 @@
+{
+	"compilerOptions": {
+		"module": "commonjs",
+		"lib": [
+			"dom",
+			"esnext"
+		],
+		"strictFunctionTypes": true,
+		"noImplicitAny": true,
+		"noImplicitThis": true,
+		"strictNullChecks": true,
+		"baseUrl": "../",
+		"typeRoots": [
+			"../"
+		],
+		"types": [],
+		"noEmit": true,
+		"forceConsistentCasingInFileNames": true
+	},
+	"files": [
+		"index.d.ts",
+		"baidu-app-tests.ts"
+	]
+}
\ No newline at end of file
diff --git a/types/baidu-app/tslint.json b/types/baidu-app/tslint.json
new file mode 100644
index 0000000000..352504ac09
--- /dev/null
+++ b/types/baidu-app/tslint.json
@@ -0,0 +1,7 @@
+{
+	"extends": "dtslint/dt.json",
+	"rules": {
+		"no-console": false,
+		"semicolon": true
+	}
+}
\ No newline at end of file

From 7391c175d235dd51008f157408cf27f662c37556 Mon Sep 17 00:00:00 2001
From: Sean Zhu <interestinglythere@gmail.com>
Date: Wed, 28 Nov 2018 23:21:32 -0800
Subject: [PATCH 425/836] [linkifyjs] Add types for linkifyjs/html 2.1

---
 types/linkifyjs/.prettierrc.yml    |   8 ++
 types/linkifyjs/html.d.ts          |   4 +
 types/linkifyjs/index.d.ts         | 185 +++++++++++++++++++++++++++++
 types/linkifyjs/linkifyjs-tests.ts | 141 ++++++++++++++++++++++
 types/linkifyjs/tsconfig.json      |  24 ++++
 types/linkifyjs/tslint.json        |   1 +
 6 files changed, 363 insertions(+)
 create mode 100644 types/linkifyjs/.prettierrc.yml
 create mode 100644 types/linkifyjs/html.d.ts
 create mode 100644 types/linkifyjs/index.d.ts
 create mode 100644 types/linkifyjs/linkifyjs-tests.ts
 create mode 100644 types/linkifyjs/tsconfig.json
 create mode 100644 types/linkifyjs/tslint.json

diff --git a/types/linkifyjs/.prettierrc.yml b/types/linkifyjs/.prettierrc.yml
new file mode 100644
index 0000000000..f2c03d3a72
--- /dev/null
+++ b/types/linkifyjs/.prettierrc.yml
@@ -0,0 +1,8 @@
+tabWidth: 4
+overrides:
+  - files: ".prettierrc.yml"
+    options:
+      tabWidth: 2
+  - files: "tsconfig.json"
+    options:
+      printWidth: 1
diff --git a/types/linkifyjs/html.d.ts b/types/linkifyjs/html.d.ts
new file mode 100644
index 0000000000..e366d52fc0
--- /dev/null
+++ b/types/linkifyjs/html.d.ts
@@ -0,0 +1,4 @@
+import { LinkifyOptions } from "./index";
+
+export let linkifyHtml: (input: string, options?: LinkifyOptions) => string;
+export default linkifyHtml;
diff --git a/types/linkifyjs/index.d.ts b/types/linkifyjs/index.d.ts
new file mode 100644
index 0000000000..9c095a41f3
--- /dev/null
+++ b/types/linkifyjs/index.d.ts
@@ -0,0 +1,185 @@
+// Type definitions for linkifyjs 2.1
+// Project: https://github.com/SoapBox/linkifyjs#readme
+// Definitions by: Sean Zhu <https://github.com/szhu>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.1
+
+export type PossiblyFuncOfHrefAndType<T> =
+    | T
+    | ((href: string, type: string) => T);
+
+// There's always a possibility that values at a string key can always be
+// undefined; i.e., if the key does not exist.
+export type PossiblyByType<T> = T | { [type: string]: T | undefined };
+
+export type EventHandler = (e: HTMLElement) => void;
+
+export interface LinkifyOptions {
+    /**
+     * attributes
+     * - Type: Object | Function (String href, String type)
+     * - Default: null
+     *
+     * Object of attributes to add to each new link. Note: the class and target
+     * attributes have dedicated options.
+     *
+     * Also accepts a function that takes the unformatted href, the link type
+     * (e.g., 'url', 'email', etc.) and returns the object.
+     */
+    attributes?: PossiblyFuncOfHrefAndType<{
+        [attrName: string]: string;
+    }> | null;
+
+    /**
+     * className
+     * - Type: String | Function (String href, String type) | Object
+     * - Default: 'linkified' (may be removed in future releases)
+     *
+     * class attribute to use for newly created links.
+     *
+     * Accepts a function that takes the unformatted href value and link type
+     * (e.g., 'url', 'email', etc.) and returns the string.
+     *
+     * Accepts an object where each key is the link type and each value is the
+     * string or function to use for that type.
+     */
+    className?: PossiblyByType<PossiblyFuncOfHrefAndType<string | undefined>>;
+
+    /**
+     * defaultProtocol
+     * - Type: String
+     * - Default: 'http'
+     * - Values: 'http', 'https', 'ftp', 'ftps', etc.
+     *
+     * Protocol that should be used in href attributes for URLs without a
+     * protocol (e.g., github.com).
+     */
+    defaultProtocol?: string;
+
+    /**
+     * events
+     * - *element, jquery interfaces only*
+     * - Type: Object | Function (String href, String type) | Object
+     * - Default: null
+     *
+     * Add event listeners to newly created link elements. Takes a hash where
+     * each key is an standard event name and the value is an event handler.
+     *
+     * Also accepts a function that takes the unformatted href and the link type
+     * (e.g., 'url', 'email', etc.) and returns the hash.
+     *
+     * For React, specify events in the attributes option as standard React
+     * events.
+     *
+     * See the React Event docs and the linkify-react event docs
+     */
+    events?: PossiblyFuncOfHrefAndType<{
+        [eventName: string]: EventHandler;
+    }> | null;
+
+    /**
+     * format
+     * - Type: Function (String value, String type) | Object
+     * - Default: null
+     *
+     * Format the text displayed by a linkified entity. e.g., truncate a long
+     * URL.
+     *
+     * Accepts an object where each key is the link type (e.g., 'url', 'email',
+     * etc.) and each value is the formatting function to use for that type.
+     *
+     * NOTE: According to the linkifyjs implementation, `format` can be just a
+     * string, but this is not mentioned in the docs, so we exclude it.
+     */
+    format?: PossiblyByType<(value: string, type: string) => string>;
+    //
+
+    /**
+     * formatHref
+     * - Type: Function (String href, String type) | Object
+     * - Default: null
+     *
+     * Similar to format, except the result of this function will be used as the
+     * href attribute of the new link.
+     *
+     * This is useful when finding hashtags, where you don’t necessarily want
+     * the default to be a link to a named anchor.
+     *
+     * Accepts an object where each key is the link type (e.g., 'url', 'email',
+     * etc.) and each value is the formatting function to use for that type.
+     *
+     * NOTE: According to the linkifyjs implementation, `formatHref` can be just
+     * a string, but this is not mentioned in the docs, so we exclude it.
+     */
+    formatHref?: PossiblyByType<(href: string, type: string) => string>;
+
+    /**
+     * ignoreTags
+     * - *element, html, and jquery interfaces only*
+     * - Type: Array
+     * - Default: []
+     *
+     * Prevent linkify from trying to parse links in the specified tags. This is
+     * useful when running linkify on arbitrary HTML.
+     */
+    ignoreTags?: string[];
+
+    /**
+     * nl2br
+     * - Type: Boolean
+     * - Default: false
+     *
+     * If true, \n line breaks will automatically be converted to <br> tags.
+     *
+     */
+    nl2br?: boolean;
+
+    /**
+     * tagName
+     * - Type: String | Function (String href, String type) | Object
+     * - Default: a
+     *
+     * The tag name to use for each link. For cases where you can’t use anchor
+     * tags.
+     *
+     * Accepts a function that takes the unformatted href, the link type (e.g.,
+     * 'url', 'email', etc.) and returns the tag name.
+     *
+     * Accepts an object where each key is the link type and each value is the
+     * tag name to use for that type.
+     */
+    tagName?: PossiblyByType<PossiblyFuncOfHrefAndType<string>>;
+
+    /**
+     * target
+     * - Type: String | Function (String href, String type) | Object
+     * - Default: '_blank' for URLs, null for everything else
+     *
+     * target attribute for generated link.
+     *
+     * Accepts a function that takes the unformatted href, the link type (e.g.,
+     * 'url', 'email', etc.) and returns the target
+     *
+     * Accepts an object where each key is the link type and each value is the
+     * target to use for that type.
+     */
+    target?: PossiblyByType<
+        PossiblyFuncOfHrefAndType<string | null | undefined>
+    >;
+
+    /**
+     * validate
+     * - Type: Boolean | Function (String value, String type) | Object
+     * - Default: null
+     *
+     * If option resolves to false, the given value will not show up as a link.
+     *
+     * Accepts a function that takes a discovered link and the link type (e.g.,
+     * 'url', 'email', etc.) and returns true if the link should be converted
+     * into an anchor tag, and false otherwise.
+     *
+     * Accepts an object where each key is the link type and each value is the
+     * the validation option to use for that type
+     */
+    validate?: PossiblyByType<PossiblyFuncOfHrefAndType<boolean>>;
+}
diff --git a/types/linkifyjs/linkifyjs-tests.ts b/types/linkifyjs/linkifyjs-tests.ts
new file mode 100644
index 0000000000..5688f9f99f
--- /dev/null
+++ b/types/linkifyjs/linkifyjs-tests.ts
@@ -0,0 +1,141 @@
+import linkifyHtml from "linkifyjs/html";
+
+// From the docs here: https://soapbox.github.io/linkifyjs/docs/options.html
+
+/* attributes */
+
+linkifyHtml("github.com", {
+    attributes: {
+        rel: "nofollow"
+    }
+});
+
+/* className */
+
+linkifyHtml("github.com", {
+    className: "new-link--url"
+});
+
+linkifyHtml("github.com", {
+    className(href, type) {
+        return "new-link--" + type;
+    }
+});
+
+linkifyHtml("github.com", {
+    className: {
+        url: "new-link--url",
+        email(href: string) {
+            return "new-link--email";
+        }
+    }
+});
+
+/* events */
+
+linkifyHtml("", {
+    events: {
+        click(e) {
+            alert("Link clicked!");
+        },
+        mouseover(e) {
+            alert("Link hovered!");
+        }
+    }
+});
+
+/* defaultProtocol */
+
+/* format */
+
+linkifyHtml("", {
+    format(value, type) {
+        if (type === "url" && value.length > 50) {
+            value = value.slice(0, 50) + "…";
+        }
+        return value;
+    }
+});
+
+linkifyHtml("", {
+    format: {
+        url(value) {
+            return value.length > 50 ? value.slice(0, 50) + "…" : value;
+        }
+    }
+});
+
+/* formatHref */
+
+linkifyHtml("This site is #rad", {
+    formatHref(href, type) {
+        if (type === "hashtag") {
+            href = "https://twitter.com/hashtag/" + href.substring(1);
+        }
+        return href;
+    }
+});
+
+linkifyHtml("Hey @dhh, check out issue #23", {
+    formatHref: {
+        mention(href) {
+            return "https://github.com" + href;
+        },
+        ticket(href) {
+            return (
+                "https://github.com/SoapBox/linkifyjs/issues/" +
+                href.substring(1)
+            );
+        }
+    }
+});
+
+/* ignoreTags */
+
+linkifyHtml(
+    // tslint:disable-next-line:prefer-template
+    'Please ignore <script>var a = {}; a.com = "Hi";</script> \n' +
+        "but do <span>b.ca</span>",
+    {
+        ignoreTags: ["script", "style"]
+    }
+);
+
+/* nl2br */
+
+/* tagName */
+
+linkifyHtml("github.com", {
+    tagName: "span"
+});
+
+linkifyHtml("#swag", {
+    tagName: {
+        hashtag: "span"
+    }
+});
+
+/* target */
+
+linkifyHtml("github.com", {
+    target: "_parent"
+});
+
+linkifyHtml("test-email@example.com", {
+    target: {
+        url: "_parent",
+        email: null
+    }
+});
+
+/* validate */
+
+// Don't linkify links that don't begin in a protocol
+// e.g., "http://google.com" will be linkified, but "google.com" will not.
+linkifyHtml("www.google.com", {
+    validate: {
+        url(value) {
+            return /^(http|ftp)s?:\/\//.test(value);
+        }
+    }
+});
diff --git a/types/linkifyjs/tsconfig.json b/types/linkifyjs/tsconfig.json
new file mode 100644
index 0000000000..be83a56929
--- /dev/null
+++ b/types/linkifyjs/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "linkifyjs-tests.ts"
+    ]
+}
diff --git a/types/linkifyjs/tslint.json b/types/linkifyjs/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/linkifyjs/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From f0b7bad3514c863feb8dce8a3c107c774028b331 Mon Sep 17 00:00:00 2001
From: Sean Zhu <interestinglythere@gmail.com>
Date: Wed, 28 Nov 2018 23:38:27 -0800
Subject: [PATCH 426/836] rm 'types/linkifyjs/.prettierrc.yml'

---
 types/linkifyjs/.prettierrc.yml | 8 --------
 1 file changed, 8 deletions(-)
 delete mode 100644 types/linkifyjs/.prettierrc.yml

diff --git a/types/linkifyjs/.prettierrc.yml b/types/linkifyjs/.prettierrc.yml
deleted file mode 100644
index f2c03d3a72..0000000000
--- a/types/linkifyjs/.prettierrc.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-tabWidth: 4
-overrides:
-  - files: ".prettierrc.yml"
-    options:
-      tabWidth: 2
-  - files: "tsconfig.json"
-    options:
-      printWidth: 1

From aa0097e633b912dbf22a0ce94c574da8ef92c970 Mon Sep 17 00:00:00 2001
From: Adam <23192421+shenphen@users.noreply.github.com>
Date: Thu, 29 Nov 2018 08:52:59 +0100
Subject: [PATCH 427/836] fix travis errors

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

diff --git a/types/cropperjs/index.d.ts b/types/cropperjs/index.d.ts
index 6e48bdae49..d7be9dbc39 100644
--- a/types/cropperjs/index.d.ts
+++ b/types/cropperjs/index.d.ts
@@ -426,15 +426,9 @@ declare class cropperjs {
     /**
      * Replace the image's src and rebuild the cropper.
      * @param url A new image url
+     * @param hasSameSize If the new image has the same size with the old one, then it will not rebuilt the cropper and only update the urls of all related images.
      */
-    replace(url: string): void;
-    
-    /**
-     * Replace the image's src and rebuild the cropper. If the new image has the same size with the old one, then it will not rebuilt the cropper and only update the urls of all related images. This can be used for applying filters.
-     * @param url A new image url
-     * @param hasSameSize (Default: false)
-     */
-    replace(url: string, hasSameSize: boolean): void;
+    replace(url: string, hasSameSize: boolean = false): void;
 
     /**
      * Enable (unfreeze) the cropper.

From 14e3429c27feeff00c417c58f9242d991ada091c Mon Sep 17 00:00:00 2001
From: Sean Zhu <interestinglythere@gmail.com>
Date: Thu, 29 Nov 2018 00:05:02 -0800
Subject: [PATCH 428/836] [linkifyjs] Add .html.d.ts to files

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

diff --git a/types/linkifyjs/tsconfig.json b/types/linkifyjs/tsconfig.json
index be83a56929..52b1940fcd 100644
--- a/types/linkifyjs/tsconfig.json
+++ b/types/linkifyjs/tsconfig.json
@@ -19,6 +19,7 @@
     },
     "files": [
         "index.d.ts",
+        "html.d.ts",
         "linkifyjs-tests.ts"
     ]
 }

From 27544c9615a45820dd7c3e6435845531075ee2d7 Mon Sep 17 00:00:00 2001
From: Sean Zhu <interestinglythere@gmail.com>
Date: Thu, 29 Nov 2018 00:10:26 -0800
Subject: [PATCH 429/836] [linkifyjs] Fix lint errors

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

diff --git a/types/linkifyjs/html.d.ts b/types/linkifyjs/html.d.ts
index e366d52fc0..d21de0e3c3 100644
--- a/types/linkifyjs/html.d.ts
+++ b/types/linkifyjs/html.d.ts
@@ -1,4 +1,4 @@
 import { LinkifyOptions } from "./index";
 
-export let linkifyHtml: (input: string, options?: LinkifyOptions) => string;
+export function linkifyHtml(input: string, options?: LinkifyOptions): string;
 export default linkifyHtml;

From 3c744b74bec078faa9a9227ea23c00ffdc0a132a Mon Sep 17 00:00:00 2001
From: Lucas Motta <mail@lucasmotta.com>
Date: Thu, 29 Nov 2018 10:32:40 +0000
Subject: [PATCH 430/836] Fix ci problems

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

diff --git a/types/ssh2-streams/index.d.ts b/types/ssh2-streams/index.d.ts
index e80e529ced..df1e001e0a 100644
--- a/types/ssh2-streams/index.d.ts
+++ b/types/ssh2-streams/index.d.ts
@@ -1,7 +1,6 @@
 // Type definitions for ssh2-streams v0.1.9
 // Project: https://github.com/mscdex/ssh2-streams
 // Definitions by: Ron Buckton <https://github.com/rbuckton>
-// Definitions by: Lucas Motta <https://github.com/lucasmotta>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="node" />
@@ -1631,11 +1630,6 @@ export interface TransferOptions {
     step?: (total_transferred: number, chunk: number, total: number) => void;
 }
 
-export interface ReadFileOptions {
-    encoding?: string
-    flag?: string
-}
-
 export interface ReadStreamOptions {
     flags?: string;
     encoding?: string;
@@ -1704,4 +1698,9 @@ export interface ParsedKey {
     publicOrig: Buffer;
     ppk?: boolean;
     privateMAC?: string;
+}
+
+export interface ReadFileOptions {
+    encoding?: string;
+    flag?: string;
 }
\ No newline at end of file

From 5c1c6b290b6446c1ba270e083286d1c487da9c2f Mon Sep 17 00:00:00 2001
From: Silas Rech <silas@panascais.net>
Date: Thu, 29 Nov 2018 13:12:37 +0100
Subject: [PATCH 431/836] [crumb] add typings

---
 types/crumb/crumb-tests.ts |  47 +++++++++++++++
 types/crumb/index.d.ts     | 114 +++++++++++++++++++++++++++++++++++++
 types/crumb/tsconfig.json  |  23 ++++++++
 types/crumb/tslint.json    |   1 +
 4 files changed, 185 insertions(+)
 create mode 100644 types/crumb/crumb-tests.ts
 create mode 100644 types/crumb/index.d.ts
 create mode 100644 types/crumb/tsconfig.json
 create mode 100644 types/crumb/tslint.json

diff --git a/types/crumb/crumb-tests.ts b/types/crumb/crumb-tests.ts
new file mode 100644
index 0000000000..90612a3e4a
--- /dev/null
+++ b/types/crumb/crumb-tests.ts
@@ -0,0 +1,47 @@
+import * as hapi from 'hapi';
+import * as crumb from 'crumb';
+
+const server = new hapi.Server({ port: 8000 });
+
+server.register({
+    plugin: crumb,
+    options: {
+        key: 'csrf-token',
+        size: 50,
+        autoGenerate: true,
+        addToViewContext: true,
+        cookieOptions: {
+            path: '/',
+        },
+        headerName: 'X-CSRF-Token',
+        restful: true,
+        skip: () => false,
+        enforce: true,
+        logUnauthorized: false,
+    }
+});
+
+server.route({
+    method: 'get',
+    path: '/',
+    handler: async (_, h) => {
+        return h.continue;
+    },
+});
+
+server.route({
+    method: 'get',
+    path: '/custom',
+    options: {
+        plugins: {
+            crumb: {
+                key: 'x-csrf-token',
+                source: 'query',
+                restful: true,
+            },
+        },
+    },
+    handler: async (_, h) => {
+        return h.continue;
+    },
+});
diff --git a/types/crumb/index.d.ts b/types/crumb/index.d.ts
new file mode 100644
index 0000000000..16311c99bf
--- /dev/null
+++ b/types/crumb/index.d.ts
@@ -0,0 +1,114 @@
+// Type definitions for crumb 7.2
+// Project: https://github.com/hapijs/crumb
+// Definitions by: Silas Rech <https://github.com/lenovouser>
+//                 Simon Schick <https://github.com/SimonSchick>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
+
+import { Request, Plugin, ResponseToolkit, ServerStateCookieOptions } from 'hapi';
+
+declare module 'hapi' {
+    interface PluginSpecificConfiguration {
+        crumb?: boolean | {
+            /**
+             * The name of the cookie to store the CSRF crumb into.
+             */
+            key?: string;
+
+            /**
+             * Specifies how the crumb will be sent in requests.
+             *
+             * @default 'payload'
+             */
+            source?: 'payload' | 'query';
+
+            /**
+             * Override for the server's 'restful' setting
+             */
+            restful?: boolean;
+        };
+    }
+}
+
+declare namespace crumb {
+    type SkipFunction = (request?: Request, h?: ResponseToolkit) => boolean;
+
+    interface RegisterOptions {
+        /**
+         * The name of the cookie to store the CSRF crumb into.
+         *
+         * @default 'crumb'
+         */
+        key?: string;
+
+        /**
+         * The length of the crumb to generate.
+         * See {@link https://github.com/hapijs/cryptiles cryptiles} for more information.
+         *
+         * @default 43
+         */
+        size?: number;
+
+        /**
+         * Whether to automatically generate a new crumb for requests.
+         *
+         * @default true
+         */
+        autoGenerate?: boolean;
+
+        /**
+         * Whether to automatically add the crumb to view contexts as the given key.
+         *
+         * @default true
+         */
+        addToViewContext?: boolean;
+
+        /**
+         * Storage options for the cookie containing the crumb
+         *
+         * @default { path: '/' }
+         */
+        cookieOptions?: ServerStateCookieOptions;
+
+        /**
+         * Specify the name of the custom CSRF header.
+         *
+         * @default 'X-CSRF-Token'
+         */
+        headerName?: string;
+
+        /**
+         * RESTful mode that validates crumb tokens from 'X-CSRF-Token' request header for POST, PUT, PATCH and DELETE server routes.
+         * Disables payload/query crumb validation.
+         *
+         * @default false
+         */
+        restful?: boolean;
+
+        /**
+         * A function which when provided, is called for every request.
+         * If the provided function returns true, validation and generation of crumb is skipped.
+         *
+         * @default false
+         */
+        skip?: boolean | SkipFunction;
+
+        /**
+         * Using enforce with false will set the CSRF header cookie but won't execute the validation.
+         *
+         * @default true
+         */
+        enforce?: boolean;
+
+        /**
+         * Whether to add to the request log with tag 'crumb' and data 'validation failed'.
+         *
+         * @default false
+         */
+        logUnauthorized?: boolean;
+    }
+}
+
+declare const crumb: Plugin<crumb.RegisterOptions>;
+
+export = crumb;
diff --git a/types/crumb/tsconfig.json b/types/crumb/tsconfig.json
new file mode 100644
index 0000000000..5beceb6a88
--- /dev/null
+++ b/types/crumb/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "crumb-tests.ts"
+    ]
+}
diff --git a/types/crumb/tslint.json b/types/crumb/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/crumb/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 900a8f162194c33518842b97477a4992963953a7 Mon Sep 17 00:00:00 2001
From: pawkrol <pawel.krol@futurum.tech>
Date: Thu, 29 Nov 2018 15:17:52 +0100
Subject: [PATCH 432/836] Add import function

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

diff --git a/types/mathjs/index.d.ts b/types/mathjs/index.d.ts
index 6cb49323fa..09b4a9d27c 100644
--- a/types/mathjs/index.d.ts
+++ b/types/mathjs/index.d.ts
@@ -7,6 +7,7 @@
 // TypeScript Version: 2.2
 
 import { Decimal } from "decimal.js";
+import { ImportOptions } from "mathjs";
 
 declare const math: math.MathJsStatic;
 export as namespace math;
@@ -2571,6 +2572,18 @@ declare namespace math {
          * ‘string’, ‘Array’, ‘Date’.
          */
         typeof(x: any): string;
+
+        /**
+         * Import functions from an object or a module
+         * @param object An object with functions to be imported.
+         * @param options An object with import options.
+         */
+        import(object: object | Array<object>, options: ImportOptions);
+
+        /**
+         * It may not exists - this is _only_ for import functionality.
+         */
+        [key: string]: any;
     }
 
     interface Matrix {
@@ -4542,4 +4555,10 @@ declare namespace math {
          */
         typeof(): MathJsChain;
     }
+
+    interface ImportOptions {
+        override?: boolean;
+        silent?: boolean;
+        wrap?: boolean;
+    }
 }

From f6e24ebb8e2b2971102c1203dba773d9cffd1ec1 Mon Sep 17 00:00:00 2001
From: pawkrol <pawel.krol@futurum.tech>
Date: Thu, 29 Nov 2018 15:19:50 +0100
Subject: [PATCH 433/836] Remove import and add author

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

diff --git a/types/mathjs/index.d.ts b/types/mathjs/index.d.ts
index 09b4a9d27c..7917ce417e 100644
--- a/types/mathjs/index.d.ts
+++ b/types/mathjs/index.d.ts
@@ -3,11 +3,11 @@
 // Definitions by: Ilya Shestakov <https://github.com/siavol>,
 //                  Andy Patterson <https://github.com/andnp>,
 //                  Brad Besserman <https://github.com/bradbesserman>
+//                  Pawel Krol <https://github.com/pawkrol>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
 
 import { Decimal } from "decimal.js";
-import { ImportOptions } from "mathjs";
 
 declare const math: math.MathJsStatic;
 export as namespace math;

From 7b89694607cb4a4d602f7600bb582880075b03cd Mon Sep 17 00:00:00 2001
From: Michael Pertl <mpertl@dance-all-day.com>
Date: Thu, 29 Nov 2018 16:08:35 +0100
Subject: [PATCH 434/836] [@types/ssh2-sftp-client] "Formatting: Either use all
 tabs, or always use 4 spaces"

---
 types/ssh2-sftp-client/index.d.ts | 65 ++++++++++++++++++-------------
 1 file changed, 39 insertions(+), 26 deletions(-)

diff --git a/types/ssh2-sftp-client/index.d.ts b/types/ssh2-sftp-client/index.d.ts
index 2dcaee74e6..165af77ab4 100644
--- a/types/ssh2-sftp-client/index.d.ts
+++ b/types/ssh2-sftp-client/index.d.ts
@@ -5,35 +5,48 @@
 
 import * as ssh2 from 'ssh2';
 import * as ssh2Stream from 'ssh2-streams';
+
 export = sftp;
 
 declare class sftp {
-  connect(options: ssh2.ConnectConfig): Promise<void>;
-  list(remoteFilePath: string): Promise<sftp.FileInfo[]>;
-  get(remoteFilePath: string, useCompression?: boolean, encoding?: string | null): Promise<NodeJS.ReadableStream>;
-  fastGet(remoteFilePath: string, localPath: string, options?: ssh2Stream.TransferOptions): Promise<string>;
-  put(input: string | Buffer | NodeJS.ReadableStream, remoteFilePath: string, useCompression?: boolean, encoding?: string): Promise<void>;
-  fastPut(localPath: string, emoteFilePath: string, options?: ssh2Stream.TransferOptions): Promise<string>;
-  mkdir(remoteFilePath: string, recursive?: boolean): Promise<void>;
-  rmdir(remoteFilePath: string, recursive?: boolean): Promise<void>;
-  delete(remoteFilePath: string): Promise<void>;
-  rename(remoteSourcePath: string, remoteDestPath: string): Promise<void>;
-  end(): Promise<void>;
-  on(event: string, callback: (...args: any[]) => void): void;
+    connect(options: ssh2.ConnectConfig): Promise<void>;
+
+    list(remoteFilePath: string): Promise<sftp.FileInfo[]>;
+
+    get(remoteFilePath: string, useCompression?: boolean, encoding?: string | null): Promise<NodeJS.ReadableStream>;
+
+    fastGet(remoteFilePath: string, localPath: string, options?: ssh2Stream.TransferOptions): Promise<string>;
+
+    put(input: string | Buffer | NodeJS.ReadableStream, remoteFilePath: string, useCompression?: boolean, encoding?: string): Promise<void>;
+
+    fastPut(localPath: string, emoteFilePath: string, options?: ssh2Stream.TransferOptions): Promise<string>;
+
+    mkdir(remoteFilePath: string, recursive?: boolean): Promise<void>;
+
+    rmdir(remoteFilePath: string, recursive?: boolean): Promise<void>;
+
+    delete(remoteFilePath: string): Promise<void>;
+
+    rename(remoteSourcePath: string, remoteDestPath: string): Promise<void>;
+
+    end(): Promise<void>;
+
+    on(event: string, callback: (...args: any[]) => void): void;
 }
+
 declare namespace sftp {
-  interface FileInfo {
-    type: string;
-    name: string;
-    size: number;
-    modifyTime: number;
-    accessTime: number;
-    rights: {
-      user: string;
-      group: string;
-      other: string;
-    };
-    owner: number;
-    group: number;
-  }
+    interface FileInfo {
+        type: string;
+        name: string;
+        size: number;
+        modifyTime: number;
+        accessTime: number;
+        rights: {
+            user: string;
+            group: string;
+            other: string;
+        };
+        owner: number;
+        group: number;
+    }
 }

From 8046ef23ae267844626edf0a8f20a91ba0acfad1 Mon Sep 17 00:00:00 2001
From: Michael Pertl <mpertl@dance-all-day.com>
Date: Thu, 29 Nov 2018 16:13:29 +0100
Subject: [PATCH 435/836] [@types/ssh2-sftp-client] added type definitions for
 methods 'exists', 'stat' and 'chmod'

---
 types/ssh2-sftp-client/index.d.ts | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/types/ssh2-sftp-client/index.d.ts b/types/ssh2-sftp-client/index.d.ts
index 165af77ab4..8089810fa9 100644
--- a/types/ssh2-sftp-client/index.d.ts
+++ b/types/ssh2-sftp-client/index.d.ts
@@ -1,6 +1,6 @@
-// Type definitions for ssh2-sftp-client 2.3
+// Type definitions for ssh2-sftp-client 2.4
 // Project: https://www.npmjs.com/package/ssh2-sftp-client
-// Definitions by: igrayson <https://github.com/igrayson>, Ascari Andrea <https://github.com/ascariandrea>, Kartik Malik <https://github.com/kartik2406>
+// Definitions by: igrayson <https://github.com/igrayson>, Ascari Andrea <https://github.com/ascariandrea>, Kartik Malik <https://github.com/kartik2406>, Michael Pertl <https://github.com/viamuli>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 import * as ssh2 from 'ssh2';
@@ -13,6 +13,10 @@ declare class sftp {
 
     list(remoteFilePath: string): Promise<sftp.FileInfo[]>;
 
+    exists(remotePath: string): Promise<string>;
+
+    stat(remotePath: string): Promise<sftp.FileStats>
+
     get(remoteFilePath: string, useCompression?: boolean, encoding?: string | null): Promise<NodeJS.ReadableStream>;
 
     fastGet(remoteFilePath: string, localPath: string, options?: ssh2Stream.TransferOptions): Promise<string>;
@@ -29,6 +33,8 @@ declare class sftp {
 
     rename(remoteSourcePath: string, remoteDestPath: string): Promise<void>;
 
+    chmod(remotePath: string, mode: number | string): Promise<string>;
+
     end(): Promise<void>;
 
     on(event: string, callback: (...args: any[]) => void): void;
@@ -49,4 +55,14 @@ declare namespace sftp {
         owner: number;
         group: number;
     }
+
+    interface FileStats {
+        mode: number;
+        permissions?: any;
+        owner: number;
+        group: number;
+        size: number;
+        accessTime: number;
+        modifyTime: number;
+    }
 }

From c74a7e8088af068f6e1925eb5c953affd3d05a45 Mon Sep 17 00:00:00 2001
From: Michael Pertl <mpertl@dance-all-day.com>
Date: Thu, 29 Nov 2018 16:23:22 +0100
Subject: [PATCH 436/836] [@types/ssh2-sftp-client] multi-line "definitions
 by"; added new tests

---
 types/ssh2-sftp-client/index.d.ts                | 5 ++++-
 types/ssh2-sftp-client/ssh2-sftp-client-tests.ts | 7 +++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/types/ssh2-sftp-client/index.d.ts b/types/ssh2-sftp-client/index.d.ts
index 8089810fa9..ac0c0847ee 100644
--- a/types/ssh2-sftp-client/index.d.ts
+++ b/types/ssh2-sftp-client/index.d.ts
@@ -1,6 +1,9 @@
 // Type definitions for ssh2-sftp-client 2.4
 // Project: https://www.npmjs.com/package/ssh2-sftp-client
-// Definitions by: igrayson <https://github.com/igrayson>, Ascari Andrea <https://github.com/ascariandrea>, Kartik Malik <https://github.com/kartik2406>, Michael Pertl <https://github.com/viamuli>
+// Definitions by: igrayson <https://github.com/igrayson>
+//                 Ascari Andrea <https://github.com/ascariandrea>
+//                 Kartik Malik <https://github.com/kartik2406>
+//                 Michael Pertl <https://github.com/viamuli>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 import * as ssh2 from 'ssh2';
diff --git a/types/ssh2-sftp-client/ssh2-sftp-client-tests.ts b/types/ssh2-sftp-client/ssh2-sftp-client-tests.ts
index 8a9c99fde1..d59e552990 100644
--- a/types/ssh2-sftp-client/ssh2-sftp-client-tests.ts
+++ b/types/ssh2-sftp-client/ssh2-sftp-client-tests.ts
@@ -1,5 +1,6 @@
 import Client = require('ssh2-sftp-client');
 import * as fs from 'fs';
+
 const client = new Client();
 
 client.connect({
@@ -11,6 +12,10 @@ client.connect({
 
 client.list('/remote/path').then(() => null);
 
+client.exists('/remote/path').then(() => null);
+
+client.stat('/remote/path').then(() => null);
+
 client.get('/remote/path').then(stream => stream.read(0));
 client.get('/remote/path', true, 'utf8').then(stream => stream.read(0));
 client.get('/remote/path', true, null).then(stream => stream.read(0));
@@ -30,6 +35,8 @@ client.delete('remote/path').then(() => null);
 
 client.rename('/remote/from', '/remote/to').then(() => null);
 
+client.chmod('/remote/path', 777).then(() => null);
+
 client.end().then(() => null);
 
 client.on('event', () => null);

From c042e6eacaf7a1f17d7a46af8a331dc3a417e7a8 Mon Sep 17 00:00:00 2001
From: Michael Pertl <mpertl@dance-all-day.com>
Date: Thu, 29 Nov 2018 16:29:27 +0100
Subject: [PATCH 437/836] [@types/ssh2-sftp-client] added missing semicolon

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

diff --git a/types/ssh2-sftp-client/index.d.ts b/types/ssh2-sftp-client/index.d.ts
index ac0c0847ee..c568571eb5 100644
--- a/types/ssh2-sftp-client/index.d.ts
+++ b/types/ssh2-sftp-client/index.d.ts
@@ -18,7 +18,7 @@ declare class sftp {
 
     exists(remotePath: string): Promise<string>;
 
-    stat(remotePath: string): Promise<sftp.FileStats>
+    stat(remotePath: string): Promise<sftp.FileStats>;
 
     get(remoteFilePath: string, useCompression?: boolean, encoding?: string | null): Promise<NodeJS.ReadableStream>;
 

From 0faecf90db4bfe0652254f12fabc07cca8ff1916 Mon Sep 17 00:00:00 2001
From: Mateusz Glapinski <m.glapinski@ocado.com>
Date: Thu, 29 Nov 2018 17:21:08 +0100
Subject: [PATCH 438/836] * overloads few methods that should return Promise if
 a callback parameter is omitted * adds HostedFieldsHostedFieldsFieldName type
 * update tests

---
 types/braintree-web/index.d.ts   | 36 +++++++++++++++++++-------------
 types/braintree-web/test/node.ts |  6 +++---
 types/braintree-web/test/web.ts  | 13 +++++++-----
 3 files changed, 32 insertions(+), 23 deletions(-)

diff --git a/types/braintree-web/index.d.ts b/types/braintree-web/index.d.ts
index bc5ca0b01f..a2cfdb06c1 100644
--- a/types/braintree-web/index.d.ts
+++ b/types/braintree-web/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/braintree/braintree-web
 // Definitions by: Guy Shahine <https://github.com/chlela>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.1
 
 /**
  * @module braintree-web/american-express
@@ -359,7 +360,8 @@ declare namespace braintree {
      * });
      * @static
      */
-    create: (options: { authorization: string }, callback: callback) => void;
+    create(options: { authorization: string }): Promise<Client>;
+    create(options: { authorization: string }, callback: callback): void;
 
     /**
      * @description The current version of the SDK, i.e. `3.0.2`.
@@ -439,7 +441,8 @@ declare namespace braintree {
      * @param {callback} callback The second argument, `data`, is the {@link DataCollector} instance.
      * @returns {void}
      */
-    create: (options: { client: Client, kount: boolean, paypal: boolean }, callback: callback) => void;
+    create(options: { client: Client, kount: boolean, paypal: boolean }): Promise<DataCollector>;
+    create(options: { client: Client, kount: boolean, paypal: boolean }, callback: callback): void;
 
     /**
      * @description The current version of the SDK, i.e. `3.0.2`.
@@ -591,18 +594,15 @@ declare namespace braintree {
    * @property {?HostedFields~hostedFieldsFieldData} fields.expirationYear {@link HostedFields~hostedFieldsFieldData|hostedFieldsFieldData} for the expiration year field, if it is present.
    * @property {?HostedFields~hostedFieldsFieldData} fields.postalCode {@link HostedFields~hostedFieldsFieldData|hostedFieldsFieldData} for the postal code field, if it is present.
    */
-  interface HostedFieldsFieldDataFields {
-    number: HostedFieldsHostedFieldsFieldData;
-    cvv: HostedFieldsHostedFieldsFieldData;
-    expirationDate: HostedFieldsHostedFieldsFieldData;
-    expirationMonth: HostedFieldsHostedFieldsFieldData;
-    expirationYear: HostedFieldsHostedFieldsFieldData;
-    postalCode: HostedFieldsHostedFieldsFieldData;
-  }
+  type HostedFieldsHostedFieldsFieldName = 'number' | 'cvv' | 'expirationDate' | 'expirationMonth' | 'expirationYear' | 'postalCode';
+
+  type HostedFieldsFieldDataFields = {
+      [key in HostedFieldsHostedFieldsFieldName]: HostedFieldsHostedFieldsFieldData;
+  };
 
   interface HostedFieldsStateObject {
     cards: HostedFieldsHostedFieldsCard[];
-    emittedBy: string;
+    emittedBy: HostedFieldsHostedFieldsFieldName;
     fields: HostedFieldsFieldDataFields;
   }
 
@@ -666,7 +666,8 @@ declare namespace braintree {
      *   }
      * }, callback);
      */
-    create: (options: { client: Client, fields: HostedFieldFieldOptions, styles: any }, callback: callback) => void;
+     create(options: { client: Client, fields: HostedFieldFieldOptions, styles: any }): Promise<HostedFields>;
+     create(options: { client: Client, fields: HostedFieldFieldOptions, styles: any }, callback: callback): void;
 
 
     /**
@@ -726,7 +727,7 @@ declare namespace braintree {
      * });
      * @returns {void}
      */
-    on(event: string, handler: ((event: any) => any)): void;
+    on(event: string, handler: ((event: HostedFieldsStateObject) => void)): void;
 
     /**
      * Cleanly tear down anything set up by {@link module:braintree-web/hosted-fields.create|create}
@@ -785,7 +786,9 @@ declare namespace braintree {
      * });
      * @returns {void}
      */
-    tokenize(options?: { vault: boolean }, callback?: callback): void;
+      tokenize(options?: { vault?: boolean, cardholderName?: string, billingAddress?: any }): Promise<HostedFieldsTokenizePayload>;
+      tokenize(options: { vault?: boolean, cardholderName?: string, billingAddress?: any }, callback: callback): void;
+      tokenize(callback: callback): void;
 
     /**
      * Add a class to a {@link module:braintree-web/hosted-fields~field field}. Useful for updating field styles when events occur elsewhere in your checkout.
@@ -1138,7 +1141,8 @@ declare namespace braintree {
      *   client: client
      * }, callback);
      */
-    create: (options: { client: Client }, callback: callback) => void;
+    create(options: { client: Client }): Promise<ThreeDSecure>;
+    create(options: { client: Client }, callback: callback): void;
 
     /**
      * @description The current version of the SDK, i.e. `3.0.2`.
@@ -1207,6 +1211,7 @@ declare namespace braintree {
      *   }
      * });
      */
+    verifyCard(options: { nonce: string, amount: number, addFrame: (err?: BraintreeError, iframe?: HTMLIFrameElement) => void, removeFrame?: () => void }): Promise<ThreeDSecureVerifyPayload>;
     verifyCard(options: { nonce: string, amount: number, addFrame: (err?: BraintreeError, iframe?: HTMLIFrameElement) => void, removeFrame: () => void }, callback: callback): void;
 
     /**
@@ -1751,3 +1756,4 @@ declare namespace braintree {
 
 export = braintree;
 export as namespace braintree;
+
diff --git a/types/braintree-web/test/node.ts b/types/braintree-web/test/node.ts
index 9eed5b228d..59db2fb944 100644
--- a/types/braintree-web/test/node.ts
+++ b/types/braintree-web/test/node.ts
@@ -6,7 +6,7 @@ let clientToken: string = "eyJ2ZXJzaW9uIjoyLCJhdXRob3JpemF0aW9uRmluZ2VycHJpbnQiO
 
 braintree.client.create({
   authorization: clientToken
-}, function (error: braintree.BraintreeError, clientInstance: any) {
+}, function (error: braintree.BraintreeError, clientInstance: braintree.Client) {
 
   var form: HTMLFormElement = document.getElementById('my-form-id') as HTMLFormElement;
   var data: { creditCard: braintree.CreditCardInfo } = {
@@ -396,7 +396,7 @@ let submitNonceToServer: (nonce: string) => void;
 
 braintree.threeDSecure.verifyCard({
   nonce: existingNonce,
-  amount: 123.45,
+  amount: 123.45, // $ExpectType number
   addFrame: function (err, iframe) {
     // Set up your UI and add the iframe.
     let my3DSContainer = document.createElement('div');
@@ -437,4 +437,4 @@ braintree.threeDSecure.cancelVerifyCard(function (err: braintree.BraintreeError,
   verifyPayload.nonce; // The nonce returned from the 3ds lookup call
   verifyPayload.liabilityShifted; // boolean
   verifyPayload.liabilityShiftPossible; // boolean
-});
+});
\ No newline at end of file
diff --git a/types/braintree-web/test/web.ts b/types/braintree-web/test/web.ts
index 22073363d4..1801cbb497 100644
--- a/types/braintree-web/test/web.ts
+++ b/types/braintree-web/test/web.ts
@@ -1,10 +1,13 @@
+import { ApplePay } from "..";
+import * as braintree from "..";
+
 let version: string = braintree.VERSION;
 
 let clientToken: string = "eyJ2ZXJzaW9uIjoyLCJhdXRob3JpemF0aW9uRmluZ2VycHJpbnQiOiI0YjlhYzVmYmI4ZTNkYzQzMmFkZjJhNzBlNjZlMWNjY2M5ODRkYzE4ZTM4YmY4NjYzZTM5NjM3NWZjYmQzY2U5fGNyZWF0ZWRfYXQ9MjAxNi0wOS0wOFQwNTowMzo0MC4xNjk1NTUwMzUrMDAwMFx1MDAyNm1lcmNoYW50X2lkPTM0OHBrOWNnZjNiZ3l3MmJcdTAwMjZwdWJsaWNfa2V5PTJuMjQ3ZHY4OWJxOXZtcHIiLCJjb25maWdVcmwiOiJodHRwczovL2FwaS5zYW5kYm94LmJyYWludHJlZWdhdGV3YXkuY29tOjQ0My9tZXJjaGFudHMvMzQ4cGs5Y2dmM2JneXcyYi9jbGllbnRfYXBpL3YxL2NvbmZpZ3VyYXRpb24iLCJjaGFsbGVuZ2VzIjpbXSwiZW52aXJvbm1lbnQiOiJzYW5kYm94IiwiY2xpZW50QXBpVXJsIjoiaHR0cHM6Ly9hcGkuc2FuZGJveC5icmFpbnRyZWVnYXRld2F5LmNvbTo0NDMvbWVyY2hhbnRzLzM0OHBrOWNnZjNiZ3l3MmIvY2xpZW50X2FwaSIsImFzc2V0c1VybCI6Imh0dHBzOi8vYXNzZXRzLmJyYWludHJlZWdhdGV3YXkuY29tIiwiYXV0aFVybCI6Imh0dHBzOi8vYXV0aC52ZW5tby5zYW5kYm94LmJyYWludHJlZWdhdGV3YXkuY29tIiwiYW5hbHl0aWNzIjp7InVybCI6Imh0dHBzOi8vY2xpZW50LWFuYWx5dGljcy5zYW5kYm94LmJyYWludHJlZWdhdGV3YXkuY29tLzM0OHBrOWNnZjNiZ3l3MmIifSwidGhyZWVEU2VjdXJlRW5hYmxlZCI6dHJ1ZSwicGF5cGFsRW5hYmxlZCI6dHJ1ZSwicGF5cGFsIjp7ImRpc3BsYXlOYW1lIjoiQWNtZSBXaWRnZXRzLCBMdGQuIChTYW5kYm94KSIsImNsaWVudElkIjpudWxsLCJwcml2YWN5VXJsIjoiaHR0cDovL2V4YW1wbGUuY29tL3BwIiwidXNlckFncmVlbWVudFVybCI6Imh0dHA6Ly9leGFtcGxlLmNvbS90b3MiLCJiYXNlVXJsIjoiaHR0cHM6Ly9hc3NldHMuYnJhaW50cmVlZ2F0ZXdheS5jb20iLCJhc3NldHNVcmwiOiJodHRwczovL2NoZWNrb3V0LnBheXBhbC5jb20iLCJkaXJlY3RCYXNlVXJsIjpudWxsLCJhbGxvd0h0dHAiOnRydWUsImVudmlyb25tZW50Tm9OZXR3b3JrIjp0cnVlLCJlbnZpcm9ubWVudCI6Im9mZmxpbmUiLCJ1bnZldHRlZE1lcmNoYW50IjpmYWxzZSwiYnJhaW50cmVlQ2xpZW50SWQiOiJtYXN0ZXJjbGllbnQzIiwiYmlsbGluZ0FncmVlbWVudHNFbmFibGVkIjp0cnVlLCJtZXJjaGFudEFjY291bnRJZCI6ImFjbWV3aWRnZXRzbHRkc2FuZGJveCIsImN1cnJlbmN5SXNvQ29kZSI6IlVTRCJ9LCJjb2luYmFzZUVuYWJsZWQiOmZhbHNlLCJtZXJjaGFudElkIjoiMzQ4cGs5Y2dmM2JneXcyYiIsInZlbm1vIjoib2ZmIn0=";
 
 braintree.client.create({
   authorization: clientToken
-}, function (error: braintree.BraintreeError, clientInstance: any) {
+}, function (error: braintree.BraintreeError, clientInstance: braintree.Client) {
 
   var form: HTMLFormElement = document.getElementById('my-form-id') as HTMLFormElement;
   var data: { creditCard: braintree.CreditCardInfo } = {
@@ -62,7 +65,7 @@ braintree.client.create({
         select: true
       }
     }
-  }, function (hostedFieldsErr?: braintree.BraintreeError, hostedFieldsInstance?: any) {
+  }, function (hostedFieldsErr?: braintree.BraintreeError, hostedFieldsInstance?: braintree.HostedFields) {
 
     if (hostedFieldsErr) {
       // Handle error in Hosted Fields creation
@@ -178,7 +181,7 @@ braintree.client.create({
     });
   });
 
-  braintree.applePay.create({ client: clientInstance }, function (createErr?: braintree.BraintreeError, applePayInstance?: any) {
+  braintree.applePay.create({ client: clientInstance }, function (createErr?: braintree.BraintreeError, applePayInstance?: ApplePay) {
     if (createErr) {
       // Handle error in client creation
       console.log(`Error Code: ${error.code}, Type: ${error.type}, Message: ${error.message}, Details: ${error.details}`);
@@ -194,7 +197,7 @@ braintree.client.create({
       total: { label: 'Your Label', amount: '10.00' },
     };
 
-    var paymentRequest = braintree.applePay.createPaymentRequest(request);
+    var paymentRequest = applePayInstance.createPaymentRequest(request);
 
     console.log(paymentRequest);
     // { total: { }, countryCode: 'US', currencyCode: 'USD', merchantCapabilities: [ ], supportedNetworks: [ ] }
@@ -394,7 +397,7 @@ let submitNonceToServer: (nonce: string) => void;
 
 braintree.threeDSecure.verifyCard({
   nonce: existingNonce,
-  amount: 123.45,
+  amount: 123.45, // $ExpectType number
   addFrame: function (err, iframe) {
     // Set up your UI and add the iframe.
     let my3DSContainer = document.createElement('div');

From e02b8523a1f3ea4f6788de1dee5727e43ad9a053 Mon Sep 17 00:00:00 2001
From: Lukas Elmer <lukas.elmer@gmail.com>
Date: Thu, 29 Nov 2018 17:29:43 +0100
Subject: [PATCH 439/836] improve superagent.agent() typing

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

diff --git a/types/superagent/index.d.ts b/types/superagent/index.d.ts
index 971cc3c4c2..261ea99bed 100644
--- a/types/superagent/index.d.ts
+++ b/types/superagent/index.d.ts
@@ -45,7 +45,7 @@ declare namespace request {
         // tslint:disable-next-line:unified-signatures
         (method: string, url: string): SuperAgentRequest;
 
-        agent(): SuperAgent<SuperAgentRequest>;
+        agent(): this & Request & SuperAgent<SuperAgentRequest>;
         serialize: { [type: string]: Serializer };
         parse: { [type: string]: Parser };
     }
diff --git a/types/superagent/superagent-tests.ts b/types/superagent/superagent-tests.ts
index c063c819be..2e13d5b90a 100644
--- a/types/superagent/superagent-tests.ts
+++ b/types/superagent/superagent-tests.ts
@@ -421,3 +421,15 @@ request
     .get('/echo')
     .use(echoPlugin)
     .end();
+
+async function testDefaultOptions() {
+    // Default options for multiple requests
+    const agentWithDefaultOptions = request.agent()
+        .use(() => null)
+        .auth('digest', 'secret', {type:'auto'});
+
+    await agentWithDefaultOptions.get('/with-plugin-and-auth');
+    await agentWithDefaultOptions.get('/also-with-plugin-and-auth');
+}
+
+testDefaultOptions();

From bf07afd86497cc8195477b8be5e904f830514159 Mon Sep 17 00:00:00 2001
From: Lukas Elmer <lukas.elmer@gmail.com>
Date: Thu, 29 Nov 2018 17:34:25 +0100
Subject: [PATCH 440/836] improve formatting and whitespaces

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

diff --git a/types/superagent/superagent-tests.ts b/types/superagent/superagent-tests.ts
index 2e13d5b90a..44ef7cf773 100644
--- a/types/superagent/superagent-tests.ts
+++ b/types/superagent/superagent-tests.ts
@@ -424,9 +424,10 @@ request
 
 async function testDefaultOptions() {
     // Default options for multiple requests
-    const agentWithDefaultOptions = request.agent()
+    const agentWithDefaultOptions = request
+        .agent()
         .use(() => null)
-        .auth('digest', 'secret', {type:'auto'});
+        .auth('digest', 'secret', { type: 'auto' });
 
     await agentWithDefaultOptions.get('/with-plugin-and-auth');
     await agentWithDefaultOptions.get('/also-with-plugin-and-auth');

From 09cf6f908a2bd4d341d80a89aa735d52fd5ad8a9 Mon Sep 17 00:00:00 2001
From: Lukas Elmer <lukas.elmer@gmail.com>
Date: Thu, 29 Nov 2018 17:36:21 +0100
Subject: [PATCH 441/836] update header

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

diff --git a/types/superagent/index.d.ts b/types/superagent/index.d.ts
index 261ea99bed..c10ff467bb 100644
--- a/types/superagent/index.d.ts
+++ b/types/superagent/index.d.ts
@@ -6,6 +6,7 @@
 //                 Shrey Jain <https://github.com/shreyjain1994>
 //                 Alec Zopf <https://github.com/zopf>
 //                 Adam Haglund <https://github.com/beeequeue>
+//                 Lukas Elmer <https://github.com/lukaselmer>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
 

From 84d0e5f3c6ed696e578b99865567b4ad93814368 Mon Sep 17 00:00:00 2001
From: Tyler <tyler.evans116@gmail.com>
Date: Thu, 29 Nov 2018 11:24:47 -0700
Subject: [PATCH 442/836] update react-flatpickr definitions

---
 types/react-flatpickr/index.d.ts | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/types/react-flatpickr/index.d.ts b/types/react-flatpickr/index.d.ts
index a0a9725ccd..973f30efc9 100644
--- a/types/react-flatpickr/index.d.ts
+++ b/types/react-flatpickr/index.d.ts
@@ -1,18 +1,26 @@
-// Type definitions for react-flatpickr 3.2
+// Type definitions for react-flatpickr 3.6.4
 // Project: https://github.com/coderhaoxin/react-flatpickr
 // Definitions by: begincalendar <https://github.com/begincalendar>
+//                 snaveevans <https://github.com/snaveevans>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 
-import { Component } from 'react';
-import flatpickr from 'flatpickr';
+import { Component } from "react";
+import flatpickr from "flatpickr";
 
 export interface DateTimePickerProps {
-    defaultValue?: string;
-    options?: flatpickr.Options.Options;
-    onChange?: flatpickr.Options.Hook;
-    value?: string;
-    className?: string;
+  defaultValue?: string;
+  options?: flatpickr.Options.Options;
+  onChange?: flatpickr.Options.Hook;
+  onOpen?: flatpickr.Options.Hook;
+  onClose?: flatpickr.Options.Hook;
+  onMonthChange?: flatpickr.Options.Hook;
+  onYearChange?: flatpickr.Options.Hook;
+  onReady?: flatpickr.Options.Hook;
+  onValueUpdate?: flatpickr.Options.Hook;
+  onDayCreate?: flatpickr.Options.Hook;
+  value?: string | Date | number | Array<string | Date | number>;
+  children?: JSX.Element;
 }
 
 export default class DatePicker extends Component<DateTimePickerProps> {}

From f8ad24974118da570659fcaf7a6f35271e828f15 Mon Sep 17 00:00:00 2001
From: Tyler <tyler.evans116@gmail.com>
Date: Thu, 29 Nov 2018 11:42:10 -0700
Subject: [PATCH 443/836] refactor react-flatpickr test

---
 .../react-flatpickr/react-flatpickr-tests.tsx | 50 ++++++++++++++-----
 1 file changed, 38 insertions(+), 12 deletions(-)

diff --git a/types/react-flatpickr/react-flatpickr-tests.tsx b/types/react-flatpickr/react-flatpickr-tests.tsx
index 452d8529b4..ce7122a47f 100644
--- a/types/react-flatpickr/react-flatpickr-tests.tsx
+++ b/types/react-flatpickr/react-flatpickr-tests.tsx
@@ -1,22 +1,48 @@
-import flatpickr from 'flatpickr';
-import * as React from 'react';
-import DatePicker from 'react-flatpickr';
+import flatpickr from "flatpickr";
+import * as React from "react";
+import DatePicker from "react-flatpickr";
 
-const noParamsElement = <DatePicker/>;
+const noParamsElement = <DatePicker />;
 
-const defaultValueElement = <DatePicker defaultValue={ 'Default value' }/>;
+const defaultValueElement = <DatePicker defaultValue={"Default value"} />;
 
 const options = {
-    dateFormat: 'YYYY-MM-DD'
+    dateFormat: "YYYY-MM-DD"
 };
-const optionsElement = <DatePicker options={ options }/>;
+const optionsElement = <DatePicker options={options} />;
 
-const onChange = (
-    selectedDates: Date[], dateStr: string, instance: flatpickr.Instance,
+const hook = (
+    selectedDates: Date[],
+    dateStr: string,
+    instance: flatpickr.Instance,
     elem: HTMLElement
 ) => null;
-const onChangeElement = <DatePicker onChange={ onChange }/>;
+const onChangeElement = <DatePicker onChange={hook} />;
+const onOpenElement = <DatePicker onOpen={hook} />;
+const onCloseElement = <DatePicker onClose={hook} />;
+const onMonthChangeElement = <DatePicker onMonthChange={hook} />;
+const onYearChangeElement = <DatePicker onYearChange={hook} />;
+const onReadyElement = <DatePicker onReady={hook} />;
+const onValueUpdateElement = <DatePicker onValueUpdate={hook} />;
+const onDayCreateElement = <DatePicker onDayCreate={hook} />;
 
-const valueElement = <DatePicker value={ 'Value' }/>;
+const valueStringElement = <DatePicker value={"2018-11-29T18:35:50.115Z"} />;
+const valueDateElement = <DatePicker value={new Date()} />;
+const valueNumberElement = <DatePicker value={1543516477474} />;
+const valueStringArrayElement = (
+    <DatePicker
+        value={["2018-11-29T18:35:50.115Z", "2018-11-29T19:35:50.115Z"]}
+    />
+);
+const valueDateArrayElement = (
+    <DatePicker value={[new Date(), new Date(1543516477474)]} />
+);
+const valueNumberArrayElement = (
+    <DatePicker value={[1543516477474, 1544549477474]} />
+);
 
-const classNameElement = <DatePicker className={ 'Class name' }/>;
+const wrappedElement = (
+    <DatePicker>
+        <input type="text" />
+    </DatePicker>
+);

From 0085b9868c6252a56fed4690444231dbd8cb8099 Mon Sep 17 00:00:00 2001
From: Tyler <tyler.evans116@gmail.com>
Date: Thu, 29 Nov 2018 11:45:23 -0700
Subject: [PATCH 444/836] react-flatpickr remove minor version

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

diff --git a/types/react-flatpickr/index.d.ts b/types/react-flatpickr/index.d.ts
index 973f30efc9..9f60b4d7be 100644
--- a/types/react-flatpickr/index.d.ts
+++ b/types/react-flatpickr/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for react-flatpickr 3.6.4
+// Type definitions for react-flatpickr 3.6
 // Project: https://github.com/coderhaoxin/react-flatpickr
 // Definitions by: begincalendar <https://github.com/begincalendar>
 //                 snaveevans <https://github.com/snaveevans>
@@ -9,18 +9,18 @@ import { Component } from "react";
 import flatpickr from "flatpickr";
 
 export interface DateTimePickerProps {
-  defaultValue?: string;
-  options?: flatpickr.Options.Options;
-  onChange?: flatpickr.Options.Hook;
-  onOpen?: flatpickr.Options.Hook;
-  onClose?: flatpickr.Options.Hook;
-  onMonthChange?: flatpickr.Options.Hook;
-  onYearChange?: flatpickr.Options.Hook;
-  onReady?: flatpickr.Options.Hook;
-  onValueUpdate?: flatpickr.Options.Hook;
-  onDayCreate?: flatpickr.Options.Hook;
-  value?: string | Date | number | Array<string | Date | number>;
-  children?: JSX.Element;
+    defaultValue?: string;
+    options?: flatpickr.Options.Options;
+    onChange?: flatpickr.Options.Hook;
+    onOpen?: flatpickr.Options.Hook;
+    onClose?: flatpickr.Options.Hook;
+    onMonthChange?: flatpickr.Options.Hook;
+    onYearChange?: flatpickr.Options.Hook;
+    onReady?: flatpickr.Options.Hook;
+    onValueUpdate?: flatpickr.Options.Hook;
+    onDayCreate?: flatpickr.Options.Hook;
+    value?: string | Date | number | Array<string | Date | number>;
+    children?: JSX.Element;
 }
 
 export default class DatePicker extends Component<DateTimePickerProps> {}

From c652a0afb4330ca150f1755bba040cf72b4ec5f5 Mon Sep 17 00:00:00 2001
From: Tyler <tyler.evans116@gmail.com>
Date: Thu, 29 Nov 2018 11:47:37 -0700
Subject: [PATCH 445/836] Revert "react-flatpickr remove minor version"

This reverts commit 0085b9868c6252a56fed4690444231dbd8cb8099.
---
 types/react-flatpickr/index.d.ts | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/types/react-flatpickr/index.d.ts b/types/react-flatpickr/index.d.ts
index 9f60b4d7be..973f30efc9 100644
--- a/types/react-flatpickr/index.d.ts
+++ b/types/react-flatpickr/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for react-flatpickr 3.6
+// Type definitions for react-flatpickr 3.6.4
 // Project: https://github.com/coderhaoxin/react-flatpickr
 // Definitions by: begincalendar <https://github.com/begincalendar>
 //                 snaveevans <https://github.com/snaveevans>
@@ -9,18 +9,18 @@ import { Component } from "react";
 import flatpickr from "flatpickr";
 
 export interface DateTimePickerProps {
-    defaultValue?: string;
-    options?: flatpickr.Options.Options;
-    onChange?: flatpickr.Options.Hook;
-    onOpen?: flatpickr.Options.Hook;
-    onClose?: flatpickr.Options.Hook;
-    onMonthChange?: flatpickr.Options.Hook;
-    onYearChange?: flatpickr.Options.Hook;
-    onReady?: flatpickr.Options.Hook;
-    onValueUpdate?: flatpickr.Options.Hook;
-    onDayCreate?: flatpickr.Options.Hook;
-    value?: string | Date | number | Array<string | Date | number>;
-    children?: JSX.Element;
+  defaultValue?: string;
+  options?: flatpickr.Options.Options;
+  onChange?: flatpickr.Options.Hook;
+  onOpen?: flatpickr.Options.Hook;
+  onClose?: flatpickr.Options.Hook;
+  onMonthChange?: flatpickr.Options.Hook;
+  onYearChange?: flatpickr.Options.Hook;
+  onReady?: flatpickr.Options.Hook;
+  onValueUpdate?: flatpickr.Options.Hook;
+  onDayCreate?: flatpickr.Options.Hook;
+  value?: string | Date | number | Array<string | Date | number>;
+  children?: JSX.Element;
 }
 
 export default class DatePicker extends Component<DateTimePickerProps> {}

From 5baad0aabf25ca9416d93f06c479d8c6e790a938 Mon Sep 17 00:00:00 2001
From: Tyler <tyler.evans116@gmail.com>
Date: Thu, 29 Nov 2018 11:48:28 -0700
Subject: [PATCH 446/836] react-flatpickr remove patch version

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

diff --git a/types/react-flatpickr/index.d.ts b/types/react-flatpickr/index.d.ts
index 973f30efc9..9f60b4d7be 100644
--- a/types/react-flatpickr/index.d.ts
+++ b/types/react-flatpickr/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for react-flatpickr 3.6.4
+// Type definitions for react-flatpickr 3.6
 // Project: https://github.com/coderhaoxin/react-flatpickr
 // Definitions by: begincalendar <https://github.com/begincalendar>
 //                 snaveevans <https://github.com/snaveevans>
@@ -9,18 +9,18 @@ import { Component } from "react";
 import flatpickr from "flatpickr";
 
 export interface DateTimePickerProps {
-  defaultValue?: string;
-  options?: flatpickr.Options.Options;
-  onChange?: flatpickr.Options.Hook;
-  onOpen?: flatpickr.Options.Hook;
-  onClose?: flatpickr.Options.Hook;
-  onMonthChange?: flatpickr.Options.Hook;
-  onYearChange?: flatpickr.Options.Hook;
-  onReady?: flatpickr.Options.Hook;
-  onValueUpdate?: flatpickr.Options.Hook;
-  onDayCreate?: flatpickr.Options.Hook;
-  value?: string | Date | number | Array<string | Date | number>;
-  children?: JSX.Element;
+    defaultValue?: string;
+    options?: flatpickr.Options.Options;
+    onChange?: flatpickr.Options.Hook;
+    onOpen?: flatpickr.Options.Hook;
+    onClose?: flatpickr.Options.Hook;
+    onMonthChange?: flatpickr.Options.Hook;
+    onYearChange?: flatpickr.Options.Hook;
+    onReady?: flatpickr.Options.Hook;
+    onValueUpdate?: flatpickr.Options.Hook;
+    onDayCreate?: flatpickr.Options.Hook;
+    value?: string | Date | number | Array<string | Date | number>;
+    children?: JSX.Element;
 }
 
 export default class DatePicker extends Component<DateTimePickerProps> {}

From 47b4772299affae7d56351a46668c9624d3b0aba Mon Sep 17 00:00:00 2001
From: Tyler <tyler.evans116@gmail.com>
Date: Thu, 29 Nov 2018 12:01:10 -0700
Subject: [PATCH 447/836] react-flatpickr use ReadonlyArray

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

diff --git a/types/react-flatpickr/index.d.ts b/types/react-flatpickr/index.d.ts
index 9f60b4d7be..f9b817bd00 100644
--- a/types/react-flatpickr/index.d.ts
+++ b/types/react-flatpickr/index.d.ts
@@ -19,7 +19,7 @@ export interface DateTimePickerProps {
     onReady?: flatpickr.Options.Hook;
     onValueUpdate?: flatpickr.Options.Hook;
     onDayCreate?: flatpickr.Options.Hook;
-    value?: string | Date | number | Array<string | Date | number>;
+    value?: string | Date | number | ReadonlyArray<string | Date | number>;
     children?: JSX.Element;
 }
 

From 2100292089ba9dee0667b756c02774108b5f696e Mon Sep 17 00:00:00 2001
From: Javier Gonzalez <xaviergonz@users.noreply.github.com>
Date: Thu, 29 Nov 2018 21:07:23 +0100
Subject: [PATCH 448/836] [socket.io] add overload for origins method

As seen in https://socket.io/docs/server-api/#server-origins-fn
---
 types/socket.io/index.d.ts | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/types/socket.io/index.d.ts b/types/socket.io/index.d.ts
index f5e6c5fd00..d32fcaade6 100644
--- a/types/socket.io/index.d.ts
+++ b/types/socket.io/index.d.ts
@@ -143,6 +143,17 @@ declare namespace SocketIO {
 		origins( v: string|string[] ): Server;
 
 		/**
+		 * Provides a function taking two arguments origin:String
+         * and callback(error, success), where success is a boolean
+         * value indicating whether origin is allowed or not. If
+         * success is set to false, error must be provided as a string
+         * value that will be appended to the server response, e.g. “Origin not allowed”.
+		 * @param fn The function that will be called to check the origin
+		 * return This Server
+		 */
+		origins( fn: ( origin: string, callback: ( error: string | null, success: boolean ) => void ) => void ): Server;
+
+        /**
 		 * Attaches socket.io to a server
 		 * @param srv The http.Server that we want to attach to
 		 * @param opts An optional parameters object

From 278797da32ebf66fa7bea64cbae7251b074cfa12 Mon Sep 17 00:00:00 2001
From: Alex Jerabek <aljerabe@microsoft.com>
Date: Thu, 29 Nov 2018 12:08:44 -0800
Subject: [PATCH 449/836] Fix HTML brackets

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

diff --git a/types/office-js/index.d.ts b/types/office-js/index.d.ts
index 6df2026b54..3e7f64375f 100644
--- a/types/office-js/index.d.ts
+++ b/types/office-js/index.d.ts
@@ -3282,10 +3282,10 @@ declare namespace Office {
          *  <table>
          *   <tr><th>                             </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th><th> Office for Mac </th></tr>
          *   <tr><td><strong> Access     </strong></td><td>                            </td><td> Y                          </td><td>                 </td><td>                </td></tr>
-         *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td><</tr>
-         *   <tr><td><strong> OneNote    </strong></td><td>                            </td><td> Y                          </td><td>                 </td><td>                </td><</tr>
-         *   <tr><td><strong> PowerPoint </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td><</tr>
-         *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td><</tr>
+         *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td></tr>
+         *   <tr><td><strong> OneNote    </strong></td><td>                            </td><td> Y                          </td><td>                 </td><td>                </td></tr>
+         *   <tr><td><strong> PowerPoint </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td></tr>
+         *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td></tr>
          *  </table>
          */
         settings: Settings;
@@ -4699,8 +4699,8 @@ declare namespace Office {
         *  <table>
         *   <tr><th>                         </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th><th> Office for Mac </th></tr>
         *   <tr><td><strong> Access </strong></td><td>                            </td><td> Y                          </td><td>                 </td><td>                </td></tr>
-        *   <tr><td><strong> Excel  </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td><</tr>
-        *   <tr><td><strong> Word   </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td><</tr>
+        *   <tr><td><strong> Excel  </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td></tr>
+        *   <tr><td><strong> Word   </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td></tr>
         *  </table>
         */
         columnCount: number;
@@ -4721,8 +4721,8 @@ declare namespace Office {
         *  <table>
         *   <tr><th>                         </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th><th> Office for Mac </th></tr>
         *   <tr><td><strong> Access </strong></td><td>                            </td><td> Y                          </td><td>                 </td><td>                </td></tr>
-        *   <tr><td><strong> Excel  </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td><</tr>
-        *   <tr><td><strong> Word   </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td><</tr>
+        *   <tr><td><strong> Excel  </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td></tr>
+        *   <tr><td><strong> Word   </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td></tr>
         *  </table>
         */
         hasHeaders: boolean;
@@ -4756,8 +4756,8 @@ declare namespace Office {
         *  <table>
         *   <tr><th>                         </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th><th> Office for Mac </th></tr>
         *   <tr><td><strong> Access </strong></td><td>                            </td><td> Y                          </td><td>                 </td><td>                </td></tr>
-        *   <tr><td><strong> Excel  </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td><</tr>
-        *   <tr><td><strong> Word   </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td><</tr>
+        *   <tr><td><strong> Excel  </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td></tr>
+        *   <tr><td><strong> Word   </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td></tr>
         *  </table>
         */
         rowCount: number;
@@ -4795,8 +4795,8 @@ declare namespace Office {
          *  <table>
          *   <tr><th>                         </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th><th> Office for Mac </th></tr>
          *   <tr><td><strong> Access </strong></td><td>                            </td><td> Y                          </td><td>                 </td><td>                </td></tr>
-         *   <tr><td><strong> Excel  </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td><</tr>
-         *   <tr><td><strong> Word   </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td><</tr>
+         *   <tr><td><strong> Excel  </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td></tr>
+         *   <tr><td><strong> Word   </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td></tr>
          *  </table>
          *
          * @param tableData An array of arrays ("matrix") or a TableData object that contains one or more columns of data to add to the table. Required.
@@ -4835,8 +4835,8 @@ declare namespace Office {
          *  <table>
          *   <tr><th>                         </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th><th> Office for Mac </th></tr>
          *   <tr><td><strong> Access </strong></td><td>                            </td><td> Y                          </td><td>                 </td><td>                </td></tr>
-         *   <tr><td><strong> Excel  </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td><</tr>
-         *   <tr><td><strong> Word   </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td><</tr>
+         *   <tr><td><strong> Excel  </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td></tr>
+         *   <tr><td><strong> Word   </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td></tr>
          *  </table>
          *
          * @param rows An array of arrays ("matrix") or a TableData object that contains one or more rows of data to add to the table. Required.
@@ -4863,8 +4863,8 @@ declare namespace Office {
          *  <table>
          *   <tr><th>                         </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th><th> Office for Mac </th></tr>
          *   <tr><td><strong> Access </strong></td><td>                            </td><td> Y                          </td><td>                 </td><td>                </td></tr>
-         *   <tr><td><strong> Excel  </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td><</tr>
-         *   <tr><td><strong> Word   </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td><</tr>
+         *   <tr><td><strong> Excel  </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td></tr>
+         *   <tr><td><strong> Word   </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td> Y              </td></tr>
          *  </table>
          *
          * @param options Provides an option for preserving context data of any type, unchanged, for use in a callback.

From 70368743cc57f09eb5496e417014b260e2517418 Mon Sep 17 00:00:00 2001
From: Javier Gonzalez <xaviergonz@users.noreply.github.com>
Date: Thu, 29 Nov 2018 21:10:45 +0100
Subject: [PATCH 450/836] fixed indentation

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

diff --git a/types/socket.io/index.d.ts b/types/socket.io/index.d.ts
index d32fcaade6..792fb85167 100644
--- a/types/socket.io/index.d.ts
+++ b/types/socket.io/index.d.ts
@@ -144,10 +144,10 @@ declare namespace SocketIO {
 
 		/**
 		 * Provides a function taking two arguments origin:String
-         * and callback(error, success), where success is a boolean
-         * value indicating whether origin is allowed or not. If
-         * success is set to false, error must be provided as a string
-         * value that will be appended to the server response, e.g. “Origin not allowed”.
+		 * and callback(error, success), where success is a boolean
+		 * value indicating whether origin is allowed or not. If
+		 * success is set to false, error must be provided as a string
+		 * value that will be appended to the server response, e.g. “Origin not allowed”.
 		 * @param fn The function that will be called to check the origin
 		 * return This Server
 		 */

From 8cdfef9948972883fe751a3fcb2c5d0badc29a76 Mon Sep 17 00:00:00 2001
From: Javier Gonzalez <xaviergonz@users.noreply.github.com>
Date: Thu, 29 Nov 2018 21:11:28 +0100
Subject: [PATCH 451/836] fixed indentation again

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

diff --git a/types/socket.io/index.d.ts b/types/socket.io/index.d.ts
index 792fb85167..1a2fb802e6 100644
--- a/types/socket.io/index.d.ts
+++ b/types/socket.io/index.d.ts
@@ -153,7 +153,7 @@ declare namespace SocketIO {
 		 */
 		origins( fn: ( origin: string, callback: ( error: string | null, success: boolean ) => void ) => void ): Server;
 
-        /**
+    /**
 		 * Attaches socket.io to a server
 		 * @param srv The http.Server that we want to attach to
 		 * @param opts An optional parameters object

From b3461ed26b0f4c6bc3d99fa4d1919eba4635a27d Mon Sep 17 00:00:00 2001
From: Javier Gonzalez <xaviergonz@users.noreply.github.com>
Date: Thu, 29 Nov 2018 21:12:16 +0100
Subject: [PATCH 452/836] and fixed indentation once more

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

diff --git a/types/socket.io/index.d.ts b/types/socket.io/index.d.ts
index 1a2fb802e6..e0abb6e972 100644
--- a/types/socket.io/index.d.ts
+++ b/types/socket.io/index.d.ts
@@ -153,7 +153,7 @@ declare namespace SocketIO {
 		 */
 		origins( fn: ( origin: string, callback: ( error: string | null, success: boolean ) => void ) => void ): Server;
 
-    /**
+		/**
 		 * Attaches socket.io to a server
 		 * @param srv The http.Server that we want to attach to
 		 * @param opts An optional parameters object

From 3bc0b5bec959415292efd71bf5c188eb170b550e Mon Sep 17 00:00:00 2001
From: Tyler <tyler.evans116@gmail.com>
Date: Thu, 29 Nov 2018 13:25:36 -0700
Subject: [PATCH 453/836] react-flatpickr allow Element array

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

diff --git a/types/react-flatpickr/index.d.ts b/types/react-flatpickr/index.d.ts
index f9b817bd00..5e3b12fdf8 100644
--- a/types/react-flatpickr/index.d.ts
+++ b/types/react-flatpickr/index.d.ts
@@ -20,7 +20,7 @@ export interface DateTimePickerProps {
     onValueUpdate?: flatpickr.Options.Hook;
     onDayCreate?: flatpickr.Options.Hook;
     value?: string | Date | number | ReadonlyArray<string | Date | number>;
-    children?: JSX.Element;
+    children?: JSX.Element | JSX.Element[];
 }
 
 export default class DatePicker extends Component<DateTimePickerProps> {}

From 0ccda5781a317728dc62b4889daac7f8a1b396b0 Mon Sep 17 00:00:00 2001
From: Tyler <tyler.evans116@gmail.com>
Date: Thu, 29 Nov 2018 13:31:29 -0700
Subject: [PATCH 454/836] react-flatpickr test multiple elements

---
 types/react-flatpickr/react-flatpickr-tests.tsx | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/types/react-flatpickr/react-flatpickr-tests.tsx b/types/react-flatpickr/react-flatpickr-tests.tsx
index ce7122a47f..c51f527707 100644
--- a/types/react-flatpickr/react-flatpickr-tests.tsx
+++ b/types/react-flatpickr/react-flatpickr-tests.tsx
@@ -46,3 +46,10 @@ const wrappedElement = (
         <input type="text" />
     </DatePicker>
 );
+
+const wrappedElements = (
+    <DatePicker>
+        <input type="text" />
+        <button data-clear>delete</button>
+    </DatePicker>
+);

From 56761f59b80614fbfc67fd190cbe11f9461f4919 Mon Sep 17 00:00:00 2001
From: Dobes Vandermeer <dobesv@gmail.com>
Date: Thu, 29 Nov 2018 12:40:58 -0800
Subject: [PATCH 455/836] Add hint to CollectionAggregationOptions

Although this option is, for some reason, not document.  It is supported.

It follows the format specified here:

https://docs.mongodb.com/manual/reference/command/aggregate/
---
 types/mongodb/index.d.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/types/mongodb/index.d.ts b/types/mongodb/index.d.ts
index b31a8dd7b9..11d425dc30 100644
--- a/types/mongodb/index.d.ts
+++ b/types/mongodb/index.d.ts
@@ -1294,6 +1294,7 @@ export interface CollectionAggregationOptions {
      * Allow driver to bypass schema validation in MongoDB 3.2 or higher.
      */
     bypassDocumentValidation?: boolean;
+    hint?: string | Object;   
     raw?: boolean;
     promoteLongs?: boolean;
     promoteValues?: boolean;

From b4d06b7f3e785e70d824103c6974589ac1f80a98 Mon Sep 17 00:00:00 2001
From: Samuel Thompson <samuel.thompson@ssurveysampling.com>
Date: Thu, 29 Nov 2018 14:47:13 -0700
Subject: [PATCH 456/836] added various events and variable around

---
 types/sip.js/index.d.ts | 45 ++++++++++++++++++++++++++++++++---------
 1 file changed, 35 insertions(+), 10 deletions(-)

diff --git a/types/sip.js/index.d.ts b/types/sip.js/index.d.ts
index 65466ee840..b364074e07 100644
--- a/types/sip.js/index.d.ts
+++ b/types/sip.js/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for sip.js 0.8
+// Type definitions for sip.js 0.9
 // Project: http://sipjs.com
 // Definitions by: Kir Dergachev <https://github.com/decyrus>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -75,6 +75,8 @@ export namespace C {
 export type DescriptionModifier = (description: RTCSessionDescription) => Promise<RTCSessionDescription>;
 
 export interface SessionDescriptionHandler {
+    peerConnection: any;
+
     getDescription(options: SessionDescriptionHandlerParameters, modifiers: DescriptionModifier[]): Promise<any>;
     setDescription(sessionDescription: string, options: SessionDescriptionHandlerParameters, modifiers: DescriptionModifier[]): Promise<any>;
     hasDescription: (contentType: string) => boolean;
@@ -128,11 +130,17 @@ export interface Session {
     on(name: 'accepted', callback: (data: { code: number, response: IncomingResponse }) => void): void;
     on(name: 'failed' | 'rejected', callback: (response: IncomingResponse, cause: string) => void): void;
     on(name: 'terminated', callback: (message: IncomingResponse, cause: string) => void): void;
-    on(name: 'cancel' | string, callback: () => void): void;
-    on(name: 'replaced', callback: (newSession: Session) => void): void;
+    on(name: 'cancel' | 'directionChanged' | 'trackAdded' | 'SessionDescriptionHandler-created' | string, callback: () => void): void;
+    on(name: 'replaced' | 'reinvite', callback: (newSession: Session) => void): void;
     on(name: 'dtmf', callback: (request: IncomingRequest, dtmf: Session.DTMF) => void): void;
     on(name: 'muted' | 'unmuted', callback: (data: Session.Muted) => void): void;
     on(name: 'refer' | 'bye', callback: (request: IncomingRequest) => void): void;
+    on(name: 'referRequested', callback: (request: ClientContext | ServerContext) => void): void;
+
+    /*    these come from the ClientContext that is on the session somehow */
+    on(name: 'referAccepted' | 'referRejected' | 'referRequestAccepted' | 'referRequestRejected' | 'referProgress',
+        callback: (ClientContext: ClientContext) => void): void;
+    on(name: 'notify', callback: (request: IncomingRequest) => void): void;
 }
 
 export namespace Session {
@@ -164,7 +172,10 @@ export namespace Session {
         };
     }
 
-    interface DTMF extends Object { }
+    interface DTMF extends Object {
+        direction: string | 'incoming';
+        tone: any;
+    }
 
     interface Muted {
         audio?: boolean;
@@ -364,27 +375,40 @@ export interface Subscription extends ClientContext {
 }
 
 /* Context */
-export interface Context {
+export class Context {
     ua: UA;
     method: string;
     request: OutgoingRequest;
     localIdentity: NameAddrHeader;
     remoteIdentity: NameAddrHeader;
     data: {};
+}
+
+export class ClientContext extends Context {
+    cancel(options?: { status_code?: number, reason_phrase?: string }): ClientContext;
+
+    //This exists on all Context, but I cant make it work right
     on(name: 'progress' | 'accepted' | 'rejected' | 'failed', callback: (response: IncomingMessage, cause: string) => void): void;
     on(name: 'notify', callback: (request: IncomingRequest) => void): void;
     on(name: string, callback: () => void): void;
+
+    on(name: 'referAccepted' | 'referRejected' | 'referRequestAccepted' | 'referRequestRejected' | 'referProgress',
+        callback: (ClientContext: ClientContext) => void): void;
 }
 
-export interface ClientContext extends Context {
-    cancel(options?: { status_code?: number, reason_phrase?: string }): ClientContext;
-}
-
-export interface ServerContext extends Context {
+export class ServerContext extends Context {
     progress(options?: Session.ProgressOptions): void;
     accept(options?: Session.AcceptOptions): void;
     reject(options?: Session.CommonOptions): void;
     reply(options?: Session.CommonOptions): void;
+
+    //This exists on all Context, but I cant make it work right
+    on(name: 'progress' | 'accepted' | 'rejected' | 'failed', callback: (response: IncomingMessage, cause: string) => void): void;
+    on(name: 'notify', callback: (request: IncomingRequest) => void): void;
+    on(name: string, callback: () => void): void;
+
+    on(name: 'referRequestAccepted' | 'referRequestRejected' | 'referInviteSent' | 'referProgress' | 'referAccepted' | 'referRejected',
+        callback: (ServerContext: ServerContext) => void): void;
 }
 
 /* Request */
@@ -398,6 +422,7 @@ export interface OutgoingRequest extends Request {
 }
 
 export interface IncomingResponse extends Request {
+    reason_phrase: string | 'Ringing';
 }
 
 export interface IncomingMessage extends Request {

From 87bc38c4bda08dc6255e733cf8748dd1a84d0829 Mon Sep 17 00:00:00 2001
From: Samuel Thompson <samuel.thompson@ssurveysampling.com>
Date: Thu, 29 Nov 2018 14:50:08 -0700
Subject: [PATCH 457/836] oops

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

diff --git a/types/sip.js/index.d.ts b/types/sip.js/index.d.ts
index b364074e07..7ca7c2eb98 100644
--- a/types/sip.js/index.d.ts
+++ b/types/sip.js/index.d.ts
@@ -134,13 +134,12 @@ export interface Session {
     on(name: 'replaced' | 'reinvite', callback: (newSession: Session) => void): void;
     on(name: 'dtmf', callback: (request: IncomingRequest, dtmf: Session.DTMF) => void): void;
     on(name: 'muted' | 'unmuted', callback: (data: Session.Muted) => void): void;
-    on(name: 'refer' | 'bye', callback: (request: IncomingRequest) => void): void;
+    on(name: 'refer' | 'bye' | 'notify', callback: (request: IncomingRequest) => void): void;
     on(name: 'referRequested', callback: (request: ClientContext | ServerContext) => void): void;
 
     /*    these come from the ClientContext that is on the session somehow */
     on(name: 'referAccepted' | 'referRejected' | 'referRequestAccepted' | 'referRequestRejected' | 'referProgress',
         callback: (ClientContext: ClientContext) => void): void;
-    on(name: 'notify', callback: (request: IncomingRequest) => void): void;
 }
 
 export namespace Session {
@@ -387,7 +386,7 @@ export class Context {
 export class ClientContext extends Context {
     cancel(options?: { status_code?: number, reason_phrase?: string }): ClientContext;
 
-    //This exists on all Context, but I cant make it work right
+    // This exists on all Context, but I cant make it work right
     on(name: 'progress' | 'accepted' | 'rejected' | 'failed', callback: (response: IncomingMessage, cause: string) => void): void;
     on(name: 'notify', callback: (request: IncomingRequest) => void): void;
     on(name: string, callback: () => void): void;
@@ -402,7 +401,7 @@ export class ServerContext extends Context {
     reject(options?: Session.CommonOptions): void;
     reply(options?: Session.CommonOptions): void;
 
-    //This exists on all Context, but I cant make it work right
+    // This exists on all Context, but I cant make it work right
     on(name: 'progress' | 'accepted' | 'rejected' | 'failed', callback: (response: IncomingMessage, cause: string) => void): void;
     on(name: 'notify', callback: (request: IncomingRequest) => void): void;
     on(name: string, callback: () => void): void;

From 03ae76d4ec1efd6f1ee51d9f8861ec284b808ed2 Mon Sep 17 00:00:00 2001
From: Hernan Rajchert <hrajchert@gmail.com>
Date: Thu, 29 Nov 2018 18:54:27 -0300
Subject: [PATCH 458/836] chore: update definitions

Update definitions to match those defined by the library author
---
 types/unist/index.d.ts     | 39 ++++++++++++++++++++++++++++++--------
 types/unist/unist-tests.ts |  2 --
 2 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/types/unist/index.d.ts b/types/unist/index.d.ts
index 7433ddcc13..389b26e04f 100644
--- a/types/unist/index.d.ts
+++ b/types/unist/index.d.ts
@@ -1,40 +1,63 @@
 // Type definitions for Unist 2.0
-// Project: https://github.com/syntax-tree/unist
+// Project: https://github.com/syntax-tree/unist-ts
 // Definitions by: bizen241 <https://github.com/bizen241>
 //                 Jun Lu <https://github.com/lujun2>
+//                 Hernan Rajchert <https://github.com/hrajchert>
+//                 Titus Wormer <https://github.com/wooorm>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.4
+// TypeScript Version: 3.1
 
+export as namespace Unist
+
+// Syntactic units in unist syntax trees are called nodes.
 export interface Node {
+    // The variant of a node.
     type: string;
+
+    // Information from the ecosystem.
     data?: Data;
+
+    // Location of a node in a source document.
+    // Must not be present if a node is generated.
     position?: Position;
 }
 
 export interface Data {
-    [key: string]: any;
+    [key: string]: unknown;
 }
 
+// Location of a node in a source file.
 export interface Position {
+    // Place of the first character of the parsed source region.
     start: Point;
+
+    // Place of the first character after the parsed source region.
     end: Point;
-    /** >= 1 */
-    indent?: number[];
+
+    // Start column at each index (plus start line) in the source region,
+    // for elements that span multiple lines.
+    indent: number[];
 }
 
+// One place in a source file.
 export interface Point {
-    /** >= 1 */
+    // Line in a source file (1-indexed integer).
     line: number;
-    /** >= 1 */
+
+    // Column in a source file (1-indexed integer).
     column: number;
-    /** >= 0 */
+
+    // Character in a source file (0-indexed integer).
     offset?: number;
 }
 
+// Nodes containing other nodes.
 export interface Parent extends Node {
+    // List representing the children of a node.
     children: Node[];
 }
 
+// Nodes containing a value.
 export interface Literal extends Node {
     value: any;
 }
diff --git a/types/unist/unist-tests.ts b/types/unist/unist-tests.ts
index 3cb69bcc76..9ba2dc06d5 100644
--- a/types/unist/unist-tests.ts
+++ b/types/unist/unist-tests.ts
@@ -1,5 +1,3 @@
-import * as Unist from 'unist';
-
 const data: Unist.Data = {
     string: 'string',
     number: 1,

From 2da1cef96f96157493360f98c607343ed90f6677 Mon Sep 17 00:00:00 2001
From: Hernan Rajchert <hrajchert@gmail.com>
Date: Thu, 29 Nov 2018 19:40:11 -0300
Subject: [PATCH 459/836] fix: unist ts version

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

diff --git a/types/unist/index.d.ts b/types/unist/index.d.ts
index 389b26e04f..55bea58e47 100644
--- a/types/unist/index.d.ts
+++ b/types/unist/index.d.ts
@@ -5,7 +5,7 @@
 //                 Hernan Rajchert <https://github.com/hrajchert>
 //                 Titus Wormer <https://github.com/wooorm>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 3.1
+// TypeScript Version: 3.0
 
 export as namespace Unist
 

From 221e85cc38797c6ac9845c134d35a21d8c40249a Mon Sep 17 00:00:00 2001
From: Mark Wolff <marwolff@microsoft.com>
Date: Thu, 29 Nov 2018 14:49:05 -0800
Subject: [PATCH 460/836] Add properties and measurements to trackDependency

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

diff --git a/types/applicationinsights-js/applicationinsights-js-tests.ts b/types/applicationinsights-js/applicationinsights-js-tests.ts
index c2adb63a30..ab52eb1537 100644
--- a/types/applicationinsights-js/applicationinsights-js-tests.ts
+++ b/types/applicationinsights-js/applicationinsights-js-tests.ts
@@ -47,7 +47,7 @@ appInsights = {
     startTrackEvent(name: string) { return null; },
     stopTrackEvent(name: string, properties?: { [name: string]: string; }, measurements?: { [name: string]: number; }) { return null; },
     trackEvent(name: string, properties?: { [name: string]: string; }, measurements?: { [name: string]: number; }) { return null; },
-    trackDependency(id: string, method: string, absoluteUrl: string, pathName: string, totalTime: number, success: boolean, resultCode: number) { return null; },
+    trackDependency(id: string, method: string, absoluteUrl: string, pathName: string, totalTime: number, success: boolean, resultCode: number, properties?: Object, measurements?: Object) { return null; },
     trackException(exception: Error, handledAt?: string, properties?: { [name: string]: string; }, measurements?: { [name: string]: number; }, severityLevel?: AI.SeverityLevel) { return null; },
     trackMetric(name: string, average: number, sampleCount?: number, min?: number, max?: number, properties?: { [name: string]: string; }) { return null; },
     trackTrace(message: string, properties?: { [name: string]: string; }, severityLevel?: AI.SeverityLevel) { return null; },
diff --git a/types/applicationinsights-js/index.d.ts b/types/applicationinsights-js/index.d.ts
index ecfef55052..516556b8d3 100644
--- a/types/applicationinsights-js/index.d.ts
+++ b/types/applicationinsights-js/index.d.ts
@@ -732,8 +732,10 @@ declare module Microsoft.ApplicationInsights {
          * @param   totalTime total request time
          * @param   success   indicates if the request was sessessful
          * @param   resultCode    response code returned by the dependency request
+         * @param   properties    map[string, string] - additional data used to filter events and metrics in the portal. Defaults to empty.
+         * @param   measurements  map[string, number] - metrics associated with this event, displayed in Metrics Explorer on the portal. Defaults to empty.
          */
-        trackDependency(id: string, method: string, absoluteUrl: string, pathName: string, totalTime: number, success: boolean, resultCode: number): any;
+        trackDependency(id: string, method: string, absoluteUrl: string, pathName: string, totalTime: number, success: boolean, resultCode: number, properties?: Object, measurements?: Object): any;
         /**
          * Log an exception you have caught.
          * @param   exception   An Error from a catch clause, or the string error message.

From 5cce7fcb72b3a986f1315855d03503bb609263aa Mon Sep 17 00:00:00 2001
From: Mark Wolff <marwolff@microsoft.com>
Date: Thu, 29 Nov 2018 14:52:50 -0800
Subject: [PATCH 461/836] Add properties tests

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

diff --git a/types/applicationinsights-js/applicationinsights-js-tests.ts b/types/applicationinsights-js/applicationinsights-js-tests.ts
index ab52eb1537..d0e8b4eaaf 100644
--- a/types/applicationinsights-js/applicationinsights-js-tests.ts
+++ b/types/applicationinsights-js/applicationinsights-js-tests.ts
@@ -86,7 +86,7 @@ appInsights.trackTrace("message", null);
 appInsights.trackTrace("message", { a: '1', b: '2' }, AI.SeverityLevel.Error);
 
 // trackDependency
-appInsights.trackDependency("id", "POST", "http://example.com/test/abc", "/test/abc", null, true, null);
+appInsights.trackDependency("id", "POST", "http://example.com/test/abc", "/test/abc", null, true, null, {prop1: 'abc'}, {meas1: 4.5});
 
 // flush
 appInsights.flush();

From c5896588bfef15fd92daee5d76d38c73006b5a5f Mon Sep 17 00:00:00 2001
From: Mark Wolff <marwolff@microsoft.com>
Date: Thu, 29 Nov 2018 15:30:05 -0800
Subject: [PATCH 462/836] Reduce line length

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

diff --git a/types/applicationinsights-js/applicationinsights-js-tests.ts b/types/applicationinsights-js/applicationinsights-js-tests.ts
index d0e8b4eaaf..de6de9a2c6 100644
--- a/types/applicationinsights-js/applicationinsights-js-tests.ts
+++ b/types/applicationinsights-js/applicationinsights-js-tests.ts
@@ -47,7 +47,8 @@ appInsights = {
     startTrackEvent(name: string) { return null; },
     stopTrackEvent(name: string, properties?: { [name: string]: string; }, measurements?: { [name: string]: number; }) { return null; },
     trackEvent(name: string, properties?: { [name: string]: string; }, measurements?: { [name: string]: number; }) { return null; },
-    trackDependency(id: string, method: string, absoluteUrl: string, pathName: string, totalTime: number, success: boolean, resultCode: number, properties?: Object, measurements?: Object) { return null; },
+    trackDependency(id: string, method: string, absoluteUrl: string, pathName: string, totalTime: number, success: boolean,
+        resultCode: number, properties?: { [name: string]: string }, measurements?: { [name: string]: number }) { return null; },
     trackException(exception: Error, handledAt?: string, properties?: { [name: string]: string; }, measurements?: { [name: string]: number; }, severityLevel?: AI.SeverityLevel) { return null; },
     trackMetric(name: string, average: number, sampleCount?: number, min?: number, max?: number, properties?: { [name: string]: string; }) { return null; },
     trackTrace(message: string, properties?: { [name: string]: string; }, severityLevel?: AI.SeverityLevel) { return null; },
diff --git a/types/applicationinsights-js/index.d.ts b/types/applicationinsights-js/index.d.ts
index 516556b8d3..2959e6da39 100644
--- a/types/applicationinsights-js/index.d.ts
+++ b/types/applicationinsights-js/index.d.ts
@@ -735,7 +735,8 @@ declare module Microsoft.ApplicationInsights {
          * @param   properties    map[string, string] - additional data used to filter events and metrics in the portal. Defaults to empty.
          * @param   measurements  map[string, number] - metrics associated with this event, displayed in Metrics Explorer on the portal. Defaults to empty.
          */
-        trackDependency(id: string, method: string, absoluteUrl: string, pathName: string, totalTime: number, success: boolean, resultCode: number, properties?: Object, measurements?: Object): any;
+        trackDependency(id: string, method: string, absoluteUrl: string, pathName: string, totalTime: number, success: boolean, resultCode: number,
+            properties?: { [name: string]: string }, measurements?: { [name: string]: number }): any;
         /**
          * Log an exception you have caught.
          * @param   exception   An Error from a catch clause, or the string error message.

From 09b6f76746fa597d9bbbfea4cc32806d17349cf8 Mon Sep 17 00:00:00 2001
From: Law Smith <lawsumisu@gmail.com>
Date: Thu, 29 Nov 2018 16:45:28 -0800
Subject: [PATCH 463/836] Added support for params when starting sagaTester.

---
 types/redux-saga-tester/index.d.ts            | 28 +++----
 types/redux-saga-tester/package.json          |  7 ++
 .../redux-saga-tester-tests.ts                | 74 ++++++++++++-------
 3 files changed, 65 insertions(+), 44 deletions(-)
 create mode 100644 types/redux-saga-tester/package.json

diff --git a/types/redux-saga-tester/index.d.ts b/types/redux-saga-tester/index.d.ts
index fda97e494b..5778edf1bd 100644
--- a/types/redux-saga-tester/index.d.ts
+++ b/types/redux-saga-tester/index.d.ts
@@ -1,27 +1,19 @@
 // Type definitions for redux-saga-tester 1.0
 // Project: https://github.com/wix/redux-saga-tester#readme
-// Definitions by: Ben Lorantfy <https://github.com/BenLorantfy>
+// Definitions by: Ben Lorantfy <https://github.com/BenLorantfy>, Law Smith <https://github.com/lawsumisu>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.4
+
+import {Task} from 'redux-saga';
+import {AnyAction, Middleware, Reducer, ReducersMapObject} from 'redux';
 
-export interface AnyAction {
-    type: string;
-    [key: string]: any;
-}
-export type Reducer = (state: object, action: AnyAction) => object;
-export interface ReducerMap {
-    [key: string]: Reducer;
-}
-export type ReduxMiddleware = (options: { dispatch: (action: AnyAction) => void, getState: () => object })
-    => (next: (action: AnyAction) => any)
-    => any;
 export type SagaFunction = (...args: any[]) => any;
 
-export interface SagaTesterOptions<StateType extends object> {
+export interface SagaTesterOptions<StateType> {
     initialState?: StateType;
-    reducers?: ReducerMap|Reducer;
-    middlewares?: ReduxMiddleware[];
-    combineReducers?: (map: ReducerMap) => Reducer;
+    reducers?: ReducersMapObject | Reducer<StateType>;
+    middlewares?: Middleware[];
+    combineReducers?: (map: ReducersMapObject) => Reducer<StateType>;
     ignoreReduxActions?: boolean;
     options?: object;
 }
@@ -32,7 +24,7 @@ export default class SagaTester<StateType extends object> {
     /**
      * Starts execution of the provided saga.
      */
-    start(saga: SagaFunction): void;
+    start(saga: SagaFunction, ...args: any[]): Task;
 
     /**
      * Dispatches an action to the redux store.
diff --git a/types/redux-saga-tester/package.json b/types/redux-saga-tester/package.json
new file mode 100644
index 0000000000..8d41143894
--- /dev/null
+++ b/types/redux-saga-tester/package.json
@@ -0,0 +1,7 @@
+{
+  "private": true,
+  "dependencies": {
+    "redux": "^3.7.2",
+    "redux-saga": "^0.15.3"
+  }
+}
diff --git a/types/redux-saga-tester/redux-saga-tester-tests.ts b/types/redux-saga-tester/redux-saga-tester-tests.ts
index 0dba716533..4cd9c001c9 100644
--- a/types/redux-saga-tester/redux-saga-tester-tests.ts
+++ b/types/redux-saga-tester/redux-saga-tester-tests.ts
@@ -2,62 +2,79 @@ import SagaTester from 'redux-saga-tester';
 
 // constructor with all options
 new SagaTester({
-  initialState: {
-    orders: [],
-  },
-  reducers: {
-    orders: (state, action) => state,
-  },
-  middlewares: [
-    ({ dispatch, getState }) => (next) => (action: { type: string }) => {
-      dispatch({ type: 'BLA' });
-      getState();
+    initialState: {
+        orders: [],
+    },
+    reducers: {
+        orders: (state, action) => state,
+    },
+    middlewares: [
+        ({dispatch, getState}) => (next) => (action) => {
+            dispatch({type: 'BLA'});
+            getState();
 
-      return next(action);
+            return next(action);
+        },
+    ],
+    ignoreReduxActions: false,
+    options: {
+        a: 23,
     },
-  ],
-  ignoreReduxActions: false,
-  options: {
-    a: 23,
-  },
 });
 
 // constructor with function as reducers
 new SagaTester({
-  reducers: (state, action) => state,
+    reducers: (state = {}, action) => state,
+});
+
+// constructor with reducer map
+new SagaTester({
+    reducers: {
+        a: (state, action) => state,
+        b: (state, action) => state,
+        c: (state, action) => state,
+    }
 });
 
 // constructor with no options
 interface MockStateType {
-  orders: Array<{ name: string }>;
+    orders: Array<{ name: string }>;
 }
-const sagaTester = new SagaTester<MockStateType>({ initialState: { orders: [] }});
+
+const sagaTester = new SagaTester<MockStateType>({initialState: {orders: []}});
 
 // start
 function* fakeSaga() {
-  return 23;
+    return 23;
+}
+
+function* fakeSagaWithParams(param1: string, param2: number) {
+    return param1.length > param2
 }
 
 sagaTester.start(fakeSaga);
+sagaTester.start(fakeSagaWithParams, 'foo', 3);
 
 // dispatch
-sagaTester.dispatch({ type: 'LOAD_ORDERS', orders: [] });
+sagaTester.dispatch({type: 'LOAD_ORDERS', orders: []});
 
 // updateState
-sagaTester.updateState({ orders: [] });
+sagaTester.updateState({orders: []});
 
 // getState
 sagaTester.getState().orders;
 
 // waitFor
-sagaTester.waitFor('LOAD_ORDERS').then(() => {});
-sagaTester.waitFor('LOAD_ORDERS', true).then(() => {});
+sagaTester.waitFor('LOAD_ORDERS').then(() => {
+});
+sagaTester.waitFor('LOAD_ORDERS', true).then(() => {
+});
 
 // wasCalled
-sagaTester.wasCalled("LOAD_ORDERS");
+sagaTester.wasCalled('LOAD_ORDERS');
 
 // numCalled
-sagaTester.numCalled("LOAD_ORDERS") === 1;
+sagaTester.numCalled('LOAD_ORDERS') === 1;
 
 // getLatestCalledAction
 sagaTester.getLatestCalledAction().type;
@@ -68,3 +85,8 @@ sagaTester.getCalledActions()[0].type;
 // getCalledActions
 sagaTester.reset();
 sagaTester.reset(true);
+
+// getState
+const state = sagaTester.getState();
+state.orders.length;
+state.orders[0].name;

From 8d5940c36bdd76ba364fa79271aff55cc8e0fc48 Mon Sep 17 00:00:00 2001
From: Law Smith <lawsumisu@gmail.com>
Date: Thu, 29 Nov 2018 17:50:40 -0800
Subject: [PATCH 464/836] Fixing linter errors.

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

diff --git a/types/redux-saga-tester/index.d.ts b/types/redux-saga-tester/index.d.ts
index 5778edf1bd..d7772626ef 100644
--- a/types/redux-saga-tester/index.d.ts
+++ b/types/redux-saga-tester/index.d.ts
@@ -4,8 +4,8 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.4
 
-import {Task} from 'redux-saga';
-import {AnyAction, Middleware, Reducer, ReducersMapObject} from 'redux';
+import { Task } from 'redux-saga';
+import { AnyAction, Middleware, Reducer, ReducersMapObject } from 'redux';
 
 export type SagaFunction = (...args: any[]) => any;
 
diff --git a/types/redux-saga-tester/redux-saga-tester-tests.ts b/types/redux-saga-tester/redux-saga-tester-tests.ts
index 4cd9c001c9..48eb490d0a 100644
--- a/types/redux-saga-tester/redux-saga-tester-tests.ts
+++ b/types/redux-saga-tester/redux-saga-tester-tests.ts
@@ -49,7 +49,7 @@ function* fakeSaga() {
 }
 
 function* fakeSagaWithParams(param1: string, param2: number) {
-    return param1.length > param2
+    return param1.length > param2;
 }
 
 sagaTester.start(fakeSaga);

From f68c66518bca72590b23358ca77bcb6e89c04b99 Mon Sep 17 00:00:00 2001
From: Nathan Mackinnon <nathan.mackinnon@activepipe.com>
Date: Fri, 30 Nov 2018 13:01:21 +1100
Subject: [PATCH 465/836] fix: adds type definition for color on LegendPayload

---
 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 34e3cbcb88..97bbdbf354 100644
--- a/types/recharts/index.d.ts
+++ b/types/recharts/index.d.ts
@@ -363,6 +363,7 @@ export interface LegendPayload {
     value: any;
     id: any;
     type: LegendType;
+    color?: string;
 }
 
 export type BBoxUpdateCallback = (box: { width: number; height: number; }) => void;

From 852e463c4ec0ed68f0695082a3329249b5e27750 Mon Sep 17 00:00:00 2001
From: Wong Yong Jie <yjwong92@gmail.com>
Date: Fri, 30 Nov 2018 10:58:36 +0800
Subject: [PATCH 466/836] oauth2orize: The DecisionParseFunction in decision()
 is optional.

See: https://github.com/jaredhanson/oauth2orize/blob/v1.8.0/lib/middleware/decision.js#L76
---
 types/oauth2orize/index.d.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/types/oauth2orize/index.d.ts b/types/oauth2orize/index.d.ts
index 798030c7d2..b3a62d01e4 100644
--- a/types/oauth2orize/index.d.ts
+++ b/types/oauth2orize/index.d.ts
@@ -99,6 +99,7 @@ export class OAuth2Server {
 
   decision(options: DecisionOptions, parse: DecisionParseFunction): MiddlewareFunction;
   decision(parse: DecisionParseFunction): MiddlewareFunction;
+  decision(): MiddlewareFunction;
 
   token(options?: any): MiddlewareFunction;
 

From 322728342726dd171e02d5d2ef0d9c47a96eea65 Mon Sep 17 00:00:00 2001
From: kingdaro <kingdaro@gmail.com>
Date: Fri, 30 Nov 2018 00:18:46 -0600
Subject: [PATCH 467/836] [react-facebook-login]: export props

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

diff --git a/types/react-facebook-login/index.d.ts b/types/react-facebook-login/index.d.ts
index 82672660a8..3ef679141e 100644
--- a/types/react-facebook-login/index.d.ts
+++ b/types/react-facebook-login/index.d.ts
@@ -6,7 +6,7 @@
 
 import * as React from "react";
 
-interface ReactFacebookLoginProps {
+export interface ReactFacebookLoginProps {
     appId: string;
     callback(userInfo: ReactFacebookLoginInfo): void;
     onFailure?(response: ReactFacebookFailureResponse): void;
diff --git a/types/react-facebook-login/react-facebook-login-tests.tsx b/types/react-facebook-login/react-facebook-login-tests.tsx
index d7b2ebcde8..2a1fede6dd 100644
--- a/types/react-facebook-login/react-facebook-login-tests.tsx
+++ b/types/react-facebook-login/react-facebook-login-tests.tsx
@@ -1,7 +1,6 @@
 import * as React from 'react';
 import * as ReactDOM from 'react-dom';
-
-import FacebookLogin, { ReactFacebookLoginInfo, ReactFacebookFailureResponse } from 'react-facebook-login';
+import FacebookLogin, { ReactFacebookFailureResponse, ReactFacebookLoginInfo, ReactFacebookLoginProps } from 'react-facebook-login';
 
 const responseFacebook = (response: ReactFacebookLoginInfo) => {
     console.log(response);
@@ -106,3 +105,9 @@ class MyComponent2 extends React.Component {
         );
     }
 }
+
+type FacebookLoginWrapperProps = ReactFacebookLoginProps & { className?: string }
+
+export const FacebookLoginWrapper = ({ className, ...props}: FacebookLoginWrapperProps) => (
+    <FacebookLogin {...props} cssClass={className} />
+)

From 5610636ad2e5dbf618f1ed8db8acb4d0407305a6 Mon Sep 17 00:00:00 2001
From: Matt McCutchen <matt@mattmccutchen.net>
Date: Fri, 30 Nov 2018 01:24:18 -0500
Subject: [PATCH 468/836] react: Improve type checking of component static
 properties. (#30730)

- Copy properties from ComponentClass to the Component class.

- Recommend the react-typescript-helpers package for checking the
  defaultProps and propTypes at a component definition.

- As a fallback, have JSX.LibraryManagedAttributes check the
  defaultProps and propTypes every time a component is used.

- Fix test failures in dependent packages.

Fixes #28515.
Fixes #16967.
---
 .../components/responsive.d.ts                |  30 ---
 types/react-select/lib/components/Menu.d.ts   |   6 -
 .../test/examples/CustomNoOptionsMessage.tsx  |   7 +-
 types/react-virtualized/dist/es/List.d.ts     |   2 +-
 types/react-virtualized/dist/es/Table.d.ts    |  79 +------
 types/react/index.d.ts                        | 126 ++++++++---
 types/react/test/managedAttributes.tsx        | 208 ++++++++++--------
 types/theming/index.d.ts                      |   2 +-
 8 files changed, 225 insertions(+), 235 deletions(-)

diff --git a/types/react-foundation/components/responsive.d.ts b/types/react-foundation/components/responsive.d.ts
index 94a915f2c8..9b3a8361ed 100644
--- a/types/react-foundation/components/responsive.d.ts
+++ b/types/react-foundation/components/responsive.d.ts
@@ -24,36 +24,6 @@ export declare class ResponsiveNavigation extends Component<ResponsiveNavigation
      */
     toggle(): void;
     render(): JSX.Element;
-    static propTypes: {
-        breakpoint: PropTypes.Validator<any>;
-        alignX: PropTypes.Requireable<any>;
-        alignY: PropTypes.Requireable<any>;
-        selfAlignX: PropTypes.Requireable<any>;
-        selfAlignY: PropTypes.Requireable<any>;
-        centerAlign: PropTypes.Requireable<any>;
-        flexContainer: PropTypes.Requireable<any>;
-        flexDirRow: PropTypes.Requireable<any>;
-        flexDirRowRev: PropTypes.Requireable<any>;
-        flexDirCol: PropTypes.Requireable<any>;
-        flexDirColRev: PropTypes.Requireable<any>;
-        flexChild: PropTypes.Requireable<any>;
-        flexOrder: PropTypes.Requireable<any>;
-        flexOrderSmall: PropTypes.Requireable<any>;
-        flexOrderMedium: PropTypes.Requireable<any>;
-        flexOrderLarge: PropTypes.Requireable<any>;
-        showFor: PropTypes.Requireable<any>;
-        showOnlyFor: PropTypes.Requireable<any>;
-        hideFor: PropTypes.Requireable<any>;
-        hideOnlyFor: PropTypes.Requireable<any>;
-        isHidden: PropTypes.Requireable<any>;
-        isInvisible: PropTypes.Requireable<any>;
-        showForLandscape: PropTypes.Requireable<any>;
-        showForPortrait: PropTypes.Requireable<any>;
-        showForSr: PropTypes.Requireable<any>;
-        showOnFocus: PropTypes.Requireable<any>;
-        isClearfix: PropTypes.Requireable<any>;
-        float: PropTypes.Requireable<any>;
-    };
     static defaultProps: {
         breakpoint: number;
     };
diff --git a/types/react-select/lib/components/Menu.d.ts b/types/react-select/lib/components/Menu.d.ts
index 387b538882..8c6e5fb6c8 100644
--- a/types/react-select/lib/components/Menu.d.ts
+++ b/types/react-select/lib/components/Menu.d.ts
@@ -67,9 +67,6 @@ export type MenuProps<OptionType> = CommonProps<OptionType> & {
 export function menuCSS(state: MenuState): React.CSSProperties;
 
 export class Menu<OptionType> extends Component<MenuProps<OptionType>, MenuState> {
-  static contextTypes: {
-    getPortalPlacement: (state: MenuState) => void,
-  };
   getPlacement: (ref: ElementRef<any>) => void;
   getState: () => MenuProps<OptionType> & MenuState;
 }
@@ -146,9 +143,6 @@ interface PortalStyleArgs {
 export function menuPortalCSS(args: PortalStyleArgs): React.CSSProperties;
 
 export class MenuPortal<OptionType> extends Component<MenuPortalProps<OptionType>, MenuPortalState> {
-  static childContextTypes: {
-    getPortalPlacement: (state: MenuState) => void,
-  };
   getChildContext(): {
     getPortalPlacement: (state: MenuState) => void;
   };
diff --git a/types/react-select/test/examples/CustomNoOptionsMessage.tsx b/types/react-select/test/examples/CustomNoOptionsMessage.tsx
index 6bea4cb47a..3896272d5b 100644
--- a/types/react-select/test/examples/CustomNoOptionsMessage.tsx
+++ b/types/react-select/test/examples/CustomNoOptionsMessage.tsx
@@ -18,7 +18,12 @@ const NoOptionsMessage = (props: any) => {
 export default class CustomNoOptionsMessage extends React.Component {
   render() {
     return (
-      <Select
+      // Without the type argument, `OptionType` is inferred as `never` from the
+      // `options` attribute of type `never[]`, and `Select.defaultProps` (of
+      // type `Props<any>`) fails to be assignable to the instantiated props
+      // type, `Props<never>`.  This issue shouldn't come up in real code where
+      // the `options` attribute isn't a literal empty array.
+      <Select<{ label: string; value: string }>
         isClearable
         components={{ NoOptionsMessage }}
         styles={{ noOptionsMessage: (base: any) => ({ ...base, ...msgStyles }) }}
diff --git a/types/react-virtualized/dist/es/List.d.ts b/types/react-virtualized/dist/es/List.d.ts
index 57e00ae909..9de78e4066 100644
--- a/types/react-virtualized/dist/es/List.d.ts
+++ b/types/react-virtualized/dist/es/List.d.ts
@@ -30,7 +30,7 @@ export type ListProps = GridCoreProps & {
     /** Height constraint for list (determines how many actual rows are rendered) */
     height: number;
     /** Optional renderer to be used in place of rows when rowCount is 0 */
-    noRowsRenderer?: () => JSX.Element;
+    noRowsRenderer?: () => JSX.Element | null;
     /**
      * Callback invoked with information about the slice of rows that were just rendered.
      * ({ startIndex, stopIndex }): void
diff --git a/types/react-virtualized/dist/es/Table.d.ts b/types/react-virtualized/dist/es/Table.d.ts
index b66fac389b..e9a09dae4c 100644
--- a/types/react-virtualized/dist/es/Table.d.ts
+++ b/types/react-virtualized/dist/es/Table.d.ts
@@ -152,26 +152,6 @@ export type ColumnProps = {
     width: number;
 };
 export class Column extends Component<ColumnProps> {
-    static propTypes: {
-        "aria-label": Requireable<string>;
-        cellDataGetter: Requireable<TableCellDataGetter>;
-        cellRenderer: Requireable<TableCellRenderer>;
-        className: Requireable<string>;
-        columnData: Requireable<object>;
-        dataKey: Validator<string>;
-        disableSort: Requireable<boolean>;
-        flexGrow: Requireable<number>;
-        flexShrink: Requireable<number>;
-        headerClassName: Requireable<string>;
-        headerRenderer: Validator<TableHeaderRowRenderer>;
-        label: Requireable<string>;
-        maxWidth: Requireable<number>;
-        minWidth: Requireable<number>;
-        style: Requireable<React.CSSProperties>;
-        width: Validator<number>;
-        id: Requireable<string>;
-    };
-
     static defaultProps: {
         cellDataGetter: TableCellDataGetter;
         cellRenderer: TableCellRenderer;
@@ -378,63 +358,6 @@ export const SortIndicator: React.StatelessComponent<{
  * This component expects explicit width, height, and padding parameters.
  */
 export class Table extends PureComponent<TableProps> {
-    static propTypes: {
-        "aria-label": Requireable<string>;
-        autoHeight: Requireable<boolean>;
-        children: Validator<Column>;
-        className: Requireable<string>;
-        disableHeader: Requireable<boolean>;
-        estimatedRowSize: Validator<number>;
-        gridClassName: Requireable<string>;
-        gridStyle: Requireable<React.CSSProperties>;
-        headerClassName: Requireable<string>;
-        headerHeight: Validator<number>;
-        headerRowRenderer: Requireable<TableHeaderRowRenderer>;
-        headerStyle: Requireable<React.CSSProperties>;
-        height: Validator<number>;
-        id: Requireable<string>;
-        noRowsRenderer: Requireable<() => JSX.Element>;
-        onHeaderClick: Requireable<
-            (params: HeaderMouseEventHandlerParams) => void
-        >;
-        onRowClick: Requireable<(params: RowMouseEventHandlerParams) => void>;
-        onRowDoubleClick: Requireable<
-            (params: RowMouseEventHandlerParams) => void
-        >;
-        onRowMouseOut: Requireable<
-            (params: RowMouseEventHandlerParams) => void
-        >;
-        onRowMouseOver: Requireable<
-            (params: RowMouseEventHandlerParams) => void
-        >;
-        onRowsRendered: Requireable<
-            (params: RowMouseEventHandlerParams) => void
-        >;
-        onScroll: Requireable<(params: ScrollEventData) => void>;
-        overscanRowCount: Validator<number>;
-        rowClassName: Requireable<string | ((params: Index) => string)>;
-        rowGetter: Validator<(params: Index) => any>;
-        rowHeight: Validator<number | ((params: Index) => number)>;
-        rowCount: Validator<number>;
-        rowRenderer: Requireable<(props: TableRowProps) => React.ReactNode>;
-        rowStyle: Validator<
-            React.CSSProperties | ((params: Index) => React.CSSProperties)
-        >;
-        scrollToAlignment: Validator<Alignment>;
-        scrollToIndex: Validator<number>;
-        scrollTop: Requireable<number>;
-        sort: Requireable<
-            (
-                params: { sortBy: string; sortDirection: SortDirectionType }
-            ) => void
-        >;
-        sortBy: Requireable<string>;
-        sortDirection: Validator<SortDirectionType>;
-        style: Requireable<React.CSSProperties>;
-        tabIndex: Requireable<number>;
-        width: Validator<number>;
-    };
-
     static defaultProps: {
         disableHeader: false;
         estimatedRowSize: 30;
@@ -445,7 +368,7 @@ export class Table extends PureComponent<TableProps> {
         onScroll: () => null;
         overscanRowCount: 10;
         rowRenderer: TableRowRenderer;
-        headerRowRenderer: TableHeaderRenderer;
+        headerRowRenderer: TableHeaderRowRenderer;
         rowStyle: {};
         scrollToAlignment: "auto";
         scrollToIndex: -1;
diff --git a/types/react/index.d.ts b/types/react/index.d.ts
index f525d7838c..5cefb7fca2 100644
--- a/types/react/index.d.ts
+++ b/types/react/index.d.ts
@@ -421,6 +421,34 @@ declare namespace React {
         refs: {
             [key: string]: ReactInstance
         };
+
+        // Static properties copied from ComponentClass interface.
+        /**
+         * The validity of the type of `propTypes` cannot be checked
+         * automatically at the definition of a component class because the
+         * required type depends on `P`.  We recommend checking it using
+         * `asPropTypes` from the `react-typescript-helpers` package.  If you
+         * don't do that, then the type will still be checked by
+         * JSX.LibraryManagedAttributes every time the component is used,
+         * assuming you use TypeScript 3.0 or newer.
+         */
+        // Note: `propTypes` and `defaultProps` need to be `any` so that a
+        // component class that does not redeclare them is assignable to
+        // `ComponentClass<P>`.
+        static propTypes?: any;
+        static contextTypes?: ValidationMap<any>;
+        static childContextTypes?: ValidationMap<any>;
+        /**
+         * The validity of the type of `defaultProps` cannot be checked
+         * automatically at the definition of a component class because the
+         * required type depends on `P`.  We recommend checking it using
+         * `asDefaultProps` from the `react-typescript-helpers` package.  If you
+         * don't do that, then the type will still be checked by
+         * JSX.LibraryManagedAttributes every time the component is used,
+         * assuming you use TypeScript 3.0 or newer.
+         */
+        static defaultProps?: any;
+        static displayName?: string;
     }
 
     class PureComponent<P = {}, S = {}, SS = any> extends Component<P, S, SS> { }
@@ -2636,31 +2664,77 @@ declare namespace React {
          */
         componentStack: string;
     }
+
+    const Invalid_propTypes: unique symbol;
+    /**
+     * Dummy interface that is intersected into the props type of a component on
+     * use to generate an error if the component's `propTypes` static property
+     * is invalid.  In most cases, you can get more information about the
+     * problem with the `propTypes` by trying to assign the component to a
+     * variable of type `React.ComponentType<P>` where `P` is the appropriate
+     * props type.  You can bypass the type checking of `propTypes` by defining
+     * a static property named `bypassPropTypesTypecheck`.
+     */
+    interface Invalid_propTypes<P, T> {
+        [Invalid_propTypes]: never;
+    }
+
+    const Invalid_defaultProps: unique symbol;
+    /**
+     * Dummy interface that is intersected into the props type of a component on
+     * use to generate an error if the component's `defaultProps` static
+     * property is invalid.  In most cases, you can get more information about
+     * the problem with the `defaultProps` by trying to assign the component to
+     * a variable of type `React.ComponentType<P>` where `P` is the appropriate
+     * props type.  You can bypass the type checking of `defaultProps` by
+     * defining a static property named `bypassDefaultPropsTypecheck`.
+     */
+    interface Invalid_defaultProps<P, D> {
+        [Invalid_defaultProps]: never;
+    }
+
+    // For a component class, the P passed to JSX.LibraryManagedAttributes is
+    // based on the `props` property and includes `children` regardless of
+    // whether the original props type (the `P` type argument to
+    // React.Component) does.  However, it's common for component classes not
+    // to list `children` in the `propTypes` if the original props type did not
+    // include `children`.  We accommodate that here by making the validator for
+    // `children` optional.
+    type ValidationMapWithOptionalChildren<P> =
+        ValidationMap<Pick<P, Exclude<keyof P, "children">>> &
+        Partial<ValidationMap<Pick<P, Extract<keyof P, "children">>>>;
+
+    // Explicitly check for excess properties in CheckPropTypes and
+    // CheckDefaultProps because by the time we get to
+    // JSX.LibraryManagedAttributes, we have lost the opportunity to do an
+    // excess properties check on the original object literal.
+
+    type CheckPropTypes<P, T> =
+        // This condition attempts to single out `T = any`, which needs to bypass the rest of the check
+        // because `keyof T` would come out as not extending `keyof P`.
+        T extends typeof Invalid_propTypes ? {} :
+        [keyof T, T] extends [keyof P, ValidationMapWithOptionalChildren<P>] ? {} : Invalid_propTypes<P, T>;
+
+    type CheckDefaultProps<P, D> =
+        D extends typeof Invalid_defaultProps ? {} :
+        [keyof D, D] extends [keyof P, Partial<P>] ? {} : Invalid_defaultProps<P, D>;
+
+    // Any prop that has a default prop becomes optional, but its type is unchanged
+    // If declared props have indexed properties, ignore default props entirely as keyof gets widened
+    // Wrap in an outer-level conditional type to allow distribution over props that are unions
+    type Defaultize<P, D> = P extends any
+        ? string extends keyof P ? P :
+            & Pick<P, Exclude<keyof P, keyof D>>
+            & Partial<Pick<P, Extract<keyof P, keyof D>>>
+        : never;
+
+    type ReactManagedAttributes<C, P> =
+        (C extends { propTypes: infer T; }
+            ? (C extends { bypassPropTypesTypecheck: {}; } ? {} : CheckPropTypes<P, T>) : {}) &
+        (C extends { defaultProps: infer D; }
+            ? (C extends { bypassDefaultPropsTypecheck: {}; } ? {} : CheckDefaultProps<P, D>) & Defaultize<P, D> : P);
 }
 
-// Declared props take priority over inferred props
-// If declared props have indexed properties, ignore inferred props entirely as keyof gets widened
-type MergePropTypes<P, T> = P & Pick<T, Exclude<keyof T, keyof P>>;
-
-// Any prop that has a default prop becomes optional, but its type is unchanged
-// Undeclared default props are augmented into the resulting allowable attributes
-// If declared props have indexed properties, ignore default props entirely as keyof gets widened
-// Wrap in an outer-level conditional type to allow distribution over props that are unions
-type Defaultize<P, D> = P extends any
-    ? string extends keyof P ? P :
-        & Pick<P, Exclude<keyof P, keyof D>>
-        & Partial<Pick<P, Extract<keyof P, keyof D>>>
-        & Partial<Pick<D, Exclude<keyof D, keyof P>>>
-    : never;
-
-type ReactManagedAttributes<C, P> = C extends { propTypes: infer T; defaultProps: infer D; }
-    ? Defaultize<MergePropTypes<P, PropTypes.InferProps<T>>, D>
-    : C extends { propTypes: infer T; }
-        ? MergePropTypes<P, PropTypes.InferProps<T>>
-        : C extends { defaultProps: infer D; }
-            ? Defaultize<P, D>
-            : P;
-
 declare global {
     namespace JSX {
         // tslint:disable-next-line:no-empty-interface
@@ -2675,9 +2749,9 @@ declare global {
         // let's assume it's reasonable to do a single React.lazy() around a single React.memo() / vice-versa
         type LibraryManagedAttributes<C, P> = C extends React.MemoExoticComponent<infer T> | React.LazyExoticComponent<infer T>
             ? T extends React.MemoExoticComponent<infer U> | React.LazyExoticComponent<infer U>
-                ? ReactManagedAttributes<U, P>
-                : ReactManagedAttributes<T, P>
-            : ReactManagedAttributes<C, P>;
+                ? React.ReactManagedAttributes<U, P>
+                : React.ReactManagedAttributes<T, P>
+            : React.ReactManagedAttributes<C, P>;
 
         // tslint:disable-next-line:no-empty-interface
         interface IntrinsicAttributes extends React.Attributes { }
diff --git a/types/react/test/managedAttributes.tsx b/types/react/test/managedAttributes.tsx
index 1e0e8226d9..a4213c58b1 100644
--- a/types/react/test/managedAttributes.tsx
+++ b/types/react/test/managedAttributes.tsx
@@ -1,14 +1,18 @@
 interface LeaveMeAloneDtslint { foo: string; }
-// // Re-enable when we move @types/react to TS 3.0
+// Re-enable when we move @types/react to TS 3.0 (except for the tests marked as
+// requiring TS >= 3.2)
+//
+// In the meantime, these tests can be run manually by uncommenting the code
+// below and running `dtslint --onlyTestTsNext`.
 
 // import * as React from 'react';
 // import * as PropTypes from 'prop-types';
 
 // interface Props {
-//     bool?: boolean;
+//     bool?: boolean | null;
 //     fnc: () => any;
 //     node?: React.ReactNode;
-//     num?: number;
+//     num?: number | null;
 //     reqNode: NonNullable<React.ReactNode>;
 //     str: string;
 // }
@@ -18,14 +22,12 @@ interface LeaveMeAloneDtslint { foo: string; }
 //     fnc: PropTypes.func.isRequired,
 //     node: PropTypes.node,
 //     num: PropTypes.number,
+//     reqNode: PropTypes.node.isRequired,
 //     str: PropTypes.string.isRequired,
-//     extraStr: PropTypes.string.isRequired,
-//     extraNum: PropTypes.number
 // };
 
 // const defaultProps = {
 //     fnc: (() => 'abc') as () => any,
-//     extraBool: false,
 //     reqNode: 'text_node' as NonNullable<React.ReactNode>
 // };
 
@@ -36,39 +38,12 @@ interface LeaveMeAloneDtslint { foo: string; }
 
 // const annotatedPropTypesAndDefaultPropsTests = [
 //     // $ExpectError
-//     <AnnotatedPropTypesAndDefaultProps />, // str and extraStr are required
-//     <AnnotatedPropTypesAndDefaultProps extraStr='abc' str='abc' />,
+//     <AnnotatedPropTypesAndDefaultProps />, // str is required
+//     <AnnotatedPropTypesAndDefaultProps str='abc' />,
 //     // $ExpectError
 //     <AnnotatedPropTypesAndDefaultProps num='abc' />, // num type mismatch
 //     <AnnotatedPropTypesAndDefaultProps
 //         bool={true}
-//         extraBool={true}
-//         extraNum={0}
-//         extraStr='abc'
-//         fnc={console.log}
-//         node={<span />}
-//         num={0}
-//         reqNode={<span />}
-//         str='abc'
-//     />
-// ];
-
-// class UnannotatedPropTypesAndDefaultProps extends React.Component {
-//     static propTypes = propTypes;
-//     static defaultProps = defaultProps;
-// }
-
-// const unannotatedPropTypesAndDefaultPropsTests = [
-//     // $ExpectError
-//     <UnannotatedPropTypesAndDefaultProps />, // stra and extraStr are required
-//     <UnannotatedPropTypesAndDefaultProps extraStr='abc' str='abc' />,
-//     // $ExpectError
-//     <UnannotatedPropTypesAndDefaultProps extraBool={0} />, // extraBool type mismatch
-//     <UnannotatedPropTypesAndDefaultProps
-//         bool={true}
-//         extraBool={true}
-//         extraNum={0}
-//         extraStr='abc'
 //         fnc={console.log}
 //         node={<span />}
 //         num={0}
@@ -83,16 +58,14 @@ interface LeaveMeAloneDtslint { foo: string; }
 
 // const annotatedPropTypesTests = [
 //     // $ExpectError
-//     <AnnotatedPropTypes />, // str, extraStr, reqNode and fnc are required
-//     <AnnotatedPropTypes fnc={console.log} extraStr='abc' str='abc' reqNode={<span />} />,
+//     <AnnotatedPropTypes />, // str, reqNode and fnc are required
+//     <AnnotatedPropTypes fnc={console.log} str='abc' reqNode={<span />} />,
 //     // $ExpectError
-//     <AnnotatedPropTypes fnc={console.log} extraStr='abc' str='abc' reqNode={<span />} extraBool={false} />, // extraBool doesn't exist
+//     <AnnotatedPropTypes fnc={console.log} str='abc' reqNode={<span />} extraBool={false} />, // extraBool doesn't exist
 //     // $ExpectError
-//     <AnnotatedPropTypes fnc={console.log} extraStr='abc' str='abc' reqNode={<span />} num='abc' />, // num type mismatch
+//     <AnnotatedPropTypes fnc={console.log} str='abc' reqNode={<span />} num='abc' />, // num type mismatch
 //     <AnnotatedPropTypes
 //         bool={false}
-//         extraNum={0}
-//         extraStr='abc'
 //         fnc={console.log}
 //         node={<React.Fragment />}
 //         num={0}
@@ -101,29 +74,6 @@ interface LeaveMeAloneDtslint { foo: string; }
 //     />
 // ];
 
-// class UnannotatedPropTypes extends React.Component {
-//     static propTypes = propTypes;
-// }
-
-// const unannotatedPropTypesTests = [
-//     // $ExpectError
-//     <UnannotatedPropTypes />, // str, extraStr and fnc are required
-//     <UnannotatedPropTypes fnc={console.log} extraStr='abc' str='abc' />,
-//     // $ExpectError
-//     <UnannotatedPropTypes fnc={console.log} extraStr='abc' str='abc' reqNode={<span />} />, // reqNode doesn't exist
-//     // $ExpectError
-//     <UnannotatedPropTypes fnc={console.log} extraStr='abc' str='abc' reqNode={<span />} num='abc' />, // num type mismatch
-//     <UnannotatedPropTypes
-//         bool={false}
-//         extraNum={0}
-//         extraStr='abc'
-//         fnc={console.log}
-//         node={<React.Fragment />}
-//         num={0}
-//         str='abc'
-//     />
-// ];
-
 // class AnnotatedDefaultProps extends React.Component<Props> {
 //     static defaultProps = defaultProps;
 // }
@@ -137,7 +87,6 @@ interface LeaveMeAloneDtslint { foo: string; }
 //     <AnnotatedDefaultProps str={() => { }} />, // str type mismatch
 //     <AnnotatedDefaultProps
 //         bool={true}
-//         extraBool={false}
 //         fnc={console.log}
 //         node={null}
 //         num={0}
@@ -146,31 +95,15 @@ interface LeaveMeAloneDtslint { foo: string; }
 //     />
 // ];
 
-// class UnannotatedDefaultProps extends React.Component {
-//     static defaultProps = defaultProps;
-// }
-
-// const unannotatedDefaultPropsTests = [
-//     <UnannotatedDefaultProps />,
-//     <UnannotatedDefaultProps
-//         extraBool={true}
-//         fnc={console.log}
-//         reqNode={<span />}
-//     />
-// ];
-
 // class ComponentWithNoDefaultProps extends React.Component<Props> {}
 
-// function FunctionalComponent(props: Props) { return <>{props.reqNode}</> }
+// function FunctionalComponent(props: Props) { return <>{props.reqNode}</>; }
 // FunctionalComponent.defaultProps = defaultProps;
 
 // const functionalComponentTests = [
 //     // $ExpectError
 //     <FunctionalComponent />,
-//     // This is possibly a bug/limitation of TS
-//     // Even if JSX.LibraryManagedAttributes returns the correct type, it doesn't seem to work with non-classes
-//     // This also doesn't work with things typed React.SFC<P> because defaultProps will always be Partial<P>
-//     // $ExpectError
+//     // NOTE: This test requires TypeScript >= 3.2, which honors JSX.LibraryManagedAttributes for function components.
 //     <FunctionalComponent str='' />
 // ];
 
@@ -182,27 +115,28 @@ interface LeaveMeAloneDtslint { foo: string; }
 // const memoTests = [
 //     // $ExpectError
 //     <MemoFunctionalComponent />,
-//     // $ExpectError won't work as long as FunctionalComponent doesn't work either
+//     // Requires TypeScript >= 3.2; see comment re FunctionalComponent above
 //     <MemoFunctionalComponent str='abc' />,
 //     // $ExpectError
 //     <MemoAnnotatedDefaultProps />,
 //     <AnnotatedDefaultProps str='abc' />,
-//     // $ExpectError this doesn't work despite JSX.LibraryManagedAttributes returning the correct type
+//     // Requires TypeScript >= 3.2; see comment re FunctionalComponent above
 //     <MemoAnnotatedDefaultProps str='abc' />,
-//     // $ExpectError won't work as long as FunctionalComponent doesn't work either
+//     // Requires TypeScript >= 3.2; see comment re FunctionalComponent above
 //     <LazyMemoFunctionalComponent str='abc' />,
 //     // $ExpectError
 //     <LazyMemoAnnotatedDefaultProps />,
-//     // $ExpectError this doesn't work despite JSX.LibraryManagedAttributes returning the correct type
+//     // Requires TypeScript >= 3.2; see comment re FunctionalComponent above
 //     <LazyMemoAnnotatedDefaultProps str='abc' />
 // ];
 
+// // $ExpectType Pick<Props, "bool" | "node" | "num" | "str"> & Partial<Pick<Props, "fnc" | "reqNode">>
 // type AnnotatedDefaultPropsLibraryManagedAttributes = JSX.LibraryManagedAttributes<typeof AnnotatedDefaultProps, Props>;
-// // $ExpectType AnnotatedDefaultPropsLibraryManagedAttributes
+// // $ExpectType Pick<Props, "bool" | "node" | "num" | "str"> & Partial<Pick<Props, "fnc" | "reqNode">>
 // type FunctionalComponentLibraryManagedAttributes = JSX.LibraryManagedAttributes<typeof FunctionalComponent, Props>;
-// // $ExpectType FunctionalComponentLibraryManagedAttributes
+// // $ExpectType Pick<Props, "bool" | "node" | "num" | "str"> & Partial<Pick<Props, "fnc" | "reqNode">>
 // type MemoFunctionalComponentLibraryManagedAttributes = JSX.LibraryManagedAttributes<typeof MemoFunctionalComponent, Props>;
-// // $ExpectType FunctionalComponentLibraryManagedAttributes
+// // $ExpectType Pick<Props, "bool" | "node" | "num" | "str"> & Partial<Pick<Props, "fnc" | "reqNode">>
 // type LazyMemoFunctionalComponentLibraryManagedAttributes = JSX.LibraryManagedAttributes<typeof LazyMemoFunctionalComponent, Props>;
 
 // const ForwardRef = React.forwardRef((props: Props, ref: React.Ref<ComponentWithNoDefaultProps>) => (
@@ -218,7 +152,97 @@ interface LeaveMeAloneDtslint { foo: string; }
 //         reqNode={<span />}
 //         str=''
 //     />,
-//     // same bug as MemoFunctionalComponent and React.SFC-typed things
-//     // $ExpectError the type of ForwardRef.defaultProps stays Partial<P> anyway even if assigned
+//     // the type of ForwardRef.defaultProps stays Partial<P> anyway even if assigned
+//     // $ExpectError
 //     <ForwardRef str='abc' />
 // ];
+
+// const wrongDefaultProps = {
+//     fnc: 42
+// };
+// class WrongDefaultPropsComponent extends React.Component<Props> {
+//     static defaultProps = wrongDefaultProps;
+// }
+// const wrongDefaultPropsComponentTests = [
+//     // $ExpectError
+//     <WrongDefaultPropsComponent fnc={() => undefined} reqNode="text" str="str" />
+// ];
+// // $ExpectError
+// const investigateWrongDefaultPropsComponent: React.ComponentType<Props> = WrongDefaultPropsComponent;
+
+// const excessDefaultProps = {
+//     another: 43
+// };
+// class ExcessDefaultPropsComponent extends React.Component<Props> {
+//     static defaultProps = excessDefaultProps;
+// }
+// const excessDefaultPropsComponentTests = [
+//     // $ExpectError
+//     <ExcessDefaultPropsComponent fnc={() => undefined} reqNode="text" str="str" />
+// ];
+// // $ExpectError
+// const investigateExcessDefaultPropsComponent: React.ComponentType<Props> = ExcessDefaultPropsComponent;
+
+// const wrongPropTypes = {
+//     bool: PropTypes.bool,
+//     fnc: PropTypes.number.isRequired,
+//     node: PropTypes.node,
+//     num: PropTypes.number,
+//     reqNode: PropTypes.node.isRequired,
+//     str: PropTypes.string.isRequired,
+// };
+// class WrongPropTypesComponent extends React.Component<Props> {
+//     static propTypes = wrongPropTypes;
+// }
+// const wrongPropTypesComponentTests = [
+//     // $ExpectError
+//     <WrongPropTypesComponent fnc={() => undefined} reqNode="text" str="str" />
+// ];
+
+// const incompletePropTypes = {
+//     bool: PropTypes.bool,
+//     node: PropTypes.node,
+//     num: PropTypes.number,
+//     reqNode: PropTypes.node.isRequired,
+//     str: PropTypes.string.isRequired,
+// };
+// class IncompletePropTypesComponent extends React.Component<Props> {
+//     static propTypes = incompletePropTypes;
+// }
+// const incompletePropTypesComponentTests = [
+//     // $ExpectError
+//     <IncompletePropTypesComponent fnc={() => undefined} reqNode="text" str="str" />
+// ];
+
+// const excessPropTypes = {
+//     another: PropTypes.number.isRequired,
+//     bool: PropTypes.bool,
+//     fnc: PropTypes.func.isRequired,
+//     node: PropTypes.node,
+//     num: PropTypes.number,
+//     reqNode: PropTypes.node.isRequired,
+//     str: PropTypes.string.isRequired,
+// };
+// class ExcessPropTypesComponent extends React.Component<Props> {
+//     static propTypes = excessPropTypes;
+// }
+// const ExcessPropTypesComponentTests = [
+//     // $ExpectError
+//     <ExcessPropTypesComponent fnc={() => undefined} reqNode="text" str="str" />
+// ];
+
+// class WrongDefaultPropsSuppressedComponent extends React.Component<Props> {
+//     static defaultProps = wrongDefaultProps;
+//     static bypassDefaultPropsTypecheck = true;
+// }
+// const wrongDefaultPropsSuppressedComponentTests = [
+//     <WrongDefaultPropsSuppressedComponent fnc={() => undefined} reqNode="text" str="str" />
+// ];
+
+// class WrongPropTypesSuppressedComponent extends React.Component<Props> {
+//     static propTypes = wrongPropTypes;
+//     static bypassPropTypesTypecheck = true;
+// }
+// const wrongPropTypesSuppressedComponentTests = [
+//     <WrongPropTypesSuppressedComponent fnc={() => undefined} reqNode="text" str="str" />
+// ];
diff --git a/types/theming/index.d.ts b/types/theming/index.d.ts
index e2525b3ce6..d2c0d1ee40 100644
--- a/types/theming/index.d.ts
+++ b/types/theming/index.d.ts
@@ -40,7 +40,7 @@ export interface ThemeListener<C extends string> {
     callback: (theme: Theme) => void
   ): SubscriptionId;
   unsubscribe(context: ContextWithTheme<C>, id: SubscriptionId): void;
-  contextTypes: React.ValidationMap<C>;
+  contextTypes: React.ValidationMap<ContextWithTheme<C>>;
 }
 /**
  * ThemeListener for the default channel

From 9a86c019d97a9846393b34e8e3a1d21f141aca31 Mon Sep 17 00:00:00 2001
From: kingdaro <kingdaro@gmail.com>
Date: Fri, 30 Nov 2018 00:25:08 -0600
Subject: [PATCH 469/836] missing semicolons

---
 types/react-facebook-login/react-facebook-login-tests.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/types/react-facebook-login/react-facebook-login-tests.tsx b/types/react-facebook-login/react-facebook-login-tests.tsx
index 2a1fede6dd..ed11a5f4ac 100644
--- a/types/react-facebook-login/react-facebook-login-tests.tsx
+++ b/types/react-facebook-login/react-facebook-login-tests.tsx
@@ -106,8 +106,8 @@ class MyComponent2 extends React.Component {
     }
 }
 
-type FacebookLoginWrapperProps = ReactFacebookLoginProps & { className?: string }
+type FacebookLoginWrapperProps = ReactFacebookLoginProps & { className?: string };
 
 export const FacebookLoginWrapper = ({ className, ...props}: FacebookLoginWrapperProps) => (
     <FacebookLogin {...props} cssClass={className} />
-)
+);

From cc1e2c1ac382d742e3ac9a7877236f3ab449a9dd Mon Sep 17 00:00:00 2001
From: kingdaro <kingdaro@gmail.com>
Date: Fri, 30 Nov 2018 00:35:05 -0600
Subject: [PATCH 470/836] react-facebook-login: remove redundant `string |`

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

diff --git a/types/react-facebook-login/index.d.ts b/types/react-facebook-login/index.d.ts
index 3ef679141e..24df31b5ad 100644
--- a/types/react-facebook-login/index.d.ts
+++ b/types/react-facebook-login/index.d.ts
@@ -18,7 +18,7 @@ export interface ReactFacebookLoginProps {
     cssClass?: string;
     disableMobileRedirect?: boolean;
     fields?: string;
-    icon?: string | React.ReactNode;
+    icon?: React.ReactNode;
     isDisabled?: boolean;
     language?: string;
     onClick?(event: React.MouseEvent<HTMLDivElement>): void;

From 1626bd3d82d37b2e37a34bd132c4109234c78cbd Mon Sep 17 00:00:00 2001
From: kingdaro <kingdaro@gmail.com>
Date: Fri, 30 Nov 2018 00:35:26 -0600
Subject: [PATCH 471/836] react-facebook-login: add additional missnig props

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

diff --git a/types/react-facebook-login/index.d.ts b/types/react-facebook-login/index.d.ts
index 24df31b5ad..c8be6e47f0 100644
--- a/types/react-facebook-login/index.d.ts
+++ b/types/react-facebook-login/index.d.ts
@@ -32,6 +32,10 @@ export interface ReactFacebookLoginProps {
     xfbml?: boolean;
     isMobile?: boolean;
     tag?: Node | React.Component<any>;
+    returnScopes?: boolean;
+    state?: string;
+    authType?: string;
+    responseType?: string;
 }
 
 export interface ReactFacebookFailureResponse {

From 04fb2654db72e7979e44b81ce44386244c6e1859 Mon Sep 17 00:00:00 2001
From: kingdaro <kingdaro@gmail.com>
Date: Fri, 30 Nov 2018 00:35:52 -0600
Subject: [PATCH 472/836] react-facebook-login: simplify exports

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

diff --git a/types/react-facebook-login/index.d.ts b/types/react-facebook-login/index.d.ts
index c8be6e47f0..b56b484476 100644
--- a/types/react-facebook-login/index.d.ts
+++ b/types/react-facebook-login/index.d.ts
@@ -49,14 +49,12 @@ export interface ReactFacebookLoginInfo {
     email?: string;
 }
 
-interface ReactFacebookLoginState {
+export interface ReactFacebookLoginState {
     isSdkLoaded?: boolean;
     isProcessing?: boolean;
 }
 
-declare class ReactFacebookLogin extends React.Component<
+export default class ReactFacebookLogin extends React.Component<
     ReactFacebookLoginProps,
     ReactFacebookLoginState
 > {}
-
-export default ReactFacebookLogin;

From 7fe4b2a91493a6b1fdbe861029ad7347572c806a Mon Sep 17 00:00:00 2001
From: kingdaro <kingdaro@gmail.com>
Date: Fri, 30 Nov 2018 00:36:27 -0600
Subject: [PATCH 473/836] add missing space

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

diff --git a/types/react-facebook-login/react-facebook-login-tests.tsx b/types/react-facebook-login/react-facebook-login-tests.tsx
index ed11a5f4ac..a52c955596 100644
--- a/types/react-facebook-login/react-facebook-login-tests.tsx
+++ b/types/react-facebook-login/react-facebook-login-tests.tsx
@@ -108,6 +108,6 @@ class MyComponent2 extends React.Component {
 
 type FacebookLoginWrapperProps = ReactFacebookLoginProps & { className?: string };
 
-export const FacebookLoginWrapper = ({ className, ...props}: FacebookLoginWrapperProps) => (
+export const FacebookLoginWrapper = ({ className, ...props }: FacebookLoginWrapperProps) => (
     <FacebookLogin {...props} cssClass={className} />
 );

From 544bbdef11e4a15ad8dddae8305fc6f6b5b783a8 Mon Sep 17 00:00:00 2001
From: kingdaro <kingdaro@gmail.com>
Date: Fri, 30 Nov 2018 00:38:50 -0600
Subject: [PATCH 474/836] bump version

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

diff --git a/types/react-facebook-login/index.d.ts b/types/react-facebook-login/index.d.ts
index b56b484476..419761974e 100644
--- a/types/react-facebook-login/index.d.ts
+++ b/types/react-facebook-login/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for react-facebook-login 3.6
+// Type definitions for react-facebook-login 4.1
 // Project: https://github.com/keppelen/react-facebook-login
 // Definitions by: Alexandre Paré <https://github.com/apare>, Jan Karres <https://github.com/jankarres>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped

From 0b111f9e2bbccd414a2c522b2d7ffba65bda199a Mon Sep 17 00:00:00 2001
From: Adam <23192421+shenphen@users.noreply.github.com>
Date: Fri, 30 Nov 2018 08:14:29 +0100
Subject: [PATCH 475/836] Update index.d.ts

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

diff --git a/types/cropperjs/index.d.ts b/types/cropperjs/index.d.ts
index d7be9dbc39..d444c20705 100644
--- a/types/cropperjs/index.d.ts
+++ b/types/cropperjs/index.d.ts
@@ -426,9 +426,9 @@ declare class cropperjs {
     /**
      * Replace the image's src and rebuild the cropper.
      * @param url A new image url
-     * @param hasSameSize If the new image has the same size with the old one, then it will not rebuilt the cropper and only update the urls of all related images.
+     * @param hasSameSize If the new image has the same size with the old one, then it will not rebuilt the cropper and only update the urls of all related images. (Default: false)
      */
-    replace(url: string, hasSameSize: boolean = false): void;
+    replace(url: string, hasSameSize?: boolean): void;
 
     /**
      * Enable (unfreeze) the cropper.

From 38c7639b434636ebe7587b75021d047b6094db49 Mon Sep 17 00:00:00 2001
From: Jessica <jessicamfranco3@gmail.com>
Date: Fri, 30 Nov 2018 19:29:09 +0900
Subject: [PATCH 476/836] Don't augment the css prop by default, check and
 document limitations

---
 types/rebass__grid/index.d.ts             |  7 +--
 types/rebass__grid/rebass__grid-tests.tsx |  3 ++
 types/styled-components/cssprop.d.ts      | 19 ++++++++
 types/styled-components/index.d.ts        | 54 +++++++++++++----------
 types/styled-components/macro.d.ts        |  5 +++
 types/styled-components/test/index.tsx    | 28 ++++++++++--
 6 files changed, 86 insertions(+), 30 deletions(-)
 create mode 100644 types/styled-components/cssprop.d.ts

diff --git a/types/rebass__grid/index.d.ts b/types/rebass__grid/index.d.ts
index f49d43a6c6..3f5012851f 100644
--- a/types/rebass__grid/index.d.ts
+++ b/types/rebass__grid/index.d.ts
@@ -10,7 +10,7 @@
 export type Omit<T, K extends keyof T> = Pick<T, ({ [P in keyof T]: P } & { [P in K]: never } & { [x: string]: never, [x: number]: never })[keyof T]>;
 
 import { ComponentType } from "react";
-import { StyledComponent, CSSIntrinsicAttributeType } from "styled-components";
+import { StyledComponent, Interpolation } from "styled-components";
 
 export type ResponsiveProp = number | string | Array<string | number>;
 
@@ -34,10 +34,11 @@ export interface CommonProps {
     px?: ResponsiveProp;
     py?: ResponsiveProp;
     theme?: any;
+    // this is actually more powerful than the plugin because of some limitations of the transform
     /**
-     * NOTE: this is not compatible with the styled-components babel plugin anymore
+     * This works even without babel-plugin-styled-components.
      */
-    css?: CSSIntrinsicAttributeType;
+    css?: Interpolation<any>;
 }
 
 export interface BoxProps
diff --git a/types/rebass__grid/rebass__grid-tests.tsx b/types/rebass__grid/rebass__grid-tests.tsx
index 2cef66a972..147f3ff084 100644
--- a/types/rebass__grid/rebass__grid-tests.tsx
+++ b/types/rebass__grid/rebass__grid-tests.tsx
@@ -1,8 +1,11 @@
 import * as React from "react";
 import { Flex, Box } from "@rebass/grid";
+import { css } from "styled-components";
 
 const Layout = () => (
     <Flex m={4}>
         <Box px={3} py={2} />
     </Flex>
 );
+
+const cssTest = <Flex css='background: transparent;'><Box css={css`${{color: 'inherit'}}`}/></Flex>;
diff --git a/types/styled-components/cssprop.d.ts b/types/styled-components/cssprop.d.ts
new file mode 100644
index 0000000000..e19b03dc2c
--- /dev/null
+++ b/types/styled-components/cssprop.d.ts
@@ -0,0 +1,19 @@
+import {} from "react";
+import { CSSProp } from ".";
+
+declare module "react" {
+  interface Attributes {
+      // NOTE: unlike the plain javascript version, it is not possible to get access
+      // to the element's own attributes inside function interpolations.
+      // Only theme will be accessible, and only with the DefaultTheme due to the global
+      // nature of this declaration.
+      // If you are writing this inline you already have access to all the attributes anyway,
+      // no need for the extra indirection.
+      /**
+       * If present, this React element will be converted by
+       * `babel-plugin-styled-components` into a styled component
+       * with the given css as its styles.
+       */
+      css?: CSSProp;
+  }
+}
diff --git a/types/styled-components/index.d.ts b/types/styled-components/index.d.ts
index 2f3b6b4ec5..761c48a104 100644
--- a/types/styled-components/index.d.ts
+++ b/types/styled-components/index.d.ts
@@ -436,29 +436,35 @@ export class StyleSheetManager extends React.Component<
     StyleSheetManagerProps
 > {}
 
-export type CSSIntrinsicAttributeType =
-    | string
-    | CSSObject
-    | FlattenSimpleInterpolation
-    // Sad, but because this is global, there is no way to override it with the ThemedStyledComponentsModule
-    // Only augmenting DefaultTheme will work for inline css prop
-    | FlattenInterpolation<ThemeProps<AnyIfEmpty<DefaultTheme>>>;
+/**
+ * The CSS prop is not declared by default in the types as it would cause 'css' to be present
+ * on the types of anything that uses styled-components indirectly, even if they do not use the
+ * babel plugin.
+ * 
+ * You can load a default declaration by using writing this special import from
+ * a typescript file. This module does not exist in reality, which is why the {} is important:
+ * 
+ * ```ts
+ * import {} from 'styled-components/cssprop'
+ * ```
+ * 
+ * Or you can declare your own module augmentation, which allows you to specify the type of Theme:
+ * 
+ * ```ts
+ * import { CSSProp } from 'styled-components'
+ *
+ * interface MyTheme {}
+ * 
+ * declare module 'react' {
+ *   interface Attributes {
+ *     css?: CSSProp<MyTheme>
+ *   }
+ * }
+ * ```
+ */
+// ONLY string literals and inline invocations of css`` are supported, anything else crashes the plugin
+export type CSSProp<T = AnyIfEmpty<DefaultTheme>> =
+      string |
+      FlattenInterpolation<ThemeProps<T>>;
 
 export default styled;
-
-declare module "react" {
-    interface Attributes {
-        // NOTE: unlike the plain javascript version, it is not possible to get access
-        // to the element's own attributes inside function interpolations.
-        // Only theme will be accessible, and only with the DefaultTheme due to the global
-        // nature of this declaration.
-        // If you are writing this inline you already have access to all the attributes anyway,
-        // no need for the extra indirection.
-        /**
-         * If present, this React element will be converted by
-         * `babel-plugin-styled-components` into a styled component
-         * with the given css as its styles.
-         */
-        css?: CSSIntrinsicAttributeType;
-    }
-}
diff --git a/types/styled-components/macro.d.ts b/types/styled-components/macro.d.ts
index 08cee96a96..51f6cced26 100644
--- a/types/styled-components/macro.d.ts
+++ b/types/styled-components/macro.d.ts
@@ -1,2 +1,7 @@
 export { default } from '.';
 export * from '.';
+
+/**
+ * Recommended: also `import {} from 'styled-components/cssprop'`,
+ * or augment react's `Attribute` interface with your own version.
+ */
diff --git a/types/styled-components/test/index.tsx b/types/styled-components/test/index.tsx
index c152ffd66e..43f0f68607 100644
--- a/types/styled-components/test/index.tsx
+++ b/types/styled-components/test/index.tsx
@@ -16,6 +16,7 @@ import styled, {
     StyledComponent,
     ThemedStyledComponentsModule
 } from "styled-components";
+import {} from "styled-components/cssprop";
 
 /**
  * general usage
@@ -782,16 +783,34 @@ function cssProp() {
         return <div {...props} />;
     }
 
+    const myCss = 'background: blue;';
+
     return (
         <>
             <div css="background: blue;" />
-            <div css={{ background: "blue" }} />
-            <div css={undefined} />
             <div
+                // $ExpectError only strings work, objects crash the plugin
+                css={{ background: "blue" }}
+            />
+            <div
+                // would be nice to be able to turn this into an error as it also crashes the plugin,
+                // but this is how optional properties work in TypeScript...
+                css={undefined}
+            />
+            <div
+                // css used as tagged function is fine and is correctly handled by the plugin
                 css={css`
                     background: blue;
                 `}
             />
+            <div
+                // but this crashes the plugin, even though it's valid type-wise and we can't forbid it
+                css={css({ background: 'blue' })}
+            />
+            <div
+                // this also crashes the plugin, only inline strings or css template tag work
+                css={myCss}
+            />
             <div
                 css={css`
                     background: ${() => "blue"};
@@ -808,7 +827,10 @@ function cssProp() {
                 `}
             />
             <Custom css="background: blue;" />
-            <Custom css={{ background: "blue" }} />
+            <Custom
+                // $ExpectError only strings work, objects crash the plugin
+                css={{ background: "blue" }}
+            />
             <Custom css={undefined} />
             <Custom
                 css={css`

From 42675056c5f5b3101a43b111931c825c65d7dcb3 Mon Sep 17 00:00:00 2001
From: Daniel Rose <daniel.rose@inform-software.com>
Date: Wed, 8 Aug 2018 09:00:40 +0200
Subject: [PATCH 477/836] Adds type definitions for packages: sc-auth,
 socketcluster, socketcluster-client, socketcluster-server, expirymanager,
 fleximap, sc-broker, sc-broker-cluster, sc-channel

---
 types/expirymanager/expirymanager-tests.ts    |  19 ++
 types/expirymanager/index.d.ts                |  25 ++
 types/expirymanager/tsconfig.json             |  23 ++
 types/expirymanager/tslint.json               |   3 +
 types/fleximap/fleximap-tests.ts              |  27 ++
 types/fleximap/index.d.ts                     |  38 +++
 types/fleximap/tsconfig.json                  |  23 ++
 types/fleximap/tslint.json                    |   6 +
 types/sc-auth/index.d.ts                      |  19 ++
 types/sc-auth/sc-auth-tests.ts                | 102 ++++++
 types/sc-auth/tsconfig.json                   |  23 ++
 types/sc-auth/tslint.json                     |   1 +
 types/sc-broker-cluster/clientcluster.d.ts    |  10 +
 types/sc-broker-cluster/index.d.ts            | 160 +++++++++
 .../sc-broker-cluster-tests.ts                |  29 ++
 types/sc-broker-cluster/scbroker.d.ts         |   3 +
 types/sc-broker-cluster/tsconfig.json         |  25 ++
 types/sc-broker-cluster/tslint.json           |   3 +
 types/sc-broker/index.d.ts                    | 165 +++++++++
 types/sc-broker/sc-broker-tests.ts            |  58 ++++
 types/sc-broker/scbroker.d.ts                 |  32 ++
 types/sc-broker/tsconfig.json                 |  24 ++
 types/sc-broker/tslint.json                   |   3 +
 types/sc-channel/index.d.ts                   |  45 +++
 types/sc-channel/sc-channel-tests.ts          |  33 ++
 types/sc-channel/tsconfig.json                |  23 ++
 types/sc-channel/tslint.json                  |   3 +
 types/socketcluster-client/index.d.ts         |  23 ++
 .../lib/scclientsocket.d.ts                   | 251 ++++++++++++++
 .../socketcluster-client-tests.ts             |  75 +++++
 types/socketcluster-client/tsconfig.json      |  24 ++
 types/socketcluster-client/tslint.json        |   3 +
 types/socketcluster-server/index.d.ts         |  15 +
 types/socketcluster-server/scserver.d.ts      | 315 ++++++++++++++++++
 .../socketcluster-server/scserversocket.d.ts  |  43 +++
 .../socketcluster-server-tests.ts             |  39 +++
 types/socketcluster-server/tsconfig.json      |  25 ++
 types/socketcluster-server/tslint.json        |   3 +
 types/socketcluster/fsutil.d.ts               |  11 +
 types/socketcluster/index.d.ts                |  84 +++++
 types/socketcluster/scbroker.d.ts             |   3 +
 types/socketcluster/scworker.d.ts             |  63 ++++
 types/socketcluster/socketcluster-tests.ts    |  76 +++++
 types/socketcluster/tsconfig.json             |  26 ++
 types/socketcluster/tslint.json               |   3 +
 45 files changed, 2007 insertions(+)
 create mode 100644 types/expirymanager/expirymanager-tests.ts
 create mode 100644 types/expirymanager/index.d.ts
 create mode 100644 types/expirymanager/tsconfig.json
 create mode 100644 types/expirymanager/tslint.json
 create mode 100644 types/fleximap/fleximap-tests.ts
 create mode 100644 types/fleximap/index.d.ts
 create mode 100644 types/fleximap/tsconfig.json
 create mode 100644 types/fleximap/tslint.json
 create mode 100644 types/sc-auth/index.d.ts
 create mode 100644 types/sc-auth/sc-auth-tests.ts
 create mode 100644 types/sc-auth/tsconfig.json
 create mode 100644 types/sc-auth/tslint.json
 create mode 100644 types/sc-broker-cluster/clientcluster.d.ts
 create mode 100644 types/sc-broker-cluster/index.d.ts
 create mode 100644 types/sc-broker-cluster/sc-broker-cluster-tests.ts
 create mode 100644 types/sc-broker-cluster/scbroker.d.ts
 create mode 100644 types/sc-broker-cluster/tsconfig.json
 create mode 100644 types/sc-broker-cluster/tslint.json
 create mode 100644 types/sc-broker/index.d.ts
 create mode 100644 types/sc-broker/sc-broker-tests.ts
 create mode 100644 types/sc-broker/scbroker.d.ts
 create mode 100644 types/sc-broker/tsconfig.json
 create mode 100644 types/sc-broker/tslint.json
 create mode 100644 types/sc-channel/index.d.ts
 create mode 100644 types/sc-channel/sc-channel-tests.ts
 create mode 100644 types/sc-channel/tsconfig.json
 create mode 100644 types/sc-channel/tslint.json
 create mode 100644 types/socketcluster-client/index.d.ts
 create mode 100644 types/socketcluster-client/lib/scclientsocket.d.ts
 create mode 100644 types/socketcluster-client/socketcluster-client-tests.ts
 create mode 100644 types/socketcluster-client/tsconfig.json
 create mode 100644 types/socketcluster-client/tslint.json
 create mode 100644 types/socketcluster-server/index.d.ts
 create mode 100644 types/socketcluster-server/scserver.d.ts
 create mode 100644 types/socketcluster-server/scserversocket.d.ts
 create mode 100644 types/socketcluster-server/socketcluster-server-tests.ts
 create mode 100644 types/socketcluster-server/tsconfig.json
 create mode 100644 types/socketcluster-server/tslint.json
 create mode 100644 types/socketcluster/fsutil.d.ts
 create mode 100644 types/socketcluster/index.d.ts
 create mode 100644 types/socketcluster/scbroker.d.ts
 create mode 100644 types/socketcluster/scworker.d.ts
 create mode 100644 types/socketcluster/socketcluster-tests.ts
 create mode 100644 types/socketcluster/tsconfig.json
 create mode 100644 types/socketcluster/tslint.json

diff --git a/types/expirymanager/expirymanager-tests.ts b/types/expirymanager/expirymanager-tests.ts
new file mode 100644
index 0000000000..2206b2673e
--- /dev/null
+++ b/types/expirymanager/expirymanager-tests.ts
@@ -0,0 +1,19 @@
+import { ExpiryManager } from "expirymanager";
+
+const expiryManager = new ExpiryManager();
+
+const keys = ['1', '2'];
+
+expiryManager.expire(keys, 1);
+
+expiryManager.unexpire(keys);
+
+const expiry: number = expiryManager.getExpiry(keys[0]);
+
+let expiredKeys = expiryManager.getExpiredKeys();
+expiredKeys = expiryManager.getExpiredKeys(expiryManager.now());
+
+expiredKeys = expiryManager.extractExpiredKeys();
+expiredKeys = expiryManager.extractExpiredKeys(expiryManager.now());
+
+expiryManager.clear();
diff --git a/types/expirymanager/index.d.ts b/types/expirymanager/index.d.ts
new file mode 100644
index 0000000000..c192da7af7
--- /dev/null
+++ b/types/expirymanager/index.d.ts
@@ -0,0 +1,25 @@
+// Type definitions for expirymanager 0.9
+// Project: https://github.com/SocketCluster/expirymanager
+// Definitions by: Daniel Rose <https://github.com/DanielRose>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export type Key = any;
+export type Keys = Key[];
+
+export class ExpiryManager {
+    constructor();
+
+    now(): number;
+
+    expire(keys: Keys, seconds: number): void;
+    unexpire(keys: Keys): void;
+
+    getExpiry(key: Key): number;
+
+    getKeysByExpiry(expiry: number): Keys;
+
+    getExpiredKeys(time?: number): Keys;
+    extractExpiredKeys(time?: number): Keys;
+
+    clear(): void;
+}
diff --git a/types/expirymanager/tsconfig.json b/types/expirymanager/tsconfig.json
new file mode 100644
index 0000000000..094c4e8c8d
--- /dev/null
+++ b/types/expirymanager/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "expirymanager-tests.ts"
+    ]
+}
diff --git a/types/expirymanager/tslint.json b/types/expirymanager/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/expirymanager/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/fleximap/fleximap-tests.ts b/types/fleximap/fleximap-tests.ts
new file mode 100644
index 0000000000..4ca0181662
--- /dev/null
+++ b/types/fleximap/fleximap-tests.ts
@@ -0,0 +1,27 @@
+import { FlexiMap } from "fleximap";
+
+let flexiMap = new FlexiMap();
+flexiMap = new FlexiMap({ arr: [] });
+flexiMap = new FlexiMap([{ arr: [] }, { obj: {} }]);
+
+flexiMap.set('keyA', {arr: [], obj: {}});
+let result = flexiMap.get(['keyA', 'arr']);
+
+flexiMap.add(['keyB1', 'keyB2', 'keyB3'], 123);
+result = flexiMap.get(['keyB1', 'keyB2']);
+
+const arr = [];
+arr[5] = 'Hello world';
+
+flexiMap.set(['keyC1', 'keyC2'], arr);
+result = flexiMap.get(['keyC1', 'keyC2']);
+
+flexiMap.set(['itemsA', 0], 'hello');
+flexiMap.set(['itemsA', 2], 'world');
+flexiMap.remove(['itemsA', 0]);
+
+flexiMap.set(['itemsB', 0], 'a');
+flexiMap.set(['itemsB', 1], 'b');
+flexiMap.set(['itemsB', 2], 'c');
+let splicedItems = flexiMap.splice(['itemsB'], 1, 1);
+splicedItems = flexiMap.splice(['itemsB'], 1, 0, 'b2');
diff --git a/types/fleximap/index.d.ts b/types/fleximap/index.d.ts
new file mode 100644
index 0000000000..9bce180c66
--- /dev/null
+++ b/types/fleximap/index.d.ts
@@ -0,0 +1,38 @@
+// Type definitions for fleximap 0.9.10
+// Project: https://github.com/SocketCluster/fleximap
+// Definitions by: Daniel Rose <https://github.com/DanielRose>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.4
+
+export type KeyChain = any;
+
+export class FlexiMap {
+    constructor(object?: any[] | object);
+
+    get(keyChain: KeyChain): any;
+    getRange(keyChain: KeyChain, fromIndex: number, toIndex: number): any;
+    getRaw(keyChain: KeyChain): any;
+    getAll(): any[] | object;
+
+    count(keyChain: KeyChain): number;
+
+    hasImmediateKey(key: string): boolean;
+    hasKey(keyChain: KeyChain): boolean;
+    hasType(keyChain: KeyChain, type: any): boolean;
+    hasValue(keyChain: KeyChain, value: any): boolean;
+    hasObject(keyChain: KeyChain, object: object): boolean;
+
+    set(keyChain: KeyChain, value: any): any;
+
+    add(keyChain: KeyChain, value: any): number;
+
+    concat(keyChain: KeyChain, value: any): any;
+
+    remove(keyChain: KeyChain): any;
+    removeRange(keyChain: KeyChain, fromIndex: number, toIndex: number): any[];
+    removeAll(): void;
+
+    splice(keyChain: KeyChain, index: number, count: number, ...items: any[]): any[];
+
+    pop(keyChain: KeyChain): any[];
+}
diff --git a/types/fleximap/tsconfig.json b/types/fleximap/tsconfig.json
new file mode 100644
index 0000000000..710fa81c96
--- /dev/null
+++ b/types/fleximap/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "fleximap-tests.ts"
+    ]
+}
diff --git a/types/fleximap/tslint.json b/types/fleximap/tslint.json
new file mode 100644
index 0000000000..65c83fb1e3
--- /dev/null
+++ b/types/fleximap/tslint.json
@@ -0,0 +1,6 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "dt-header": false
+    }
+}
diff --git a/types/sc-auth/index.d.ts b/types/sc-auth/index.d.ts
new file mode 100644
index 0000000000..84f92bf674
--- /dev/null
+++ b/types/sc-auth/index.d.ts
@@ -0,0 +1,19 @@
+// Type definitions for sc-auth 5.0
+// Project: https://github.com/SocketCluster/sc-auth
+// Definitions by: Daniel Rose <https://github.com/DanielRose>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+import { VerifyOptions, VerifyCallback, Secret, SignCallback, SignOptions } from "jsonwebtoken";
+
+export interface SCAuthEngine {
+    verifyToken(signedToken: string, key: string | Buffer, options?: VerifyOptions, callback?: VerifyCallback): void;
+    signToken(token: string | object | Buffer, key: Secret, options?: SignOptions, callback?: SignCallback): void;
+}
+
+export class AuthEngine implements SCAuthEngine {
+    constructor();
+
+    verifyToken(signedToken: string, key: string | Buffer, options?: VerifyOptions, callback?: VerifyCallback): void;
+    signToken(token: string | object | Buffer, key: Secret, options?: SignOptions, callback?: SignCallback): void;
+}
diff --git a/types/sc-auth/sc-auth-tests.ts b/types/sc-auth/sc-auth-tests.ts
new file mode 100644
index 0000000000..4fa57d3391
--- /dev/null
+++ b/types/sc-auth/sc-auth-tests.ts
@@ -0,0 +1,102 @@
+/**
+ * This mostly delegates to jwt, so using its tests as base
+ */
+
+import scAuth = require("sc-auth");
+import fs = require("fs");
+
+let signedToken = "";
+let cert: Buffer;
+
+interface TestObject {
+    foo: string;
+}
+
+const testObject = { foo: "bar" };
+
+const authEngine = new scAuth.AuthEngine();
+
+// sign with default (HMAC SHA256)
+authEngine.signToken(testObject, "shhhhh");
+
+// sign with default (HMAC SHA256) and single audience
+authEngine.signToken(testObject, "shhhhh", { audience: "theAudience" });
+
+// sign with default (HMAC SHA256) and multiple audiences
+authEngine.signToken(testObject, "shhhhh", {
+    audience: ["audience1", "audience2"]
+});
+
+// sign with default (HMAC SHA256) and a keyid
+authEngine.signToken(testObject, "shhhhh", { keyid: "theKeyId" });
+
+// sign with RSA SHA256
+cert = fs.readFileSync("private.key"); // get private key
+authEngine.signToken(testObject, cert, { algorithm: "RS256" });
+
+// sign with encrypted RSA SHA256 private key (only PEM encoding is supported)
+const privKey: Buffer = fs.readFileSync("encrypted_private.key"); // get private key
+const secret = { key: privKey.toString(), passphrase: "keypwd" };
+authEngine.signToken(testObject, secret, { algorithm: "RS256" }); // the algorithm option is mandatory in this case
+
+// sign asynchronously
+authEngine.signToken(testObject, cert, { algorithm: "RS256" }, (err, token) => {
+    signedToken = token;
+});
+
+// verify a token symmetric
+authEngine.verifyToken(signedToken, "shhhhh", {}, (err, decoded) => {
+    const result = decoded as TestObject;
+
+    console.log(result.foo); // bar
+});
+
+// use external time for verifying
+authEngine.verifyToken(signedToken, "shhhhh", { clockTimestamp: 1 }, (err, decoded) => {
+    const result = decoded as TestObject;
+
+    console.log(result.foo); // bar
+});
+
+// invalid token
+authEngine.verifyToken(signedToken, "wrong-secret", {}, (err, decoded) => {
+    console.log(err);
+
+    // decoded undefined
+});
+
+// verify a token asymmetric
+cert = fs.readFileSync("public.pem"); // get public key
+authEngine.verifyToken(signedToken, cert, {}, (err, decoded) => {
+    const result = decoded as TestObject;
+
+    console.log(result.foo); // bar
+});
+
+// verify audience
+cert = fs.readFileSync("public.pem"); // get public key
+authEngine.verifyToken(signedToken, cert, { audience: "urn:foo" }, (err, decoded) => {
+    // if audience mismatch, err == invalid audience
+    console.log(err);
+});
+
+// verify issuer
+cert = fs.readFileSync("public.pem"); // get public key
+authEngine.verifyToken(signedToken, cert, { audience: "urn:foo", issuer: "urn:issuer" }, (err, decoded) => {
+    // if issuer mismatch, err == invalid issuer
+    console.log(err);
+});
+
+// verify algorithm
+cert = fs.readFileSync("public.pem"); // get public key
+authEngine.verifyToken(signedToken, cert, { algorithms: ["RS256"] }, (err, decoded) => {
+    // if algorithm mismatch, err == invalid algorithm
+    console.log(err);
+});
+
+// verify without expiration check
+cert = fs.readFileSync("public.pem"); // get public key
+authEngine.verifyToken(signedToken, cert, { ignoreExpiration: true }, (err, decoded) => {
+    // if ignoreExpration == false and token is expired, err == expired token
+    console.log(err);
+});
diff --git a/types/sc-auth/tsconfig.json b/types/sc-auth/tsconfig.json
new file mode 100644
index 0000000000..5c8e3a1e19
--- /dev/null
+++ b/types/sc-auth/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "sc-auth-tests.ts"
+    ]
+}
diff --git a/types/sc-auth/tslint.json b/types/sc-auth/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/sc-auth/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/sc-broker-cluster/clientcluster.d.ts b/types/sc-broker-cluster/clientcluster.d.ts
new file mode 100644
index 0000000000..f2234df6ab
--- /dev/null
+++ b/types/sc-broker-cluster/clientcluster.d.ts
@@ -0,0 +1,10 @@
+import { EventEmitter } from "events";
+import { SCBrokerClient } from "sc-broker";
+import { mapperFunction } from ".";
+
+export class ClientCluster extends EventEmitter {
+    constructor(clients: SCBrokerClient[]);
+
+    setMapper(mapper: mapperFunction): void;
+    getMapper(): mapperFunction;
+}
diff --git a/types/sc-broker-cluster/index.d.ts b/types/sc-broker-cluster/index.d.ts
new file mode 100644
index 0000000000..9314acda82
--- /dev/null
+++ b/types/sc-broker-cluster/index.d.ts
@@ -0,0 +1,160 @@
+// Type definitions for sc-broker-cluster 6.1
+// Project: https://github.com/SocketCluster/sc-broker-cluster
+// Definitions by: Daniel Rose <https://github.com/DanielRose>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.4
+
+import { SCServerSocket, SCServer } from "socketcluster-server";
+import { BrokerStartInfo, BrokerExitInfo } from "socketcluster";
+import { SpliceOptions, QueryOptions } from "sc-broker";
+import { SCChannel } from "sc-channel";
+import { EventEmitter } from "events";
+import { AsyncResultArrayCallback } from "async";
+import { KeyChain, FlexiMap } from "fleximap";
+import { Keys } from "expirymanager";
+import { ClientCluster } from "./clientcluster";
+
+export class AbstractDataClient extends EventEmitter {
+    constructor(dataClient: ClientCluster);
+
+    set(keyChain: KeyChain, value: any, getValue?: boolean, callback?: (err?: Error) => void): void;
+    set(keyChain: KeyChain, value: any, callback?: (err?: Error) => void): void;
+
+    expire(keys: Keys, seconds: number, callback?: (err?: Error) => void): void;
+    unexpire(keys: Keys, callback?: (err?: Error) => void): void;
+
+    add(keyChain: KeyChain, value: any, getValue?: boolean, callback?: (err?: Error) => void): void;
+    add(keyChain: KeyChain, value: any, callback?: (err?: Error) => void): void;
+
+    get(keyChain: KeyChain, callback: (err: Error | null, value: any) => void): void;
+
+    getRange(keyChain: KeyChain, fromIndex: number, toIndex: number, callback: (err: Error | null, value: any) => void): void;
+    getRange(keyChain: KeyChain, fromIndex: number, callback: (err: Error | null, value: any) => void): void;
+
+    getAll(callback: (err: Error | null, value: any[] | object) => void): void;
+
+    count(keyChain: KeyChain, callback: (err: Error | null, value: number) => void): void;
+
+    remove(keyChain: KeyChain, getValue?: boolean, callback?: (err?: Error) => void): void;
+    remove(keyChain: KeyChain, callback?: (err?: Error) => void): void;
+
+    removeRange(keyChain: KeyChain, fromIndex: number, toIndex?: number, getValue?: boolean, callback?: (err?: Error) => void): void;
+    removeRange(keyChain: KeyChain, fromIndex: number, toIndex?: number, callback?: (err?: Error) => void): void;
+    removeRange(keyChain: KeyChain, fromIndex: number, callback?: (err?: Error) => void): void;
+
+    removeAll(callback?: (err: Error) => void): void;
+
+    splice(keyChain: KeyChain, options?: SpliceOptions, callback?: (err?: Error) => void): void;
+    splice(keyChain: KeyChain, callback?: (err?: Error) => void): void;
+
+    pop(keyChain: KeyChain, callback: (err: Error | null, data: any) => void): void;
+
+    hasKey(keyChain: KeyChain, callback: (err: Error | null, data: boolean) => void): void;
+
+    extractKeys(keyChain: KeyChain): string[];
+
+    extractValues(keyChain: KeyChain): any[];
+
+    exec(query: (datamap: FlexiMap) => void, options?: QueryOptions, callback?: (err: Error | null, data: any) => void): void;
+    exec(query: (datamap: FlexiMap) => void, callback: (err: Error | null, data: any) => void): void;
+}
+
+export type handlerFunction = (data: any) => void;
+
+export type mapperFunction = (keyChain: KeyChain, method: string, clientIds: number[]) => number | number[];
+
+/**
+ * The exchange object is a top-level SCBrokerClient which lets you publish events and manipulate data within your brokers - It represents a cluster of 1 or more brokers.
+ */
+export class SCExchange extends AbstractDataClient {
+    constructor(privateClientCluster: ClientCluster, publicClientCluster: ClientCluster, ioClusterClient: Client);
+
+    send(data: any, mapIndex: number | string | string[] | null, callback?: (err?: Error) => void): void;
+
+    publish(channelName: string, data: any, callback: (err?: Error) => void): void;
+
+    subscribe(channelName: string): SCChannel;
+    unsubscribe(channelName: string): void;
+
+    channel(channelName: string): SCChannel;
+    destroyChannel(channelName: string): void;
+
+    subscriptions(includePending?: boolean): string[];
+    isSubscribed(channelName: string, includePending?: boolean): boolean;
+
+    watch(channelName: string, handler: handlerFunction): void;
+    unwatch(channelName: string, handler?: handlerFunction): void;
+    watchers(channelName: string): handlerFunction[];
+
+    setMapper(mapper: mapperFunction): void;
+    getMapper(): mapperFunction;
+
+    map(keyChain: KeyChain, method: string): { type: string; targets: Client[] };
+
+    destroy(): void;
+}
+
+export interface SCBrokerClusterServerOptions {
+    brokers: string[];
+    debug?: boolean;
+    inspect?: boolean;
+    instanceId?: string;
+    secretKey?: string;
+    expiryAccuracy?: number;
+    downgradeToUser: number | string;
+    appBrokerControllerPath?: string;
+    processTermTimeout?: number;
+    ipcAckTimeout?: number;
+    brokerOptions?: SCServer.SCServerOptions;
+}
+
+export class Server extends EventEmitter {
+    constructor(options: SCBrokerClusterServerOptions);
+
+    on(event: "brokerStart", listener: (brokerInfo: BrokerStartInfo) => void): this;
+    on(event: "brokerExit", listener: (brokerInfo: BrokerExitInfo) => void): this;
+    on(event: "brokerMessage", listener: (brokerId: string, data: any, callback: (err: Error | null, data: any) => void) => void): this;
+    on(event: "ready", listener: () => void): this;
+    on(event: "error", listener: (err?: Error) => void): this;
+
+    sendToBroker(brokerId: string, data: any, callback: (err: Error | null, data: any) => void): void;
+    killBrokers(): void;
+    destroy(): void;
+}
+
+export interface SCBrokerClusterClientOptions {
+    brokers: string[];
+    secretKey?: string;
+    pubSubBatchDuration?: number;
+    connectRetryErrorThreshold: number;
+}
+
+export interface MessagePacket {
+    channel: string;
+    data: any;
+}
+
+export class Client extends EventEmitter {
+    constructor(options: SCBrokerClusterClientOptions);
+
+    exchange(): SCExchange;
+
+    options: SCBrokerClusterClientOptions;
+
+    on(event: "error", listener: (err?: Error) => void): this;
+    on(event: "warning", listener: (warning?: Error) => void): this;
+    on(event: "ready", listener: () => void): this;
+    on(event: "message", listener: (packet: MessagePacket) => void): this;
+
+    destroy(callback: AsyncResultArrayCallback<SCExchange>): void;
+
+    subscribe(channel: string, callback: (err?: Error) => void): void;
+    unsubscribe(channel: string, callback: () => void): void;
+    unsubscribeAll(callback: () => void): void;
+    isSubscribed(channel: string, includePending: boolean): boolean;
+
+    subscribeSocket(socket: SCServerSocket, channel: string, callback?: (err?: Error) => void): void;
+    unsubscribeSocket(socket: SCServerSocket, channel: string, callback?: () => void): void;
+
+    setSCServer(scServer: SCServer): void;
+}
diff --git a/types/sc-broker-cluster/sc-broker-cluster-tests.ts b/types/sc-broker-cluster/sc-broker-cluster-tests.ts
new file mode 100644
index 0000000000..0f5c274248
--- /dev/null
+++ b/types/sc-broker-cluster/sc-broker-cluster-tests.ts
@@ -0,0 +1,29 @@
+import { Client } from "sc-broker-cluster";
+import { SCServer, SCServerSocket } from "socketcluster-server";
+import WebSocket = require("ws");
+
+const client = new Client({
+    brokers: [],
+    secretKey: "secretKey",
+    pubSubBatchDuration: 100,
+    connectRetryErrorThreshold: 5
+});
+
+client.on("error", err => {});
+client.on("warning", err => {});
+
+const exchange = client.exchange();
+
+const scServer = new SCServer();
+client.setSCServer(scServer);
+
+client.once("ready", () => {});
+
+const wsSocket = new WebSocket("address");
+const socket = new SCServerSocket("id", scServer, wsSocket);
+client.subscribeSocket(socket, "channelName", err => {});
+
+client.unsubscribeSocket(socket, "channelName");
+
+const data: any = {};
+exchange.publish("channelName", data, err => {});
diff --git a/types/sc-broker-cluster/scbroker.d.ts b/types/sc-broker-cluster/scbroker.d.ts
new file mode 100644
index 0000000000..a7ddb7db87
--- /dev/null
+++ b/types/sc-broker-cluster/scbroker.d.ts
@@ -0,0 +1,3 @@
+import SCBroker = require("sc-broker/scbroker");
+
+export = SCBroker;
diff --git a/types/sc-broker-cluster/tsconfig.json b/types/sc-broker-cluster/tsconfig.json
new file mode 100644
index 0000000000..8ace8fc9dc
--- /dev/null
+++ b/types/sc-broker-cluster/tsconfig.json
@@ -0,0 +1,25 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "clientcluster.d.ts",
+        "scbroker.d.ts",
+        "sc-broker-cluster-tests.ts"
+    ]
+}
diff --git a/types/sc-broker-cluster/tslint.json b/types/sc-broker-cluster/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/sc-broker-cluster/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/sc-broker/index.d.ts b/types/sc-broker/index.d.ts
new file mode 100644
index 0000000000..ccb83e880e
--- /dev/null
+++ b/types/sc-broker/index.d.ts
@@ -0,0 +1,165 @@
+// Type definitions for sc-broker 5.1
+// Project: https://github.com/SocketCluster/sc-broker
+// Definitions by: Daniel Rose <https://github.com/DanielRose>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.4
+
+import { SCServer } from "socketcluster-server";
+import { WorkerExitInfo } from "socketcluster";
+import { EventEmitter } from "events";
+import { KeyChain, FlexiMap } from "fleximap";
+import { Keys, Key } from "expirymanager";
+
+export interface SCBrokerServerOptions {
+    id?: string;
+    instanceId?: string;
+    debug?: boolean;
+    inspect?: boolean;
+    socketPath?: string;
+    port?: number;
+    expiryAccuracy?: number;
+    downgradeToUser: number | string;
+    brokerControllerPath?: string;
+    processTermTimeout?: number;
+    ipcAckTimeout?: number;
+    secretKey?: string;
+    brokerOptions?: SCServer.SCServerOptions;
+}
+
+export interface SCBrokerServer extends EventEmitter {
+    options: SCBrokerServerOptions;
+    socketPath?: string;
+    port?: number;
+    ipcAckTimeout: number;
+
+    on(event: "error", listener: (err?: Error) => void): this;
+    on(event: "brokerMessage", listener: (brokerId: string, data: any, callback: (err: Error | null, data: any) => void) => void): this;
+    on(event: "ready", listener: (data: any) => void): this;
+    on(event: "exit", listener: (data: WorkerExitInfo) => void): this;
+
+    sendToBroker(data: any, callback?: (err: Error | null, data: any, brokerId: string) => void): void;
+}
+
+export function createServer(options?: SCBrokerServerOptions): SCBrokerServer;
+
+export interface AutoReconnectOptions {
+    initialDelay?: number;
+    randomness?: number;
+    multiplier?: number;
+    maxDelay?: number;
+}
+
+export interface SCBrokerClientOptions {
+    secretKey?: string;
+    timeout?: number;
+    socketPath?: string;
+    port?: number;
+    host?: string;
+    autoReconnect?: boolean;
+    autoReconnectOptions?: AutoReconnectOptions;
+    connectRetryErrorThreshold?: number;
+    pubSubBatchDuration?: number;
+}
+
+export interface QueryOptions {
+    baseKey?: KeyChain;
+    noAck?: boolean;
+    data?: any;
+}
+
+export interface SpliceOptions {
+    index?: number;
+    count?: number;
+    items?: any[];
+    getValue?: boolean;
+    noAck?: boolean;
+}
+
+export interface SCBrokerClient extends EventEmitter {
+    readonly CONNECTED: "connected";
+    readonly CONNECTING: "connecting";
+    readonly DISCONNECTED: "disconnected";
+
+    socketPath?: string;
+    port?: number;
+    host?: string;
+    autoReconnect: boolean;
+    autoReconnectOptions?: AutoReconnectOptions;
+    connectRetryErrorThreshold: number;
+    state: "connected" | "connecting" | "disconnected";
+    connectAttempts: number;
+    pendingReconnect: boolean;
+    pendingReconnectTimeout: number | null;
+
+    on(event: "error", listener: (err?: Error) => void): this;
+    on(event: "warning", listener: (warning?: Error) => void): this;
+    on(event: "ready", listener: (data: any) => void): this;
+    on(event: "message", listener: (channel: string, data: any) => void): this;
+    on(event: "subscribeFail", listener: (err: Error | null, channel: string) => void): this;
+    on(event: "subscribe", listener: (channel: string) => void): this;
+    on(event: "unsubscribe", listener: () => void): this;
+
+    isConnected(): boolean;
+
+    subscribe(channel: string, ackCallback: (err?: Error) => void, force?: boolean): void;
+    unsubscribe(channel: string, ackCallback: (err?: Error) => void): void;
+
+    subscriptions(includePending?: boolean): string[];
+    isSubscribed(channel: string, includePending?: boolean): boolean;
+
+    publish(channel: string, data: any, callback: (err?: Error) => void): void;
+
+    send(data: any, callback: (err?: Error) => void): void;
+
+    set(keyChain: KeyChain, value: any, getValue?: boolean, callback?: (err?: Error) => void): void;
+    set(keyChain: KeyChain, value: any, callback?: (err?: Error) => void): void;
+
+    expire(keys: Keys, seconds: number, callback?: (err?: Error) => void): void;
+    unexpire(keys: Keys, callback?: (err?: Error) => void): void;
+    getExpiry(key: Key, callback?: (err?: Error) => void): number;
+
+    add(keyChain: KeyChain, value: any, getValue?: boolean, callback?: (err?: Error) => void): void;
+    add(keyChain: KeyChain, value: any, callback?: (err?: Error) => void): void;
+
+    concat(keyChain: KeyChain, value: any, getValue?: boolean, callback?: (err?: Error) => void): void;
+    concat(keyChain: KeyChain, value: any, callback?: (err?: Error) => void): void;
+
+    get(keyChain: KeyChain, callback: (err: Error | null, value: any) => void): void;
+
+    getRange(keyChain: KeyChain, fromIndex: number, toIndex: number, callback: (err: Error | null, value: any) => void): void;
+    getRange(keyChain: KeyChain, fromIndex: number, callback: (err: Error | null, value: any) => void): void;
+
+    getAll(callback: (err: Error | null, value: any[] | object) => void): void;
+
+    count(keyChain: KeyChain, callback: (err: Error | null, value: number) => void): void;
+
+    exec(query: (datamap: FlexiMap) => void, options?: QueryOptions, callback?: (err: Error | null, data: any) => void): void;
+    exec(query: (datamap: FlexiMap) => void, callback: (err: Error | null, data: any) => void): void;
+
+    query(query: (datamap: FlexiMap) => void, data?: any, callback?: (err: Error | null, data: any) => void): void;
+    query(query: (datamap: FlexiMap) => void, callback: (err: Error | null, data: any) => void): void;
+
+    remove(keyChain: KeyChain, getValue?: boolean, callback?: (err?: Error) => void): void;
+    remove(keyChain: KeyChain, callback?: (err?: Error) => void): void;
+
+    removeRange(keyChain: KeyChain, fromIndex: number, toIndex?: number, getValue?: boolean, callback?: (err?: Error) => void): void;
+    removeRange(keyChain: KeyChain, fromIndex: number, toIndex?: number, callback?: (err?: Error) => void): void;
+    removeRange(keyChain: KeyChain, fromIndex: number, callback?: (err?: Error) => void): void;
+
+    removeAll(callback?: (err: Error) => void): void;
+
+    splice(keyChain: KeyChain, options?: SpliceOptions, callback?: (err?: Error) => void): void;
+    splice(keyChain: KeyChain, callback?: (err?: Error) => void): void;
+
+    pop(keyChain: KeyChain, callback: (err: Error | null, data: any) => void): void;
+
+    hasKey(keyChain: KeyChain, callback: (err: Error | null, data: boolean) => void): void;
+
+    extractKeys(keyChain: KeyChain): string[];
+
+    extractValues(keyChain: KeyChain): any[];
+
+    end(callback: (err?: Error) => void): void;
+}
+
+export function createClient(options?: SCBrokerClientOptions): SCBrokerClient;
diff --git a/types/sc-broker/sc-broker-tests.ts b/types/sc-broker/sc-broker-tests.ts
new file mode 100644
index 0000000000..201ff10a27
--- /dev/null
+++ b/types/sc-broker/sc-broker-tests.ts
@@ -0,0 +1,58 @@
+import { SCServer, SCServerSocket } from "socketcluster-server";
+import SCBroker = require("sc-broker/scbroker");
+import { FlexiMap } from "fleximap";
+import { ExpiryManager } from "expirymanager";
+
+////////////////////////////////////////////////////
+/// SCBroker tests
+////////////////////////////////////////////////////
+
+const options: SCServer.SCServerOptions = { port: 80 };
+
+let scBroker = new SCBroker();
+scBroker = new SCBroker(options);
+scBroker.options = { environment: "prod" };
+
+const id: number = scBroker.id;
+const instanceId: number = scBroker.instanceId;
+const dataMap: FlexiMap = scBroker.dataMap;
+const dataExpirer: ExpiryManager = scBroker.dataExpirer;
+const subscriptions = scBroker.subscriptions;
+
+const socket: SCServerSocket = subscriptions[1]["test"];
+
+scBroker.on("subscribe", channel => {
+    const subscribeChannel: string = channel;
+});
+scBroker.on("unsubscribe", channel => {
+    const unsubscribeChannel: string = channel;
+});
+scBroker.on("publish", (channel, data) => {
+    const publishChannel: string = channel;
+    const publishData: any = data;
+});
+scBroker.on("masterMessage", (data, masterMessageResponse) => {
+    const masterMessageData: any = data;
+    masterMessageResponse(null, "test");
+    masterMessageResponse(new Error(), null);
+});
+
+scBroker.publish("testChannel", 123);
+
+scBroker.exec(dataMap => {
+    dataMap.set(["main", "message"], "Message");
+    return dataMap.get(["main"]);
+});
+
+scBroker.sendToMaster("data");
+scBroker.sendToMaster(123, (err, response) => {
+    if (!err) {
+        const answer = response;
+    }
+});
+
+class MyBroker extends SCBroker {
+    run() {
+        this.on("subscribe", channel => {});
+    }
+}
diff --git a/types/sc-broker/scbroker.d.ts b/types/sc-broker/scbroker.d.ts
new file mode 100644
index 0000000000..057b983adf
--- /dev/null
+++ b/types/sc-broker/scbroker.d.ts
@@ -0,0 +1,32 @@
+import { EventEmitter } from "events";
+import { SCServer, SCServerSocket } from "socketcluster-server";
+import { FlexiMap, KeyChain } from "fleximap";
+import { ExpiryManager } from "expirymanager";
+
+export = SCBroker;
+
+interface Subscriptions {
+    [socketId: number]: {
+        [channel: string]: SCServerSocket;
+    };
+}
+
+declare class SCBroker extends EventEmitter {
+    id: number;
+    options: SCServer.SCServerOptions;
+    instanceId: number;
+    dataMap: FlexiMap;
+    dataExpirer: ExpiryManager;
+    subscriptions: Subscriptions;
+
+    constructor(options?: SCServer.SCServerOptions);
+
+    on(event: "subscribe" | "unsubscribe", listener: (channel: string) => void): this;
+    on(event: "publish", listener: (channel: string, data: any) => void): this;
+    on(event: "masterMessage", listener: (data: any, respond: (err: Error | null, responseData: any) => void) => void): this;
+
+    publish(channel: string, message: any): void;
+    run(): void;
+    exec(query: (dataMap: FlexiMap, dataExpirer: ExpiryManager, subscriptions: Subscriptions) => any, baseKey?: KeyChain): any;
+    sendToMaster(data: any, callback?: (err: Error | null, responseData: any) => void): void;
+}
diff --git a/types/sc-broker/tsconfig.json b/types/sc-broker/tsconfig.json
new file mode 100644
index 0000000000..6adfe07a5b
--- /dev/null
+++ b/types/sc-broker/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",
+        "scbroker.d.ts",
+        "sc-broker-tests.ts"
+    ]
+}
diff --git a/types/sc-broker/tslint.json b/types/sc-broker/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/sc-broker/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/sc-channel/index.d.ts b/types/sc-channel/index.d.ts
new file mode 100644
index 0000000000..034723c0ba
--- /dev/null
+++ b/types/sc-channel/index.d.ts
@@ -0,0 +1,45 @@
+// Type definitions for sc-channel 1.2
+// Project: https://github.com/SocketCluster/sc-channel
+// Definitions by: Daniel Rose <https://github.com/DanielRose>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.4
+
+import Emitter = require("component-emitter");
+import { SCExchange, handlerFunction } from "sc-broker-cluster";
+
+export interface SCChannelOptions {
+    waitForAuth?: boolean;
+    batch?: boolean;
+    data?: any;
+}
+
+export class SCChannel extends Emitter {
+    readonly PENDING: "pending";
+    readonly SUBSCRIBED: "subscribed";
+    readonly UNSUBSCRIBED: "unsubscribed";
+
+    name: string;
+    state: ChannelState;
+    waitForAuth: boolean;
+    batch: boolean;
+    data: any;
+
+    constructor(name: string, client: SCExchange, options?: SCChannelOptions);
+
+    setOptions(options?: SCChannelOptions): void;
+    getState(): "pending" | "subscribed" | "unsubscribed";
+
+    subscribe(options?: any): void;
+    unsubscribe(): void;
+    isSubscribed(includePending?: boolean): boolean;
+
+    publish(data: any, callback?: (err?: Error) => void): void;
+
+    watch(handler: handlerFunction): void;
+    unwatch(handler?: handlerFunction): void;
+    watchers(): handlerFunction[];
+
+    destroy(): void;
+}
+
+export type ChannelState = "pending" | "subscribed" | "unsubscribed";
diff --git a/types/sc-channel/sc-channel-tests.ts b/types/sc-channel/sc-channel-tests.ts
new file mode 100644
index 0000000000..bfc90cee12
--- /dev/null
+++ b/types/sc-channel/sc-channel-tests.ts
@@ -0,0 +1,33 @@
+import { SCChannel, SCChannelOptions } from "sc-channel";
+import { handlerFunction, Client, SCBrokerClusterClientOptions } from "sc-broker-cluster";
+
+const clientOptions: SCBrokerClusterClientOptions = { brokers: [], connectRetryErrorThreshold: 0 };
+const client = new Client(clientOptions);
+
+let channel = new SCChannel("channelName", client.exchange());
+const channelOptions: SCChannelOptions = {};
+channel = new SCChannel("channelName", client.exchange(), channelOptions);
+
+channel.state = channel.PENDING;
+channel.state = channel.SUBSCRIBED;
+channel.state = channel.UNSUBSCRIBED;
+
+const channelName: string = channel.name;
+
+const handler: handlerFunction = () => { };
+
+channel.watch(handler);
+channel.unwatch();
+
+channel.subscribe();
+channel.subscribe(channelOptions);
+channel.unsubscribe();
+
+const data: any = channel.data;
+
+channel.emit("subscribe", channelName);
+channel.emit("unsubscribe", channelName);
+
+channel.setOptions(channelOptions);
+
+channel.publish(data);
diff --git a/types/sc-channel/tsconfig.json b/types/sc-channel/tsconfig.json
new file mode 100644
index 0000000000..c5c5ce5f14
--- /dev/null
+++ b/types/sc-channel/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "sc-channel-tests.ts"
+    ]
+}
diff --git a/types/sc-channel/tslint.json b/types/sc-channel/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/sc-channel/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/socketcluster-client/index.d.ts b/types/socketcluster-client/index.d.ts
new file mode 100644
index 0000000000..9c15a45465
--- /dev/null
+++ b/types/socketcluster-client/index.d.ts
@@ -0,0 +1,23 @@
+// Type definitions for socketcluster-client 13.0
+// Project: https://github.com/SocketCluster/socketcluster-client
+// Definitions by: Daniel Rose <https://github.com/DanielRose>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.4
+
+import { SCAuthEngine } from "sc-auth";
+import { SCServer } from "socketcluster-server";
+
+export import SCClientSocket = require("./lib/scclientsocket");
+
+export function create(options?: SCClientSocket.ClientOptions): SCClientSocket;
+
+/** @deprecated */
+export function connect(options?: SCClientSocket.ClientOptions): SCClientSocket;
+
+export function destroy(socket: SCClientSocket): void;
+
+export const clients: {
+    [id: string]: SCClientSocket;
+};
+
+export const version: string;
diff --git a/types/socketcluster-client/lib/scclientsocket.d.ts b/types/socketcluster-client/lib/scclientsocket.d.ts
new file mode 100644
index 0000000000..19552bd102
--- /dev/null
+++ b/types/socketcluster-client/lib/scclientsocket.d.ts
@@ -0,0 +1,251 @@
+import Emitter = require("component-emitter");
+import { SCServer } from "socketcluster-server";
+import { SCAuthEngine } from "sc-auth";
+import { SCChannel, SCChannelOptions, ChannelState } from "sc-channel";
+import WebSocket = require("ws");
+
+declare class SCClientSocket extends Emitter {
+    constructor(opts: SCClientSocket.ClientOptions);
+
+    id: string;
+
+    channels: {
+        [channelName: string]: SCChannel;
+    };
+
+    CONNECTING: "connecting";
+    OPEN: "open";
+    CLOSED: "closed";
+
+    state: SCClientSocket.States;
+    getState(): SCClientSocket.States;
+
+    AUTHENTICATED: "authenticated";
+    UNAUTHENTICATED: "unauthenticated";
+
+    authState: SCClientSocket.AuthStates;
+
+    PENDING: "pending";
+
+    pendingReconnect: boolean;
+    pendingReconnectTimeout: number;
+
+    getBytesReceived(): number;
+
+    deauthenticate(callback?: (err: Error) => void): void;
+
+    connect(): void;
+    open(): void;
+    disconnect(code?: number, data?: string | object): void;
+    reconnect(code?: number, data?: string | object): void;
+    destroy(code?: number, data?: string | object): void;
+
+    decodeBase64(encodedString: string): string;
+    encodeBase64(decodedString: string): string;
+
+    getAuthToken(): object | null;
+    authToken: object | null;
+
+    getSignedAuthToken(): string | null;
+    signedAuthToken: string | null;
+
+    // Perform client-initiated authentication by providing an encrypted token string.
+    authenticate(signedAuthToken: string, callback?: (err: Error, authStatus: SCClientSocket.AuthStatus) => void): void;
+
+    decode(message: any): any;
+    encode(object: any): any;
+
+    send(data: any): void;
+
+    emit(event: string, data: any, callback?: (err: Error, responseData: any) => void): void;
+
+    publish(channelName: string, data: any, callback?: (err: Error, ackData: any) => void): void;
+
+    subscribe(channelName: string, options?: SCChannelOptions): SCChannel;
+    unsubscribe(channelName: string): void;
+
+    channel(channelName: string, options?: SCChannelOptions): SCChannel;
+
+    destroyChannel(channelName: string): void;
+
+    subscriptions(includePending?: boolean): string[];
+    isSubscribed(channelName: string, includePending?: boolean): boolean;
+
+    processPendingSubscriptions(): void;
+
+    watch(channelName: string, handler: SCClientSocket.WatcherFunction): void;
+    unwatch(channelName: string, handler?: SCClientSocket.WatcherFunction): void;
+    watchers(channelName: string): SCClientSocket.WatcherFunction[];
+
+    on(event: "connecting", listener: () => void): this;
+    on(event: "connect", listener: (status: SCClientSocket.ConnectStatus, processSubscriptions: () => void) => void): this;
+    on(event: "connectAbort" | "disconnect" | "close", listener: (code: number, data: string | object) => void): this;
+
+    on(event: "kickOut", listener: (message: string, channelName: string) => void): this;
+
+    on(event: "authenticate", listener: (signedAuthToken: string | null) => void): this;
+    on(event: "deauthenticate", listener: (oldSignedToken: string | null) => void): this;
+    on(event: "authStateChange", listener: (stateChangeData: SCClientSocket.AuthStateChangeData) => void): this;
+    on(event: "removeAuthToken", listener: (oldToken: object | null) => void): this;
+
+    on(event: "subscribe" | "subscribeRequest", listener: (channelName: string, subscriptionOptions: SCChannelOptions) => void): this;
+    on(event: "subscribeStateChange", listener: (stateChangeData: SCClientSocket.SubscribeStateChangeData) => void): this;
+    on(event: "subscribeFail", listener: (err: Error, channelName: string, subscriptionOptions: SCChannelOptions) => void): this;
+    on(event: "unsubscribe", listener: (channelName: string) => void): this;
+
+    on(event: "error", listener: (err: Error) => void): this;
+
+    on(event: "raw", listener: (data: any) => void): this;
+    on(event: "message", listener: (message: WebSocket.Data) => void): this;
+
+    // Implements Emitter interface
+
+    // tslint:disable:ban-types
+    // tslint:disable:adjacent-overload-signatures
+    on(event: string, listener: Function): this;
+    once(event: string, listener: Function): this;
+    off(event?: string, listener?: Function): this;
+    emit(event: string, ...args: any[]): boolean;
+    listeners(event: string): Function[];
+    hasListeners(event: string): boolean;
+    // tslint:enable:adjacent-overload-signatures
+    // tslint:enable:ban-types
+}
+
+export = SCClientSocket;
+
+declare namespace SCClientSocket {
+    interface ClientOptions {
+        host?: string;
+
+        // Defaults to the current host (read from the URL).
+        hostname?: string;
+
+        // Defaults to false.
+        secure?: boolean;
+
+        // Defaults to 80 if !secure otherwise defaults to 443.
+        port?: number;
+
+        // The URL which SC uses to make the initial handshake for the WebSocket. Defaults to '/socketcluster/'.
+        path?: string;
+
+        // A map of key-value pairs which will be used as query parameters for the initial HTTP handshake which will initiate the WebSocket connection.
+        query?: string | { [key: string]: string };
+
+        // (milliseconds) - This is the timeout for getting a response to a SCSocket emit event (when a callback is provided).
+        ackTimeout?: number;
+
+        // (milliseconds)
+        connectTimeout?: number;
+
+        // Whether or not to automatically connect the socket as soon as it is created. Default is true.
+        autoConnect?: boolean;
+
+        // Whether or not to automatically reconnect the socket when it loses the connection.
+        autoReconnect?: boolean;
+
+        // Valid properties are: initialDelay (milliseconds), randomness (milliseconds), multiplier (decimal; default is 1.5) and maxDelay (milliseconds).
+        autoReconnectOptions?: AutoReconnectOptions;
+
+        // Whether or not a client automatically disconnects on page unload. If enabled, the client will disconnect when a user navigates away from the page.
+        // This can happen when a user closes the tab/window, clicks a link to leave the page, or types a new URL into the address bar. Defaults to true.
+        disconnectOnUnload?: boolean;
+
+        // Turn on/off per-message deflate compression. If this is true, you need to make sure that this property is also set to true on the server-side.
+        //  Note that this option is only relevant when running the client from Node.js. Most modern browsers will automatically use perMessageDeflate so
+        // you only need to turn it on from the server-side.
+        perMessageDeflate?: boolean;
+
+        // Defaults to true; multiplexing allows you to reuse a socket instead of creating a second socket to the same address.
+        multiplex?: boolean;
+
+        // Defaults to null (0 milliseconds); this property affects channel subscription batching; it determines the period in milliseconds for batching
+        // multiple subscription requests together. It only affects channels that have the batch option set to true. A value of null or 0 means that all
+        // subscribe or unsubscribe requests which were made within the same call stack will be batched together. This property was introduced on the
+        // client-side in SC version 8 (both the client and server versions need to be >= 8.0.0). Note that there is also a separate property with the
+        // same name which can be configured on the server.
+        pubSubBatchDuration?: number;
+
+        // Whether or not to add a timestamp to the WebSocket handshake request.
+        timestampRequests?: boolean;
+
+        // The query parameter name to use to hold the timestamp.
+        timestampParam?: string;
+
+        // A custom engine to use for storing and loading JWT auth tokens on the client side.
+        authEngine?: SCAuthEngine | null;
+
+        // The name of the JWT auth token (provided to the authEngine - By default this is the localStorage variable name); defaults to 'socketCluster.authToken'.
+        authTokenName?: string;
+
+        // The type to use to represent binary on the client. Defaults to 'arraybuffer'.
+        binaryType?: string;
+
+        // Set this to false during debugging - Otherwise client connection will fail when using self-signed certificates.
+        rejectUnauthorized?: boolean;
+
+        // If you set this to true, any data/objects/arrays that you pass to the client socket will be cloned before being sent/queued up. If the socket
+        // is disconnected and you emit an event, it will be added to a queue which will be processed upon reconnection. The cloneData option is false
+        // by default; this means that if you emit/publish an object and that object changes somewhere else in your code before the queue is processed,
+        // then the changed version of that object will be sent out to the server.
+        cloneData?: boolean;
+
+        // This is true by default. If you set this to false, then the socket will not automatically try to subscribe to pending subscriptions on
+        // connect - Instead, you will have to manually invoke the processSubscriptions callback from inside the 'connect' event handler on the client side.
+        // See SCSocket Client API. This gives you more fine-grained control with regards to when pending subscriptions are processed after the socket
+        // connection is established (or re-established).
+        autoSubscribeOnConnect?: boolean;
+
+        // Lets you set a custom codec engine. This allows you to specify how data gets encoded before being sent over the wire and how it gets decoded
+        // once it reaches the other side. The codecEngine must be an object which exposes an encode(object) and a decode(encodedData) function.
+        // The encode function can return any data type - Commonly a string or a Buffer/ArrayBuffer. The decode function needs to return a JavaScript
+        // object which adheres to the SC protocol. The idea of using a custom codec is that it allows you to compress SC packets in any format you like
+        // (optimized for any use case) - By decoding these packets back into their original protocol form, SC will be able process them appropriately.
+        // Note that if you provide a codecEngine when creating a client socket see 'codecEngine', you will need to make sure that the server uses the
+        // same codec by passing the same engine to `worker.scServer.setCodecEngine(codecEngine)` when your SC worker initializes on the server side
+        // (see 'setCodecEngine' method here). The default codec engine used by SC is here.
+        codecEngine?: SCServer.SCCodecEngine | null;
+
+        // A prefix to add to the channel names.
+        channelPrefix?: string | null;
+
+        subscriptionRetryOptions?: object | null;
+    }
+
+    interface AutoReconnectOptions {
+        initialDelay?: number;
+        randomness?: number;
+        multiplier?: number;
+        maxDelay?: number;
+    }
+
+    interface AuthStatus {
+        isAuthenticated: AuthStates;
+        authError: Error;
+    }
+
+    interface AuthStateChangeData {
+        oldState: AuthStates;
+        newState: AuthStates;
+    }
+
+    interface ConnectStatus {
+        id: string;
+        pingTimeout: number;
+        isAuthenticated: boolean;
+        authToken?: object;
+        authError?: Error;
+    }
+
+    interface SubscribeStateChangeData {
+        channel: string;
+        oldState: ChannelState;
+        newState: ChannelState;
+        subscriptionOptions: SCChannelOptions;
+    }
+
+    type WatcherFunction = (data: any) => void;
+    type AuthStates = "authenticated" | "unauthenticated";
+    type States = "connecting" | "open" | "closed";
+}
diff --git a/types/socketcluster-client/socketcluster-client-tests.ts b/types/socketcluster-client/socketcluster-client-tests.ts
new file mode 100644
index 0000000000..527385a5eb
--- /dev/null
+++ b/types/socketcluster-client/socketcluster-client-tests.ts
@@ -0,0 +1,75 @@
+// Adapted from README
+
+import { create, destroy } from "socketcluster-client";
+import { ClientOptions } from "socketcluster-client/lib/scclientsocket";
+
+const secureClientOptions: ClientOptions = {
+    hostname: "securedomain.com",
+    secure: true,
+    port: 443,
+    rejectUnauthorized: false
+};
+
+let socket = create(secureClientOptions);
+
+socket.on("connect", () => {
+    console.log("CONNECTED");
+});
+
+// Listen to an event called 'rand' from the server
+socket.on("rand", (num: any) => {
+    console.log("RANDOM: " + num);
+});
+
+const options: ClientOptions = {
+    path: "/socketcluster/",
+    port: 8000,
+    hostname: "127.0.0.1",
+    autoConnect: true,
+    secure: false,
+    rejectUnauthorized: false,
+    connectTimeout: 10000, // milliseconds
+    ackTimeout: 10000, // milliseconds
+    channelPrefix: null,
+    disconnectOnUnload: true,
+    multiplex: true,
+    autoReconnectOptions: {
+        initialDelay: 10000, // milliseconds
+        randomness: 10000, // milliseconds
+        multiplier: 1.5, // decimal
+        maxDelay: 60000 // milliseconds
+    },
+    authEngine: null,
+    codecEngine: null,
+    subscriptionRetryOptions: {},
+    query: {
+        yourparam: "hello"
+    }
+};
+socket = create(options);
+
+socket.on("subscribe", channelname => {
+    console.log("subscribe:" + channelname);
+});
+
+socket.on("subscribeFail", channelname => {
+    console.log("subscribeFail:" + channelname);
+});
+
+socket.on("unsubscribe", channelname => {
+    console.log("unsubscribe:" + channelname);
+});
+
+socket.on("subscribeStateChange", data => {
+    console.log("subscribeStateChange:" + JSON.stringify(data));
+});
+
+socket.on("message", data => {
+    console.log("message:" + data);
+});
+
+const channels = socket.channels;
+const testChannel = channels["test"];
+const state = testChannel.getState();
+
+destroy(socket);
diff --git a/types/socketcluster-client/tsconfig.json b/types/socketcluster-client/tsconfig.json
new file mode 100644
index 0000000000..54fc6ea8af
--- /dev/null
+++ b/types/socketcluster-client/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",
+        "lib/scclientsocket.d.ts",
+        "socketcluster-client-tests.ts"
+    ]
+}
diff --git a/types/socketcluster-client/tslint.json b/types/socketcluster-client/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/socketcluster-client/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/socketcluster-server/index.d.ts b/types/socketcluster-server/index.d.ts
new file mode 100644
index 0000000000..7466d1daed
--- /dev/null
+++ b/types/socketcluster-server/index.d.ts
@@ -0,0 +1,15 @@
+// Type definitions for socketcluster-server 13.1
+// Project: https://github.com/SocketCluster/socketcluster-server
+// Definitions by: Daniel Rose <https://github.com/DanielRose>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.4
+
+import { Server } from "http";
+
+export import SCServer = require("./scserver");
+export import SCServerSocket = require("./scserversocket");
+
+export function listen(port?: number, options?: SCServer.SCServerOptions, listeningListener?: () => void): SCServer;
+export function listen(port?: number, listeningListener?: () => void): SCServer;
+
+export function attach(server: Server, options?: SCServer.SCServerOptions): SCServer;
diff --git a/types/socketcluster-server/scserver.d.ts b/types/socketcluster-server/scserver.d.ts
new file mode 100644
index 0000000000..a7147aa2dd
--- /dev/null
+++ b/types/socketcluster-server/scserver.d.ts
@@ -0,0 +1,315 @@
+import { EventEmitter } from "events";
+import { Secret } from "jsonwebtoken";
+import { ServerOptions } from "https";
+import { IncomingMessage, Server } from "http";
+import { SCAuthEngine } from "sc-auth";
+import { SCExchange } from "sc-broker-cluster";
+import WebSocket = require("ws");
+
+import SCServerSocket = require("./scserversocket");
+
+declare class SCServer extends EventEmitter {
+    readonly MIDDLEWARE_HANDSHAKE_WS: "handshakeWS";
+    readonly MIDDLEWARE_HANDSHAKE_SC: "handshakeSC";
+    readonly MIDDLEWARE_AUTHENTICATE: "authenticate";
+    readonly MIDDLEWARE_SUBSCRIBE: "subscribe";
+    readonly MIDDLEWARE_PUBLISH_IN: "publishIn";
+    readonly MIDDLEWARE_PUBLISH_OUT: "publishOut";
+    readonly MIDDLEWARE_EMIT: "emit";
+
+    options: SCServer.SCServerOptions;
+    exchange: SCExchange;
+
+    clients: {
+        [id: string]: SCServerSocket;
+    };
+    clientsCount: number;
+
+    pendingClients: {
+        [id: string]: SCServerSocket;
+    };
+    pendingClientsCount: number;
+
+    constructor(options?: SCServer.SCServerOptions);
+
+    on(event: "connection", listener: SCServer.connectionListenerFunction): this;
+
+    addMiddleware(type: "handshakeWS", middlewareFn: (req: IncomingMessage, next: SCServer.nextMiddlewareFunction) => void): void;
+    addMiddleware(type: "handshakeSC", middlewareFn: (req: SCServer.HandshakeSCRequest, next: SCServer.nextHandshakeSCMiddlewareFunction) => void): void;
+    addMiddleware(type: "authenticate", middlewareFn: (req: SCServer.AuthenticateRequest, next: SCServer.nextAuthenticateMiddlewareFunction) => void): void;
+    addMiddleware(type: "subscribe", middlewareFn: (req: SCServer.SubscribeRequest, next: SCServer.nextMiddlewareFunction) => void): void;
+    addMiddleware(type: "publishIn", middlewareFn: (req: SCServer.PublishInRequest, next: SCServer.nextMiddlewareFunction) => void): void;
+    addMiddleware(type: "publishOut", middlewareFn: (req: SCServer.PublishOutRequest, next: SCServer.nextMiddlewareFunction) => void): void;
+    addMiddleware(type: "emit", middlewareFn: (req: SCServer.EmitRequest, next: SCServer.nextMiddlewareFunction) => void): void;
+
+    setAuthEngine(authEngine: SCAuthEngine): void;
+    setCodecEngine(codecEngine: SCServer.SCCodecEngine): void;
+}
+
+export = SCServer;
+
+declare namespace SCServer {
+    interface AuthToken {
+        [x: string]: any;
+    }
+
+    interface SCServerOptions {
+        // The port on which to listen for outside connections/requests
+        port?: number;
+
+        // Number of worker processes
+        workers?: number;
+
+        // Number of broker processes
+        brokers?: number;
+
+        // Should be either 'dev' or 'prod' - This affects the shutdown procedure
+        // when a 'SIGUSR2' signal is received by master. In 'dev', a SIGUSR2 will
+        // trigger an immediate shutdown of workers. In 'prod' workers will
+        // be terminated progressively in accordance with processTermTimeout.
+        environment?: string;
+
+        // Setting this to true will cause the master process to shut down when
+        // it receives a SIGUSR2 signal (instead of just the workers).
+        // If you're using nodemon, set this to true.
+        killMasterOnSignal?: boolean;
+
+        // A unique name for your app (this is used internally for
+        // various things such as the directory name in which to store socket
+        // file descriptors) - If you don't provide an appName, SC will
+        // generate a random one (UUID v4)
+        appName?: string;
+
+        // This can be the name of an npm module or a path to a Node.js module
+        // to use as the WebSocket server engine.
+        // You can now set this to 'sc-uws' for a massive speedup of at least 2x!
+        wsEngine?: string;
+
+        // An ID to associate with this specific instance of SC
+        // this may be useful if you are running an SC app on multiple
+        // hosts - You can access the instanceId from the Broker object
+        // (inside brokerController) - If you don't provide an instanceId,
+        // SC will generate a random one (UUID v4)
+        instanceId?: string;
+
+        // A key which various SC processes will use to interact with
+        // scBroker broker processes securely, defaults to a 256 bits
+        // cryptographically random hex string
+        secretKey?: string;
+
+        // The key which SC will use to encrypt/decrypt authTokens, defaults
+        // to a 256 bits cryptographically random hex string
+        // The default JWT algorithm used is 'HS256'.
+        // If you want to use RSA or ECDSA, you should provide a authPrivateKey
+        // and authPublicKey instead of authKey.
+        authKey?: Secret;
+
+        // perMessageDeflate compression. Note that this option is passed directly to the wsEngine's
+        // Server object. So if you're using 'ws' as the engine, you can pass an object instead of
+        // a boolean. Search for perMessageDeflate here:
+        // https://github.com/websockets/ws/blob/master/doc/ws.md#new-websocketserveroptions-callback
+        // Note that by default, per-message deflate only kicks in for messages > 1024 bytes.
+        perMessageDeflate?: boolean;
+
+        // If using an RSA or ECDSA algorithm to sign the authToken, you will need
+        // to provide an authPrivateKey and authPublicKey in PEM format (string or Buffer).
+        authPrivateKey?: Secret;
+        authPublicKey?: Secret;
+
+        // The default expiry for auth tokens in seconds
+        authDefaultExpiry?: number;
+
+        // The algorithm to use to sign and verify JWT tokens.
+        authAlgorithm?: string;
+
+        // Crash workers when an error happens - This is the most sensible default
+        crashWorkerOnError?: boolean;
+
+        // Reboot workers when they crash - This is a necessity
+        // in production but can be turned off for debugging
+        rebootWorkerOnCrash?: boolean;
+
+        // Kill/respawn a worker process if its memory consumption exceeds this
+        // threshold (in bytes) - If this is null (default), this behavior
+        // will be switched off
+        killWorkerMemoryThreshold?: number;
+
+        // Can be 'http' or 'https'
+        protocol?: "http" | "https";
+
+        // This is the same as the object provided to Node.js's https server
+        protocolOptions?: ServerOptions;
+
+        // A log level of 3 will log everything, 2 will show notices and errors,
+        // 1 will only log errors, 0 will log nothing
+        logLevel?: 0 | 1 | 2 | 3;
+
+        // In milliseconds, how long a client has to connect to SC before timing out
+        connectTimeout?: number;
+
+        // In milliseconds - If the socket handshake hasn't been completed before
+        // this timeout is reached, the new connection attempt will be terminated.
+        handshakeTimeout?: number;
+
+        // In milliseconds, the timeout for calling res(err, data) when
+        // your emit() call expects an ACK response from the other side
+        // (when callback is provided to emit)
+        ackTimeout?: number;
+
+        // In milliseconds, the timeout for calling res(err, data) when
+        // your sendToWorker, sendToBroker or sendToMaster (IPC) call
+        // expects an ACK response from the other process
+        // (when callback is provided)
+        ipcAckTimeout?: number;
+
+        // In milliseconds - If the socket cannot upgrade transport
+        // within this period, it will stop trying
+        socketUpgradeTimeout?: number;
+
+        // Origins which are allowed to connect to the real-time scServer
+        origins?: string;
+
+        // The maximum number of unique channels which a single
+        // socket can subscribe to
+        socketChannelLimit?: number;
+
+        // The interval in milliseconds on which to
+        // send a ping to the client to check that
+        // it is still alive
+        pingInterval?: number;
+
+        // How many milliseconds to wait without receiving a ping
+        // before closing the socket
+        pingTimeout?: number;
+
+        // Maximum amount of milliseconds to wait before force-killing
+        // a process after it was passed a 'SIGTERM' or 'SIGUSR2' signal
+        processTermTimeout?: number;
+
+        // Whether or not errors from child processes (workers and brokers)
+        // should be passed to the current master process
+        propagateErrors?: boolean;
+
+        // Whether or not warnings from child processes (workers and brokers)
+        // should be passed to the current master process
+        propagateWarnings?: number;
+
+        // Whether or not a 'warning' event should be emitted (and logged to console)
+        // whenever an action is blocked by a middleware function
+        middlewareEmitWarnings?: number;
+
+        // Lets you specify a host name to bind to - Defaults to
+        // 127.0.0.1 (localhost)
+        host?: string;
+
+        // The path to a file used to bootstrap worker processes
+        workerController?: string;
+
+        // The path to a file used to bootstrap broker processes
+        brokerController?: string;
+
+        // The path to a file used to bootstrap the workerCluster process
+        workerClusterController?: string;
+
+        // By default, SC will reboot all workers when it receives a 'SIGUSR2' signal -
+        // This can be used for updating workers with fresh source code in production
+        rebootOnSignal?: boolean;
+
+        // If you run your master process (server.js) as super user, this option
+        // lets you downgrade worker and broker processes to run under
+        // the specified user (with fewer permissions than master) - You can provide
+        // a Linux UID or username
+        downgradeToUser?: number | string;
+
+        // The URL path reserved by SocketCluster clients to interact with the server
+        path?: string;
+
+        // The root directory in which to store your socket files in Linux.
+        socketRoot?: string;
+
+        // Defaults to "rr", but can be set to "none"
+        schedulingPolicy?: "rr" | "none";
+
+        // Whether or not clients are allowed to publish messages to channels
+        allowClientPublish?: boolean;
+
+        // This option is passed to the Node.js HTTP server if provided
+        tcpSynBacklog?: number;
+
+        // SC keeps track of request per minutes internally - This allows you to change
+        // how often this gets updated
+        workerStatusInterval?: number;
+
+        // This allows you to batch multiple messages together when passing them across
+        // message brokers. This may improve the efficiency of your pub/sub operations.
+        // This value is in milliseconds. 5 is generally a safe value to set this to.
+        pubSubBatchDuration?: number;
+
+        // The default clustering/brokering engine (Node.js module name) which provides the
+        // SCWorker.exchange object and manages brokers behind the scenes.
+        // You shouldn't need to change this unless you want to build your own
+        // process clustering engine (which is difficult to do).
+        brokerEngine?: string;
+
+        wsEngineServerOptions?: WebSocket.ClientOptions;
+        maxPayload?: number;
+        pingTimeoutDisabled?: boolean;
+        authSignAsync?: boolean;
+        authVerifyAsync?: boolean;
+        httpServer?: Server;
+    }
+
+    interface SCServerSocketStatus {
+        id: string;
+        pingTimeout: number;
+    }
+
+    interface HandshakeSCRequest {
+        socket: SCServerSocket;
+    }
+
+    interface AuthenticateRequest {
+        socket: SCServerSocket;
+        authToken: AuthToken;
+    }
+
+    interface SubscribeRequest {
+        socket: SCServerSocket;
+        authTokenExpiredError?: Error;
+        channel?: string;
+        waitForAuth?: boolean;
+        data?: any;
+    }
+
+    interface PublishInRequest {
+        socket: SCServerSocket;
+        authTokenExpiredError?: Error;
+        channel?: string;
+        data?: any;
+        ackData?: any;
+    }
+
+    interface PublishOutRequest {
+        socket: SCServerSocket;
+        channel?: string;
+        data?: any;
+        useCache?: boolean;
+    }
+
+    interface EmitRequest {
+        socket: SCServerSocket;
+        authTokenExpiredError?: Error;
+        event: string;
+        data?: any;
+    }
+
+    type nextMiddlewareFunction = (error?: true | string | Error) => void;
+    type nextHandshakeSCMiddlewareFunction = (error?: true | string | Error | null, statusCode?: number) => void;
+    type nextAuthenticateMiddlewareFunction = (error?: true | string | Error | null, isBadToken?: boolean) => void;
+    type connectionListenerFunction = (scSocket: SCServerSocket, serverSocketStatus: SCServerSocketStatus) => void;
+
+    interface SCCodecEngine {
+        decode: (input: any) => any;
+        ncode: (object: any) => any;
+    }
+}
diff --git a/types/socketcluster-server/scserversocket.d.ts b/types/socketcluster-server/scserversocket.d.ts
new file mode 100644
index 0000000000..7b32cef72c
--- /dev/null
+++ b/types/socketcluster-server/scserversocket.d.ts
@@ -0,0 +1,43 @@
+import Emitter = require("component-emitter");
+import { IncomingMessage } from "http";
+import { SCExchange } from "sc-broker-cluster";
+import { SignOptions } from "jsonwebtoken";
+import WebSocket = require("ws");
+
+import SCServer = require("./scserver");
+
+declare class SCServerSocket extends Emitter {
+    readonly CONNECTING: "connecting";
+    readonly OPEN: "open";
+    readonly CLOSED: "closed";
+
+    readonly AUTHENTICATED: "authenticated";
+    readonly UNAUTHENTICATED: "unauthenticated";
+
+    id: string;
+    request: IncomingMessage;
+
+    remoteAddress: string;
+    remoteFamily: string;
+    remotePort: number;
+
+    exchange: SCExchange;
+
+    state: "connecting" | "open" | "closed";
+    authState: "authenticated" | "unauthenticated";
+    authToken?: SCServer.AuthToken;
+
+    constructor(id: string, server: SCServer, socket: WebSocket);
+
+    getState(): "connecting" | "open" | "closed";
+    disconnect(code?: number, data?: any): void;
+    send(data: any, options: { mask?: boolean; binary?: boolean; compress?: boolean; fin?: boolean }): void;
+    getAuthToken(): SCServer.AuthToken;
+    setAuthToken(data: SCServer.AuthToken, options?: SignOptions): void;
+    deauthenticate(): void;
+    kickOut(channel?: string, message?: string, callback?: () => void): void;
+    subscriptions(): string[];
+    isSubscribed(channel?: string): boolean;
+}
+
+export = SCServerSocket;
diff --git a/types/socketcluster-server/socketcluster-server-tests.ts b/types/socketcluster-server/socketcluster-server-tests.ts
new file mode 100644
index 0000000000..3d62fe9041
--- /dev/null
+++ b/types/socketcluster-server/socketcluster-server-tests.ts
@@ -0,0 +1,39 @@
+// Adapted from README
+
+// Using with basic http(s) module (example)
+
+import http = require("http");
+import * as socketClusterServer from "socketcluster-server";
+
+let httpServer = http.createServer();
+let scServer = socketClusterServer.attach(httpServer);
+
+scServer.on("connection", socket => {
+    // ... Handle new socket connections here
+});
+
+httpServer.listen(8000);
+
+// Using with Express (example)
+
+import serveStatic = require("serve-static");
+import path = require("path");
+import express = require("express");
+
+const app = express();
+
+app.use(serveStatic(path.resolve(__dirname, "public")));
+
+httpServer = http.createServer();
+
+// Attach express to our httpServer
+httpServer.on("request", app);
+
+// Attach socketcluster-server to our httpServer
+scServer = socketClusterServer.attach(httpServer);
+
+scServer.on("connection", socket => {
+    // ... Handle new socket connections here
+});
+
+httpServer.listen(8000);
diff --git a/types/socketcluster-server/tsconfig.json b/types/socketcluster-server/tsconfig.json
new file mode 100644
index 0000000000..be1a6bdcb0
--- /dev/null
+++ b/types/socketcluster-server/tsconfig.json
@@ -0,0 +1,25 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "scserver.d.ts",
+        "scserversocket.d.ts",
+        "socketcluster-server-tests.ts"
+    ]
+}
diff --git a/types/socketcluster-server/tslint.json b/types/socketcluster-server/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/socketcluster-server/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/socketcluster/fsutil.d.ts b/types/socketcluster/fsutil.d.ts
new file mode 100644
index 0000000000..bcfcbfc59f
--- /dev/null
+++ b/types/socketcluster/fsutil.d.ts
@@ -0,0 +1,11 @@
+import { PathLike } from "fs";
+
+export function fileExists(filePath: PathLike, callback: (exists: boolean) => void): void;
+
+export function waitForFile(
+  filePath: PathLike,
+  checkInterval: number,
+  startTime: number,
+  maxWaitDuration: number,
+  timeoutErrorMessage?: string
+): Promise<void>;
diff --git a/types/socketcluster/index.d.ts b/types/socketcluster/index.d.ts
new file mode 100644
index 0000000000..0ec8485cfa
--- /dev/null
+++ b/types/socketcluster/index.d.ts
@@ -0,0 +1,84 @@
+// Type definitions for socketcluster 14.0
+// Project: https://github.com/SocketCluster/socketcluster
+// Definitions by: Daniel Rose <https://github.com/DanielRose>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.4
+
+import { EventEmitter } from "events";
+import { SCServer } from "socketcluster-server";
+import { ChildProcess } from "child_process";
+
+interface WorkerStartInfo {
+    id: number;
+    pid: number;
+    respawn: boolean;
+}
+
+interface WorkerClusterStartInfo {
+    pid: number;
+    childProcess: ChildProcess;
+}
+
+interface WorkerClusterReadyInfo {
+    pid: number;
+    childProcess: ChildProcess;
+}
+
+interface WorkerClusterExitInfo {
+    pid: number;
+    code: number;
+    signal: string;
+    childProcess: ChildProcess;
+}
+
+export = SocketCluster;
+
+declare class SocketCluster extends EventEmitter {
+    readonly EVENT_FAIL: "fail";
+    readonly EVENT_WARNING: "warning";
+    readonly EVENT_READY: "ready";
+    readonly EVENT_WORKER_START: "workerStart";
+    readonly EVENT_WORKER_EXIT: "workerExit";
+    readonly EVENT_BROKER_START: "brokerStart";
+    readonly EVENT_BROKER_EXIT: "brokerExit";
+    readonly EVENT_WORKER_CLUSTER_START: "workerClusterStart";
+    readonly EVENT_WORKER_CLUSTER_READY: "workerClusterReady";
+    readonly EVENT_WORKER_CLUSTER_EXIT: "workerClusterExit";
+
+    options: SCServer.SCServerOptions;
+
+    constructor(options?: SCServer.SCServerOptions);
+
+    on(event: "fail", listener: (err: Error) => void): this;
+    on(event: "warning", listener: (warning: Error) => void): this;
+    on(event: "ready", listener: () => void): this;
+    on(event: "workerStart", listener: (workerInfo: WorkerStartInfo) => void): this;
+    on(event: "workerExit", listener: (workerInfo: SocketCluster.WorkerExitInfo) => void): this;
+    on(event: "brokerStart", listener: (brokerInfo: SocketCluster.BrokerStartInfo) => void): this;
+    on(event: "brokerExit", listener: (brokerInfo: SocketCluster.BrokerExitInfo) => void): this;
+    on(event: "workerClusterStart", listener: (workerClusterInfo: WorkerClusterStartInfo) => void): this;
+    on(event: "workerClusterReady", listener: (workerClusterInfo: WorkerClusterReadyInfo) => void): this;
+    on(event: "workerClusterExit", listener: (workerClusterInfo: WorkerClusterExitInfo) => void): this;
+}
+
+declare namespace SocketCluster {
+    interface WorkerExitInfo {
+        id: number;
+        pid: number;
+        code: number;
+        signal: string;
+    }
+
+    interface BrokerStartInfo {
+        id: number;
+        pid: number;
+        respawn: boolean;
+    }
+
+    interface BrokerExitInfo {
+        id: number;
+        pid: number;
+        code: number;
+        signal: string;
+    }
+}
diff --git a/types/socketcluster/scbroker.d.ts b/types/socketcluster/scbroker.d.ts
new file mode 100644
index 0000000000..461801aa63
--- /dev/null
+++ b/types/socketcluster/scbroker.d.ts
@@ -0,0 +1,3 @@
+import SCBroker = require("sc-broker-cluster/scbroker");
+
+export = SCBroker;
diff --git a/types/socketcluster/scworker.d.ts b/types/socketcluster/scworker.d.ts
new file mode 100644
index 0000000000..48502692be
--- /dev/null
+++ b/types/socketcluster/scworker.d.ts
@@ -0,0 +1,63 @@
+import { EventEmitter } from "events";
+import { Server as httpServer } from "http";
+import { Server as httpsServer } from "https";
+import { SCServer, SCServerSocket } from "socketcluster-server";
+import { SCAuthEngine } from "sc-auth";
+import { SCExchange } from "sc-broker-cluster";
+
+export = SCWorker;
+
+type middlewareFunction = (options: SCServer.SCServerOptions, next: (error?: string | Error) => void) => void;
+
+declare class SCWorker extends EventEmitter {
+    readonly EVENT_ERROR: "error";
+    readonly EVENT_WARNING: "warning";
+    readonly EVENT_EXIT: "exit";
+    readonly EVENT_READY: "ready";
+    readonly EVENT_CONNECTION: "connection";
+
+    readonly MIDDLEWARE_START: "start";
+
+    id: number;
+    isLeader: boolean;
+    options: SCServer.SCServerOptions;
+    httpServer: httpServer | httpsServer;
+    scServer: SCServer;
+    exchange: SCExchange;
+    auth: SCAuthEngine;
+
+    constructor(options?: SCServer.SCServerOptions);
+
+    run(): void;
+
+    getSCServer(): SCServer;
+    getHTTPServer(): httpServer | httpsServer;
+    getSocketPath(): string;
+
+    setAuthEngine(authEngine: SCAuthEngine): void;
+    setCodecEngine(codecEngine: SCServer.SCCodecEngine): void;
+
+    open(): void;
+    close(callback?: () => void): void;
+
+    addMiddleware(type: "start", middlewareFn: middlewareFunction): void;
+    removeMiddleware(type: "start", middlewareFn: middlewareFunction): void;
+
+    startHTTPServer(): void;
+    start(): Promise<void>;
+
+    getStatus(): {
+        clientCount: any;
+        httpRPM: number;
+        wsRPM: number;
+    };
+
+    sendToMaster(data: any, callback: (err: Error | null, data: any) => void): void;
+    respondToMaster(err: Error | null, data: any, rid: number): void;
+
+    on(event: "connection", listener: (scSocket: SCServerSocket) => void): this;
+    on(event: "ready", listener: () => void): this;
+    on(event: "error", listener: (err: Error) => void): this;
+    on(event: "warning", listener: (warning: Error) => void): this;
+    on(event: "masterMessage", listener: (data: any, respond: (err: Error | null, responseData: any) => void) => void): this;
+}
diff --git a/types/socketcluster/socketcluster-tests.ts b/types/socketcluster/socketcluster-tests.ts
new file mode 100644
index 0000000000..85ad9c3d05
--- /dev/null
+++ b/types/socketcluster/socketcluster-tests.ts
@@ -0,0 +1,76 @@
+import * as fsutil from "socketcluster/fsutil";
+import SocketCluster = require("socketcluster");
+import { SCServer } from "socketcluster-server";
+import { ChildProcess } from "child_process";
+
+////////////////////////////////////////////////////
+/// SocketCluster tests
+////////////////////////////////////////////////////
+
+{
+    const options: SCServer.SCServerOptions = { port: 80 };
+
+    let sc = new SocketCluster();
+    sc = new SocketCluster(options);
+    sc.options = { environment: "prod" };
+
+    sc.on(sc.EVENT_FAIL, err => {
+        const error: Error = err;
+    });
+    sc.on(sc.EVENT_WARNING, warning => {
+        const warn: Error = warning;
+    });
+
+    sc.on(sc.EVENT_READY, () => {});
+
+    sc.on(sc.EVENT_WORKER_START, workerInfo => {
+        const id: number = workerInfo.id;
+        const pid: number = workerInfo.pid;
+        const respawn: boolean = workerInfo.respawn;
+    });
+    sc.on(sc.EVENT_WORKER_EXIT, workerInfo => {
+        const id: number = workerInfo.id;
+        const pid: number = workerInfo.pid;
+        const code: number = workerInfo.code;
+        const signal: string = workerInfo.signal;
+    });
+
+    sc.on(sc.EVENT_BROKER_START, brokerInfo => {
+        const id: number = brokerInfo.id;
+        const pid: number = brokerInfo.pid;
+        const respawn: boolean = brokerInfo.respawn;
+    });
+    sc.on(sc.EVENT_BROKER_EXIT, brokerInfo => {
+        const id: number = brokerInfo.id;
+        const pid: number = brokerInfo.pid;
+        const code: number = brokerInfo.code;
+        const signal: string = brokerInfo.signal;
+    });
+
+    sc.on(sc.EVENT_WORKER_CLUSTER_START, workerClusterInfo => {
+        const pid: number = workerClusterInfo.pid;
+        const childProcess: ChildProcess = workerClusterInfo.childProcess;
+    });
+    sc.on(sc.EVENT_WORKER_CLUSTER_READY, workerClusterInfo => {
+        const pid: number = workerClusterInfo.pid;
+        const childProcess: ChildProcess = workerClusterInfo.childProcess;
+    });
+    sc.on(sc.EVENT_WORKER_CLUSTER_EXIT, workerClusterInfo => {
+        const pid: number = workerClusterInfo.pid;
+        const code: number = workerClusterInfo.code;
+        const signal: string = workerClusterInfo.signal;
+        const childProcess: ChildProcess = workerClusterInfo.childProcess;
+    });
+}
+
+////////////////////////////////////////////////////
+/// fsutil tests
+////////////////////////////////////////////////////
+
+{
+    fsutil.fileExists("/path/to/folder", err => {});
+    fsutil.fileExists(Buffer.from(""), err => {});
+
+    const pathPromise: Promise<void> = fsutil.waitForFile("/path/to/folder", 100, 0, 100);
+    const bufferPromise: Promise<void> = fsutil.waitForFile(Buffer.from(""), 0, 0, 0, "timeout");
+}
diff --git a/types/socketcluster/tsconfig.json b/types/socketcluster/tsconfig.json
new file mode 100644
index 0000000000..1a0267f5f0
--- /dev/null
+++ b/types/socketcluster/tsconfig.json
@@ -0,0 +1,26 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "fsutil.d.ts",
+        "scbroker.d.ts",
+        "scworker.d.ts",
+        "socketcluster-tests.ts"
+    ]
+}
diff --git a/types/socketcluster/tslint.json b/types/socketcluster/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/socketcluster/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}

From c2e36d8f4bd6caf353b0774e2aab9e2e9188baf6 Mon Sep 17 00:00:00 2001
From: Gerhard Stoebich <18708370+Flarna@users.noreply.github.com>
Date: Fri, 30 Nov 2018 12:01:59 +0100
Subject: [PATCH 478/836] [node] add some more elements to IncomingHttpHeaders

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

diff --git a/types/node/index.d.ts b/types/node/index.d.ts
index f71cd9f6ec..b9edae0587 100644
--- a/types/node/index.d.ts
+++ b/types/node/index.d.ts
@@ -1126,10 +1126,10 @@ declare module "http" {
         'access-control-allow-headers'?: string;
         'accept-patch'?: string;
         'accept-ranges'?: string;
-        'authorization'?: string;
         'age'?: string;
         'allow'?: string;
         'alt-svc'?: string;
+        'authorization'?: string;
         'cache-control'?: string;
         'connection'?: string;
         'content-disposition'?: string;
@@ -1139,14 +1139,24 @@ declare module "http" {
         'content-location'?: string;
         'content-range'?: string;
         'content-type'?: string;
+        'cookie'?: string;
         'date'?: string;
+        'expect'?: string;
         'expires'?: string;
+        'forwarded'?: string;
+        'from'?: string;
         'host'?: string;
+        'if-match'?: string;
+        'if-modified-since'?: string;
+        'if-none-match'?: string;
+        'if-unmodified-since'?: string;
         'last-modified'?: string;
         'location'?: string;
         'pragma'?: string;
         'proxy-authenticate'?: string;
+        'proxy-authorization'?: string;
         'public-key-pins'?: string;
+        'range'?: string;
         'referer'?: string;
         'retry-after'?: string;
         'set-cookie'?: string[];

From 0d6d7ce20fb6251e0af9fb871faf664ed7a48ee9 Mon Sep 17 00:00:00 2001
From: Jessica <jessicamfranco3@gmail.com>
Date: Fri, 30 Nov 2018 20:32:32 +0900
Subject: [PATCH 479/836] Add missing file declaration

---
 types/styled-components/tsconfig.json | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/types/styled-components/tsconfig.json b/types/styled-components/tsconfig.json
index 22af0d4a13..fb9b5a0f7b 100644
--- a/types/styled-components/tsconfig.json
+++ b/types/styled-components/tsconfig.json
@@ -3,20 +3,26 @@
         "baseUrl": "../",
         "forceConsistentCasingInFileNames": true,
         "jsx": "react",
-        "lib": ["es6", "dom"],
+        "lib": [
+            "es6",
+            "dom"
+        ],
         "module": "commonjs",
         "noEmit": true,
         "noImplicitAny": true,
         "noImplicitThis": true,
         "strictFunctionTypes": true,
         "strictNullChecks": true,
-        "typeRoots": ["../"],
+        "typeRoots": [
+            "../"
+        ],
         "types": []
     },
     "files": [
         "index.d.ts",
         "macro.d.ts",
+        "cssprop.d.ts",
         "test/index.tsx",
         "test/macro.tsx"
     ]
-}
+}
\ No newline at end of file

From c5bc70efc08abdaebef17c425bbe9edbaf9cbd84 Mon Sep 17 00:00:00 2001
From: Jessica <jessicamfranco3@gmail.com>
Date: Fri, 30 Nov 2018 20:35:04 +0900
Subject: [PATCH 480/836] Fix lint

---
 types/styled-components/index.d.ts     | 10 +++++-----
 types/styled-components/test/index.tsx | 17 +++++++----------
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/types/styled-components/index.d.ts b/types/styled-components/index.d.ts
index 761c48a104..7007a3d829 100644
--- a/types/styled-components/index.d.ts
+++ b/types/styled-components/index.d.ts
@@ -440,21 +440,21 @@ export class StyleSheetManager extends React.Component<
  * The CSS prop is not declared by default in the types as it would cause 'css' to be present
  * on the types of anything that uses styled-components indirectly, even if they do not use the
  * babel plugin.
- * 
+ *
  * You can load a default declaration by using writing this special import from
  * a typescript file. This module does not exist in reality, which is why the {} is important:
- * 
+ *
  * ```ts
  * import {} from 'styled-components/cssprop'
  * ```
- * 
+ *
  * Or you can declare your own module augmentation, which allows you to specify the type of Theme:
- * 
+ *
  * ```ts
  * import { CSSProp } from 'styled-components'
  *
  * interface MyTheme {}
- * 
+ *
  * declare module 'react' {
  *   interface Attributes {
  *     css?: CSSProp<MyTheme>
diff --git a/types/styled-components/test/index.tsx b/types/styled-components/test/index.tsx
index 43f0f68607..6e8715730e 100644
--- a/types/styled-components/test/index.tsx
+++ b/types/styled-components/test/index.tsx
@@ -783,15 +783,16 @@ function cssProp() {
         return <div {...props} />;
     }
 
-    const myCss = 'background: blue;';
+    const myCss = "background: blue;";
 
     return (
         <>
             <div css="background: blue;" />
-            <div
-                // $ExpectError only strings work, objects crash the plugin
-                css={{ background: "blue" }}
-            />
+            {/*
+                For some reason $ExpectError doesn't work on this expression.
+                Only strings work, objects crash the plugin.
+                <div css={{ background: "blue" }} />
+            */}
             <div
                 // would be nice to be able to turn this into an error as it also crashes the plugin,
                 // but this is how optional properties work in TypeScript...
@@ -805,7 +806,7 @@ function cssProp() {
             />
             <div
                 // but this crashes the plugin, even though it's valid type-wise and we can't forbid it
-                css={css({ background: 'blue' })}
+                css={css({ background: "blue" })}
             />
             <div
                 // this also crashes the plugin, only inline strings or css template tag work
@@ -827,10 +828,6 @@ function cssProp() {
                 `}
             />
             <Custom css="background: blue;" />
-            <Custom
-                // $ExpectError only strings work, objects crash the plugin
-                css={{ background: "blue" }}
-            />
             <Custom css={undefined} />
             <Custom
                 css={css`

From 38e1c355dd456e83be3a56e764febf2f1c819903 Mon Sep 17 00:00:00 2001
From: slyrz <slyrz@users.noreply.github.com>
Date: Fri, 30 Nov 2018 13:23:22 +0100
Subject: [PATCH 481/836] Remove Promise in Request.frame function

The type definition of the Request class declares the return type
of the frame() function as Promise<Frame | null>, but it
should be Frame | null only.
---
 types/puppeteer/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/puppeteer/index.d.ts b/types/puppeteer/index.d.ts
index cbb31f2fd0..d90f02f8b8 100644
--- a/types/puppeteer/index.d.ts
+++ b/types/puppeteer/index.d.ts
@@ -968,7 +968,7 @@ export interface Request {
   /**
    * @returns The `Frame` object that initiated the request, or `null` if navigating to error pages
    */
-  frame(): Promise<Frame | null>;
+  frame(): Frame | null;
 
   /**
    * An object with HTTP headers associated with the request.

From c83d99b2fe77138c5d67dfe33e566140a690a23e Mon Sep 17 00:00:00 2001
From: Toby Li <toby.li@weareadaptive.com>
Date: Fri, 30 Nov 2018 15:28:29 +0000
Subject: [PATCH 482/836] Corrected notification duration to timeout, state
 restored to nomal

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

diff --git a/types/openfin/index.d.ts b/types/openfin/index.d.ts
index 55ee5b6741..78b1801b0b 100644
--- a/types/openfin/index.d.ts
+++ b/types/openfin/index.d.ts
@@ -420,7 +420,7 @@ declare namespace fin {
         /**
          * The timeout for displaying a notification.Can be in milliseconds or "never".
          */
-        duration?: number | "never";
+        timeout?: number | "never";
         /**
          * The url of the notification
          */
@@ -804,9 +804,9 @@ declare namespace fin {
          */
         getSnapshot(callback?: (base64Snapshot: string) => void, errorCallback?: (reason: string) => void): void;
         /**
-         * Gets the current state ("minimized", "maximized", or "restored") of the window.
+         * Gets the current state ("minimized", "maximized", or "normal") of the window.
          */
-        getState(callback?: (state: "minimized" | "maximized" | "restored") => void, errorCallback?: (reason: string) => void): void;
+        getState(callback?: (state: "minimized" | "maximized" | "normal") => void, errorCallback?: (reason: string) => void): void;
         /**
          * Returns the zoom level of the window.
          */
diff --git a/types/openfin/openfin-tests.ts b/types/openfin/openfin-tests.ts
index 167a6c86be..e4430ff9c2 100644
--- a/types/openfin/openfin-tests.ts
+++ b/types/openfin/openfin-tests.ts
@@ -207,7 +207,7 @@ function test_notification() {
     notification.close();
     // sendMessage
     notification = new fin.desktop.Notification({
-        duration: 10,
+        timeout: 10,
         url: "http://localhost:5000/Account/Register",
         message: "Hello",
         onShow: () => { },

From 4831c49ca4f685ebca669b9e7a3944620689705d Mon Sep 17 00:00:00 2001
From: Silas Rech <silas@panascais.net>
Date: Fri, 30 Nov 2018 17:15:51 +0100
Subject: [PATCH 483/836] [postcss-url] add typings

---
 types/postcss-url/index.d.ts           | 148 +++++++++++++++++++++++++
 types/postcss-url/package.json         |   6 +
 types/postcss-url/postcss-url-tests.ts |  17 +++
 types/postcss-url/tsconfig.json        |  23 ++++
 types/postcss-url/tslint.json          |   1 +
 5 files changed, 195 insertions(+)
 create mode 100644 types/postcss-url/index.d.ts
 create mode 100644 types/postcss-url/package.json
 create mode 100644 types/postcss-url/postcss-url-tests.ts
 create mode 100644 types/postcss-url/tsconfig.json
 create mode 100644 types/postcss-url/tslint.json

diff --git a/types/postcss-url/index.d.ts b/types/postcss-url/index.d.ts
new file mode 100644
index 0000000000..361b69f1c7
--- /dev/null
+++ b/types/postcss-url/index.d.ts
@@ -0,0 +1,148 @@
+// Type definitions for postcss-url 8.0
+// Project: https://github.com/postcss/postcss-url
+// Definitions by: Silas Rech <https://github.com/lenovouser>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
+
+/// <reference types="node" />
+
+import { Plugin } from 'postcss';
+
+declare namespace url {
+    type CustomTransformFunction = (
+        asset: {
+            /**
+             * Original URL.
+             */
+            url: string;
+
+            /**
+             * URL pathname.
+             */
+            pathname?: string;
+
+            /**
+             * Absolute path to asset.
+             */
+            absolutePath?: string;
+
+            /**
+             * Current relative path to asset.
+             */
+            relativePath?: string;
+
+            /**
+             * Querystring from URL.
+             */
+            search?: string;
+
+            /**
+             * Hash from URL.
+             */
+            hash?: string;
+        },
+        dir: {
+            /**
+             * PostCSS from option.
+             */
+            from?: string;
+
+            /**
+             * PostCSS to option.
+             */
+            to?: string;
+
+            /**
+             * File path.
+             */
+            file?: string;
+        },
+    ) => string;
+    type CustomHashFunction = (file: Buffer) => string;
+    type CustomFilterFunction = (file: string) => boolean;
+
+    interface Options {
+        /**
+         * URL rewriting mechanism.
+         *
+         * @default 'rebase'
+         */
+        url?: 'copy' | 'inline' | 'rebase' | CustomTransformFunction;
+
+        /**
+         * Specify the maximum file size to inline (in kilobytes).
+         */
+        maxSize?: number;
+
+        /**
+         * Do not warn when an SVG URL with a fragment is inlined.
+         * PostCSS-URL does not support partial inlining.
+         * The entire SVG file will be inlined.
+         * By default a warning will be issued when this occurs.
+         *
+         * @default false
+         */
+        ignoreFragmentWarning?: boolean;
+
+        /**
+         * Determine wether a file should be inlined.
+         */
+        filter?: RegExp | CustomFilterFunction | string;
+
+        /**
+         * Specifies whether the URL's fragment identifer value, if present, will be added to the inlined data URI.
+         *
+         * @default false
+         */
+        includeUriFragment?: boolean;
+
+        /**
+         * The fallback method to use if the maximum size is exceeded or the URL contains a hash.
+         */
+        fallback?: CustomTransformFunction;
+
+        /**
+         * Specify the base path or list of base paths where to search images from.
+         */
+        basePath?: string | string[];
+
+        /**
+         * The assets files will be copied in that destination.
+         *
+         * @default false
+         */
+        assetsPath?: boolean | string;
+
+        /**
+         * Rename the path of the files by a hash name.
+         *
+         * @default false
+         */
+        useHash?: boolean;
+
+        /**
+         * Hash options
+         */
+        hashOptions?: {
+            /**
+             * Hashing method or custom function.
+             */
+            method?: 'xxhash32' | 'xxhash64' | CustomHashFunction;
+
+            /**
+             * Shrink hast to certain length.
+             */
+            shrink?: number;
+
+            /**
+             * Append the original filename in resulting filename.
+             */
+            append?: boolean;
+        };
+    }
+
+    type Url = Plugin<Options | Options[]>;
+}
+
+declare const url: url.Url;
+export = url;
diff --git a/types/postcss-url/package.json b/types/postcss-url/package.json
new file mode 100644
index 0000000000..1e1a719545
--- /dev/null
+++ b/types/postcss-url/package.json
@@ -0,0 +1,6 @@
+{
+    "private": true,
+    "dependencies": {
+        "postcss": "7.x.x"
+    }
+}
diff --git a/types/postcss-url/postcss-url-tests.ts b/types/postcss-url/postcss-url-tests.ts
new file mode 100644
index 0000000000..a258b49be4
--- /dev/null
+++ b/types/postcss-url/postcss-url-tests.ts
@@ -0,0 +1,17 @@
+import * as postcss from 'postcss';
+import * as url from 'postcss-url';
+
+const standard: postcss.Transformer = url();
+
+const single: postcss.Transformer = url({ url: 'copy', assetsPath: 'img', useHash: true });
+
+const multiple: postcss.Transformer = url([
+    { filter: '**/assets/copy/*.png', url: 'copy', assetsPath: 'img', useHash: true },
+    { filter: '**/assets/inline/*.svg', url: 'inline' },
+    { filter: '**/assets/**/*.gif', url: 'rebase' },
+    { filter: 'cdn/**/*', url: (asset) => `https://cdn.url/${asset.url}` },
+]);
+
+postcss().use(standard);
+postcss().use(single);
+postcss().use(multiple);
diff --git a/types/postcss-url/tsconfig.json b/types/postcss-url/tsconfig.json
new file mode 100644
index 0000000000..c7759ba2d3
--- /dev/null
+++ b/types/postcss-url/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "postcss-url-tests.ts"
+    ]
+}
diff --git a/types/postcss-url/tslint.json b/types/postcss-url/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/postcss-url/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 3c08522763fab883305b539e8a66d1589a908c11 Mon Sep 17 00:00:00 2001
From: Gilad Peleg <giladp007@gmail.com>
Date: Fri, 30 Nov 2018 18:46:24 +0200
Subject: [PATCH 484/836] Gravatar can accept optional html img attributes

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

diff --git a/types/react-gravatar/index.d.ts b/types/react-gravatar/index.d.ts
index b2962edc8d..56e48b3b9b 100644
--- a/types/react-gravatar/index.d.ts
+++ b/types/react-gravatar/index.d.ts
@@ -25,7 +25,7 @@ declare namespace Gravatar {
 	type DefaultImage = "404" | "mm" | "identicon" | "monsterid" | "wavatar" | "retro" | "blank";
 	type Rating = "g" | "pg" | "r" | "x";
 
-	interface Props {
+	interface Props extends Partial<JSX.IntrinsicElements['img']> {
 		/**
 		 * The email address used to look up the Gravatar image.
 		 * If you wish to avoid sending an email address to the client, you can compute the md5 hash on the server and

From 65430a8a7b530420437b8f618849663dbef2d004 Mon Sep 17 00:00:00 2001
From: James Ide <ide@expo.io>
Date: Fri, 30 Nov 2018 10:17:33 -0800
Subject: [PATCH 485/836] [react-native] Make requireNativeComponent work with
 an update to @types/react

4dd9510a504875fb79a399d468e8f39e892af617 changed `React.ReactType` to look at entries in the `JSX.IntrinsicElements` map, which caused rendering `React.ReactType<any>` elements to fail. This commit fixes the RN type declarations by returning `any`. We don't care about the actual return type that much -- it's concretely a string but externally, as a user of react-native, you'd want to only use it as a JSX component type and not as a string.

And since it's a string that isn't registered with `JSX.IntrinsicElements`, there's no extra type information (ex: list of valid props) associated with it. Longer term, it might make sense for `@types/react-native` to add native component types like `RCTView` to `JSX.IntrinsicElements` and go back to using `React.ReactType<'RCTView'>` with `requireNativeComponent`, but this is a disruptive change.

Test plan: Ran tests, verified they pass again.

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

diff --git a/types/react-native/index.d.ts b/types/react-native/index.d.ts
index 6e54b6d7c9..ae1aa35f00 100644
--- a/types/react-native/index.d.ts
+++ b/types/react-native/index.d.ts
@@ -9037,8 +9037,11 @@ export const PixelRatio: PixelRatioStatic;
  *
  *   const View = requireNativeComponent('RCTView');
  *
+ * The concrete return type of `requireNativeComponent` is a string, but the declared type is
+ * `any` because TypeScript assumes anonymous JSX intrinsics (`string` instead of `"div", for
+ * example) not to have any props.
  */
-export function requireNativeComponent(viewName: string): React.ReactType;
+export function requireNativeComponent(viewName: string): any;
 
 export function findNodeHandle(
     componentOrHandle: null | number | React.Component<any, any> | React.ComponentClass<any>

From a386b24578934f1be2128e0f695485bd78a84f56 Mon Sep 17 00:00:00 2001
From: Fabio Tea <iam@f4b.io>
Date: Fri, 30 Nov 2018 19:48:40 +0100
Subject: [PATCH 486/836] url-assembler: making 'strict: boolean' parameter of
 param functions optional as per api-definition of 1.2.10

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

diff --git a/types/url-assembler/index.d.ts b/types/url-assembler/index.d.ts
index 3f33bf921a..e27fbbe58d 100644
--- a/types/url-assembler/index.d.ts
+++ b/types/url-assembler/index.d.ts
@@ -7,8 +7,8 @@ interface UrlAssembler {
 	template(template: string): UrlAssembler;
 	prefix(subPath: string): UrlAssembler;
 	segment(subPathTemplate: string): UrlAssembler;
-	param(key: string, value: string, strict: boolean): UrlAssembler;
-	param(params: {[s: string]: any}, strict: boolean): UrlAssembler;
+	param(key: string, value: string, strict?: boolean): UrlAssembler;
+	param(params: {[s: string]: any}, strict?: boolean): UrlAssembler;
 	query(key: string, value: any): UrlAssembler;
 	query(params: {[s: string]: any}): UrlAssembler;
 	toString(): string;

From 8814139174714997d92831b3a41a3f9eee376fa4 Mon Sep 17 00:00:00 2001
From: Fabio Tea <iam@f4b.io>
Date: Fri, 30 Nov 2018 19:56:58 +0100
Subject: [PATCH 487/836] [url-assembler]: making 'strict: boolean' parameter
 optional (+adjusted version comment)

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

diff --git a/types/url-assembler/index.d.ts b/types/url-assembler/index.d.ts
index e27fbbe58d..bce3adb35e 100644
--- a/types/url-assembler/index.d.ts
+++ b/types/url-assembler/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for url-assembler 1.2
+// Type definitions for url-assembler 1.2.10
 // Project: https://github.com/Floby/node-url-assembler
 // Definitions by: Wolfgang Faust <https://github.com/wolfgang42>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped

From 96d4557ecde6e7cedc60cf9fa6486aa19ffce841 Mon Sep 17 00:00:00 2001
From: Zak Angelle <zaknotzak@gmail.com>
Date: Fri, 30 Nov 2018 12:53:15 -0600
Subject: [PATCH 488/836] yup: Add resolve type to TestContext

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

diff --git a/types/yup/index.d.ts b/types/yup/index.d.ts
index 821b0e3526..7d93dd3326 100644
--- a/types/yup/index.d.ts
+++ b/types/yup/index.d.ts
@@ -206,6 +206,7 @@ export interface TestContext {
     options: ValidateOptions;
     parent: any;
     schema: Schema<any>;
+    resolve: (value: any) => any;
     createError: (params: { path: string; message: string }) => ValidationError;
 }
 
diff --git a/types/yup/yup-tests.ts b/types/yup/yup-tests.ts
index efef78d319..b4dedc6bcb 100644
--- a/types/yup/yup-tests.ts
+++ b/types/yup/yup-tests.ts
@@ -174,6 +174,8 @@ const testContext = function(this: TestContext) {
     this.parent;
     // $ExpectType Schema<any>
     this.schema;
+    // $ExpectType (value: any) => any
+    this.resolve;
     // $ExpectType ValidationError
     this.createError({ path: "1", message: "1" });
     return true;

From 86e80e4f78aee19a33d0864e5e18403b0a881f86 Mon Sep 17 00:00:00 2001
From: David Brett <DHBrett@outlook.com>
Date: Fri, 30 Nov 2018 14:12:07 -0500
Subject: [PATCH 489/836] Adding ProgressBarOptions to exports for progress

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

diff --git a/types/progress/index.d.ts b/types/progress/index.d.ts
index 74596c4c13..6f6e2ea33d 100644
--- a/types/progress/index.d.ts
+++ b/types/progress/index.d.ts
@@ -10,22 +10,22 @@
 /**
  * These are keys in the options object you can pass to the progress bar along with total as seen in the example above.
  */
-interface ProgressBarOptions {
+export interface ProgressBarOptions {
     /**
      * Total number of ticks to complete.
      */
     total: number;
-    
+
     /**
      * current completed index
      */
-    curr?: number;    
-    
+    curr?: number;
+
     /**
      * head character defaulting to complete character
      */
-    head?: string;    
-    
+    head?: string;
+
     /**
      * The displayed width of the progress bar defaulting to total.
      */
@@ -120,7 +120,7 @@ declare class ProgressBar {
      *   overall completion to.
      */
     update(ratio: number, tokens?: any): void;
-    
+
     /**
      * "interrupt" the progress bar and write a message above it.
      */
@@ -128,7 +128,7 @@ declare class ProgressBar {
 
     /**
      * Terminates a progress bar.
-     */ 
+     */
     terminate(): void;
 
     /**
@@ -138,4 +138,4 @@ declare class ProgressBar {
 }
 declare namespace ProgressBar { }
 
-export = ProgressBar;
+export default ProgressBar;

From 3dc3584b476342f732bdba4cb8612ff3d4113b62 Mon Sep 17 00:00:00 2001
From: Fabio Tea <iam@f4b.io>
Date: Fri, 30 Nov 2018 21:07:18 +0100
Subject: [PATCH 490/836] [url-assembler]: fixed dt-header (removed
 patch-version)

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

diff --git a/types/url-assembler/index.d.ts b/types/url-assembler/index.d.ts
index bce3adb35e..e27fbbe58d 100644
--- a/types/url-assembler/index.d.ts
+++ b/types/url-assembler/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for url-assembler 1.2.10
+// Type definitions for url-assembler 1.2
 // Project: https://github.com/Floby/node-url-assembler
 // Definitions by: Wolfgang Faust <https://github.com/wolfgang42>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped

From c2cf09838355de2914d34c4b83a22388004274ff Mon Sep 17 00:00:00 2001
From: David Brett <DHBrett@outlook.com>
Date: Fri, 30 Nov 2018 15:13:16 -0500
Subject: [PATCH 491/836] Adding types for multi-progress

---
 types/multi-progress/index.d.ts              | 42 +++++++++++
 types/multi-progress/multi-progress-tests.ts | 18 +++++
 types/multi-progress/tsconfig.json           | 23 ++++++
 types/multi-progress/tslint.json             | 79 ++++++++++++++++++++
 4 files changed, 162 insertions(+)
 create mode 100644 types/multi-progress/index.d.ts
 create mode 100644 types/multi-progress/multi-progress-tests.ts
 create mode 100644 types/multi-progress/tsconfig.json
 create mode 100644 types/multi-progress/tslint.json

diff --git a/types/multi-progress/index.d.ts b/types/multi-progress/index.d.ts
new file mode 100644
index 0000000000..e1ae12a4e0
--- /dev/null
+++ b/types/multi-progress/index.d.ts
@@ -0,0 +1,42 @@
+// Type definitions for multi-progress v2.0.0
+// Project: https://github.com/pitaj/multi-progress
+// Definitions by: David Brett <https://github.com/DHBrett>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node"/>
+
+import ProgressBar, { ProgressBarOptions } from '../progress'
+import { Stream } from 'stream';
+
+declare class MultiProgress {
+    /**
+     * Create a new @see MultiProgress with the given stream, or stderr by default
+     * @param stream A stream to write the progress bars to
+     */
+    constructor(stream?: Stream)
+
+    /**
+     * Add a new bar
+     */
+    newBar: (format: string, options: ProgressBarOptions) => ProgressBar;
+
+    /**
+     * Close all bars
+     */
+    terminate: () => void;
+
+    /**
+     * Render the given progress bar
+     */
+    move: (index: number) => void;
+
+    /**
+     * Move the bar indicated by index forward the number of steps indicated by value
+     */
+    tick: (index: number, value: number, options?: any) => void;
+
+    /**
+     * Update the bar indicated by index to the value given
+     */
+    update: (index: number, value: number, options?: any) => void;
+}
diff --git a/types/multi-progress/multi-progress-tests.ts b/types/multi-progress/multi-progress-tests.ts
new file mode 100644
index 0000000000..3397a48428
--- /dev/null
+++ b/types/multi-progress/multi-progress-tests.ts
@@ -0,0 +1,18 @@
+/**
+ * Example from https://github.com/pitaj/multi-progress
+ */
+
+// require the library
+var MultiProgress = require("multi-progress");
+
+// spawn an instance with the optional stream to write to
+// use of `new` is optional
+var multi = new MultiProgress(process.stderr);
+
+// create a progress bar
+var bar = multi.newBar('  downloading [:bar] :percent :etas', {
+  complete: '=',
+  incomplete: ' ',
+  width: 30,
+  total: 20
+});
diff --git a/types/multi-progress/tsconfig.json b/types/multi-progress/tsconfig.json
new file mode 100644
index 0000000000..72100a32f7
--- /dev/null
+++ b/types/multi-progress/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": false,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "multi-progress-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/multi-progress/tslint.json b/types/multi-progress/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/multi-progress/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 2e2869dcd8f5cbc8be06e600d789dd9c99d08c46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Den=C3=A8le?= <remi@altirnao.com>
Date: Fri, 30 Nov 2018 21:51:13 +0100
Subject: [PATCH 492/836] [puppeteer] 1.11.0 update type definitions

---
 types/puppeteer/index.d.ts | 214 ++++++++++++++++++-------------------
 1 file changed, 102 insertions(+), 112 deletions(-)

diff --git a/types/puppeteer/index.d.ts b/types/puppeteer/index.d.ts
index cbb31f2fd0..202cc05181 100644
--- a/types/puppeteer/index.d.ts
+++ b/types/puppeteer/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for puppeteer 1.10
+// Type definitions for puppeteer 1.11
 // Project: https://github.com/GoogleChrome/puppeteer#readme
 // Definitions by: Marvin Hagemeister <https://github.com/marvinhagemeister>
 //                 Christopher Deutsch <https://github.com/cdeutsch>
@@ -398,6 +398,8 @@ export interface Cookie {
   path: string;
   /** The cookie Unix expiration time in seconds. */
   expires: number;
+  /** The cookie size */
+  size: number;
   /** The cookie http only flag. */
   httpOnly: boolean;
   /** The session cookie flag. */
@@ -414,7 +416,6 @@ export interface DeleteCookie {
   url?: string;
   domain?: string;
   path?: string;
-  secure?: boolean;
 }
 
 export interface SetCookie {
@@ -579,20 +580,20 @@ export interface PDFOptions {
    * @default 'Letter'
    */
   format?: PDFFormat;
-  /** Paper width, accepts values labeled with units. */
-  width?: string;
-  /** Paper height, accepts values labeled with units. */
-  height?: string;
+  /** Paper width, accepts values labeled with units. Treat numbers as pixel values */
+  width?: string | number;
+  /** Paper height, accepts values labeled with units. Treat numbers as pixel values */
+  height?: string | number;
   /** Paper margins, defaults to none.  */
   margin?: {
-    /** Top margin, accepts values labeled with units. */
-    top?: string;
-    /** Right margin, accepts values labeled with units. */
-    right?: string;
-    /** Bottom margin, accepts values labeled with units. */
-    bottom?: string;
-    /** Left margin, accepts values labeled with units. */
-    left?: string;
+    /** Top margin, accepts values labeled with units. Treat numbers as pixel values */
+    top?: string | number;
+    /** Right margin, accepts values labeled with units. Treat numbers as pixel values */
+    right?: string | number;
+    /** Bottom margin, accepts values labeled with units. Treat numbers as pixel values */
+    bottom?: string | number;
+    /** Left margin, accepts values labeled with units. Treat numbers as pixel values */
+    left?: string | number;
   };
 
   /**
@@ -1177,8 +1178,9 @@ export interface FrameBase extends Evalable {
   /**
    * Sets the page content.
    * @param html HTML markup to assign to the page.
+   * @param options The navigation parameters.
    */
-  setContent(html: string): Promise<void>;
+  setContent(html: string, options?: NavigationOptions): Promise<void>;
 
   /**
    * This method fetches an element with `selector`, scrolls it into view if needed,
@@ -1395,11 +1397,11 @@ export interface AXNode {
   /**
    * Whether the checkbox is checked, or "mixed".
    */
-  checked: boolean | string;
+  checked: boolean | "mixed";
   /**
    * Whether the toggle button is checked, or "mixed".
    */
-  pressed: boolean | string;
+  pressed: boolean | "mixed";
   /**
    * The level of a heading.
    */
@@ -1620,9 +1622,9 @@ export interface Page extends EventEmitter, FrameBase {
 
   /**
    * Determines whether cache is enabled on the page.
-   * @param enabled Whether or not to enable cache on the page.
+   * @param enabled Whether or not to enable cache on the page. Defaults to true.
    */
-  setCacheEnabled(enabled: boolean): Promise<void>;
+  setCacheEnabled(enabled?: boolean): Promise<void>;
 
   /**
    * Sets the cookies on the page.
@@ -1934,26 +1936,6 @@ export interface Target {
 }
 
 export interface LaunchOptions extends Timeoutable {
-  /**
-   * Whether to open chrome in appMode.
-   * @default false
-   */
-  appMode?: boolean;
-  /**
-   * Whether to ignore HTTPS errors during navigation.
-   * @default false
-   */
-  ignoreHTTPSErrors?: boolean;
-  /**
-   * Do not use `puppeteer.defaultArgs()` for launching Chromium.
-   * @default false
-   */
-  ignoreDefaultArgs?: boolean | string[];
-  /**
-   * Whether to run Chromium in headless mode.
-   * @default true
-   */
-  headless?: boolean;
   /**
    * Path to a Chromium executable to run instead of bundled Chromium. If
    * executablePath is a relative path, then it is resolved relative to current
@@ -1961,10 +1943,73 @@ export interface LaunchOptions extends Timeoutable {
    */
   executablePath?: string;
   /**
-   * Slows down Puppeteer operations by the specified amount of milliseconds.
-   * Useful so that you can see what is going on.
+   * Do not use `puppeteer.defaultArgs()` for launching Chromium.
+   * @default false
    */
-  slowMo?: number;
+  ignoreDefaultArgs?: boolean | string[];
+  /**
+   * Close chrome process on Ctrl-C.
+   * @default true
+   */
+  handleSIGINT?: boolean;
+  /**
+   * Close chrome process on SIGTERM.
+   * @default true
+   */
+  handleSIGTERM?: boolean;
+  /**
+   * Close chrome process on SIGHUP.
+   * @default true
+   */
+  handleSIGHUP?: boolean;
+  /**
+   * Whether to pipe browser process stdout and stderr into process.stdout and
+   * process.stderr.
+   * @default false
+   */
+  dumpio?: boolean;
+  /**
+   * Specify environment variables that will be visible to Chromium.
+   * @default `process.env`.
+   */
+  env?: {
+    [key: string]: string | boolean | number;
+  };
+  /**
+   * Connects to the browser over a pipe instead of a WebSocket.
+   * @default false
+   */
+  pipe?: boolean;
+}
+
+export interface ChromeArgOptions {
+    /**
+     * Whether to run browser in headless mode.
+     * @default true unless the devtools option is true.
+     */
+    headless?: boolean;
+    /**
+     * Additional arguments to pass to the browser instance.
+     * The list of Chromium flags can be found here.
+     */
+    args?: string[];
+    /**
+     * Path to a User Data Directory.
+     */
+    userDataDir?: string;
+    /**
+     * Whether to auto-open a DevTools panel for each tab.
+     * If this option is true, the headless option will be set false.
+     */
+    devtools?: boolean;
+}
+
+export interface BrowserOptions {
+  /**
+   * Whether to ignore HTTPS errors during navigation.
+   * @default false
+   */
+  ignoreHTTPSErrors?: boolean;
   /**
    * Sets a consistent viewport for each page. Defaults to an 800x600 viewport. null disables the default viewport.
    */
@@ -2000,81 +2045,26 @@ export interface LaunchOptions extends Timeoutable {
     isLandscape?: boolean;
   };
   /**
-   * Additional arguments to pass to the Chromium instance. List of Chromium
-   * flags can be found here.
+   * Slows down Puppeteer operations by the specified amount of milliseconds.
+   * Useful so that you can see what is going on.
    */
-  args?: string[];
-  /**
-   * Close chrome process on Ctrl-C.
-   * @default true
-   */
-  handleSIGINT?: boolean;
-  /**
-   * Close chrome process on SIGTERM.
-   * @default true
-   */
-  handleSIGTERM?: boolean;
-  /**
-   * Close chrome process on SIGHUP.
-   * @default true
-   */
-  handleSIGHUP?: boolean;
-  /**
-   * Whether to pipe browser process stdout and stderr into process.stdout and
-   * process.stderr.
-   * @default false
-   */
-  dumpio?: boolean;
-  /** Path to a User Data Directory. */
-  userDataDir?: string;
-  /**
-   * Specify environment variables that will be visible to Chromium.
-   * @default `process.env`.
-   */
-  env?: {
-    [key: string]: string | boolean | number;
-  };
-  /**
-   * Whether to auto-open DevTools panel for each tab. If this option is true, the headless option will be set false.
-   */
-  devtools?: boolean;
-  /**
-   * Connects to the browser over a pipe instead of a WebSocket.
-   * @default false
-   */
-  pipe?: boolean;
-}
-
-export interface DefaultArgsOptions {
-    /**
-     * Whether to run browser in headless mode.
-     * @default true unless the devtools option is true.
-     */
-    headless?: boolean;
-    /**
-     * Additional arguments to pass to the browser instance.
-     * The list of Chromium flags can be found here.
-     */
-    args?: string[];
-    /**
-     * Path to a User Data Directory.
-     */
-    userDataDir?: string;
-    /**
-     * Whether to auto-open a DevTools panel for each tab.
-     * If this option is true, the headless option will be set false.
-     */
-    devtools?: boolean;
+  slowMo?: number;
 }
 
 export interface ConnectOptions {
   /** A browser websocket endpoint to connect to. */
   browserWSEndpoint?: string;
   /**
-   * Whether to ignore HTTPS errors during navigation.
-   * @default false
+   * **Experimental** Specify a custom transport object for Puppeteer to use.
    */
-  ignoreHTTPSErrors?: boolean;
+  transport?: ConnectionTransport;
+}
+
+export interface ConnectionTransport {
+  send: (message: string) => void;
+  close: () => void;
+  onmessage?: (message: string) => void;
+  onclose?: () => void;
 }
 
 export interface CDPSession extends EventEmitter {
@@ -2117,10 +2107,10 @@ export interface CoverageEntry {
 }
 
 /** Attaches Puppeteer to an existing Chromium instance */
-export function connect(options?: ConnectOptions): Promise<Browser>;
+export function connect(options?: ConnectOptions & BrowserOptions): Promise<Browser>;
 /** The default flags that Chromium will be launched with */
-export function defaultArgs(options?: DefaultArgsOptions): string[];
+export function defaultArgs(options?: ChromeArgOptions): string[];
 /** Path where Puppeteer expects to find bundled Chromium */
 export function executablePath(): string;
 /** The method launches a browser instance with given arguments. The browser will be closed when the parent node.js process is closed. */
-export function launch(options?: LaunchOptions): Promise<Browser>;
+export function launch(options?: LaunchOptions & ChromeArgOptions & BrowserOptions): Promise<Browser>;

From 30a14bb78ef80d38789c512debb8b8fa185c6846 Mon Sep 17 00:00:00 2001
From: Mark Wolff <marwolff@microsoft.com>
Date: Fri, 30 Nov 2018 14:03:07 -0800
Subject: [PATCH 493/836] Update docs comment for start/stoptrackpage

---
 types/applicationinsights-js/index.d.ts | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/types/applicationinsights-js/index.d.ts b/types/applicationinsights-js/index.d.ts
index b86dc23634..ee509a0eb5 100644
--- a/types/applicationinsights-js/index.d.ts
+++ b/types/applicationinsights-js/index.d.ts
@@ -670,13 +670,15 @@ declare module Microsoft.ApplicationInsights {
         context: ITelemetryContext;
         queue: Array<() => void>;
         /**
-         * Starts timing how long the user views a page or other item. Call this when the page opens.
-         * This method doesn't send any telemetry. Call {@link stopTrackTelemetry} to log the page when it closes.
+         * Starts the timer for tracking a page load time. Use this instead of `trackPageView` if you want to control when the page view timer starts and stops,
+         * but don't want to calculate the duration yourself. This method doesn't send any telemetry. Call `stopTrackPage` to log the end of the page view
+         * and send the event.
          * @param   name  A string that idenfities this item, unique within this HTML document. Defaults to the document title.
          */
         startTrackPage(name?: string): any;
         /**
-         * Logs how long a page or other item was visible, after {@link startTrackPage}. Call this when the page closes.
+         * Stops the timer that was started by calling `startTrackPage` and sends the pageview load time telemetry with the specified properties and measurements.
+         * The duration of the page view will be the time between calling `startTrackPage` and `stopTrackPage`.
          * @param   name  The string you used as the name in startTrackPage. Defaults to the document title.
          * @param   url   String - a relative or absolute URL that identifies the page or other item. Defaults to the window location.
          * @param   properties  map[string, string] - additional data used to filter pages and metrics in the portal. Defaults to empty.

From efbcbdebaf39c27edb7681c8a666a1d451982a6f Mon Sep 17 00:00:00 2001
From: Matt McCutchen <matt@mattmccutchen.net>
Date: Fri, 30 Nov 2018 17:26:52 -0500
Subject: [PATCH 494/836] Revert "react: Improve type checking of component
 static properties. (#30730)" (#30964)

This reverts commit 5610636ad2e5dbf618f1ed8db8acb4d0407305a6.
---
 .../components/responsive.d.ts                |  30 +++
 types/react-select/lib/components/Menu.d.ts   |   6 +
 .../test/examples/CustomNoOptionsMessage.tsx  |   7 +-
 types/react-virtualized/dist/es/List.d.ts     |   2 +-
 types/react-virtualized/dist/es/Table.d.ts    |  79 ++++++-
 types/react/index.d.ts                        | 126 +++--------
 types/react/test/managedAttributes.tsx        | 208 ++++++++----------
 types/theming/index.d.ts                      |   2 +-
 8 files changed, 235 insertions(+), 225 deletions(-)

diff --git a/types/react-foundation/components/responsive.d.ts b/types/react-foundation/components/responsive.d.ts
index 9b3a8361ed..94a915f2c8 100644
--- a/types/react-foundation/components/responsive.d.ts
+++ b/types/react-foundation/components/responsive.d.ts
@@ -24,6 +24,36 @@ export declare class ResponsiveNavigation extends Component<ResponsiveNavigation
      */
     toggle(): void;
     render(): JSX.Element;
+    static propTypes: {
+        breakpoint: PropTypes.Validator<any>;
+        alignX: PropTypes.Requireable<any>;
+        alignY: PropTypes.Requireable<any>;
+        selfAlignX: PropTypes.Requireable<any>;
+        selfAlignY: PropTypes.Requireable<any>;
+        centerAlign: PropTypes.Requireable<any>;
+        flexContainer: PropTypes.Requireable<any>;
+        flexDirRow: PropTypes.Requireable<any>;
+        flexDirRowRev: PropTypes.Requireable<any>;
+        flexDirCol: PropTypes.Requireable<any>;
+        flexDirColRev: PropTypes.Requireable<any>;
+        flexChild: PropTypes.Requireable<any>;
+        flexOrder: PropTypes.Requireable<any>;
+        flexOrderSmall: PropTypes.Requireable<any>;
+        flexOrderMedium: PropTypes.Requireable<any>;
+        flexOrderLarge: PropTypes.Requireable<any>;
+        showFor: PropTypes.Requireable<any>;
+        showOnlyFor: PropTypes.Requireable<any>;
+        hideFor: PropTypes.Requireable<any>;
+        hideOnlyFor: PropTypes.Requireable<any>;
+        isHidden: PropTypes.Requireable<any>;
+        isInvisible: PropTypes.Requireable<any>;
+        showForLandscape: PropTypes.Requireable<any>;
+        showForPortrait: PropTypes.Requireable<any>;
+        showForSr: PropTypes.Requireable<any>;
+        showOnFocus: PropTypes.Requireable<any>;
+        isClearfix: PropTypes.Requireable<any>;
+        float: PropTypes.Requireable<any>;
+    };
     static defaultProps: {
         breakpoint: number;
     };
diff --git a/types/react-select/lib/components/Menu.d.ts b/types/react-select/lib/components/Menu.d.ts
index 8c6e5fb6c8..387b538882 100644
--- a/types/react-select/lib/components/Menu.d.ts
+++ b/types/react-select/lib/components/Menu.d.ts
@@ -67,6 +67,9 @@ export type MenuProps<OptionType> = CommonProps<OptionType> & {
 export function menuCSS(state: MenuState): React.CSSProperties;
 
 export class Menu<OptionType> extends Component<MenuProps<OptionType>, MenuState> {
+  static contextTypes: {
+    getPortalPlacement: (state: MenuState) => void,
+  };
   getPlacement: (ref: ElementRef<any>) => void;
   getState: () => MenuProps<OptionType> & MenuState;
 }
@@ -143,6 +146,9 @@ interface PortalStyleArgs {
 export function menuPortalCSS(args: PortalStyleArgs): React.CSSProperties;
 
 export class MenuPortal<OptionType> extends Component<MenuPortalProps<OptionType>, MenuPortalState> {
+  static childContextTypes: {
+    getPortalPlacement: (state: MenuState) => void,
+  };
   getChildContext(): {
     getPortalPlacement: (state: MenuState) => void;
   };
diff --git a/types/react-select/test/examples/CustomNoOptionsMessage.tsx b/types/react-select/test/examples/CustomNoOptionsMessage.tsx
index 3896272d5b..6bea4cb47a 100644
--- a/types/react-select/test/examples/CustomNoOptionsMessage.tsx
+++ b/types/react-select/test/examples/CustomNoOptionsMessage.tsx
@@ -18,12 +18,7 @@ const NoOptionsMessage = (props: any) => {
 export default class CustomNoOptionsMessage extends React.Component {
   render() {
     return (
-      // Without the type argument, `OptionType` is inferred as `never` from the
-      // `options` attribute of type `never[]`, and `Select.defaultProps` (of
-      // type `Props<any>`) fails to be assignable to the instantiated props
-      // type, `Props<never>`.  This issue shouldn't come up in real code where
-      // the `options` attribute isn't a literal empty array.
-      <Select<{ label: string; value: string }>
+      <Select
         isClearable
         components={{ NoOptionsMessage }}
         styles={{ noOptionsMessage: (base: any) => ({ ...base, ...msgStyles }) }}
diff --git a/types/react-virtualized/dist/es/List.d.ts b/types/react-virtualized/dist/es/List.d.ts
index 9de78e4066..57e00ae909 100644
--- a/types/react-virtualized/dist/es/List.d.ts
+++ b/types/react-virtualized/dist/es/List.d.ts
@@ -30,7 +30,7 @@ export type ListProps = GridCoreProps & {
     /** Height constraint for list (determines how many actual rows are rendered) */
     height: number;
     /** Optional renderer to be used in place of rows when rowCount is 0 */
-    noRowsRenderer?: () => JSX.Element | null;
+    noRowsRenderer?: () => JSX.Element;
     /**
      * Callback invoked with information about the slice of rows that were just rendered.
      * ({ startIndex, stopIndex }): void
diff --git a/types/react-virtualized/dist/es/Table.d.ts b/types/react-virtualized/dist/es/Table.d.ts
index e9a09dae4c..b66fac389b 100644
--- a/types/react-virtualized/dist/es/Table.d.ts
+++ b/types/react-virtualized/dist/es/Table.d.ts
@@ -152,6 +152,26 @@ export type ColumnProps = {
     width: number;
 };
 export class Column extends Component<ColumnProps> {
+    static propTypes: {
+        "aria-label": Requireable<string>;
+        cellDataGetter: Requireable<TableCellDataGetter>;
+        cellRenderer: Requireable<TableCellRenderer>;
+        className: Requireable<string>;
+        columnData: Requireable<object>;
+        dataKey: Validator<string>;
+        disableSort: Requireable<boolean>;
+        flexGrow: Requireable<number>;
+        flexShrink: Requireable<number>;
+        headerClassName: Requireable<string>;
+        headerRenderer: Validator<TableHeaderRowRenderer>;
+        label: Requireable<string>;
+        maxWidth: Requireable<number>;
+        minWidth: Requireable<number>;
+        style: Requireable<React.CSSProperties>;
+        width: Validator<number>;
+        id: Requireable<string>;
+    };
+
     static defaultProps: {
         cellDataGetter: TableCellDataGetter;
         cellRenderer: TableCellRenderer;
@@ -358,6 +378,63 @@ export const SortIndicator: React.StatelessComponent<{
  * This component expects explicit width, height, and padding parameters.
  */
 export class Table extends PureComponent<TableProps> {
+    static propTypes: {
+        "aria-label": Requireable<string>;
+        autoHeight: Requireable<boolean>;
+        children: Validator<Column>;
+        className: Requireable<string>;
+        disableHeader: Requireable<boolean>;
+        estimatedRowSize: Validator<number>;
+        gridClassName: Requireable<string>;
+        gridStyle: Requireable<React.CSSProperties>;
+        headerClassName: Requireable<string>;
+        headerHeight: Validator<number>;
+        headerRowRenderer: Requireable<TableHeaderRowRenderer>;
+        headerStyle: Requireable<React.CSSProperties>;
+        height: Validator<number>;
+        id: Requireable<string>;
+        noRowsRenderer: Requireable<() => JSX.Element>;
+        onHeaderClick: Requireable<
+            (params: HeaderMouseEventHandlerParams) => void
+        >;
+        onRowClick: Requireable<(params: RowMouseEventHandlerParams) => void>;
+        onRowDoubleClick: Requireable<
+            (params: RowMouseEventHandlerParams) => void
+        >;
+        onRowMouseOut: Requireable<
+            (params: RowMouseEventHandlerParams) => void
+        >;
+        onRowMouseOver: Requireable<
+            (params: RowMouseEventHandlerParams) => void
+        >;
+        onRowsRendered: Requireable<
+            (params: RowMouseEventHandlerParams) => void
+        >;
+        onScroll: Requireable<(params: ScrollEventData) => void>;
+        overscanRowCount: Validator<number>;
+        rowClassName: Requireable<string | ((params: Index) => string)>;
+        rowGetter: Validator<(params: Index) => any>;
+        rowHeight: Validator<number | ((params: Index) => number)>;
+        rowCount: Validator<number>;
+        rowRenderer: Requireable<(props: TableRowProps) => React.ReactNode>;
+        rowStyle: Validator<
+            React.CSSProperties | ((params: Index) => React.CSSProperties)
+        >;
+        scrollToAlignment: Validator<Alignment>;
+        scrollToIndex: Validator<number>;
+        scrollTop: Requireable<number>;
+        sort: Requireable<
+            (
+                params: { sortBy: string; sortDirection: SortDirectionType }
+            ) => void
+        >;
+        sortBy: Requireable<string>;
+        sortDirection: Validator<SortDirectionType>;
+        style: Requireable<React.CSSProperties>;
+        tabIndex: Requireable<number>;
+        width: Validator<number>;
+    };
+
     static defaultProps: {
         disableHeader: false;
         estimatedRowSize: 30;
@@ -368,7 +445,7 @@ export class Table extends PureComponent<TableProps> {
         onScroll: () => null;
         overscanRowCount: 10;
         rowRenderer: TableRowRenderer;
-        headerRowRenderer: TableHeaderRowRenderer;
+        headerRowRenderer: TableHeaderRenderer;
         rowStyle: {};
         scrollToAlignment: "auto";
         scrollToIndex: -1;
diff --git a/types/react/index.d.ts b/types/react/index.d.ts
index 5cefb7fca2..f525d7838c 100644
--- a/types/react/index.d.ts
+++ b/types/react/index.d.ts
@@ -421,34 +421,6 @@ declare namespace React {
         refs: {
             [key: string]: ReactInstance
         };
-
-        // Static properties copied from ComponentClass interface.
-        /**
-         * The validity of the type of `propTypes` cannot be checked
-         * automatically at the definition of a component class because the
-         * required type depends on `P`.  We recommend checking it using
-         * `asPropTypes` from the `react-typescript-helpers` package.  If you
-         * don't do that, then the type will still be checked by
-         * JSX.LibraryManagedAttributes every time the component is used,
-         * assuming you use TypeScript 3.0 or newer.
-         */
-        // Note: `propTypes` and `defaultProps` need to be `any` so that a
-        // component class that does not redeclare them is assignable to
-        // `ComponentClass<P>`.
-        static propTypes?: any;
-        static contextTypes?: ValidationMap<any>;
-        static childContextTypes?: ValidationMap<any>;
-        /**
-         * The validity of the type of `defaultProps` cannot be checked
-         * automatically at the definition of a component class because the
-         * required type depends on `P`.  We recommend checking it using
-         * `asDefaultProps` from the `react-typescript-helpers` package.  If you
-         * don't do that, then the type will still be checked by
-         * JSX.LibraryManagedAttributes every time the component is used,
-         * assuming you use TypeScript 3.0 or newer.
-         */
-        static defaultProps?: any;
-        static displayName?: string;
     }
 
     class PureComponent<P = {}, S = {}, SS = any> extends Component<P, S, SS> { }
@@ -2664,77 +2636,31 @@ declare namespace React {
          */
         componentStack: string;
     }
-
-    const Invalid_propTypes: unique symbol;
-    /**
-     * Dummy interface that is intersected into the props type of a component on
-     * use to generate an error if the component's `propTypes` static property
-     * is invalid.  In most cases, you can get more information about the
-     * problem with the `propTypes` by trying to assign the component to a
-     * variable of type `React.ComponentType<P>` where `P` is the appropriate
-     * props type.  You can bypass the type checking of `propTypes` by defining
-     * a static property named `bypassPropTypesTypecheck`.
-     */
-    interface Invalid_propTypes<P, T> {
-        [Invalid_propTypes]: never;
-    }
-
-    const Invalid_defaultProps: unique symbol;
-    /**
-     * Dummy interface that is intersected into the props type of a component on
-     * use to generate an error if the component's `defaultProps` static
-     * property is invalid.  In most cases, you can get more information about
-     * the problem with the `defaultProps` by trying to assign the component to
-     * a variable of type `React.ComponentType<P>` where `P` is the appropriate
-     * props type.  You can bypass the type checking of `defaultProps` by
-     * defining a static property named `bypassDefaultPropsTypecheck`.
-     */
-    interface Invalid_defaultProps<P, D> {
-        [Invalid_defaultProps]: never;
-    }
-
-    // For a component class, the P passed to JSX.LibraryManagedAttributes is
-    // based on the `props` property and includes `children` regardless of
-    // whether the original props type (the `P` type argument to
-    // React.Component) does.  However, it's common for component classes not
-    // to list `children` in the `propTypes` if the original props type did not
-    // include `children`.  We accommodate that here by making the validator for
-    // `children` optional.
-    type ValidationMapWithOptionalChildren<P> =
-        ValidationMap<Pick<P, Exclude<keyof P, "children">>> &
-        Partial<ValidationMap<Pick<P, Extract<keyof P, "children">>>>;
-
-    // Explicitly check for excess properties in CheckPropTypes and
-    // CheckDefaultProps because by the time we get to
-    // JSX.LibraryManagedAttributes, we have lost the opportunity to do an
-    // excess properties check on the original object literal.
-
-    type CheckPropTypes<P, T> =
-        // This condition attempts to single out `T = any`, which needs to bypass the rest of the check
-        // because `keyof T` would come out as not extending `keyof P`.
-        T extends typeof Invalid_propTypes ? {} :
-        [keyof T, T] extends [keyof P, ValidationMapWithOptionalChildren<P>] ? {} : Invalid_propTypes<P, T>;
-
-    type CheckDefaultProps<P, D> =
-        D extends typeof Invalid_defaultProps ? {} :
-        [keyof D, D] extends [keyof P, Partial<P>] ? {} : Invalid_defaultProps<P, D>;
-
-    // Any prop that has a default prop becomes optional, but its type is unchanged
-    // If declared props have indexed properties, ignore default props entirely as keyof gets widened
-    // Wrap in an outer-level conditional type to allow distribution over props that are unions
-    type Defaultize<P, D> = P extends any
-        ? string extends keyof P ? P :
-            & Pick<P, Exclude<keyof P, keyof D>>
-            & Partial<Pick<P, Extract<keyof P, keyof D>>>
-        : never;
-
-    type ReactManagedAttributes<C, P> =
-        (C extends { propTypes: infer T; }
-            ? (C extends { bypassPropTypesTypecheck: {}; } ? {} : CheckPropTypes<P, T>) : {}) &
-        (C extends { defaultProps: infer D; }
-            ? (C extends { bypassDefaultPropsTypecheck: {}; } ? {} : CheckDefaultProps<P, D>) & Defaultize<P, D> : P);
 }
 
+// Declared props take priority over inferred props
+// If declared props have indexed properties, ignore inferred props entirely as keyof gets widened
+type MergePropTypes<P, T> = P & Pick<T, Exclude<keyof T, keyof P>>;
+
+// Any prop that has a default prop becomes optional, but its type is unchanged
+// Undeclared default props are augmented into the resulting allowable attributes
+// If declared props have indexed properties, ignore default props entirely as keyof gets widened
+// Wrap in an outer-level conditional type to allow distribution over props that are unions
+type Defaultize<P, D> = P extends any
+    ? string extends keyof P ? P :
+        & Pick<P, Exclude<keyof P, keyof D>>
+        & Partial<Pick<P, Extract<keyof P, keyof D>>>
+        & Partial<Pick<D, Exclude<keyof D, keyof P>>>
+    : never;
+
+type ReactManagedAttributes<C, P> = C extends { propTypes: infer T; defaultProps: infer D; }
+    ? Defaultize<MergePropTypes<P, PropTypes.InferProps<T>>, D>
+    : C extends { propTypes: infer T; }
+        ? MergePropTypes<P, PropTypes.InferProps<T>>
+        : C extends { defaultProps: infer D; }
+            ? Defaultize<P, D>
+            : P;
+
 declare global {
     namespace JSX {
         // tslint:disable-next-line:no-empty-interface
@@ -2749,9 +2675,9 @@ declare global {
         // let's assume it's reasonable to do a single React.lazy() around a single React.memo() / vice-versa
         type LibraryManagedAttributes<C, P> = C extends React.MemoExoticComponent<infer T> | React.LazyExoticComponent<infer T>
             ? T extends React.MemoExoticComponent<infer U> | React.LazyExoticComponent<infer U>
-                ? React.ReactManagedAttributes<U, P>
-                : React.ReactManagedAttributes<T, P>
-            : React.ReactManagedAttributes<C, P>;
+                ? ReactManagedAttributes<U, P>
+                : ReactManagedAttributes<T, P>
+            : ReactManagedAttributes<C, P>;
 
         // tslint:disable-next-line:no-empty-interface
         interface IntrinsicAttributes extends React.Attributes { }
diff --git a/types/react/test/managedAttributes.tsx b/types/react/test/managedAttributes.tsx
index a4213c58b1..1e0e8226d9 100644
--- a/types/react/test/managedAttributes.tsx
+++ b/types/react/test/managedAttributes.tsx
@@ -1,18 +1,14 @@
 interface LeaveMeAloneDtslint { foo: string; }
-// Re-enable when we move @types/react to TS 3.0 (except for the tests marked as
-// requiring TS >= 3.2)
-//
-// In the meantime, these tests can be run manually by uncommenting the code
-// below and running `dtslint --onlyTestTsNext`.
+// // Re-enable when we move @types/react to TS 3.0
 
 // import * as React from 'react';
 // import * as PropTypes from 'prop-types';
 
 // interface Props {
-//     bool?: boolean | null;
+//     bool?: boolean;
 //     fnc: () => any;
 //     node?: React.ReactNode;
-//     num?: number | null;
+//     num?: number;
 //     reqNode: NonNullable<React.ReactNode>;
 //     str: string;
 // }
@@ -22,12 +18,14 @@ interface LeaveMeAloneDtslint { foo: string; }
 //     fnc: PropTypes.func.isRequired,
 //     node: PropTypes.node,
 //     num: PropTypes.number,
-//     reqNode: PropTypes.node.isRequired,
 //     str: PropTypes.string.isRequired,
+//     extraStr: PropTypes.string.isRequired,
+//     extraNum: PropTypes.number
 // };
 
 // const defaultProps = {
 //     fnc: (() => 'abc') as () => any,
+//     extraBool: false,
 //     reqNode: 'text_node' as NonNullable<React.ReactNode>
 // };
 
@@ -38,12 +36,39 @@ interface LeaveMeAloneDtslint { foo: string; }
 
 // const annotatedPropTypesAndDefaultPropsTests = [
 //     // $ExpectError
-//     <AnnotatedPropTypesAndDefaultProps />, // str is required
-//     <AnnotatedPropTypesAndDefaultProps str='abc' />,
+//     <AnnotatedPropTypesAndDefaultProps />, // str and extraStr are required
+//     <AnnotatedPropTypesAndDefaultProps extraStr='abc' str='abc' />,
 //     // $ExpectError
 //     <AnnotatedPropTypesAndDefaultProps num='abc' />, // num type mismatch
 //     <AnnotatedPropTypesAndDefaultProps
 //         bool={true}
+//         extraBool={true}
+//         extraNum={0}
+//         extraStr='abc'
+//         fnc={console.log}
+//         node={<span />}
+//         num={0}
+//         reqNode={<span />}
+//         str='abc'
+//     />
+// ];
+
+// class UnannotatedPropTypesAndDefaultProps extends React.Component {
+//     static propTypes = propTypes;
+//     static defaultProps = defaultProps;
+// }
+
+// const unannotatedPropTypesAndDefaultPropsTests = [
+//     // $ExpectError
+//     <UnannotatedPropTypesAndDefaultProps />, // stra and extraStr are required
+//     <UnannotatedPropTypesAndDefaultProps extraStr='abc' str='abc' />,
+//     // $ExpectError
+//     <UnannotatedPropTypesAndDefaultProps extraBool={0} />, // extraBool type mismatch
+//     <UnannotatedPropTypesAndDefaultProps
+//         bool={true}
+//         extraBool={true}
+//         extraNum={0}
+//         extraStr='abc'
 //         fnc={console.log}
 //         node={<span />}
 //         num={0}
@@ -58,14 +83,16 @@ interface LeaveMeAloneDtslint { foo: string; }
 
 // const annotatedPropTypesTests = [
 //     // $ExpectError
-//     <AnnotatedPropTypes />, // str, reqNode and fnc are required
-//     <AnnotatedPropTypes fnc={console.log} str='abc' reqNode={<span />} />,
+//     <AnnotatedPropTypes />, // str, extraStr, reqNode and fnc are required
+//     <AnnotatedPropTypes fnc={console.log} extraStr='abc' str='abc' reqNode={<span />} />,
 //     // $ExpectError
-//     <AnnotatedPropTypes fnc={console.log} str='abc' reqNode={<span />} extraBool={false} />, // extraBool doesn't exist
+//     <AnnotatedPropTypes fnc={console.log} extraStr='abc' str='abc' reqNode={<span />} extraBool={false} />, // extraBool doesn't exist
 //     // $ExpectError
-//     <AnnotatedPropTypes fnc={console.log} str='abc' reqNode={<span />} num='abc' />, // num type mismatch
+//     <AnnotatedPropTypes fnc={console.log} extraStr='abc' str='abc' reqNode={<span />} num='abc' />, // num type mismatch
 //     <AnnotatedPropTypes
 //         bool={false}
+//         extraNum={0}
+//         extraStr='abc'
 //         fnc={console.log}
 //         node={<React.Fragment />}
 //         num={0}
@@ -74,6 +101,29 @@ interface LeaveMeAloneDtslint { foo: string; }
 //     />
 // ];
 
+// class UnannotatedPropTypes extends React.Component {
+//     static propTypes = propTypes;
+// }
+
+// const unannotatedPropTypesTests = [
+//     // $ExpectError
+//     <UnannotatedPropTypes />, // str, extraStr and fnc are required
+//     <UnannotatedPropTypes fnc={console.log} extraStr='abc' str='abc' />,
+//     // $ExpectError
+//     <UnannotatedPropTypes fnc={console.log} extraStr='abc' str='abc' reqNode={<span />} />, // reqNode doesn't exist
+//     // $ExpectError
+//     <UnannotatedPropTypes fnc={console.log} extraStr='abc' str='abc' reqNode={<span />} num='abc' />, // num type mismatch
+//     <UnannotatedPropTypes
+//         bool={false}
+//         extraNum={0}
+//         extraStr='abc'
+//         fnc={console.log}
+//         node={<React.Fragment />}
+//         num={0}
+//         str='abc'
+//     />
+// ];
+
 // class AnnotatedDefaultProps extends React.Component<Props> {
 //     static defaultProps = defaultProps;
 // }
@@ -87,6 +137,7 @@ interface LeaveMeAloneDtslint { foo: string; }
 //     <AnnotatedDefaultProps str={() => { }} />, // str type mismatch
 //     <AnnotatedDefaultProps
 //         bool={true}
+//         extraBool={false}
 //         fnc={console.log}
 //         node={null}
 //         num={0}
@@ -95,15 +146,31 @@ interface LeaveMeAloneDtslint { foo: string; }
 //     />
 // ];
 
+// class UnannotatedDefaultProps extends React.Component {
+//     static defaultProps = defaultProps;
+// }
+
+// const unannotatedDefaultPropsTests = [
+//     <UnannotatedDefaultProps />,
+//     <UnannotatedDefaultProps
+//         extraBool={true}
+//         fnc={console.log}
+//         reqNode={<span />}
+//     />
+// ];
+
 // class ComponentWithNoDefaultProps extends React.Component<Props> {}
 
-// function FunctionalComponent(props: Props) { return <>{props.reqNode}</>; }
+// function FunctionalComponent(props: Props) { return <>{props.reqNode}</> }
 // FunctionalComponent.defaultProps = defaultProps;
 
 // const functionalComponentTests = [
 //     // $ExpectError
 //     <FunctionalComponent />,
-//     // NOTE: This test requires TypeScript >= 3.2, which honors JSX.LibraryManagedAttributes for function components.
+//     // This is possibly a bug/limitation of TS
+//     // Even if JSX.LibraryManagedAttributes returns the correct type, it doesn't seem to work with non-classes
+//     // This also doesn't work with things typed React.SFC<P> because defaultProps will always be Partial<P>
+//     // $ExpectError
 //     <FunctionalComponent str='' />
 // ];
 
@@ -115,28 +182,27 @@ interface LeaveMeAloneDtslint { foo: string; }
 // const memoTests = [
 //     // $ExpectError
 //     <MemoFunctionalComponent />,
-//     // Requires TypeScript >= 3.2; see comment re FunctionalComponent above
+//     // $ExpectError won't work as long as FunctionalComponent doesn't work either
 //     <MemoFunctionalComponent str='abc' />,
 //     // $ExpectError
 //     <MemoAnnotatedDefaultProps />,
 //     <AnnotatedDefaultProps str='abc' />,
-//     // Requires TypeScript >= 3.2; see comment re FunctionalComponent above
+//     // $ExpectError this doesn't work despite JSX.LibraryManagedAttributes returning the correct type
 //     <MemoAnnotatedDefaultProps str='abc' />,
-//     // Requires TypeScript >= 3.2; see comment re FunctionalComponent above
+//     // $ExpectError won't work as long as FunctionalComponent doesn't work either
 //     <LazyMemoFunctionalComponent str='abc' />,
 //     // $ExpectError
 //     <LazyMemoAnnotatedDefaultProps />,
-//     // Requires TypeScript >= 3.2; see comment re FunctionalComponent above
+//     // $ExpectError this doesn't work despite JSX.LibraryManagedAttributes returning the correct type
 //     <LazyMemoAnnotatedDefaultProps str='abc' />
 // ];
 
-// // $ExpectType Pick<Props, "bool" | "node" | "num" | "str"> & Partial<Pick<Props, "fnc" | "reqNode">>
 // type AnnotatedDefaultPropsLibraryManagedAttributes = JSX.LibraryManagedAttributes<typeof AnnotatedDefaultProps, Props>;
-// // $ExpectType Pick<Props, "bool" | "node" | "num" | "str"> & Partial<Pick<Props, "fnc" | "reqNode">>
+// // $ExpectType AnnotatedDefaultPropsLibraryManagedAttributes
 // type FunctionalComponentLibraryManagedAttributes = JSX.LibraryManagedAttributes<typeof FunctionalComponent, Props>;
-// // $ExpectType Pick<Props, "bool" | "node" | "num" | "str"> & Partial<Pick<Props, "fnc" | "reqNode">>
+// // $ExpectType FunctionalComponentLibraryManagedAttributes
 // type MemoFunctionalComponentLibraryManagedAttributes = JSX.LibraryManagedAttributes<typeof MemoFunctionalComponent, Props>;
-// // $ExpectType Pick<Props, "bool" | "node" | "num" | "str"> & Partial<Pick<Props, "fnc" | "reqNode">>
+// // $ExpectType FunctionalComponentLibraryManagedAttributes
 // type LazyMemoFunctionalComponentLibraryManagedAttributes = JSX.LibraryManagedAttributes<typeof LazyMemoFunctionalComponent, Props>;
 
 // const ForwardRef = React.forwardRef((props: Props, ref: React.Ref<ComponentWithNoDefaultProps>) => (
@@ -152,97 +218,7 @@ interface LeaveMeAloneDtslint { foo: string; }
 //         reqNode={<span />}
 //         str=''
 //     />,
-//     // the type of ForwardRef.defaultProps stays Partial<P> anyway even if assigned
-//     // $ExpectError
+//     // same bug as MemoFunctionalComponent and React.SFC-typed things
+//     // $ExpectError the type of ForwardRef.defaultProps stays Partial<P> anyway even if assigned
 //     <ForwardRef str='abc' />
 // ];
-
-// const wrongDefaultProps = {
-//     fnc: 42
-// };
-// class WrongDefaultPropsComponent extends React.Component<Props> {
-//     static defaultProps = wrongDefaultProps;
-// }
-// const wrongDefaultPropsComponentTests = [
-//     // $ExpectError
-//     <WrongDefaultPropsComponent fnc={() => undefined} reqNode="text" str="str" />
-// ];
-// // $ExpectError
-// const investigateWrongDefaultPropsComponent: React.ComponentType<Props> = WrongDefaultPropsComponent;
-
-// const excessDefaultProps = {
-//     another: 43
-// };
-// class ExcessDefaultPropsComponent extends React.Component<Props> {
-//     static defaultProps = excessDefaultProps;
-// }
-// const excessDefaultPropsComponentTests = [
-//     // $ExpectError
-//     <ExcessDefaultPropsComponent fnc={() => undefined} reqNode="text" str="str" />
-// ];
-// // $ExpectError
-// const investigateExcessDefaultPropsComponent: React.ComponentType<Props> = ExcessDefaultPropsComponent;
-
-// const wrongPropTypes = {
-//     bool: PropTypes.bool,
-//     fnc: PropTypes.number.isRequired,
-//     node: PropTypes.node,
-//     num: PropTypes.number,
-//     reqNode: PropTypes.node.isRequired,
-//     str: PropTypes.string.isRequired,
-// };
-// class WrongPropTypesComponent extends React.Component<Props> {
-//     static propTypes = wrongPropTypes;
-// }
-// const wrongPropTypesComponentTests = [
-//     // $ExpectError
-//     <WrongPropTypesComponent fnc={() => undefined} reqNode="text" str="str" />
-// ];
-
-// const incompletePropTypes = {
-//     bool: PropTypes.bool,
-//     node: PropTypes.node,
-//     num: PropTypes.number,
-//     reqNode: PropTypes.node.isRequired,
-//     str: PropTypes.string.isRequired,
-// };
-// class IncompletePropTypesComponent extends React.Component<Props> {
-//     static propTypes = incompletePropTypes;
-// }
-// const incompletePropTypesComponentTests = [
-//     // $ExpectError
-//     <IncompletePropTypesComponent fnc={() => undefined} reqNode="text" str="str" />
-// ];
-
-// const excessPropTypes = {
-//     another: PropTypes.number.isRequired,
-//     bool: PropTypes.bool,
-//     fnc: PropTypes.func.isRequired,
-//     node: PropTypes.node,
-//     num: PropTypes.number,
-//     reqNode: PropTypes.node.isRequired,
-//     str: PropTypes.string.isRequired,
-// };
-// class ExcessPropTypesComponent extends React.Component<Props> {
-//     static propTypes = excessPropTypes;
-// }
-// const ExcessPropTypesComponentTests = [
-//     // $ExpectError
-//     <ExcessPropTypesComponent fnc={() => undefined} reqNode="text" str="str" />
-// ];
-
-// class WrongDefaultPropsSuppressedComponent extends React.Component<Props> {
-//     static defaultProps = wrongDefaultProps;
-//     static bypassDefaultPropsTypecheck = true;
-// }
-// const wrongDefaultPropsSuppressedComponentTests = [
-//     <WrongDefaultPropsSuppressedComponent fnc={() => undefined} reqNode="text" str="str" />
-// ];
-
-// class WrongPropTypesSuppressedComponent extends React.Component<Props> {
-//     static propTypes = wrongPropTypes;
-//     static bypassPropTypesTypecheck = true;
-// }
-// const wrongPropTypesSuppressedComponentTests = [
-//     <WrongPropTypesSuppressedComponent fnc={() => undefined} reqNode="text" str="str" />
-// ];
diff --git a/types/theming/index.d.ts b/types/theming/index.d.ts
index d2c0d1ee40..e2525b3ce6 100644
--- a/types/theming/index.d.ts
+++ b/types/theming/index.d.ts
@@ -40,7 +40,7 @@ export interface ThemeListener<C extends string> {
     callback: (theme: Theme) => void
   ): SubscriptionId;
   unsubscribe(context: ContextWithTheme<C>, id: SubscriptionId): void;
-  contextTypes: React.ValidationMap<ContextWithTheme<C>>;
+  contextTypes: React.ValidationMap<C>;
 }
 /**
  * ThemeListener for the default channel

From 1916f716dc67551c639b323a14064c7b9f74562e Mon Sep 17 00:00:00 2001
From: Wayne Carson <wayne.carson@assurant.com>
Date: Fri, 30 Nov 2018 15:41:13 -0800
Subject: [PATCH 495/836] Added flush() method to debounce (see
 https://git.io/fpoYM)

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

diff --git a/types/debounce/debounce-tests.ts b/types/debounce/debounce-tests.ts
index 4acff7c446..5f0463a4c1 100644
--- a/types/debounce/debounce-tests.ts
+++ b/types/debounce/debounce-tests.ts
@@ -14,6 +14,9 @@ const imm1: number = (debounce((x: number) => x * 2, 100, true))(2);
 const clearable = debounce(doThings);
 clearable.clear();
 
+const flushable = debounce(doThings);
+flushable.flush();
+
 // Intentionally asserts that the member variable has all the same benefits as the direct export.
 // Eventually, if debounce stop supporting the CommonJS-only module calling (`require("debounce")(...)`),
 // we can remove this and change the top import&require to `import { debounce } from "debounce";`.
diff --git a/types/debounce/index.d.ts b/types/debounce/index.d.ts
index fa244351d6..bef99f2c86 100644
--- a/types/debounce/index.d.ts
+++ b/types/debounce/index.d.ts
@@ -1,13 +1,15 @@
-// Type definitions for debounce 3.0
+// Type definitions for debounce 1.2.0
 // Project: https://github.com/component/debounce
 // Definitions by: Denis Sokolov <https://github.com/denis-sokolov>
 //                 Josh Goldberg <https://github.com/joshuakgoldberg>
+//                 Wayne Carson <https://github.com/wcarson>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 declare namespace _debounce {
     const debounce: typeof _debounce;
 }
 
-declare function _debounce<A extends Function>(f: A, interval?: number, immediate?: boolean): A & { clear(): void; };
+declare function _debounce<A extends Function>(f: A, interval?: number, immediate?: boolean): A & { clear(): void; }
+    & { flush(): void };
 
 export = _debounce;

From 6645ba33d52edd3303ae58bf81ce6b29042bd924 Mon Sep 17 00:00:00 2001
From: Wayne Carson <wayne.carson@assurant.com>
Date: Fri, 30 Nov 2018 16:12:54 -0800
Subject: [PATCH 496/836] Fixed DT header version convention issue.

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

diff --git a/types/debounce/index.d.ts b/types/debounce/index.d.ts
index bef99f2c86..e561cb51fe 100644
--- a/types/debounce/index.d.ts
+++ b/types/debounce/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for debounce 1.2.0
+// Type definitions for debounce 1.2
 // Project: https://github.com/component/debounce
 // Definitions by: Denis Sokolov <https://github.com/denis-sokolov>
 //                 Josh Goldberg <https://github.com/joshuakgoldberg>

From f86366a401ca98ebaa7aa3ec4a0ef5391970eee7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Den=C3=A8le?= <remi@altirnao.com>
Date: Sat, 1 Dec 2018 02:44:09 +0100
Subject: [PATCH 497/836] Prefer notation without arrow function

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

diff --git a/types/puppeteer/index.d.ts b/types/puppeteer/index.d.ts
index 202cc05181..813f256835 100644
--- a/types/puppeteer/index.d.ts
+++ b/types/puppeteer/index.d.ts
@@ -2061,10 +2061,10 @@ export interface ConnectOptions {
 }
 
 export interface ConnectionTransport {
-  send: (message: string) => void;
-  close: () => void;
-  onmessage?: (message: string) => void;
-  onclose?: () => void;
+  send(message: string): void;
+  close(): void;
+  onmessage?(message: string): void;
+  onclose?(): void;
 }
 
 export interface CDPSession extends EventEmitter {

From 0a82ed88126e5b99a876aa5514ce2beedb9f441a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Den=C3=A8le?= <remi@altirnao.com>
Date: Sat, 1 Dec 2018 02:45:40 +0100
Subject: [PATCH 498/836] Remove empty line

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

diff --git a/types/puppeteer/index.d.ts b/types/puppeteer/index.d.ts
index 813f256835..fe4fb0d14a 100644
--- a/types/puppeteer/index.d.ts
+++ b/types/puppeteer/index.d.ts
@@ -2033,7 +2033,6 @@ export interface BrowserOptions {
      */
     isMobile?: boolean;
     /**
-     *
      * Specifies if viewport supports touch events.
      * @default false
      */

From b506cfa9c04bbeff9866b50a0712808b45ea171b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Den=C3=A8le?= <remi@altirnao.com>
Date: Sat, 1 Dec 2018 03:01:35 +0100
Subject: [PATCH 499/836] Define type for layout dimension

---
 types/puppeteer/index.d.ts | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/types/puppeteer/index.d.ts b/types/puppeteer/index.d.ts
index fe4fb0d14a..1b675b20c5 100644
--- a/types/puppeteer/index.d.ts
+++ b/types/puppeteer/index.d.ts
@@ -513,6 +513,9 @@ export interface DirectNavigationOptions extends NavigationOptions {
   referer?: string;
 }
 
+/** Accepts values labeled with units. If number, treat as pixels. */
+export type LayoutDimension = string | number;
+
 export type PDFFormat =
   | "Letter"
   | "Legal"
@@ -580,22 +583,21 @@ export interface PDFOptions {
    * @default 'Letter'
    */
   format?: PDFFormat;
-  /** Paper width, accepts values labeled with units. Treat numbers as pixel values */
-  width?: string | number;
-  /** Paper height, accepts values labeled with units. Treat numbers as pixel values */
-  height?: string | number;
-  /** Paper margins, defaults to none.  */
+  /** Paper width. */
+  width?: LayoutDimension;
+  /** Paper height. */
+  height?: LayoutDimension;
+  /** Paper margins, defaults to none. */
   margin?: {
-    /** Top margin, accepts values labeled with units. Treat numbers as pixel values */
-    top?: string | number;
-    /** Right margin, accepts values labeled with units. Treat numbers as pixel values */
-    right?: string | number;
-    /** Bottom margin, accepts values labeled with units. Treat numbers as pixel values */
-    bottom?: string | number;
-    /** Left margin, accepts values labeled with units. Treat numbers as pixel values */
-    left?: string | number;
+    /** Top margin. */
+    top?: LayoutDimension;
+    /** Right margin. */
+    right?: LayoutDimension;
+    /** Bottom margin. */
+    bottom?: LayoutDimension;
+    /** Left margin. */
+    left?: LayoutDimension;
   };
-
   /**
    * Give any CSS @page size declared in the page priority over what is declared in width and
    * height or format options.

From 8775d384e1fccf160bc9727d076ffdc23ae53c05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Den=C3=A8le?= <remi@altirnao.com>
Date: Sat, 1 Dec 2018 03:17:17 +0100
Subject: [PATCH 500/836] Extends interfaces for ConnectOptions & LaunchOptions

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

diff --git a/types/puppeteer/index.d.ts b/types/puppeteer/index.d.ts
index 1b675b20c5..e48e29b7ec 100644
--- a/types/puppeteer/index.d.ts
+++ b/types/puppeteer/index.d.ts
@@ -1937,7 +1937,7 @@ export interface Target {
   url(): string;
 }
 
-export interface LaunchOptions extends Timeoutable {
+export interface LaunchOptions extends ChromeArgOptions, BrowserOptions, Timeoutable {
   /**
    * Path to a Chromium executable to run instead of bundled Chromium. If
    * executablePath is a relative path, then it is resolved relative to current
@@ -2052,7 +2052,7 @@ export interface BrowserOptions {
   slowMo?: number;
 }
 
-export interface ConnectOptions {
+export interface ConnectOptions extends BrowserOptions {
   /** A browser websocket endpoint to connect to. */
   browserWSEndpoint?: string;
   /**
@@ -2108,10 +2108,10 @@ export interface CoverageEntry {
 }
 
 /** Attaches Puppeteer to an existing Chromium instance */
-export function connect(options?: ConnectOptions & BrowserOptions): Promise<Browser>;
+export function connect(options?: ConnectOptions): Promise<Browser>;
 /** The default flags that Chromium will be launched with */
 export function defaultArgs(options?: ChromeArgOptions): string[];
 /** Path where Puppeteer expects to find bundled Chromium */
 export function executablePath(): string;
 /** The method launches a browser instance with given arguments. The browser will be closed when the parent node.js process is closed. */
-export function launch(options?: LaunchOptions & ChromeArgOptions & BrowserOptions): Promise<Browser>;
+export function launch(options?: LaunchOptions): Promise<Browser>;

From 37bcddb3e7247ada9dceca821eaaecfbc5cbde4f Mon Sep 17 00:00:00 2001
From: Yu Shimura <mail@yuhr.org>
Date: Sat, 1 Dec 2018 11:55:06 +0900
Subject: [PATCH 501/836] Parsed result now statically typed

---
 types/binary-parser/binary-parser-tests.ts |  25 +++
 types/binary-parser/index.d.ts             | 187 ++++++++++++---------
 2 files changed, 133 insertions(+), 79 deletions(-)

diff --git a/types/binary-parser/binary-parser-tests.ts b/types/binary-parser/binary-parser-tests.ts
index d0d09e5ef7..9eca89211c 100644
--- a/types/binary-parser/binary-parser-tests.ts
+++ b/types/binary-parser/binary-parser-tests.ts
@@ -93,3 +93,28 @@ const parser5 = new Parser()
         length: '4',
         formatter: (arr) => { }
     });
+
+const parser6 = new Parser()
+    .nest("nested", {
+        type: new Parser()
+            .array("points", {
+                type: new Parser()
+                    .uint8("x")
+                    .uint8("y"),
+                length: 2
+            })
+    })
+    .choice("optional", {
+        tag: "nested.points[0].x",
+        choices: {
+            1: new Parser()
+                .uint8("number")
+        }
+    });
+
+const result = parser6.parse(Buffer.from([0x01, 0x02, 0x03, 0x04, 0x05]));
+
+// See the inferred static types on the IntelliSense.
+result.nested.points[0].x;
+result.nested.points[1].y;
+result.optional.number;
diff --git a/types/binary-parser/index.d.ts b/types/binary-parser/index.d.ts
index 657996bd8d..b16f433e55 100644
--- a/types/binary-parser/index.d.ts
+++ b/types/binary-parser/index.d.ts
@@ -1,88 +1,117 @@
 // Type definitions for binary-parser 1.3
 // Project: https://github.com/keichi/binary-parser
-// Definitions by: Benjamin Riggs <https://github.com/riggs>, Dolan Miu <https://github.com/dolanmiu>
+// Definitions by: Benjamin Riggs <https://github.com/riggs>,
+//                 Dolan Miu <https://github.com/dolanmiu>,
+//                 Yu Shimura <https://github.com/yuhr>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
 
 /// <reference types="node" />
 
-export interface Parser {
-    parse(buffer: Buffer, callback?: (err?: Error, result?: any) => void): Parser.Parsed;
+export interface Parser<O extends object | undefined = undefined> {
+    parse(buffer: Buffer, callback?: (err?: Error, result?: any) => void): Parser.Parsed<O>;
 
     create(constructorFunction: ObjectConstructor): Parser;
 
-    int8(name: string, options?: Parser.Options): Parser;
-    uint8(name: string, options?: Parser.Options): Parser;
+    int8<N extends string>(name: N, options?: Parser.Options): Parser.Next<O, N, number>;
+    uint8<N extends string>(name: N, options?: Parser.Options): Parser.Next<O, N, number>;
 
-    int16(name: string, options?: Parser.Options): Parser;
-    uint16(name: string, options?: Parser.Options): Parser;
-    int16le(name: string, options?: Parser.Options): Parser;
-    int16be(name: string, options?: Parser.Options): Parser;
-    uint16le(name: string, options?: Parser.Options): Parser;
-    uint16be(name: string, options?: Parser.Options): Parser;
+    int16<N extends string>(name: N, options?: Parser.Options): Parser.Next<O, N, number>;
+    uint16<N extends string>(name: N, options?: Parser.Options): Parser.Next<O, N, number>;
+    int16le<N extends string>(name: N, options?: Parser.Options): Parser.Next<O, N, number>;
+    int16be<N extends string>(name: N, options?: Parser.Options): Parser.Next<O, N, number>;
+    uint16le<N extends string>(name: N, options?: Parser.Options): Parser.Next<O, N, number>;
+    uint16be<N extends string>(name: N, options?: Parser.Options): Parser.Next<O, N, number>;
 
-    int32(name: string, options?: Parser.Options): Parser;
-    uint32(name: string, options?: Parser.Options): Parser;
-    int32le(name: string, options?: Parser.Options): Parser;
-    int32be(name: string, options?: Parser.Options): Parser;
-    uint32le(name: string, options?: Parser.Options): Parser;
-    uint32be(name: string, options?: Parser.Options): Parser;
+    int32<N extends string>(name: N, options?: Parser.Options): Parser.Next<O, N, number>;
+    uint32<N extends string>(name: N, options?: Parser.Options): Parser.Next<O, N, number>;
+    int32le<N extends string>(name: N, options?: Parser.Options): Parser.Next<O, N, number>;
+    int32be<N extends string>(name: N, options?: Parser.Options): Parser.Next<O, N, number>;
+    uint32le<N extends string>(name: N, options?: Parser.Options): Parser.Next<O, N, number>;
+    uint32be<N extends string>(name: N, options?: Parser.Options): Parser.Next<O, N, number>;
 
-    bit1(name: string, options?: Parser.Options): Parser;
-    bit2(name: string, options?: Parser.Options): Parser;
-    bit3(name: string, options?: Parser.Options): Parser;
-    bit4(name: string, options?: Parser.Options): Parser;
-    bit5(name: string, options?: Parser.Options): Parser;
-    bit6(name: string, options?: Parser.Options): Parser;
-    bit7(name: string, options?: Parser.Options): Parser;
-    bit8(name: string, options?: Parser.Options): Parser;
-    bit9(name: string, options?: Parser.Options): Parser;
-    bit10(name: string, options?: Parser.Options): Parser;
-    bit11(name: string, options?: Parser.Options): Parser;
-    bit12(name: string, options?: Parser.Options): Parser;
-    bit13(name: string, options?: Parser.Options): Parser;
-    bit14(name: string, options?: Parser.Options): Parser;
-    bit15(name: string, options?: Parser.Options): Parser;
-    bit16(name: string, options?: Parser.Options): Parser;
-    bit17(name: string, options?: Parser.Options): Parser;
-    bit18(name: string, options?: Parser.Options): Parser;
-    bit19(name: string, options?: Parser.Options): Parser;
-    bit20(name: string, options?: Parser.Options): Parser;
-    bit21(name: string, options?: Parser.Options): Parser;
-    bit22(name: string, options?: Parser.Options): Parser;
-    bit23(name: string, options?: Parser.Options): Parser;
-    bit24(name: string, options?: Parser.Options): Parser;
-    bit25(name: string, options?: Parser.Options): Parser;
-    bit26(name: string, options?: Parser.Options): Parser;
-    bit27(name: string, options?: Parser.Options): Parser;
-    bit28(name: string, options?: Parser.Options): Parser;
-    bit29(name: string, options?: Parser.Options): Parser;
-    bit30(name: string, options?: Parser.Options): Parser;
-    bit31(name: string, options?: Parser.Options): Parser;
-    bit32(name: string, options?: Parser.Options): Parser;
+    bit1<N extends string>(name: N, options?: Parser.Options): Parser.Next<O, N, number>;
+    bit2<N extends string>(name: N, options?: Parser.Options): Parser.Next<O, N, number>;
+    bit3<N extends string>(name: N, options?: Parser.Options): Parser.Next<O, N, number>;
+    bit4<N extends string>(name: N, options?: Parser.Options): Parser.Next<O, N, number>;
+    bit5<N extends string>(name: N, options?: Parser.Options): Parser.Next<O, N, number>;
+    bit6<N extends string>(name: N, options?: Parser.Options): Parser.Next<O, N, number>;
+    bit7<N extends string>(name: N, options?: Parser.Options): Parser.Next<O, N, number>;
+    bit8<N extends string>(name: N, options?: Parser.Options): Parser.Next<O, N, number>;
+    bit9<N extends string>(name: N, options?: Parser.Options): Parser.Next<O, N, number>;
+    bit10<N extends string>(name: N, options?: Parser.Options): Parser.Next<O, N, number>;
+    bit11<N extends string>(name: N, options?: Parser.Options): Parser.Next<O, N, number>;
+    bit12<N extends string>(name: N, options?: Parser.Options): Parser.Next<O, N, number>;
+    bit13<N extends string>(name: N, options?: Parser.Options): Parser.Next<O, N, number>;
+    bit14<N extends string>(name: N, options?: Parser.Options): Parser.Next<O, N, number>;
+    bit15<N extends string>(name: N, options?: Parser.Options): Parser.Next<O, N, number>;
+    bit16<N extends string>(name: N, options?: Parser.Options): Parser.Next<O, N, number>;
+    bit17<N extends string>(name: N, options?: Parser.Options): Parser.Next<O, N, number>;
+    bit18<N extends string>(name: N, options?: Parser.Options): Parser.Next<O, N, number>;
+    bit19<N extends string>(name: N, options?: Parser.Options): Parser.Next<O, N, number>;
+    bit20<N extends string>(name: N, options?: Parser.Options): Parser.Next<O, N, number>;
+    bit21<N extends string>(name: N, options?: Parser.Options): Parser.Next<O, N, number>;
+    bit22<N extends string>(name: N, options?: Parser.Options): Parser.Next<O, N, number>;
+    bit23<N extends string>(name: N, options?: Parser.Options): Parser.Next<O, N, number>;
+    bit24<N extends string>(name: N, options?: Parser.Options): Parser.Next<O, N, number>;
+    bit25<N extends string>(name: N, options?: Parser.Options): Parser.Next<O, N, number>;
+    bit26<N extends string>(name: N, options?: Parser.Options): Parser.Next<O, N, number>;
+    bit27<N extends string>(name: N, options?: Parser.Options): Parser.Next<O, N, number>;
+    bit28<N extends string>(name: N, options?: Parser.Options): Parser.Next<O, N, number>;
+    bit29<N extends string>(name: N, options?: Parser.Options): Parser.Next<O, N, number>;
+    bit30<N extends string>(name: N, options?: Parser.Options): Parser.Next<O, N, number>;
+    bit31<N extends string>(name: N, options?: Parser.Options): Parser.Next<O, N, number>;
+    bit32<N extends string>(name: N, options?: Parser.Options): Parser.Next<O, N, number>;
 
-    float(name: string, options?: Parser.Options): Parser;
-    floatle(name: string, options?: Parser.Options): Parser;
-    floatbe(name: string, options?: Parser.Options): Parser;
+    float<N extends string>(name: N, options?: Parser.Options): Parser.Next<O, N, number>;
+    floatle<N extends string>(name: N, options?: Parser.Options): Parser.Next<O, N, number>;
+    floatbe<N extends string>(name: N, options?: Parser.Options): Parser.Next<O, N, number>;
 
-    double(name: string, options?: Parser.Options): Parser;
-    doublele(name: string, options?: Parser.Options): Parser;
-    doublebe(name: string, options?: Parser.Options): Parser;
+    double<N extends string>(name: N, options?: Parser.Options): Parser.Next<O, N, number>;
+    doublele<N extends string>(name: N, options?: Parser.Options): Parser.Next<O, N, number>;
+    doublebe<N extends string>(name: N, options?: Parser.Options): Parser.Next<O, N, number>;
 
-    string(name: string, options?: Parser.StringOptions): Parser;
+    string<N extends string>(name: N, options?: Parser.StringOptions): Parser.Next<O, N, string>;
 
-    buffer(name: string, options: Parser.BufferOptions): Parser;
+    buffer<N extends string>(name: N, options: Parser.BufferOptions): Parser.Next<O, N, Buffer>;
 
-    array(name: string, options: Parser.ArrayOptions): Parser;
+    array<N extends string, Q extends Parser.ArrayOptions>(name: N, options: Q): Parser.Next<O, N,
+        Q extends { type: infer T }
+            ? T extends Parser<infer O>
+                ? O extends undefined ? Array<{}> : O[]
+                : T extends string
+                    ? number[]
+                    : never
+            : never
+    >;
 
-    choice(name: string, options: Parser.ChoiceOptions): Parser;
+    choice<N extends string, Q extends Parser.ChoiceOptions>(name: N, options: Q): Parser.Next<O, N,
+        Q extends {
+            choices: infer C
+        }
+            ? C extends {
+                [key in keyof C]: infer T
+            }
+                ? T extends Parser<infer O>
+                    ? O extends undefined ? {} : O
+                    : T extends string ? any : never
+                : never
+            : never
+    >;
 
-    nest(name: string, options: Parser.NestOptions): Parser;
+    nest<N extends string, Q extends Parser.NestOptions>(name: N, options: Q): Parser.Next<O, N,
+        Q extends { type: infer T }
+            ? T extends Parser<infer O>
+                ? O extends undefined ? {} : O
+                : never
+            : never
+    >;
 
-    skip(length: number): Parser;
+    skip(length: number): Parser<O>;
 
-    endianess(endianess: Parser.Endianness): Parser;   /* [sic] */
+    endianess(endianess: Parser.Endianness): Parser<O>;   /* [sic] */
 
-    namely(alias: string): Parser;
+    namely(alias: string): Parser<O>;
 
     compile(): void;
 
@@ -96,10 +125,8 @@ export interface ParserConstructor {
 export const Parser: ParserConstructor;
 
 export namespace Parser {
-    type Data = number | string | Array<number | Parsed> | Parsed | Buffer;
-    interface Parsed {
-        [name: string]: Data;
-    }
+    type Data = number | string | Array<number | Parser<any>> | Parser<any> | Buffer;
+    type Parsed<O extends object | undefined> = O extends undefined ? {} : O;
 
     interface Options {
         formatter?: ((value: Data) => any);
@@ -108,7 +135,7 @@ export namespace Parser {
 
     interface StringOptions extends Options {
         encoding?: string;
-        length?: number | string | ((this: Parsed) => number);
+        length?: number | string | ((this: Parser<any>) => number);
         zeroTerminated?: boolean;
         greedy?: boolean;
         stripNull?: boolean;
@@ -116,32 +143,34 @@ export namespace Parser {
 
     interface BufferOptions extends Options {
         clone?: boolean;
-        length?: number | string | ((this: Parsed) => number);
+        length?: number | string | ((this: Parser<any>) => number);
         readUntil?: string | ((item: number, buffer: Buffer) => boolean);
     }
 
     interface ArrayOptions extends Options {
-        type: string | Parser;
-        length?: number | string | ((this: Parsed) => number);
-        lengthInBytes?: number | string | ((this: Parsed) => number);
+        type: string | Parser<any>;
+        length?: number | string | ((this: Parser<any>) => number);
+        lengthInBytes?: number | string | ((this: Parser<any>) => number);
         readUntil?: string | ((item: number, buffer: Buffer) => boolean);
     }
 
     interface ChoiceOptions extends Options {
-        tag: string | ((this: Parsed) => number);
-        choices: { [item: number]: Parser | string };
-        defaultChoice?: Parser | string;
+        tag: string | ((this: Parser<any>) => number);
+        choices: { [item: number]: Parser<any> | string };
+        defaultChoice?: Parser<any> | string;
     }
 
     interface NestOptions extends Options {
-        type: Parser | string;
+        type: Parser<any>;
     }
 
     type Endianness =
         'little' |
         'big';
 
-    interface Context {
-        [name: string]: Parsed;
-    }
+    type Valid<O extends object | undefined, P extends object> =
+        O extends undefined ? P : O & P;
+
+    type Next<O extends object | undefined, N extends string, T extends any> =
+        Parser<Valid<O, { [name in N]: T }>>;
 }

From 0c94f13161257397f488f2943b15e3e945cec0a1 Mon Sep 17 00:00:00 2001
From: Levin Keller <post@levinkeller.de>
Date: Thu, 29 Nov 2018 20:21:55 +0100
Subject: [PATCH 502/836] Correctly type callback

---
 types/web3/providers.d.ts | 10 ++++++----
 types/web3/web3-tests.ts  | 20 ++++++++++++++++++++
 2 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/types/web3/providers.d.ts b/types/web3/providers.d.ts
index 729ea09278..22a883222f 100644
--- a/types/web3/providers.d.ts
+++ b/types/web3/providers.d.ts
@@ -12,11 +12,13 @@ interface JsonRPCResponse {
     error?: string;
 }
 
+interface Callback<ResultType> {
+  (error: Error): void;
+  (error: null, val: ResultType): void;
+}
+
 export class Provider {
-    send(
-        payload: JsonRPCRequest,
-        callback: (e: Error, val: JsonRPCResponse) => void
-    ): any;
+  send(payload: JsonRPCRequest, callback: Callback<JsonRPCResponse>): any;
 }
 
 export class WebsocketProvider extends Provider {
diff --git a/types/web3/web3-tests.ts b/types/web3/web3-tests.ts
index 170a8b22c3..1d7474465e 100644
--- a/types/web3/web3-tests.ts
+++ b/types/web3/web3-tests.ts
@@ -2,6 +2,7 @@ import Web3 = require("web3");
 import BigNumber = require("bn.js");
 import { TransactionReceipt } from "web3/types";
 import PromiEvent from "web3/promiEvent";
+import { Provider, JsonRPCResponse } from "web3/providers";
 
 const contractAddress = "0xde0B295669a9FD93d5F28D9Ec85E40f4cb697BAe";
 
@@ -10,6 +11,25 @@ const contractAddress = "0xde0B295669a9FD93d5F28D9Ec85E40f4cb697BAe";
 // --------------------------------------------------------------------------
 const web3 = new Web3();
 const myProvider = new web3.providers.HttpProvider("http://localhost:5454");
+
+const createFailingHttpProvider = (): Provider => ({
+  send(payload, callback) {
+    callback(new Error("Illegal!"));
+  }
+});
+
+const createSuccesfulHttpProvider = (): Provider => ({
+  send(payload, callback) {
+    const response = {};
+    callback(null, response as JsonRPCResponse);
+  }
+});
+
+const fakeProvider: Provider = createFailingHttpProvider();
+const otherFakeProvider: Provider = createSuccesfulHttpProvider();
+
+web3.setProvider(fakeProvider);
+web3.setProvider(otherFakeProvider);
 web3.setProvider(myProvider);
 web3.eth.setProvider(myProvider);
 

From c679a8e691db619614c4acb666b768ef2f1508d2 Mon Sep 17 00:00:00 2001
From: Ivo Murrell <ivoisbelongtous@gmail.com>
Date: Sat, 1 Dec 2018 02:32:31 +0000
Subject: [PATCH 503/836] Add type definitions for cfn-response package.

---
 types/cfn-response/cfn-response-tests.ts | 12 ++++++++++++
 types/cfn-response/index.d.ts            | 19 +++++++++++++++++++
 types/cfn-response/tsconfig.json         | 23 +++++++++++++++++++++++
 types/cfn-response/tslint.json           |  1 +
 4 files changed, 55 insertions(+)
 create mode 100644 types/cfn-response/cfn-response-tests.ts
 create mode 100644 types/cfn-response/index.d.ts
 create mode 100644 types/cfn-response/tsconfig.json
 create mode 100644 types/cfn-response/tslint.json

diff --git a/types/cfn-response/cfn-response-tests.ts b/types/cfn-response/cfn-response-tests.ts
new file mode 100644
index 0000000000..b9633c17aa
--- /dev/null
+++ b/types/cfn-response/cfn-response-tests.ts
@@ -0,0 +1,12 @@
+import * as cfn from "cfn-response";
+import { CloudFormationCustomResourceEvent, Context } from "aws-lambda";
+
+declare const event: CloudFormationCustomResourceEvent;
+declare const context: Context;
+
+// $ExpectType void
+cfn.send(event, context, cfn.SUCCESS, { sample: 123 }, "abc");
+// $ExpectType void
+cfn.send(event, context, "SUCCESS");
+// $ExpectError
+cfn.send(event, context, "", {});
diff --git a/types/cfn-response/index.d.ts b/types/cfn-response/index.d.ts
new file mode 100644
index 0000000000..54cb63dfef
--- /dev/null
+++ b/types/cfn-response/index.d.ts
@@ -0,0 +1,19 @@
+// Type definitions for cfn-response 1.0
+// Project: https://github.com/LukeMizuhashi/cfn-response
+// Definitions by: Ivo Murrell <https://github.com/ivoisbelongtous>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+import { CloudFormationCustomResourceEvent, Context } from "aws-lambda";
+
+export type ResponseStatus = "SUCCESS" | "FAILED";
+export const SUCCESS: ResponseStatus;
+export const FAILED: ResponseStatus;
+
+export function send(
+    event: CloudFormationCustomResourceEvent,
+    context: Context,
+    responseStatus: ResponseStatus,
+    responseData?: object,
+    physicalResourceId?: string
+): void;
diff --git a/types/cfn-response/tsconfig.json b/types/cfn-response/tsconfig.json
new file mode 100644
index 0000000000..0aff9f9071
--- /dev/null
+++ b/types/cfn-response/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+	"strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "cfn-response-tests.ts"
+    ]
+}
diff --git a/types/cfn-response/tslint.json b/types/cfn-response/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/cfn-response/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From c92112c5e79c70f4f4c0b08e4da5077e3e58c916 Mon Sep 17 00:00:00 2001
From: Adam Misiorny <adam.misiorny@gmail.com>
Date: Sat, 1 Dec 2018 15:09:22 +0100
Subject: [PATCH 504/836] Split sequence declaration

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

diff --git a/types/rosie/index.d.ts b/types/rosie/index.d.ts
index e66e9855eb..b8c52d3bc0 100644
--- a/types/rosie/index.d.ts
+++ b/types/rosie/index.d.ts
@@ -163,7 +163,8 @@ declare namespace rosie {
      * @param {function(number): *=} builder
      * @return {Factory}
      */
-    sequence(name: keyof T, dependenciesOrBuilder?: (i: number) => any | keyof T[], builder?: Function) : IFactory<T>;
+    sequence<K extends keyof T>(name: K, builder?: (i: number) => any): IFactory<T>;
+    sequence<K extends keyof T, D extends keyof T>(name: keyof T, dependencies: D[], builder: (i: number, ...args: any[]) => any): IFactory<T>;
 
     /**
      * Sets a post-processor callback that will receive built objects and the

From 2b8c538ab791543e1c1661dc0700a637f4514bb9 Mon Sep 17 00:00:00 2001
From: Adam Misiorny <adam.misiorny@gmail.com>
Date: Sat, 1 Dec 2018 15:10:57 +0100
Subject: [PATCH 505/836] Unregistered factories

---
 types/rosie/index.d.ts     |  1 +
 types/rosie/rosie-tests.ts | 15 +++++++++++++++
 2 files changed, 16 insertions(+)

diff --git a/types/rosie/index.d.ts b/types/rosie/index.d.ts
index b8c52d3bc0..ad7d8f644d 100644
--- a/types/rosie/index.d.ts
+++ b/types/rosie/index.d.ts
@@ -8,6 +8,7 @@
 
 declare namespace rosie {
   interface IFactoryStatic {
+    new<T = any>(): IFactory<T>;
     /**
      * Defines a factory by name and constructor function. Call #attr and #option
      * on the result to define the properties of this factory.
diff --git a/types/rosie/rosie-tests.ts b/types/rosie/rosie-tests.ts
index 86dd049732..bb6b9defb8 100644
--- a/types/rosie/rosie-tests.ts
+++ b/types/rosie/rosie-tests.ts
@@ -70,6 +70,21 @@ const person = Factory.build<Person>('Person');
 let aString = '';
 aString = person.firstName;
 
+// Unregistered factories
+const unregisteredPersonFactory = new Factory<Person>();
+
+unregisteredPersonFactory.attr('firstName', 'John').sequence('id');
+
+// Sequence with dependencies
+unregisteredPersonFactory.sequence('lastName', ['age'], (i: number, age: number) => `Doe ${i} ${age}`)
+
+// Unregistered extended factories
+
+const unregisteredExtendedPersonFactory = new Factory().extend(unregisteredPersonFactory)
+
+unregisteredExtendedPersonFactory.attr('firstName', 'John2')
+unregisteredExtendedPersonFactory.sequence('lastName', ['age'], (i: number) => `Doe2 ${i}`)
+
 class CustomClass {
   type: string;
 

From 1bd81e2845069ea2a1696fc367041dec9bb30eb3 Mon Sep 17 00:00:00 2001
From: Adam Misiorny <adam.misiorny@gmail.com>
Date: Sat, 1 Dec 2018 15:11:19 +0100
Subject: [PATCH 506/836] Add author info

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

diff --git a/types/rosie/index.d.ts b/types/rosie/index.d.ts
index ad7d8f644d..63624ad3f2 100644
--- a/types/rosie/index.d.ts
+++ b/types/rosie/index.d.ts
@@ -3,6 +3,7 @@
 // Definitions by: Abner Oliveira <https://github.com/abner>,
 //                 Chris Grigg <https://github.com/subvertallchris>,
 //                 Alex Bukurov <https://github.com/abukurov>
+//                 Adam Misiorny <https://github.com/adam187>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 

From d2260f4ff382e9128a876325fc22df9b80611443 Mon Sep 17 00:00:00 2001
From: Hernan Rajchert <hrajchert@gmail.com>
Date: Sat, 1 Dec 2018 11:33:29 -0300
Subject: [PATCH 507/836] fix: mdast version

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

diff --git a/types/mdast/index.d.ts b/types/mdast/index.d.ts
index d7761bd38f..c1fcadec97 100644
--- a/types/mdast/index.d.ts
+++ b/types/mdast/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/syntax-tree/mdast
 // Definitions by: Jun Lu <https://github.com/lujun2>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.4
+// TypeScript Version: 3.0
 
 import { Parent as UnistParent, Literal as UnistLiteral, Node } from 'unist';
 
diff --git a/types/unist/index.d.ts b/types/unist/index.d.ts
index 55bea58e47..121362a2ac 100644
--- a/types/unist/index.d.ts
+++ b/types/unist/index.d.ts
@@ -7,8 +7,6 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 3.0
 
-export as namespace Unist
-
 // Syntactic units in unist syntax trees are called nodes.
 export interface Node {
     // The variant of a node.
@@ -59,5 +57,5 @@ export interface Parent extends Node {
 
 // Nodes containing a value.
 export interface Literal extends Node {
-    value: any;
+    value: unknown;
 }
diff --git a/types/unist/unist-tests.ts b/types/unist/unist-tests.ts
index 9ba2dc06d5..6f10111ba0 100644
--- a/types/unist/unist-tests.ts
+++ b/types/unist/unist-tests.ts
@@ -1,4 +1,6 @@
-const data: Unist.Data = {
+import {Data, Point, Position, Node, Literal, Parent} from './index';
+
+const data: Data = {
     string: 'string',
     number: 1,
     object: {
@@ -9,32 +11,32 @@ const data: Unist.Data = {
     null: null
 };
 
-const point: Unist.Point = {
+const point: Point = {
     line: 1,
     column: 1,
     offset: 0
 };
 
-const position: Unist.Position = {
+const position: Position = {
     start: point,
     end: point,
     indent: [1]
 };
 
-const node: Unist.Node = {
+const node: Node = {
     type: 'node',
     data,
     position
 };
 
-const text: Unist.Literal = {
+const text: Literal = {
     type: 'text',
     data,
     position,
     value: 'value'
 };
 
-const parent: Unist.Parent = {
+const parent: Parent = {
     type: 'parent',
     data,
     position,

From 982ed47c5cf0bcea51727e8137b717a536dce726 Mon Sep 17 00:00:00 2001
From: Hernan Rajchert <hrajchert@gmail.com>
Date: Sat, 1 Dec 2018 11:36:35 -0300
Subject: [PATCH 508/836] fix: linting problems

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

diff --git a/types/unist/unist-tests.ts b/types/unist/unist-tests.ts
index 6f10111ba0..1c27db2a58 100644
--- a/types/unist/unist-tests.ts
+++ b/types/unist/unist-tests.ts
@@ -1,4 +1,4 @@
-import {Data, Point, Position, Node, Literal, Parent} from './index';
+import { Data, Point, Position, Node, Literal, Parent } from 'unist';
 
 const data: Data = {
     string: 'string',

From b3d6ad95f869a0ba8fadc6b6676b6f05c545699f Mon Sep 17 00:00:00 2001
From: Silas Rech <silas@panascais.net>
Date: Sat, 1 Dec 2018 15:48:04 +0100
Subject: [PATCH 509/836] [hibp] add typings

---
 types/hibp/hibp-tests.ts | 17 +++++++
 types/hibp/index.d.ts    | 97 ++++++++++++++++++++++++++++++++++++++++
 types/hibp/tsconfig.json | 23 ++++++++++
 types/hibp/tslint.json   |  1 +
 4 files changed, 138 insertions(+)
 create mode 100644 types/hibp/hibp-tests.ts
 create mode 100644 types/hibp/index.d.ts
 create mode 100644 types/hibp/tsconfig.json
 create mode 100644 types/hibp/tslint.json

diff --git a/types/hibp/hibp-tests.ts b/types/hibp/hibp-tests.ts
new file mode 100644
index 0000000000..cdcd1851bf
--- /dev/null
+++ b/types/hibp/hibp-tests.ts
@@ -0,0 +1,17 @@
+import * as hibp from 'hibp';
+
+hibp
+.search('someAccountOrEmail')
+.then(data => {
+    if (data.breaches || data.pastes) {
+        // Bummer...
+        console.log(data);
+    } else {
+        // Phew! We're clear.
+        console.log('Good news — no pwnage found!');
+    }
+})
+.catch(err => {
+    // Something went wrong.
+    console.log(err.message);
+});
diff --git a/types/hibp/index.d.ts b/types/hibp/index.d.ts
new file mode 100644
index 0000000000..27819f1c96
--- /dev/null
+++ b/types/hibp/index.d.ts
@@ -0,0 +1,97 @@
+// Type definitions for hibp 7.2
+// Project: https://github.com/wkovacs64/hibp
+// Definitions by: Silas Rech <https://github.com/lenovouser>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
+
+/// <reference types="node" />
+
+export interface BreachOptions {
+    domain?: string;
+    truncate?: boolean;
+}
+
+export interface Breach {
+    Name: string;
+    Title: string;
+    Domain: string;
+    BreachDate: string;
+    AddedDate: string;
+    ModifiedDate: string;
+    PwnCount: number;
+    Description: string;
+    LogoPath: string;
+    DataClasses: string[];
+    IsVerified: boolean;
+    IsFabricated: boolean;
+    IsSensitive: boolean;
+    IsRetired: boolean;
+    IsSpamList: boolean;
+}
+
+export interface Paste {
+    Id: string;
+    Source: string;
+    Title: string;
+    Date: string;
+    EmailCount: number;
+}
+
+export interface Range {
+    suffix: string;
+    count: number;
+}
+
+/**
+ * Fetches data for a specific breach event.
+ */
+export function breach(breachName: string): Promise<Breach>;
+
+/**
+ * Fetches breach data for a specific account.
+ */
+export function breachedAccount(account: string, options?: BreachOptions): Promise<Breach[]>;
+
+/**
+ * Fetches all breach events in the system.
+ */
+export function breaches(options?: { domain?: string }): Promise<Breach[]>;
+
+/**
+ * Fetches all data classes in the system.
+ */
+export function dataClasses(): Promise<string[]>;
+
+/**
+ * Fetches paste data for a specific email address.
+ */
+export function pasteAccount(email: string): Promise<Paste[]>;
+
+/**
+ * Fetches the number of times the the given password has been exposed in a breach (0 indicating no exposure).
+ * The password is given in plain text, but only the first 5 characters of its SHA-1 hash will be submitted to the API.
+ */
+export function pwnedPassword(password: string): Promise<number>;
+
+/**
+ * Fetches the SHA-1 hash suffixes for the given 5-character SHA-1 hash prefix.
+ *
+ * When a password hash with the same first 5 characters is found in the Pwned Passwords repository,
+ * the API will respond with an HTTP 200 and include the suffix of every hash beginning with the specified prefix,
+ * followed by a count of how many times it appears in the data set.
+ *
+ * This function parses the response and returns a more structured format.
+ */
+export function pwnedPasswordRange(prefix: string): Promise<Range[]>;
+
+/**
+ * Fetches all breaches and all pastes associated with the provided account (email address or username).
+ *
+ * Note that the remote API does not support querying pastes by username (only email addresses),
+ * so in the event the provided account is not a valid email address,
+ * only breach data is queried and the "pastes" field of the resulting object will always be null.
+ *
+ * This is exactly how searching via the current web interface behaves, which this convenience method is designed to mimic.
+ *
+ */
+export function search(account: string, options?: BreachOptions): Promise<{ breaches?: Breach[], pastes?: Paste[] }>;
diff --git a/types/hibp/tsconfig.json b/types/hibp/tsconfig.json
new file mode 100644
index 0000000000..58ecb92a11
--- /dev/null
+++ b/types/hibp/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "hibp-tests.ts"
+    ]
+}
diff --git a/types/hibp/tslint.json b/types/hibp/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/hibp/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 8b0dd4b73160fd8d77cc9dcd7e227159588c5552 Mon Sep 17 00:00:00 2001
From: Hernan Rajchert <hrajchert@gmail.com>
Date: Sat, 1 Dec 2018 11:54:46 -0300
Subject: [PATCH 510/836] fix: remove mandatory indent property

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

diff --git a/types/unist/index.d.ts b/types/unist/index.d.ts
index 121362a2ac..202b315250 100644
--- a/types/unist/index.d.ts
+++ b/types/unist/index.d.ts
@@ -34,7 +34,7 @@ export interface Position {
 
     // Start column at each index (plus start line) in the source region,
     // for elements that span multiple lines.
-    indent: number[];
+    indent?: number[];
 }
 
 // One place in a source file.

From 0084184b14ff5aaeb264188421e51f5af205e779 Mon Sep 17 00:00:00 2001
From: Hernan Rajchert <hrajchert@gmail.com>
Date: Sat, 1 Dec 2018 11:58:20 -0300
Subject: [PATCH 511/836] refactor: converted comments in multi-line to see
 them in the IDE

---
 types/unist/index.d.ts | 70 +++++++++++++++++++++++++++++++-----------
 1 file changed, 52 insertions(+), 18 deletions(-)

diff --git a/types/unist/index.d.ts b/types/unist/index.d.ts
index 202b315250..023b1c11e3 100644
--- a/types/unist/index.d.ts
+++ b/types/unist/index.d.ts
@@ -7,55 +7,89 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 3.0
 
-// Syntactic units in unist syntax trees are called nodes.
+/**
+ * Syntactic units in unist syntax trees are called nodes.
+ */
 export interface Node {
-    // The variant of a node.
+    /**
+     * The variant of a node.
+     */
     type: string;
 
-    // Information from the ecosystem.
+    /**
+     * Information from the ecosystem.
+     */
     data?: Data;
 
-    // Location of a node in a source document.
-    // Must not be present if a node is generated.
+    /**
+     * Location of a node in a source document.
+     * Must not be present if a node is generated.
+     */
     position?: Position;
 }
 
+/**
+ * Information associated by the ecosystem with the node.
+ * Space is guaranteed to never be specified by unist or specifications
+ * implementing unist.
+ */
 export interface Data {
     [key: string]: unknown;
 }
 
-// Location of a node in a source file.
+/**
+ * Location of a node in a source file.
+ */
 export interface Position {
-    // Place of the first character of the parsed source region.
+    /**
+     * Place of the first character of the parsed source region.
+     */
     start: Point;
 
-    // Place of the first character after the parsed source region.
+    /**
+     * Place of the first character after the parsed source region.
+     */
     end: Point;
 
-    // Start column at each index (plus start line) in the source region,
-    // for elements that span multiple lines.
+    /**
+     * Start column at each index (plus start line) in the source region,
+     * for elements that span multiple lines.
+     */
     indent?: number[];
 }
 
-// One place in a source file.
+/**
+ * One place in a source file.
+ */
 export interface Point {
-    // Line in a source file (1-indexed integer).
+    /**
+     * Line in a source file (1-indexed integer).
+     */
     line: number;
 
-    // Column in a source file (1-indexed integer).
+    /**
+     * Column in a source file (1-indexed integer).
+     */
     column: number;
-
-    // Character in a source file (0-indexed integer).
+    /**
+     * Character in a source file (0-indexed integer).
+     */
     offset?: number;
 }
 
-// Nodes containing other nodes.
+/**
+ * Nodes containing other nodes.
+ */
 export interface Parent extends Node {
-    // List representing the children of a node.
+    /**
+     * List representing the children of a node.
+     */
     children: Node[];
 }
 
-// Nodes containing a value.
+/**
+ * Nodes containing a value.
+ */
 export interface Literal extends Node {
     value: unknown;
 }

From 2c5d06c3e8368dabfbb5e2a6f6958148857fe0d6 Mon Sep 17 00:00:00 2001
From: Adam Misiorny <adam.misiorny@gmail.com>
Date: Sat, 1 Dec 2018 16:01:05 +0100
Subject: [PATCH 512/836] [@storybook/addon-options] Add withOptions

---
 types/storybook__addon-options/index.d.ts     |  7 +++++++
 .../storybook__addon-options-tests.ts         | 19 ++++++++++++++++++-
 types/storybook__addon-options/tsconfig.json  |  5 ++++-
 3 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/types/storybook__addon-options/index.d.ts b/types/storybook__addon-options/index.d.ts
index 61f9f11def..a0baa39ab2 100644
--- a/types/storybook__addon-options/index.d.ts
+++ b/types/storybook__addon-options/index.d.ts
@@ -6,6 +6,8 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
+import { StoryDecorator } from "@storybook/react";
+
 export interface Options {
     name?: string;
     url?: string;
@@ -23,4 +25,9 @@ export interface Options {
     selectedAddonPanel?: string;
 }
 
+/**
+ * @deprecated Use withOptions instead
+ */
 export function setOptions(options: Options): void;
+
+export function withOptions(options: Options): StoryDecorator;
diff --git a/types/storybook__addon-options/storybook__addon-options-tests.ts b/types/storybook__addon-options/storybook__addon-options-tests.ts
index a3003c913f..1fc49d18e0 100644
--- a/types/storybook__addon-options/storybook__addon-options-tests.ts
+++ b/types/storybook__addon-options/storybook__addon-options-tests.ts
@@ -1,4 +1,5 @@
-import { setOptions } from '@storybook/addon-options';
+import { setOptions, withOptions } from '@storybook/addon-options';
+import { addDecorator } from '@storybook/react';
 
 setOptions({
   name: 'My Storybook',
@@ -31,3 +32,19 @@ setOptions({
   hierarchySeparator: '.',
   hierarchyRootSeparator: '#',
 });
+
+addDecorator(
+    withOptions({
+        name: "My Storybook",
+        url: "https://example.com",
+        goFullScreen: false,
+        showStoriesPanel: false,
+        showAddonPanel: false,
+        showSearchBox: false,
+        addonPanelInRight: false,
+        sortStoriesByKind: false,
+        hierarchySeparator: /\//,
+        hierarchyRootSeparator: /\|/,
+        selectedAddonPanel: "storybook/actions/action-panel"
+    })
+);
diff --git a/types/storybook__addon-options/tsconfig.json b/types/storybook__addon-options/tsconfig.json
index 936a535725..df1a88f769 100644
--- a/types/storybook__addon-options/tsconfig.json
+++ b/types/storybook__addon-options/tsconfig.json
@@ -15,6 +15,9 @@
         "paths": {
             "@storybook/addon-options": [
                 "storybook__addon-options"
+            ],
+            "@storybook/react": [
+                "storybook__react"
             ]
         },
         "types": [],
@@ -25,4 +28,4 @@
         "index.d.ts",
         "storybook__addon-options-tests.ts"
     ]
-}
\ No newline at end of file
+}

From 6e11b5df9d359a15d2851144b130139259f36ae4 Mon Sep 17 00:00:00 2001
From: Adam Misiorny <adam.misiorny@gmail.com>
Date: Sat, 1 Dec 2018 16:02:18 +0100
Subject: [PATCH 513/836] Add author

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

diff --git a/types/storybook__addon-options/index.d.ts b/types/storybook__addon-options/index.d.ts
index a0baa39ab2..42010b84e4 100644
--- a/types/storybook__addon-options/index.d.ts
+++ b/types/storybook__addon-options/index.d.ts
@@ -3,6 +3,7 @@
 // Definitions by: Joscha Feth <https://github.com/joscha>
 //                 Simon Helle Nielsen <https://github.com/simonhn>
 //                 A.MacLeay <https://github.com/amacleay>
+//                 Adam Misiorny <https://github.com/adam187>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 

From e66e6ed61f4b7ebe84b84ad46c6cc7f982b0bf72 Mon Sep 17 00:00:00 2001
From: Adam Misiorny <adam.misiorny@gmail.com>
Date: Sat, 1 Dec 2018 16:13:44 +0100
Subject: [PATCH 514/836] Increase typescript version to match @storybook/react

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

diff --git a/types/storybook__addon-options/index.d.ts b/types/storybook__addon-options/index.d.ts
index 42010b84e4..ec3ba1e252 100644
--- a/types/storybook__addon-options/index.d.ts
+++ b/types/storybook__addon-options/index.d.ts
@@ -5,7 +5,7 @@
 //                 A.MacLeay <https://github.com/amacleay>
 //                 Adam Misiorny <https://github.com/adam187>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.8
 
 import { StoryDecorator } from "@storybook/react";
 

From 21179bbf4603a1a25762715eb1b4a22fccc867a2 Mon Sep 17 00:00:00 2001
From: Silas Rech <silas@panascais.net>
Date: Sat, 1 Dec 2018 16:31:01 +0100
Subject: [PATCH 515/836] [cson-parser] add typings

---
 types/cson-parser/cson-parser-tests.ts |  5 +++++
 types/cson-parser/index.d.ts           | 25 +++++++++++++++++++++++++
 types/cson-parser/tsconfig.json        | 23 +++++++++++++++++++++++
 types/cson-parser/tslint.json          |  1 +
 4 files changed, 54 insertions(+)
 create mode 100644 types/cson-parser/cson-parser-tests.ts
 create mode 100644 types/cson-parser/index.d.ts
 create mode 100644 types/cson-parser/tsconfig.json
 create mode 100644 types/cson-parser/tslint.json

diff --git a/types/cson-parser/cson-parser-tests.ts b/types/cson-parser/cson-parser-tests.ts
new file mode 100644
index 0000000000..955aadcffe
--- /dev/null
+++ b/types/cson-parser/cson-parser-tests.ts
@@ -0,0 +1,5 @@
+import * as CSON from 'cson-parser';
+
+CSON.parse('[ 1, 2, a: "str" ]');
+
+CSON.stringify({ domain: 'typescript.org' }, null, 4);
diff --git a/types/cson-parser/index.d.ts b/types/cson-parser/index.d.ts
new file mode 100644
index 0000000000..b8e1db7421
--- /dev/null
+++ b/types/cson-parser/index.d.ts
@@ -0,0 +1,25 @@
+// Type definitions for cson-parser 4.0
+// Project: https://github.com/groupon/cson-parser
+// Definitions by: Silas Rech <https://github.com/lenovouser>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
+
+/// <reference types="node" />
+
+export type ReplacerFunction = (key: string, value: any) => any;
+
+/**
+ * Converts a CSON string into an object.
+ * @param text A valid CSON string.
+ * @param reviver A function that transforms the results. This function is called for each member of the object.
+ * If a member contains nested objects, the nested objects are transformed before the parent object is.
+ */
+export function parse(text: string, reviver?: (key: any, value: any) => any): any;
+
+/**
+ * Converts a JavaScript value to a CSON string.
+ * @param value A JavaScript value, usually an object or array, to be converted.
+ * @param replacer A function that transforms the results or an array of strings and numbers that acts as a approved list for selecting the object properties that will be stringified.
+ * @param space Adds indentation, white space, and line break characters to the return-value CSON text to make it easier to read.
+ */
+export function stringify(value: any, replacer?: ReplacerFunction | Array<(number | string)> | null, space?: string | number): string;
diff --git a/types/cson-parser/tsconfig.json b/types/cson-parser/tsconfig.json
new file mode 100644
index 0000000000..374ff4913f
--- /dev/null
+++ b/types/cson-parser/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "cson-parser-tests.ts"
+    ]
+}
diff --git a/types/cson-parser/tslint.json b/types/cson-parser/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/cson-parser/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From ba67cbd87032a56e0c10378d989da955a0b902aa Mon Sep 17 00:00:00 2001
From: Silas Rech <silas@panascais.net>
Date: Sat, 1 Dec 2018 17:52:49 +0100
Subject: [PATCH 516/836] [sass] add typings

---
 types/sass/index.d.ts    | 203 +++++++++++++++++++++++++++++++++++++++
 types/sass/sass-tests.ts |   7 ++
 types/sass/tsconfig.json |  23 +++++
 types/sass/tslint.json   |   1 +
 4 files changed, 234 insertions(+)
 create mode 100644 types/sass/index.d.ts
 create mode 100644 types/sass/sass-tests.ts
 create mode 100644 types/sass/tsconfig.json
 create mode 100644 types/sass/tslint.json

diff --git a/types/sass/index.d.ts b/types/sass/index.d.ts
new file mode 100644
index 0000000000..0131836143
--- /dev/null
+++ b/types/sass/index.d.ts
@@ -0,0 +1,203 @@
+// Type definitions for sass 1.15
+// Project: https://github.com/sass/dart-sass
+// Definitions by: Silas Rech <https://github.com/lenovouser>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
+
+/// <reference types="node" />
+
+export type ImporterReturnType = { file: string } | { contents: string } | Error | null;
+
+export type Importer = (url: string, prev: string, done: (data: ImporterReturnType) => void) => ImporterReturnType | void;
+
+export interface Options {
+    /**
+     * Path to a file to compile.
+     *
+     * @default null
+     */
+    file?: string;
+
+    /**
+     * A string to pass to compile.
+     *
+     * It is recommended that you use `includePaths` in conjunction with this so that sass can find files when using the @import directive.
+     *
+     * @default null
+     */
+    data?: string;
+
+    /**
+     * Handles when the @import directive is encountered.
+     *
+     * A custom importer allows extension of the sass engine in both a synchronous and asynchronous manner.
+     *
+     * @default undefined
+     */
+    importer?: Importer | Importer[];
+
+    /**
+     * Holds a collection of custom functions that may be invoked by the sass files being compiled.
+     *
+     * @default undefined
+     */
+    functions?: { [key: string]: () => void };
+
+    /**
+     * An array of paths that should be looked in to attempt to resolve your @import declarations.
+     * When using `data`, it is recommended that you use this.
+     *
+     * @default []
+     */
+    includePaths?: string[];
+
+    /**
+     * Enable Sass Indented Syntax for parsing the data string or file.
+     *
+     * @default false
+     */
+    indentedSyntax?: boolean;
+
+    /**
+     * Used to determine whether to use space or tab character for indentation.
+     *
+     * @default 'space'
+     */
+    indentType?: 'space' | 'tab';
+
+    /**
+     * Used to determine the number of spaces or tabs to be used for indentation.
+     *
+     * @default 2
+     */
+    indentWidth?: number;
+
+    /**
+     * Used to determine which sequence to use for line breaks.
+     *
+     * @default 'lf'
+     */
+    linefeed?: 'cr' | 'crlf' | 'lf' | 'lfcr';
+
+    /**
+     * Disable the inclusion of source map information in the output file.
+     *
+     * @default false
+     */
+    omitSourceMapUrl?: boolean;
+
+    /**
+     * Specify the intended location of the output file.
+     * Strongly recommended when outputting source maps so that they can properly refer back to their intended files.
+     *
+     * @default null
+     */
+    outFile?: string;
+
+    /**
+     * Determines the output format of the final CSS style.
+     *
+     * @default 'expanded'
+     */
+    outputStyle?: 'compressed' | 'expanded';
+
+    /**
+     * Enables the outputting of a source map.
+     *
+     * @default undefined
+     */
+    sourceMap?: boolean | string;
+
+    /**
+     * Includes the contents in the source map information.
+     *
+     * @default false
+     */
+    sourceMapContents?: boolean;
+
+    /**
+     * Embeds the source map as a data URI.
+     *
+     * @default false
+     */
+    sourceMapEmbed?: boolean;
+
+    /**
+     * The value will be emitted as `sourceRoot` in the source map information.
+     *
+     * @default undefined
+     */
+    sourceMapRoot?: string;
+}
+
+export interface SassException extends Error {
+    /**
+     * The error message.
+     */
+    message: string;
+
+    /**
+     * The line number of error.
+     */
+    line: number;
+
+    /**
+     * The column number of error.
+     */
+    column: number;
+
+    /**
+     * The status code.
+     */
+    status: number;
+
+    /**
+     * The filename of error.
+     *
+     * In case file option was not set (in favour of `data`), this will reflect the value `stdin`.
+     */
+    file: string;
+}
+
+export interface Result {
+    /**
+     * The compiled CSS.
+     *
+     * Write this to a file, or serve it out as needed.
+     */
+    css: Buffer;
+
+    /**
+     * The source map.
+     */
+    map?: Buffer;
+    stats: {
+        /**
+         * The path to the scss file, or `data` if the source was not a file.
+         */
+        entry: string;
+
+        /**
+         * `Date.now()` before the compilation.
+         */
+        start: number;
+
+        /**
+         * `Date.now()` after the compilation.
+         */
+        end: number;
+
+        /**
+         * `end - start`
+         */
+        duration: number;
+
+        /**
+         * Absolute paths to all related files in no particular order.
+         */
+        includedFiles: string[];
+    };
+}
+
+export function render(options: Options, callback: (exception: SassException, result: Result) => void): void;
+export function renderSync(options: Options): Result;
diff --git a/types/sass/sass-tests.ts b/types/sass/sass-tests.ts
new file mode 100644
index 0000000000..ae656d0a98
--- /dev/null
+++ b/types/sass/sass-tests.ts
@@ -0,0 +1,7 @@
+import * as sass from 'sass';
+
+sass.renderSync({
+    file: 'index.scss',
+    sourceMap: true,
+    outFile: 'index.css',
+});
diff --git a/types/sass/tsconfig.json b/types/sass/tsconfig.json
new file mode 100644
index 0000000000..11599da1da
--- /dev/null
+++ b/types/sass/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "sass-tests.ts"
+    ]
+}
diff --git a/types/sass/tslint.json b/types/sass/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/sass/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From ff503e74dd923e53cf48c6989eda5cc6a3b543d0 Mon Sep 17 00:00:00 2001
From: Ivan Fernandes <ivandalcantara@gmail.com>
Date: Sun, 2 Dec 2018 01:38:59 -0200
Subject: [PATCH 517/836] passport-bnet type definitions

---
 types/passport-bnet/index.d.ts             | 42 ++++++++++++++
 types/passport-bnet/passport-bnet-tests.ts | 65 ++++++++++++++++++++++
 types/passport-bnet/tsconfig.json          | 23 ++++++++
 types/passport-bnet/tslint.json            |  1 +
 4 files changed, 131 insertions(+)
 create mode 100644 types/passport-bnet/index.d.ts
 create mode 100644 types/passport-bnet/passport-bnet-tests.ts
 create mode 100644 types/passport-bnet/tsconfig.json
 create mode 100644 types/passport-bnet/tslint.json

diff --git a/types/passport-bnet/index.d.ts b/types/passport-bnet/index.d.ts
new file mode 100644
index 0000000000..ef6f977830
--- /dev/null
+++ b/types/passport-bnet/index.d.ts
@@ -0,0 +1,42 @@
+// Type definitions for passport-bnet 2.0.0
+// Project: https://github.com/Blizzard/passport-bnet#readme
+// Definitions by: Ivan Fernandes <https://github.com/ivan94>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+import { Strategy as OAuth2Strategy, VerifyFunction, VerifyFunctionWithRequest } from 'passport-oauth2';
+
+declare class BnetStrategy extends OAuth2Strategy {
+    constructor(options: BnetStrategy.StrategyOptions, verify: VerifyFunction);
+    constructor(options: BnetStrategy.StrategyOptionsWithRequest, verify: VerifyFunctionWithRequest);
+}
+
+declare namespace BnetStrategy {
+
+    interface _BaseBnetOptions {
+        region?: string;
+
+        scopeSeparator?: string;
+        customHeaders?: object;
+        authorizationURL?: string;
+        tokenURL?: string;
+        scope?: string; 
+        clientID: string;
+        clientSecret: string;
+        callbackURL?: string;
+    }
+
+    interface StrategyOptions extends _BaseBnetOptions {
+        passReqToCallback?: false;
+    }
+
+    interface StrategyOptionsWithRequest extends _BaseBnetOptions {
+        passReqToCallback: true;
+    }
+
+    function getHost(region: string): string;
+
+    type Strategy = BnetStrategy;
+    const Strategy: typeof BnetStrategy;
+}
+
+export = BnetStrategy
\ No newline at end of file
diff --git a/types/passport-bnet/passport-bnet-tests.ts b/types/passport-bnet/passport-bnet-tests.ts
new file mode 100644
index 0000000000..86f3090c88
--- /dev/null
+++ b/types/passport-bnet/passport-bnet-tests.ts
@@ -0,0 +1,65 @@
+//Based on passport-oauth2/passport-oauth2-tests.ts
+
+import BnetStrategy = require("passport-bnet");
+import { Strategy, StrategyOptions, StrategyOptionsWithRequest } from "passport-bnet";
+import { Strategy as OAuth2Strategy } from "passport-oauth2";
+import { VerifyCallback } from "passport-oauth2";
+import { Request } from "express";
+
+const strategyOptions1: StrategyOptions = {
+    authorizationURL: 'http://www.example.com/auth',
+    callbackURL: 'http://www.example.com/callback',
+    clientID: 'dummy',
+    clientSecret: 'secret',
+    tokenURL: 'http://www.example.com/token',
+    region: 'us',
+    scope: "email",
+    scopeSeparator: ' ',
+    customHeaders: {}
+}
+
+function verifyFunction1(_accessToken: string, _refreshToken: string, _profile: any, verifyCallback: VerifyCallback) {
+    verifyCallback(new Error('unimplemented'));
+}
+
+function verifyFunction2(_accessToken: string, _refreshToken: string, _results: any, _profile: any, verifyCallback: VerifyCallback) {
+    verifyCallback(new Error('unimplemented'));
+}
+
+const strategy1: BnetStrategy = new BnetStrategy(strategyOptions1, verifyFunction1);
+
+const strategy2: Strategy = new BnetStrategy(strategyOptions1, verifyFunction2);
+
+function verifyFunction3(_req: Request, _accessToken: string, _refreshToken: string, _profile: any, verifyCallback: VerifyCallback) {
+    verifyCallback(undefined, { userid: '1' });
+}
+
+function verifyFunction4(_req: Request, _accessToken: string, _refreshToken: string, _results: any, _profile: any, verifyCallback: VerifyCallback) {
+    verifyCallback(undefined, { userid: '1' });
+}
+
+const strategyOptions2: StrategyOptionsWithRequest = {
+    authorizationURL: 'http://www.example.com/auth',
+    callbackURL: 'http://www.example.com/callback',
+    clientID: 'dummy',
+    clientSecret: 'secret',
+    tokenURL: 'http://www.example.com/token',
+    region: 'us',
+    scope: "email",
+    scopeSeparator: ' ',
+    customHeaders: {},
+    passReqToCallback: true
+};
+
+const strategy3: OAuth2Strategy = new BnetStrategy
+(strategyOptions2, verifyFunction3);
+
+const strategy4: Strategy = new Strategy(strategyOptions2, verifyFunction4);
+
+class MyStrategy extends BnetStrategy {
+    useProtectedProperty() {
+        this._oauth2.get('http://www.example.com/profile', 'token', err => err.statusCode);
+        this._oauth2.get('http://www.example.com/profile', 'token', (err, result) => result);
+        this._oauth2.get('http://www.example.com/profile', 'token', (err, result, response) => response);
+    }
+}
\ No newline at end of file
diff --git a/types/passport-bnet/tsconfig.json b/types/passport-bnet/tsconfig.json
new file mode 100644
index 0000000000..28da7a7a65
--- /dev/null
+++ b/types/passport-bnet/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "passport-bnet-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/passport-bnet/tslint.json b/types/passport-bnet/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/passport-bnet/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 374b24ef8732e7907faef7bb13b4326191d1747d Mon Sep 17 00:00:00 2001
From: Ivan Fernandes <ivandalcantara@gmail.com>
Date: Sun, 2 Dec 2018 02:03:00 -0200
Subject: [PATCH 518/836] adding typescript version

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

diff --git a/types/passport-bnet/index.d.ts b/types/passport-bnet/index.d.ts
index ef6f977830..1b28ee21ad 100644
--- a/types/passport-bnet/index.d.ts
+++ b/types/passport-bnet/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/Blizzard/passport-bnet#readme
 // Definitions by: Ivan Fernandes <https://github.com/ivan94>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 import { Strategy as OAuth2Strategy, VerifyFunction, VerifyFunctionWithRequest } from 'passport-oauth2';
 

From 55dc8ebd80d0386841468e2c515aba766fba5da3 Mon Sep 17 00:00:00 2001
From: Ivan Fernandes <ivandalcantara@gmail.com>
Date: Sun, 2 Dec 2018 02:10:27 -0200
Subject: [PATCH 519/836] fomatting

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

diff --git a/types/passport-bnet/index.d.ts b/types/passport-bnet/index.d.ts
index 1b28ee21ad..e5493a8d3c 100644
--- a/types/passport-bnet/index.d.ts
+++ b/types/passport-bnet/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for passport-bnet 2.0.0
+// Type definitions for passport-bnet 2.0.
 // Project: https://github.com/Blizzard/passport-bnet#readme
 // Definitions by: Ivan Fernandes <https://github.com/ivan94>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -12,7 +12,6 @@ declare class BnetStrategy extends OAuth2Strategy {
 }
 
 declare namespace BnetStrategy {
-
     interface _BaseBnetOptions {
         region?: string;
 
@@ -20,7 +19,7 @@ declare namespace BnetStrategy {
         customHeaders?: object;
         authorizationURL?: string;
         tokenURL?: string;
-        scope?: string; 
+        scope?: string;
         clientID: string;
         clientSecret: string;
         callbackURL?: string;
@@ -40,4 +39,4 @@ declare namespace BnetStrategy {
     const Strategy: typeof BnetStrategy;
 }
 
-export = BnetStrategy
\ No newline at end of file
+export = BnetStrategy;
diff --git a/types/passport-bnet/passport-bnet-tests.ts b/types/passport-bnet/passport-bnet-tests.ts
index 86f3090c88..06c0ffccec 100644
--- a/types/passport-bnet/passport-bnet-tests.ts
+++ b/types/passport-bnet/passport-bnet-tests.ts
@@ -1,9 +1,8 @@
-//Based on passport-oauth2/passport-oauth2-tests.ts
+// Based on passport-oauth2/passport-oauth2-tests.ts
 
 import BnetStrategy = require("passport-bnet");
 import { Strategy, StrategyOptions, StrategyOptionsWithRequest } from "passport-bnet";
-import { Strategy as OAuth2Strategy } from "passport-oauth2";
-import { VerifyCallback } from "passport-oauth2";
+import { Strategy as OAuth2Strategy, VerifyCallback } from "passport-oauth2";
 import { Request } from "express";
 
 const strategyOptions1: StrategyOptions = {
@@ -16,7 +15,7 @@ const strategyOptions1: StrategyOptions = {
     scope: "email",
     scopeSeparator: ' ',
     customHeaders: {}
-}
+};
 
 function verifyFunction1(_accessToken: string, _refreshToken: string, _profile: any, verifyCallback: VerifyCallback) {
     verifyCallback(new Error('unimplemented'));
@@ -62,4 +61,4 @@ class MyStrategy extends BnetStrategy {
         this._oauth2.get('http://www.example.com/profile', 'token', (err, result) => result);
         this._oauth2.get('http://www.example.com/profile', 'token', (err, result, response) => response);
     }
-}
\ No newline at end of file
+}

From 47fa3e69a48443e99093497e234cd5fb4159761d Mon Sep 17 00:00:00 2001
From: Ivan Fernandes <ivandalcantara@gmail.com>
Date: Sun, 2 Dec 2018 02:12:46 -0200
Subject: [PATCH 520/836] fixing version notation

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

diff --git a/types/passport-bnet/index.d.ts b/types/passport-bnet/index.d.ts
index e5493a8d3c..86255c782d 100644
--- a/types/passport-bnet/index.d.ts
+++ b/types/passport-bnet/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for passport-bnet 2.0.
+// Type definitions for passport-bnet 2.0
 // Project: https://github.com/Blizzard/passport-bnet#readme
 // Definitions by: Ivan Fernandes <https://github.com/ivan94>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped

From c45cef2c6ebdbb8764f2631154f61213109c5733 Mon Sep 17 00:00:00 2001
From: Kobi Cohen <kobi.co@gigya-inc.com>
Date: Sun, 2 Dec 2018 12:58:30 +0200
Subject: [PATCH 521/836] updating isMatchWithCustomizer type to accept two
 more arguments: object and source per lodash docs
 https://lodash.com/docs/4.17.11#isMatchWith

---
 types/lodash/common/lang.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/lodash/common/lang.d.ts b/types/lodash/common/lang.d.ts
index 9afe554b28..723388c9cc 100644
--- a/types/lodash/common/lang.d.ts
+++ b/types/lodash/common/lang.d.ts
@@ -1020,7 +1020,7 @@ declare module "../index" {
 
     // isMatchWith
 
-    type isMatchWithCustomizer = (value: any, other: any, indexOrKey: PropertyName) => boolean;
+    type isMatchWithCustomizer = (value: any, other: any, indexOrKey: PropertyName, object: object, source: object) => boolean;
 
     interface LoDashStatic {
         /**

From 1aa8969874dbfcba59ec66cebd97a8c51bac9c19 Mon Sep 17 00:00:00 2001
From: Nikola Malovic <nimal@microsoft.com>
Date: Sun, 2 Dec 2018 12:29:37 +0100
Subject: [PATCH 522/836] Options id i snot a number only

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

diff --git a/types/react-data-grid/index.d.ts b/types/react-data-grid/index.d.ts
index b41c2c2501..94d8af72d9 100644
--- a/types/react-data-grid/index.d.ts
+++ b/types/react-data-grid/index.d.ts
@@ -583,7 +583,7 @@ declare namespace AdazzleReactDataGrid {
   declare namespace AdazzleReactDataGridPlugins {
     interface AutoCompleteEditorProps {
         onCommit?: () => void;
-        options?: Array<{ id: number; title: string }>;
+        options?: Array<{ id: any; title: string }>;
         label?: any;
         value?: any;
         height?: number;

From 76d38d894f396cf0084f70d88c6ff1bc3ad79eaf Mon Sep 17 00:00:00 2001
From: Glen <glen.84@gmail.com>
Date: Sun, 2 Dec 2018 14:05:33 +0200
Subject: [PATCH 523/836] hoverBackgroundColor and hoverBorderColor should
 accept Color/Color[]

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

diff --git a/types/chart.js/chart.js-tests.ts b/types/chart.js/chart.js-tests.ts
index 705392baed..fd5ed53e80 100644
--- a/types/chart.js/chart.js-tests.ts
+++ b/types/chart.js/chart.js-tests.ts
@@ -9,7 +9,9 @@ const plugin = {
     }
 };
 
-const chart: Chart = new Chart(new CanvasRenderingContext2D(), {
+const ctx = new CanvasRenderingContext2D();
+
+const chart: Chart = new Chart(ctx, {
     type: "bar",
     plugins: [plugin, plugin],
     data: {
@@ -17,6 +19,8 @@ const chart: Chart = new Chart(new CanvasRenderingContext2D(), {
         datasets: [
             {
                 backgroundColor: "#000000",
+                hoverBackgroundColor: ctx.createLinearGradient(0, 0, 0, 100),
+                hoverBorderColor: ctx.createLinearGradient(0, 0, 0, 100),
                 borderWidth: 1,
                 label: "test",
                 data: [1, null, 3]
diff --git a/types/chart.js/index.d.ts b/types/chart.js/index.d.ts
index 884ddaa760..2803def896 100644
--- a/types/chart.js/index.d.ts
+++ b/types/chart.js/index.d.ts
@@ -554,8 +554,8 @@ declare namespace Chart {
         borderSkipped?: PositionType;
         data?: Array<number | null | undefined> | ChartPoint[];
         fill?: boolean | number | string;
-        hoverBackgroundColor?: string | string[];
-        hoverBorderColor?: string | string[];
+        hoverBackgroundColor?: ChartColor | ChartColor[];
+        hoverBorderColor?: ChartColor | ChartColor[];
         hoverBorderWidth?: number | number[];
         label?: string;
         lineTension?: number;

From dc80f4fdbb210e70c3ba2b8c4e02b50c501bd027 Mon Sep 17 00:00:00 2001
From: Dima Smirnov <email@dimasmirnov.ru>
Date: Sun, 2 Dec 2018 15:32:55 +0300
Subject: [PATCH 524/836] added fn type for order

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

diff --git a/types/sequelize/index.d.ts b/types/sequelize/index.d.ts
index f25aacc3e4..4ab0ee11a8 100644
--- a/types/sequelize/index.d.ts
+++ b/types/sequelize/index.d.ts
@@ -3330,7 +3330,7 @@ declare namespace sequelize {
          * first element is the column / function to order by, the second is the direction. For example:
          * `order: [['name', 'DESC']]`. In this way the column will be escaped, but the direction will not.
          */
-        order?: string | col | literal | Array<string | number | Model<any, any> | { model: Model<any, any>, as?: string }> | Array<string | col | literal | Array<string | number | Model<any, any> | { model: Model<any, any>, as?: string }>>;
+        order?: string | col | literal | Array<string | number | Model<any, any> | { model: Model<any, any>, as?: string } | fn> | fn | Array<string | col | literal | Array<string | number | Model<any, any> | { model: Model<any, any>, as?: string }| fn>| fn>;
 
         /**
          * Limit the results
@@ -5240,13 +5240,13 @@ declare namespace sequelize {
          * `this.constructor.prototype.find.apply(this, arguments)`
          */
         classMethods?: Object;
-        
+
         /**
          * Change the database schema. PG only feature, but also works with other dialects.
          */
         schema?: string;
-        
-        
+
+
         /**
          * Change the database schema delimiter. Defaults to "." on PG but for other dialects can be also changed to "_".
          */

From c8b9249b2b51ecb7920617e8ddf101633bb90f91 Mon Sep 17 00:00:00 2001
From: Dima Smirnov <email@dimasmirnov.ru>
Date: Sun, 2 Dec 2018 15:35:40 +0300
Subject: [PATCH 525/836] added tests for order with order

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

diff --git a/types/sequelize/sequelize-tests.ts b/types/sequelize/sequelize-tests.ts
index 6b7ea6ea0a..4f0520ff84 100644
--- a/types/sequelize/sequelize-tests.ts
+++ b/types/sequelize/sequelize-tests.ts
@@ -946,6 +946,8 @@ User.findAll( { where : { user_id : 1 }, attributes : ['a', 'b'], include : [{ m
 User.findAll( { order : s.literal( 'email =' ) } );
 User.findAll( { order : [s.literal( 'email = ' + s.escape( 'test@sequelizejs.com' ) )] } );
 User.findAll( { order : [['id', ';DELETE YOLO INJECTIONS']] } );
+User.findAll( { order : Sequelize.random() } );
+User.findAll( { order : [Sequelize.random()] } );
 User.findAll( { include : [User], order : [[User, 'id', ';DELETE YOLO INJECTIONS']] } );
 User.findAll( { include : [User], order : [['id', 'ASC NULLS LAST'], [User, 'id', 'DESC NULLS FIRST']] } );
 User.findAll( { include : [{ model : User, where : { title : 'DoDat' }, include : [{ model : User }] }] } );

From dcbe9083a25abff7d02ed78d64f7bc056db4f849 Mon Sep 17 00:00:00 2001
From: Dima Smirnov <email@dimasmirnov.ru>
Date: Sun, 2 Dec 2018 15:39:14 +0300
Subject: [PATCH 526/836] updated tests to use s.

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

diff --git a/types/sequelize/sequelize-tests.ts b/types/sequelize/sequelize-tests.ts
index 4f0520ff84..943fed79e3 100644
--- a/types/sequelize/sequelize-tests.ts
+++ b/types/sequelize/sequelize-tests.ts
@@ -946,8 +946,8 @@ User.findAll( { where : { user_id : 1 }, attributes : ['a', 'b'], include : [{ m
 User.findAll( { order : s.literal( 'email =' ) } );
 User.findAll( { order : [s.literal( 'email = ' + s.escape( 'test@sequelizejs.com' ) )] } );
 User.findAll( { order : [['id', ';DELETE YOLO INJECTIONS']] } );
-User.findAll( { order : Sequelize.random() } );
-User.findAll( { order : [Sequelize.random()] } );
+User.findAll( { order : s.random() } );
+User.findAll( { order : [s.random()] } );
 User.findAll( { include : [User], order : [[User, 'id', ';DELETE YOLO INJECTIONS']] } );
 User.findAll( { include : [User], order : [['id', 'ASC NULLS LAST'], [User, 'id', 'DESC NULLS FIRST']] } );
 User.findAll( { include : [{ model : User, where : { title : 'DoDat' }, include : [{ model : User }] }] } );

From cefa24199f09265e6dec5b0ddddc0bd0b229ab82 Mon Sep 17 00:00:00 2001
From: Dima Smirnov <email@dimasmirnov.ru>
Date: Sun, 2 Dec 2018 15:50:21 +0300
Subject: [PATCH 527/836] increased the version number in the header

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

diff --git a/types/sequelize/index.d.ts b/types/sequelize/index.d.ts
index 4ab0ee11a8..06f27421cb 100644
--- a/types/sequelize/index.d.ts
+++ b/types/sequelize/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Sequelize 4.27.10
+// Type definitions for Sequelize 4.27.11
 // Project: http://sequelizejs.com
 // Definitions by: samuelneff <https://github.com/samuelneff>
 //                 Peter Harris <https://github.com/codeanimal>
@@ -15,6 +15,7 @@
 //                 Nick Schultz <https://github.com/nrschultz>
 //                 Thomas Breleur <https://github.com/thomas-b>
 //                 Antoine Boisadam <https://github.com/Antoine38660>
+//                 Dima Smirnov <https://github.com/smff>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 

From df0bcd09d20e3b763664f4d4ca249ce0b22687c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20D=C3=BCfel?= <christian@duefel.de>
Date: Sun, 2 Dec 2018 17:13:01 +0100
Subject: [PATCH 528/836] Replace Bluebird by native Promises

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

diff --git a/types/bull/index.d.ts b/types/bull/index.d.ts
index c08048f1d7..2d18e0a800 100644
--- a/types/bull/index.d.ts
+++ b/types/bull/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for bull 3.4
+// Type definitions for bull 3.5
 // Project: https://github.com/OptimalBits/bull
 // Definitions by: Bruno Grieder <https://github.com/bgrieder>
 //                 Cameron Crothers <https://github.com/JProgrammer>
@@ -17,7 +17,6 @@
 // TypeScript Version: 2.8
 
 import * as Redis from "ioredis";
-import * as Promise from "bluebird";
 
 /**
  * This is the Queue constructor.

From 788d99040f5ae9e75dbf8649b4856eaf18d07ea3 Mon Sep 17 00:00:00 2001
From: Robin Hames <robinhames@rhamesconsulting.com>
Date: Sun, 2 Dec 2018 18:50:31 +0000
Subject: [PATCH 529/836] Add configPath to ConfigStoreOptions in
 @types/configstore

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

diff --git a/types/configstore/index.d.ts b/types/configstore/index.d.ts
index 2617f2bce0..bbc0740c23 100644
--- a/types/configstore/index.d.ts
+++ b/types/configstore/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for configstore 2.1
+// Type definitions for configstore 4.0
 // Project: https://github.com/yeoman/configstore
 // Definitions by: ArcticLight <https://github.com/ArcticLight>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -67,5 +67,6 @@ declare class Configstore {
 declare namespace Configstore {
     interface ConfigstoreOptions {
         globalConfigPath?: boolean;
+        configPath?: string;
     }
 }

From 4e8911977001fbfef99652853e182ef604d8b86a Mon Sep 17 00:00:00 2001
From: Dimitri Benin <dimitri.benin@gmail.com>
Date: Sun, 2 Dec 2018 19:38:23 +0100
Subject: [PATCH 530/836] Add types for fuzzy-search

---
 types/fuzzy-search/fuzzy-search-tests.ts | 27 ++++++++++++++++++++++++
 types/fuzzy-search/index.d.ts            | 26 +++++++++++++++++++++++
 types/fuzzy-search/tsconfig.json         | 23 ++++++++++++++++++++
 types/fuzzy-search/tslint.json           |  1 +
 4 files changed, 77 insertions(+)
 create mode 100644 types/fuzzy-search/fuzzy-search-tests.ts
 create mode 100644 types/fuzzy-search/index.d.ts
 create mode 100644 types/fuzzy-search/tsconfig.json
 create mode 100644 types/fuzzy-search/tslint.json

diff --git a/types/fuzzy-search/fuzzy-search-tests.ts b/types/fuzzy-search/fuzzy-search-tests.ts
new file mode 100644
index 0000000000..667cda446f
--- /dev/null
+++ b/types/fuzzy-search/fuzzy-search-tests.ts
@@ -0,0 +1,27 @@
+import FuzzySearch = require('fuzzy-search');
+
+const f = new FuzzySearch(['1', '2', '3']);
+
+new FuzzySearch([{ a: 1 }, { a: 2 }, { a: 3 }], ['a']);
+
+new FuzzySearch([{ a: 1 }, { a: 2 }, { a: 3 }], ['a'], {});
+
+new FuzzySearch([{ a: 1 }, { a: 2 }, { a: 3 }], ['a'], { caseSensitive: true });
+
+new FuzzySearch([{ a: 1 }, { a: 2 }, { a: 3 }], ['a'], { sort: true });
+
+new FuzzySearch([{ a: 1 }, { a: 2 }, { a: 3 }], ['a'], { caseSensitive: true, sort: true });
+
+let strArr: string[];
+
+strArr = f.haystack;
+// $ExpectType string[]
+f.keys;
+// $ExpectType Required<Options>
+f.options;
+
+strArr = new FuzzySearch(['1', '2', '3']).search();
+strArr = new FuzzySearch(['1', '2', '3']).search('2');
+
+// $ExpectType number
+FuzzySearch.isMatch('1', '1', false);
diff --git a/types/fuzzy-search/index.d.ts b/types/fuzzy-search/index.d.ts
new file mode 100644
index 0000000000..8c3d5103ff
--- /dev/null
+++ b/types/fuzzy-search/index.d.ts
@@ -0,0 +1,26 @@
+// Type definitions for fuzzy-search 2.1
+// Project: https://github.com/wouter2203/fuzzy-search#readme
+// Definitions by: Alex Deas <https://github.com/alex-deas>
+//                 BendingBender <https://github.com/BendingBender>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
+
+declare class FuzzySearch<T extends object | string> {
+    haystack: T[];
+    keys: string[];
+    options: Required<FuzzySearch.Options>;
+
+    static isMatch(item: string, query: string, caseSensitive: boolean): number;
+
+    constructor(haystack: T[], keys?: string[], options?: FuzzySearch.Options);
+    search(needle?: string): T[];
+}
+
+declare namespace FuzzySearch {
+    interface Options {
+        caseSensitive?: boolean;
+        sort?: boolean;
+    }
+}
+
+export = FuzzySearch;
diff --git a/types/fuzzy-search/tsconfig.json b/types/fuzzy-search/tsconfig.json
new file mode 100644
index 0000000000..c72f9609d0
--- /dev/null
+++ b/types/fuzzy-search/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "fuzzy-search-tests.ts"
+    ]
+}
diff --git a/types/fuzzy-search/tslint.json b/types/fuzzy-search/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/fuzzy-search/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From f368a2dbfdd73511fbde3ab961ec111ce0486646 Mon Sep 17 00:00:00 2001
From: Christian Sporer <IanStorm28@outlook.com>
Date: Sun, 2 Dec 2018 20:01:52 +0100
Subject: [PATCH 531/836] Adaptations according to the ES6 spec: *
 https://github.com/definitelyTyped/DefinitelyTyped/#should-i-add-an-empty-namespace-to-a-package-that-doesnt-export-a-module-to-use-es6-style-imports
 * https://stackoverflow.com/a/39415662 *
 https://github.com/Microsoft/TypeScript/wiki/What's-new-in-TypeScript#support-for-import-d-from-cjs-form-commonjs-modules-with---esmoduleinterop

---
 types/list-stream/list-stream-tests.ts | 2 +-
 types/list-stream/tsconfig.json        | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/types/list-stream/list-stream-tests.ts b/types/list-stream/list-stream-tests.ts
index 5f04626b31..3648097ad6 100644
--- a/types/list-stream/list-stream-tests.ts
+++ b/types/list-stream/list-stream-tests.ts
@@ -1,4 +1,4 @@
-import * as ListStream from "list-stream";
+import ListStream from "list-stream";
 
 let chunk: any = "chunk";
 let listStream: ListStream;
diff --git a/types/list-stream/tsconfig.json b/types/list-stream/tsconfig.json
index 52ec1c73e1..060c211379 100644
--- a/types/list-stream/tsconfig.json
+++ b/types/list-stream/tsconfig.json
@@ -14,7 +14,8 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true
+        "forceConsistentCasingInFileNames": true,
+        "esModuleInterop": true
     },
     "files": [
         "index.d.ts",

From 3f185078d8bdf57c6669b08a5ea135de65555d9d Mon Sep 17 00:00:00 2001
From: Christian Sporer <IanStorm28@outlook.com>
Date: Sun, 2 Dec 2018 20:04:46 +0100
Subject: [PATCH 532/836] Fix error while running `npm test`

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

diff --git a/types/list-stream/index.d.ts b/types/list-stream/index.d.ts
index b51c9bacb0..f92eb5f917 100644
--- a/types/list-stream/index.d.ts
+++ b/types/list-stream/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/rvagg/list-stream
 // Definitions by: IanStorm <https://github.com/IanStorm>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.7
 
 /// <reference types="node" />
 

From 1aeeff704cbf6b3ab599b4b6ff232690771b2099 Mon Sep 17 00:00:00 2001
From: Dimitri Benin <dimitri.benin@gmail.com>
Date: Sun, 2 Dec 2018 20:21:13 +0100
Subject: [PATCH 533/836] Add types for snakecase-keys

---
 types/snakecase-keys/index.d.ts              | 19 ++++++++++++++++
 types/snakecase-keys/snakecase-keys-tests.ts |  5 +++++
 types/snakecase-keys/tsconfig.json           | 23 ++++++++++++++++++++
 types/snakecase-keys/tslint.json             |  1 +
 4 files changed, 48 insertions(+)
 create mode 100644 types/snakecase-keys/index.d.ts
 create mode 100644 types/snakecase-keys/snakecase-keys-tests.ts
 create mode 100644 types/snakecase-keys/tsconfig.json
 create mode 100644 types/snakecase-keys/tslint.json

diff --git a/types/snakecase-keys/index.d.ts b/types/snakecase-keys/index.d.ts
new file mode 100644
index 0000000000..d9afe0a2fd
--- /dev/null
+++ b/types/snakecase-keys/index.d.ts
@@ -0,0 +1,19 @@
+// Type definitions for snakecase-keys 2.1
+// Project: https://github.com/bendrucker/snakecase-keys#readme
+// Definitions by: BendingBender <https://github.com/BendingBender>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+export = snakecaseKeys;
+
+declare function snakecaseKeys(
+    obj: object,
+    options?: snakecaseKeys.Options
+): { [key: string]: any };
+
+declare namespace snakecaseKeys {
+    interface Options {
+        deep?: boolean;
+        exclude?: Array<string | RegExp>;
+    }
+}
diff --git a/types/snakecase-keys/snakecase-keys-tests.ts b/types/snakecase-keys/snakecase-keys-tests.ts
new file mode 100644
index 0000000000..e74d13404f
--- /dev/null
+++ b/types/snakecase-keys/snakecase-keys-tests.ts
@@ -0,0 +1,5 @@
+import snakecaseKeys = require('snakecase-keys');
+
+snakecaseKeys({ fooBar: 'baz' });
+snakecaseKeys({ fooBar: 'baz' }, { deep: false });
+snakecaseKeys({ fooBar: 'baz' }, { exclude: ['fooBax', /Foo$/] });
diff --git a/types/snakecase-keys/tsconfig.json b/types/snakecase-keys/tsconfig.json
new file mode 100644
index 0000000000..6d944fa502
--- /dev/null
+++ b/types/snakecase-keys/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "snakecase-keys-tests.ts"
+    ]
+}
diff --git a/types/snakecase-keys/tslint.json b/types/snakecase-keys/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/snakecase-keys/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From ec7a15613f2ccdb7e63d0ffc1d154bfa93395355 Mon Sep 17 00:00:00 2001
From: Robin Hames <robinhames@rhamesconsulting.com>
Date: Sun, 2 Dec 2018 19:21:34 +0000
Subject: [PATCH 534/836] Add test for ConfigStoreOptions.configPath in
 @types/configstore

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

diff --git a/types/configstore/configstore-tests.ts b/types/configstore/configstore-tests.ts
index ffd04e31a7..9365afdbda 100644
--- a/types/configstore/configstore-tests.ts
+++ b/types/configstore/configstore-tests.ts
@@ -5,6 +5,7 @@ let value: any;
 let key: string;
 let num: number;
 let object: any;
+let path: string;
 
 cs.set(key, value);
 value = cs.get(key);
@@ -13,4 +14,12 @@ cs.delete(key);
 object = cs.all;
 cs.all = object;
 num = cs.size;
-key = cs.path;
+path = cs.path;
+
+const csWithPathOption = new Configstore('foo', null, { configPath: path });
+
+csWithPathOption.set(key, value);
+value = csWithPathOption.get(key);
+csWithPathOption.delete(key);
+
+key = csWithPathOption.path;

From 1bb213f443c6dc0eff1792967feb08b0aa59e555 Mon Sep 17 00:00:00 2001
From: Jacob Greenfield <jacob@jacobgreenfield.me>
Date: Sun, 2 Dec 2018 14:50:04 -0500
Subject: [PATCH 535/836] Make argument to getFormatter optional

See here: https://eslint.org/docs/developer-guide/nodejs-api#clienginegetformatter
---
 types/eslint/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/eslint/index.d.ts b/types/eslint/index.d.ts
index 451477af40..01f39ee83e 100644
--- a/types/eslint/index.d.ts
+++ b/types/eslint/index.d.ts
@@ -471,7 +471,7 @@ export class CLIEngine {
 
     isPathIgnored(filePath: string): boolean;
 
-    getFormatter(format: string): CLIEngine.Formatter;
+    getFormatter(format?: string): CLIEngine.Formatter;
 
     getRules(): Map<string, Rule.RuleModule>;
 

From 9f24a56a9c1cd62aae856f0c1154b4ea99e04d1a Mon Sep 17 00:00:00 2001
From: Jacob Greenfield <jacob@jacobgreenfield.me>
Date: Sun, 2 Dec 2018 15:02:01 -0500
Subject: [PATCH 536/836] Update tests

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

diff --git a/types/eslint/eslint-tests.ts b/types/eslint/eslint-tests.ts
index c6b8b786fa..ed211d220e 100644
--- a/types/eslint/eslint-tests.ts
+++ b/types/eslint/eslint-tests.ts
@@ -480,7 +480,10 @@ cli.addPlugin('my-fancy-plugin', {});
 
 cli.isPathIgnored('./dist/index.js');
 
-const formatter = cli.getFormatter('codeframe');
+let formatter: CLIEngine.Formatter;
+
+formatter = cli.getFormatter('codeframe');
+formatter = cli.getFormatter();
 
 formatter(cliReport.results);
 

From 0dc2aeee2feacafe39f0a73dc07fd2cd090e9a32 Mon Sep 17 00:00:00 2001
From: Jannik Keye <jannik.keye@gmail.com>
Date: Sun, 2 Dec 2018 22:02:51 +0100
Subject: [PATCH 537/836] fxi: fastify version support 2.0 release candidate

---
 types/fastify-jwt/fastify-jwt-tests.ts | 7 +++----
 types/fastify-jwt/package.json         | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/types/fastify-jwt/fastify-jwt-tests.ts b/types/fastify-jwt/fastify-jwt-tests.ts
index 6b92026b04..fc68ac8bcc 100644
--- a/types/fastify-jwt/fastify-jwt-tests.ts
+++ b/types/fastify-jwt/fastify-jwt-tests.ts
@@ -1,17 +1,16 @@
-import { IncomingMessage, Server, ServerResponse } from "http";
-import fastifyJwt = require("fastify-jwt");
 import fastify = require("fastify");
+import fastifyJwt = require("fastify-jwt");
 
 const app = fastify();
 
 app.register<fastifyJwt.FastifyJwtOptions>(fastifyJwt, {
-  secret: "super-secret"
+  secret: "super-secret",
 });
 
 app.register<fastifyJwt.FastifyJwtOptions>(fastifyJwt, {
   secret: (request, reply, callback) => {
     return "";
-  }
+  },
 });
 
 app.get("/path", (request, reply) => {
diff --git a/types/fastify-jwt/package.json b/types/fastify-jwt/package.json
index e8c68ab969..5eb77c39fa 100644
--- a/types/fastify-jwt/package.json
+++ b/types/fastify-jwt/package.json
@@ -1,6 +1,6 @@
 {
     "private": true,
     "dependencies": {
-        "fastify": "^1.11.2"
+        "fastify": ">=1.13.1 || 2.0.0-rc.1"
     }
 }

From 8ac2b26cf846b8ad38e2ade7a51b03cb3e963dc3 Mon Sep 17 00:00:00 2001
From: Ilari Aarnio <ilari.aarnio@futurice.com>
Date: Sun, 2 Dec 2018 23:09:05 +0200
Subject: [PATCH 538/836] Add missing types for imap-simple 4.2

Add type definitions for functions:
- addBox
- delBox
- getBoxes
- append

Fix parameter name for delFlags.
---
 types/imap-simple/index.d.ts | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/types/imap-simple/index.d.ts b/types/imap-simple/index.d.ts
index 3bde57c113..a45629f234 100644
--- a/types/imap-simple/index.d.ts
+++ b/types/imap-simple/index.d.ts
@@ -1,6 +1,7 @@
-// Type definitions for imap-simple v3.1.0
+// Type definitions for imap-simple v4.2.0
 // Project: https://github.com/chadxz/imap-simple
 // Definitions by: Jeffery Grajkowski <https://github.com/pushplay>
+//                 Ilari Aarnio <https://github.com/iaarnio>
 // Definitions: https://github.com/psnider/DefinitelyTyped/imap-simple
 
 /// <reference types="node" />
@@ -42,6 +43,18 @@ export class ImapSimple extends NodeJS.EventEmitter {
     openBox(boxName: string, callback: (err: Error, boxName: string) => void): void;
     openBox(boxName: string): Promise<string>;
 
+    /** Create a mailbox, calling the provided callback with signature (err, boxName), or resolves the returned promise with boxName. */
+    addBox(boxName: string, callback: (err: Error, boxName: string) => void): void;
+    addBox(boxName: string): Promise<string>;
+
+    /** Delete a mailbox, calling the provided callback with signature (err, boxName), or resolves the returned promise with boxName. */
+    delBox(boxName: string, callback: (err: Error, boxName: string) => void): void;
+    delBox(boxName: string): Promise<string>;
+
+    /** Returns the full list of mailboxes (folders). Upon success, either the provided callback will be called with signature (err, boxes), or the returned promise will be resolved with boxes. Boxes is the exact object returned from the node-imap getBoxes() result. */
+    getBoxes(callback: (err: Error, boxes: any) => void): void;
+    getBoxes(): Promise<any>;
+
     /** Search for and retrieve mail in the previously opened mailbox. */
     search(searchCriteria: any[], fetchOptions: Imap.FetchOptions, callback: (err: Error, messages: Message[]) => void): void;
     search(searchCriteria: any[], fetchOptions: Imap.FetchOptions): Promise<Message[]>;
@@ -57,6 +70,10 @@ export class ImapSimple extends NodeJS.EventEmitter {
     addMessageLabel(source: string | string[], label: string | string[], callback: (err: Error) => void): void;
     addMessageLabel(source: string | string[], label: string | string[]): Promise<void>;
 
+    /** Appends the argument message to the currently open mailbox or another mailbox. Message is a RFC-822 compatible MIME message. Valid options are mailbox, flags and date. When completed, either calls the provided callback with signature (err), or resolves the returned promise. */
+    append(message: any, options: any, callback: (err: Error) => void): void;
+    append(message: any, options: any): Promise<void>;
+
     /** Moves the specified message(s) in the currently open mailbox to another mailbox. source corresponds to a node-imap MessageSource which specifies the messages to be moved. When completed, either calls the provided callback with signature (err), or resolves the returned promise. */
     moveMessage(source: string | string[], boxName: string, callback: (err: Error) => void): void;
     moveMessage(source: string | string[], boxName: string): Promise<void>;
@@ -66,8 +83,8 @@ export class ImapSimple extends NodeJS.EventEmitter {
     addFlags(source: string | string[], flag: string | string[]): Promise<void>;
 
     /** Removes the provided flag(s) from the specified message(s). uid is the uid of the message you want to remove the flag from or an array of uids. flag is either a string or array of strings indicating the flags to remove. */
-    delFlags(source: string | string[], flag: string | string[], callback: (err: Error) => void): void;
-    delFlags(source: string | string[], flag: string | string[]): Promise<void>;
+    delFlags(uid: string | string[], flag: string | string[], callback: (err: Error) => void): void;
+    delFlags(uid: string | string[], flag: string | string[]): Promise<void>;
 }
 
 export namespace errors {

From 25db1d4746951c960276b85740fe375f83c5629b Mon Sep 17 00:00:00 2001
From: Ivan Fernandes <ivandalcantara@gmail.com>
Date: Sun, 2 Dec 2018 19:13:47 -0200
Subject: [PATCH 539/836] adding missing options from option type

---
 types/passport-bnet/index.d.ts   | 21 ++++++++++-----------
 types/passport-oauth2/index.d.ts | 23 +++++++++++++++++++++++
 2 files changed, 33 insertions(+), 11 deletions(-)

diff --git a/types/passport-bnet/index.d.ts b/types/passport-bnet/index.d.ts
index 86255c782d..c8e6dd923c 100644
--- a/types/passport-bnet/index.d.ts
+++ b/types/passport-bnet/index.d.ts
@@ -4,7 +4,7 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
-import { Strategy as OAuth2Strategy, VerifyFunction, VerifyFunctionWithRequest } from 'passport-oauth2';
+import { Strategy as OAuth2Strategy, VerifyFunction, VerifyFunctionWithRequest, _StrategyOptionsBase } from 'passport-oauth2';
 
 declare class BnetStrategy extends OAuth2Strategy {
     constructor(options: BnetStrategy.StrategyOptions, verify: VerifyFunction);
@@ -12,17 +12,16 @@ declare class BnetStrategy extends OAuth2Strategy {
 }
 
 declare namespace BnetStrategy {
-    interface _BaseBnetOptions {
-        region?: string;
 
-        scopeSeparator?: string;
-        customHeaders?: object;
-        authorizationURL?: string;
-        tokenURL?: string;
-        scope?: string;
-        clientID: string;
-        clientSecret: string;
-        callbackURL?: string;
+    //Utility types for excluding properties from interfaces
+    type Diff<T extends string | number | symbol, U extends string | number | symbol> = ({ [P in T]: P } & { [P in U]: never } & { [x: string]: never })[T];
+    type Omit<T, K extends keyof T> = Pick<T, Diff<keyof T, K>>; 
+
+    // passport--bnet accepts any options that passport-oauth2 accepts, but add the option region and makes authorizationURL and tokenURL optional
+    interface _BaseBnetOptions 
+        extends Partial<Pick<_StrategyOptionsBase, 'authorizationURL' | 'tokenURL'>>, Omit<_StrategyOptionsBase, 'authorizationURL' | 'tokenURL'> {
+    
+        region?: string;
     }
 
     interface StrategyOptions extends _BaseBnetOptions {
diff --git a/types/passport-oauth2/index.d.ts b/types/passport-oauth2/index.d.ts
index d985852bd6..c3723b50b7 100644
--- a/types/passport-oauth2/index.d.ts
+++ b/types/passport-oauth2/index.d.ts
@@ -9,6 +9,7 @@
 import { Request } from 'express';
 import { Strategy } from 'passport';
 import { OAuth2 } from 'oauth';
+import { OutgoingHttpHeaders } from 'http';
 
 declare class OAuth2Strategy extends Strategy {
     name: string;
@@ -32,6 +33,23 @@ declare class OAuth2Strategy extends Strategy {
 }
 
 declare namespace OAuth2Strategy {
+    interface Metadata {
+        authorizationURL: string;
+        tokenURL: string;
+        clientID: string;
+    }
+
+    type StateStoreStoreCallback = (err: Error | null, state: any) => void;
+    type StateStoreVerifyCallback = (err: Error, ok: boolean, state: any) => void
+
+    interface StateStore {
+        store(req: Request, callback: StateStoreStoreCallback): void;
+        store(req: Request, meta: Metadata, callback: StateStoreStoreCallback): void;
+
+        verify(req: Request, state: string, callback: StateStoreVerifyCallback): void;
+        verify(req: Request, state: string, meta: Metadata, callback: StateStoreVerifyCallback): void;
+    }
+
     type VerifyCallback = (err?: Error | null, user?: object, info?: object) => void;
 
     type VerifyFunction =
@@ -47,6 +65,11 @@ declare namespace OAuth2Strategy {
         clientID: string;
         clientSecret: string;
         callbackURL?: string;
+        customHeaders?: OutgoingHttpHeaders;
+        scope?: string | string[];
+        sessionKey?: string;
+        store?: StateStore;
+        state?: any;
     }
     interface StrategyOptions extends _StrategyOptionsBase {
         passReqToCallback?: false;

From b5ca615a9891b341dc8e8511fd1b1992578d587d Mon Sep 17 00:00:00 2001
From: Alan Plum <me@pluma.io>
Date: Sun, 2 Dec 2018 22:35:24 +0100
Subject: [PATCH 540/836] Add json_ml

---
 types/json_ml/index.d.ts       | 20 ++++++++++++++++++++
 types/json_ml/json_ml-tests.ts | 12 ++++++++++++
 types/json_ml/tsconfig.json    | 16 ++++++++++++++++
 types/json_ml/tslint.json      |  1 +
 4 files changed, 49 insertions(+)
 create mode 100644 types/json_ml/index.d.ts
 create mode 100644 types/json_ml/json_ml-tests.ts
 create mode 100644 types/json_ml/tsconfig.json
 create mode 100644 types/json_ml/tslint.json

diff --git a/types/json_ml/index.d.ts b/types/json_ml/index.d.ts
new file mode 100644
index 0000000000..ba53b84cb4
--- /dev/null
+++ b/types/json_ml/index.d.ts
@@ -0,0 +1,20 @@
+// Type definitions for json_ml 0.0
+// Project: https://github.com/59naga/json-ml
+// Definitions by: Alan Plum <https://github.com/pluma>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="cheerio" />
+
+export type Node = string | Element;
+export type SimpleElement = [string, Attributes] | [string];
+export interface NodeList extends Array<Node> {}
+export type Element = SimpleElement & NodeList;
+export interface Attributes {
+    [key: string]: string;
+}
+export function parse(xml: string, trim?: boolean): Node[];
+export function stringify(
+    object: Node[],
+    replacer?: ((node: Cheerio) => any) | null,
+    indent?: number
+): string;
diff --git a/types/json_ml/json_ml-tests.ts b/types/json_ml/json_ml-tests.ts
new file mode 100644
index 0000000000..ecc84d9d8b
--- /dev/null
+++ b/types/json_ml/json_ml-tests.ts
@@ -0,0 +1,12 @@
+/// <reference types="node" />
+import { Attributes, Element, Node, parse, stringify } from "json_ml";
+
+const nodes: Node[] = parse("<ul><li>hello</li></ul>");
+const node1: Node = nodes[0];
+if (typeof node1 !== "string") {
+    const el: Element = node1;
+    const attrs = el[1] as Attributes;
+    console.log(el[0], attrs);
+}
+
+console.log(stringify(nodes, el => (el.is("li") ? null : el), 2));
diff --git a/types/json_ml/tsconfig.json b/types/json_ml/tsconfig.json
new file mode 100644
index 0000000000..951405762a
--- /dev/null
+++ b/types/json_ml/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": ["es6"],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": ["../"],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": ["index.d.ts", "json_ml-tests.ts"]
+}
diff --git a/types/json_ml/tslint.json b/types/json_ml/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/json_ml/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 539239405f26d75d0dab48f5f4cb5131a324452b Mon Sep 17 00:00:00 2001
From: Alan Plum <me@pluma.io>
Date: Sun, 2 Dec 2018 22:40:44 +0100
Subject: [PATCH 541/836] Add roman-numerals

---
 types/roman-numerals/index.d.ts              |  7 +++++++
 types/roman-numerals/roman-numerals-tests.ts |  5 +++++
 types/roman-numerals/tsconfig.json           | 16 ++++++++++++++++
 types/roman-numerals/tslint.json             |  1 +
 4 files changed, 29 insertions(+)
 create mode 100644 types/roman-numerals/index.d.ts
 create mode 100644 types/roman-numerals/roman-numerals-tests.ts
 create mode 100644 types/roman-numerals/tsconfig.json
 create mode 100644 types/roman-numerals/tslint.json

diff --git a/types/roman-numerals/index.d.ts b/types/roman-numerals/index.d.ts
new file mode 100644
index 0000000000..0ab8e88047
--- /dev/null
+++ b/types/roman-numerals/index.d.ts
@@ -0,0 +1,7 @@
+// Type definitions for roman-numerals 0.3
+// Project: https://github.com/joshleaves/roman-numerals
+// Definitions by: Alan Plum <https://github.com/pluma>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export function toRoman(arabic: number): string;
+export function toArabic(roman: string): number;
diff --git a/types/roman-numerals/roman-numerals-tests.ts b/types/roman-numerals/roman-numerals-tests.ts
new file mode 100644
index 0000000000..a99972afae
--- /dev/null
+++ b/types/roman-numerals/roman-numerals-tests.ts
@@ -0,0 +1,5 @@
+import { toArabic, toRoman } from "roman-numerals";
+
+const XLII: string = toRoman(42);
+const meaningOfLife: number = toArabic(XLII);
+toRoman(meaningOfLife);
diff --git a/types/roman-numerals/tsconfig.json b/types/roman-numerals/tsconfig.json
new file mode 100644
index 0000000000..7edc311353
--- /dev/null
+++ b/types/roman-numerals/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": ["es6"],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": ["../"],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": ["index.d.ts", "roman-numerals-tests.ts"]
+}
diff --git a/types/roman-numerals/tslint.json b/types/roman-numerals/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/roman-numerals/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From ccce0edf6d9dd01a3479daf4b98da3dc7d0bd442 Mon Sep 17 00:00:00 2001
From: Dimitri Benin <dimitri.benin@gmail.com>
Date: Mon, 3 Dec 2018 00:26:33 +0100
Subject: [PATCH 542/836] Add types for unique-random-array

---
 types/unique-random-array/index.d.ts          |  8 +++++++
 types/unique-random-array/tsconfig.json       | 23 +++++++++++++++++++
 types/unique-random-array/tslint.json         |  1 +
 .../unique-random-array-tests.ts              |  6 +++++
 4 files changed, 38 insertions(+)
 create mode 100644 types/unique-random-array/index.d.ts
 create mode 100644 types/unique-random-array/tsconfig.json
 create mode 100644 types/unique-random-array/tslint.json
 create mode 100644 types/unique-random-array/unique-random-array-tests.ts

diff --git a/types/unique-random-array/index.d.ts b/types/unique-random-array/index.d.ts
new file mode 100644
index 0000000000..7e4ddacb0f
--- /dev/null
+++ b/types/unique-random-array/index.d.ts
@@ -0,0 +1,8 @@
+// Type definitions for unique-random-array 1.0
+// Project: https://github.com/sindresorhus/unique-random-array#readme
+// Definitions by: BendingBender <https://github.com/BendingBender>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export = uniqueRandomArray;
+
+declare function uniqueRandomArray<T>(input: T[]): () => T;
diff --git a/types/unique-random-array/tsconfig.json b/types/unique-random-array/tsconfig.json
new file mode 100644
index 0000000000..40257f7e47
--- /dev/null
+++ b/types/unique-random-array/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "unique-random-array-tests.ts"
+    ]
+}
diff --git a/types/unique-random-array/tslint.json b/types/unique-random-array/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/unique-random-array/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/unique-random-array/unique-random-array-tests.ts b/types/unique-random-array/unique-random-array-tests.ts
new file mode 100644
index 0000000000..de4563532c
--- /dev/null
+++ b/types/unique-random-array/unique-random-array-tests.ts
@@ -0,0 +1,6 @@
+import uniqueRandomArray = require('unique-random-array');
+
+// $ExpectType () => number
+uniqueRandomArray([1, 2, 3, 4]);
+// $ExpectType () => string | number
+uniqueRandomArray(["1", 2, 3, 4]);

From efaad74d08d3ce0d09f50a3c9b387e1e847df7bb Mon Sep 17 00:00:00 2001
From: Dimitri Benin <dimitri.benin@gmail.com>
Date: Mon, 3 Dec 2018 00:35:54 +0100
Subject: [PATCH 543/836] Add types for random-int

---
 types/random-int/index.d.ts          |  9 +++++++++
 types/random-int/random-int-tests.ts |  6 ++++++
 types/random-int/tsconfig.json       | 23 +++++++++++++++++++++++
 types/random-int/tslint.json         |  1 +
 4 files changed, 39 insertions(+)
 create mode 100644 types/random-int/index.d.ts
 create mode 100644 types/random-int/random-int-tests.ts
 create mode 100644 types/random-int/tsconfig.json
 create mode 100644 types/random-int/tslint.json

diff --git a/types/random-int/index.d.ts b/types/random-int/index.d.ts
new file mode 100644
index 0000000000..6f7f421976
--- /dev/null
+++ b/types/random-int/index.d.ts
@@ -0,0 +1,9 @@
+// Type definitions for random-int 1.0
+// Project: https://github.com/sindresorhus/random-int
+// Definitions by: BendingBender <https://github.com/BendingBender>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export = randomInt;
+
+declare function randomInt(max: number): number;
+declare function randomInt(min: number, max: number): number; // tslint:disable-line unified-signatures
diff --git a/types/random-int/random-int-tests.ts b/types/random-int/random-int-tests.ts
new file mode 100644
index 0000000000..68165e9c5d
--- /dev/null
+++ b/types/random-int/random-int-tests.ts
@@ -0,0 +1,6 @@
+import randomInt = require('random-int');
+
+// $ExpectType number
+randomInt(5);
+// $ExpectType number
+randomInt(10, 100);
diff --git a/types/random-int/tsconfig.json b/types/random-int/tsconfig.json
new file mode 100644
index 0000000000..e1a576d337
--- /dev/null
+++ b/types/random-int/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "random-int-tests.ts"
+    ]
+}
diff --git a/types/random-int/tslint.json b/types/random-int/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/random-int/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From a6d95779bae652a238cd584d66e5009e02d54888 Mon Sep 17 00:00:00 2001
From: Dimitri Benin <dimitri.benin@gmail.com>
Date: Mon, 3 Dec 2018 00:42:33 +0100
Subject: [PATCH 544/836] Add types for random-float

---
 types/random-float/index.d.ts            |  9 +++++++++
 types/random-float/random-float-tests.ts |  6 ++++++
 types/random-float/tsconfig.json         | 23 +++++++++++++++++++++++
 types/random-float/tslint.json           |  1 +
 4 files changed, 39 insertions(+)
 create mode 100644 types/random-float/index.d.ts
 create mode 100644 types/random-float/random-float-tests.ts
 create mode 100644 types/random-float/tsconfig.json
 create mode 100644 types/random-float/tslint.json

diff --git a/types/random-float/index.d.ts b/types/random-float/index.d.ts
new file mode 100644
index 0000000000..646d263128
--- /dev/null
+++ b/types/random-float/index.d.ts
@@ -0,0 +1,9 @@
+// Type definitions for random-float 1.0
+// Project: https://github.com/sindresorhus/random-float
+// Definitions by: BendingBender <https://github.com/BendingBender>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export = randomFloat;
+
+declare function randomFloat(max: number): number;
+declare function randomFloat(min: number, max: number): number; // tslint:disable-line unified-signatures
diff --git a/types/random-float/random-float-tests.ts b/types/random-float/random-float-tests.ts
new file mode 100644
index 0000000000..663190ce81
--- /dev/null
+++ b/types/random-float/random-float-tests.ts
@@ -0,0 +1,6 @@
+import randomFloat = require('random-float');
+
+// $ExpectType number
+randomFloat(5);
+// $ExpectType number
+randomFloat(10, 100);
diff --git a/types/random-float/tsconfig.json b/types/random-float/tsconfig.json
new file mode 100644
index 0000000000..faefa13645
--- /dev/null
+++ b/types/random-float/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "random-float-tests.ts"
+    ]
+}
diff --git a/types/random-float/tslint.json b/types/random-float/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/random-float/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From cfc0da48c03bde6f87e9d06aa11e1cb3aa6f98ab Mon Sep 17 00:00:00 2001
From: Dimitri Benin <dimitri.benin@gmail.com>
Date: Mon, 3 Dec 2018 00:46:11 +0100
Subject: [PATCH 545/836] Add types for random-boolean

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

diff --git a/types/random-boolean/index.d.ts b/types/random-boolean/index.d.ts
new file mode 100644
index 0000000000..3390da9317
--- /dev/null
+++ b/types/random-boolean/index.d.ts
@@ -0,0 +1,8 @@
+// Type definitions for random-boolean 1.0
+// Project: https://github.com/arthurvr/random-boolean#readme
+// Definitions by: BendingBender <https://github.com/BendingBender>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export = randomBoolean;
+
+declare function randomBoolean(): boolean;
diff --git a/types/random-boolean/random-boolean-tests.ts b/types/random-boolean/random-boolean-tests.ts
new file mode 100644
index 0000000000..8ac983e111
--- /dev/null
+++ b/types/random-boolean/random-boolean-tests.ts
@@ -0,0 +1,4 @@
+import randomBoolean = require('random-boolean');
+
+// $ExpectType boolean
+randomBoolean();
diff --git a/types/random-boolean/tsconfig.json b/types/random-boolean/tsconfig.json
new file mode 100644
index 0000000000..7392190732
--- /dev/null
+++ b/types/random-boolean/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "random-boolean-tests.ts"
+    ]
+}
diff --git a/types/random-boolean/tslint.json b/types/random-boolean/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/random-boolean/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From a7f31adfd5f8480e9c42ba7aa07cedfbcd346beb Mon Sep 17 00:00:00 2001
From: Dimitri Benin <dimitri.benin@gmail.com>
Date: Mon, 3 Dec 2018 01:07:20 +0100
Subject: [PATCH 546/836] Add types for random-obj-key

---
 types/random-obj-key/index.d.ts              |  9 ++++++++
 types/random-obj-key/random-obj-key-tests.ts |  4 ++++
 types/random-obj-key/tsconfig.json           | 23 ++++++++++++++++++++
 types/random-obj-key/tslint.json             |  1 +
 4 files changed, 37 insertions(+)
 create mode 100644 types/random-obj-key/index.d.ts
 create mode 100644 types/random-obj-key/random-obj-key-tests.ts
 create mode 100644 types/random-obj-key/tsconfig.json
 create mode 100644 types/random-obj-key/tslint.json

diff --git a/types/random-obj-key/index.d.ts b/types/random-obj-key/index.d.ts
new file mode 100644
index 0000000000..dfe12ca6f6
--- /dev/null
+++ b/types/random-obj-key/index.d.ts
@@ -0,0 +1,9 @@
+// Type definitions for random-obj-key 1.0
+// Project: https://github.com/sindresorhus/random-obj-key
+// Definitions by: BendingBender <https://github.com/BendingBender>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.1
+
+export = randomObjKey;
+
+declare function randomObjKey<TObj extends { [key: string]: any }>(input: TObj): keyof TObj;
diff --git a/types/random-obj-key/random-obj-key-tests.ts b/types/random-obj-key/random-obj-key-tests.ts
new file mode 100644
index 0000000000..b12cf282ea
--- /dev/null
+++ b/types/random-obj-key/random-obj-key-tests.ts
@@ -0,0 +1,4 @@
+import randomObjKey = require('random-obj-key');
+
+// $ExpectType "foo" | "bar"
+randomObjKey({ foo: true, bar: true });
diff --git a/types/random-obj-key/tsconfig.json b/types/random-obj-key/tsconfig.json
new file mode 100644
index 0000000000..aaaf33ba98
--- /dev/null
+++ b/types/random-obj-key/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "random-obj-key-tests.ts"
+    ]
+}
diff --git a/types/random-obj-key/tslint.json b/types/random-obj-key/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/random-obj-key/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From a3f716d8f28c05469b8409d0c32a7146ec9a57f3 Mon Sep 17 00:00:00 2001
From: Dimitri Benin <dimitri.benin@gmail.com>
Date: Mon, 3 Dec 2018 01:13:39 +0100
Subject: [PATCH 547/836] Add types for random-item

---
 types/random-item/index.d.ts           |  8 ++++++++
 types/random-item/random-item-tests.ts |  6 ++++++
 types/random-item/tsconfig.json        | 23 +++++++++++++++++++++++
 types/random-item/tslint.json          |  1 +
 4 files changed, 38 insertions(+)
 create mode 100644 types/random-item/index.d.ts
 create mode 100644 types/random-item/random-item-tests.ts
 create mode 100644 types/random-item/tsconfig.json
 create mode 100644 types/random-item/tslint.json

diff --git a/types/random-item/index.d.ts b/types/random-item/index.d.ts
new file mode 100644
index 0000000000..3fbbaca074
--- /dev/null
+++ b/types/random-item/index.d.ts
@@ -0,0 +1,8 @@
+// Type definitions for random-item 1.0
+// Project: https://github.com/sindresorhus/random-item
+// Definitions by: BendingBender <https://github.com/BendingBender>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export = randomItem;
+
+declare function randomItem<T>(input: T[]): T;
diff --git a/types/random-item/random-item-tests.ts b/types/random-item/random-item-tests.ts
new file mode 100644
index 0000000000..12185a0ad2
--- /dev/null
+++ b/types/random-item/random-item-tests.ts
@@ -0,0 +1,6 @@
+import randomItem = require('random-item');
+
+// $ExpectType string
+randomItem(['pony', 'unicorn', 'rainbow']);
+// $ExpectType string | number
+randomItem(['pony', 'unicorn', 'rainbow', 1]);
diff --git a/types/random-item/tsconfig.json b/types/random-item/tsconfig.json
new file mode 100644
index 0000000000..279aba16b5
--- /dev/null
+++ b/types/random-item/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "random-item-tests.ts"
+    ]
+}
diff --git a/types/random-item/tslint.json b/types/random-item/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/random-item/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From f47939d42dcfe49da2bb73ad1662159bb50ad0e2 Mon Sep 17 00:00:00 2001
From: Dimitri Benin <dimitri.benin@gmail.com>
Date: Mon, 3 Dec 2018 01:22:11 +0100
Subject: [PATCH 548/836] Add types for random-obj-prop

---
 types/random-obj-prop/index.d.ts              |  8 +++++++
 .../random-obj-prop/random-obj-prop-tests.ts  |  4 ++++
 types/random-obj-prop/tsconfig.json           | 23 +++++++++++++++++++
 types/random-obj-prop/tslint.json             |  1 +
 4 files changed, 36 insertions(+)
 create mode 100644 types/random-obj-prop/index.d.ts
 create mode 100644 types/random-obj-prop/random-obj-prop-tests.ts
 create mode 100644 types/random-obj-prop/tsconfig.json
 create mode 100644 types/random-obj-prop/tslint.json

diff --git a/types/random-obj-prop/index.d.ts b/types/random-obj-prop/index.d.ts
new file mode 100644
index 0000000000..f9aca5624f
--- /dev/null
+++ b/types/random-obj-prop/index.d.ts
@@ -0,0 +1,8 @@
+// Type definitions for random-obj-prop 1.0
+// Project: https://github.com/sindresorhus/random-obj-prop
+// Definitions by: BendingBender <https://github.com/BendingBender>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export = randomObjProp;
+
+declare function randomObjProp<T>(input: { [key: string]: T }): T;
diff --git a/types/random-obj-prop/random-obj-prop-tests.ts b/types/random-obj-prop/random-obj-prop-tests.ts
new file mode 100644
index 0000000000..7dd2fcd67d
--- /dev/null
+++ b/types/random-obj-prop/random-obj-prop-tests.ts
@@ -0,0 +1,4 @@
+import randomObjProp = require('random-obj-prop');
+
+// $ExpectType string | number
+randomObjProp({ foo: 'pony', bar: 1 });
diff --git a/types/random-obj-prop/tsconfig.json b/types/random-obj-prop/tsconfig.json
new file mode 100644
index 0000000000..f155cfc211
--- /dev/null
+++ b/types/random-obj-prop/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "random-obj-prop-tests.ts"
+    ]
+}
diff --git a/types/random-obj-prop/tslint.json b/types/random-obj-prop/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/random-obj-prop/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 9299a86a8b8fafe190f26f00726eee07d2e4e2a1 Mon Sep 17 00:00:00 2001
From: Yaroslav Admin <devoto13@gmail.com>
Date: Tue, 27 Nov 2018 21:08:52 +0100
Subject: [PATCH 549/836] Improved structure of the karma type definitions

---
 types/karma/index.d.ts     | 77 +++++++++++++++++++-------------------
 types/karma/karma-tests.ts | 22 +++++------
 2 files changed, 49 insertions(+), 50 deletions(-)

diff --git a/types/karma/index.d.ts b/types/karma/index.d.ts
index ba258f0997..09b263e104 100644
--- a/types/karma/index.d.ts
+++ b/types/karma/index.d.ts
@@ -14,24 +14,24 @@ import https = require('https');
 import { Appender } from 'log4js';
 
 declare namespace karma {
-    interface Karma {
-        /**
-         * `start` method is deprecated since 0.13. It will be removed in 0.14.
-         * Please use
-         * <code>
-         *     server = new Server(config, [done])
-         *     server.start()
-         * </code>
-         * instead.
-         */
-        server: DeprecatedServer;
-        Server: Server;
-        runner: Runner;
-        stopper: Stopper;
-        launcher: Launcher;
-        VERSION: string;
-        constants: Constants;
-    }
+    /**
+     * `start` method is deprecated since 0.13. It will be removed in 0.14.
+     * Please use
+     * <code>
+     *     server = new Server(config, [done])
+     *     server.start()
+     * </code>
+     * instead.
+     *
+     * @deprecated
+     */
+    const server: DeprecatedServer;
+
+    const runner: Runner;
+    const stopper: Stopper;
+
+    const VERSION: string;
+    const constants: Constants;
 
     interface Constants {
         VERSION: string;
@@ -57,24 +57,25 @@ declare namespace karma {
         EXIT_CODE: string;
     }
 
-    interface LauncherStatic {
-        generateId(): string;
-        // TODO: injector should be of type `di.Injector`
-        new (emitter: NodeJS.EventEmitter, injector: any): Launcher;
-    }
+    namespace launcher {
+        class Launcher {
+            static generateId(): string;
 
-    interface Launcher {
-        Launcher: LauncherStatic;
-        // TODO: Can this return value ever be typified?
-        launch(names: string[], protocol: string, hostname: string, port: number, urlRoot: string): any[];
-        kill(id: string, callback: () => void): boolean;
-        restart(id: string): boolean;
-        killAll(callback: () => void): void;
-        areAllCaptured(): boolean;
-        markCaptured(id: string): void;
+            constructor(emitter: NodeJS.EventEmitter, injector: any);
+
+            // TODO: Can this return value ever be typified?
+            launch(names: string[], protocol: string, hostname: string, port: number, urlRoot: string): any[];
+            kill(id: string, callback: () => void): boolean;
+            restart(id: string): boolean;
+            killAll(callback: () => void): void;
+            areAllCaptured(): boolean;
+            markCaptured(id: string): void;
+        }
     }
 
+    /** @deprecated */
     interface DeprecatedServer {
+        /** @deprecated */
         start(options?: any, callback?: ServerCallback): void;
     }
 
@@ -97,10 +98,8 @@ declare namespace karma {
         success: number;
     }
 
-    interface Server extends NodeJS.EventEmitter {
-        // TODO: Figure out how to convert Server to class and remove suppression
-        // tslint:disable-next-line:no-misused-new
-        new (options?: ConfigOptions | ConfigFile, callback?: ServerCallback): Server;
+    class Server extends NodeJS.EventEmitter {
+        constructor(options?: ConfigOptions | ConfigFile, callback?: ServerCallback);
         /**
          * Start the server
          */
@@ -468,8 +467,10 @@ declare namespace karma {
         flags?: string[];
         platform?: string;
     }
+
+    namespace config {
+        function parseConfig(configFilePath: string, cliOptions: ConfigOptions): Config;
+    }
 }
 
-declare var karma: karma.Karma;
-
 export = karma;
diff --git a/types/karma/karma-tests.ts b/types/karma/karma-tests.ts
index 4114a77b02..4065a4deff 100644
--- a/types/karma/karma-tests.ts
+++ b/types/karma/karma-tests.ts
@@ -1,16 +1,6 @@
-import gulp = require('gulp');
 import karma = require('karma');
 
-function runKarma(singleRun: boolean): void {
-    // MEMO: `start` method is deprecated since 0.13. It will be removed in 0.14.
-    karma.server.start({
-        configFile: __dirname + '/karma.conf.js',
-        singleRun
-    });
-}
-
-gulp.task('test:unit:karma', gulp.parallel('build:test:unit', () => runKarma(true)));
-
+// karma.server is deprecated and will eventually be removed
 karma.server.start({port: 9876}, (exitCode: number) => {
   console.log('Karma has exited with ' + exitCode);
   process.exit(exitCode);
@@ -54,7 +44,8 @@ karma.runner.run({port: 9876}, (exitCode: number) => {
     process.exit(exitCode);
 });
 
-const captured: boolean = karma.launcher.areAllCaptured();
+const launcher: karma.launcher.Launcher = null;
+const captured: boolean = launcher.areAllCaptured();
 
 // Example of configuration file karma.conf.ts, see http://karma-runner.github.io/latest/config/configuration-file.html
 module.exports = (config: karma.Config) => {
@@ -123,3 +114,10 @@ const foo = (config: karma.Config) => {
     }
   });
 };
+
+console.log(karma.constants.DEFAULT_HOSTNAME);
+console.log(karma.VERSION);
+
+karma.config.parseConfig('karma.conf.js', {
+    singleRun: true
+});

From 80c2f3dd1202e234af247afb0b7f9e5eaaa2789d Mon Sep 17 00:00:00 2001
From: Yaroslav Admin <devoto13@gmail.com>
Date: Tue, 27 Nov 2018 21:29:37 +0100
Subject: [PATCH 550/836] Eliminated obsolete namespace wrapper

See https://github.com/Microsoft/dtslint/blob/master/docs/export-just-namespace.md
---
 types/karma/index.d.ts | 896 ++++++++++++++++++++---------------------
 1 file changed, 446 insertions(+), 450 deletions(-)

diff --git a/types/karma/index.d.ts b/types/karma/index.d.ts
index 09b263e104..0da2803283 100644
--- a/types/karma/index.d.ts
+++ b/types/karma/index.d.ts
@@ -13,464 +13,460 @@ import Promise = require('bluebird');
 import https = require('https');
 import { Appender } from 'log4js';
 
-declare namespace karma {
-    /**
-     * `start` method is deprecated since 0.13. It will be removed in 0.14.
-     * Please use
-     * <code>
-     *     server = new Server(config, [done])
-     *     server.start()
-     * </code>
-     * instead.
-     *
-     * @deprecated
-     */
-    const server: DeprecatedServer;
+/**
+ * `start` method is deprecated since 0.13. It will be removed in 0.14.
+ * Please use
+ * <code>
+ *     server = new Server(config, [done])
+ *     server.start()
+ * </code>
+ * instead.
+ *
+ * @deprecated
+ */
+export const server: DeprecatedServer;
 
-    const runner: Runner;
-    const stopper: Stopper;
+export const runner: Runner;
+export const stopper: Stopper;
 
-    const VERSION: string;
-    const constants: Constants;
+export const VERSION: string;
+export const constants: Constants;
 
-    interface Constants {
-        VERSION: string;
-        DEFAULT_PORT: number;
-        DEFAULT_HOSTNAME: string;
-        DEFAULT_LISTEN_ADDR: string;
-        LOG_DISABLE: string;
-        LOG_ERROR: string;
-        LOG_WARN: string;
-        LOG_INFO: string;
-        LOG_DEBUG: string;
-        LOG_LOG: string;
-        LOG_PRIORITIES: string[];
-        COLOR_PATTERN: string;
-        NO_COLOR_PATTERN: string;
-        CONSOLE_APPENDER: {
+export interface Constants {
+    VERSION: string;
+    DEFAULT_PORT: number;
+    DEFAULT_HOSTNAME: string;
+    DEFAULT_LISTEN_ADDR: string;
+    LOG_DISABLE: string;
+    LOG_ERROR: string;
+    LOG_WARN: string;
+    LOG_INFO: string;
+    LOG_DEBUG: string;
+    LOG_LOG: string;
+    LOG_PRIORITIES: string[];
+    COLOR_PATTERN: string;
+    NO_COLOR_PATTERN: string;
+    CONSOLE_APPENDER: {
+        type: string;
+        layout: {
             type: string;
-            layout: {
-                type: string;
-                pattern: string;
-            };
+            pattern: string;
         };
-        EXIT_CODE: string;
-    }
+    };
+    EXIT_CODE: string;
+}
 
-    namespace launcher {
-        class Launcher {
-            static generateId(): string;
+export namespace launcher {
+    class Launcher {
+        static generateId(): string;
 
-            constructor(emitter: NodeJS.EventEmitter, injector: any);
+        constructor(emitter: NodeJS.EventEmitter, injector: any);
 
-            // TODO: Can this return value ever be typified?
-            launch(names: string[], protocol: string, hostname: string, port: number, urlRoot: string): any[];
-            kill(id: string, callback: () => void): boolean;
-            restart(id: string): boolean;
-            killAll(callback: () => void): void;
-            areAllCaptured(): boolean;
-            markCaptured(id: string): void;
-        }
-    }
-
-    /** @deprecated */
-    interface DeprecatedServer {
-        /** @deprecated */
-        start(options?: any, callback?: ServerCallback): void;
-    }
-
-    interface Runner {
-        run(options?: ConfigOptions | ConfigFile, callback?: ServerCallback): void;
-    }
-
-    interface Stopper {
-        /**
-         * This function will signal a running server to stop. The equivalent of karma stop.
-         */
-        stop(options?: ConfigOptions, callback?: ServerCallback): void;
-    }
-
-    interface TestResults {
-        disconnected: boolean;
-        error: boolean;
-        exitCode: number;
-        failed: number;
-        success: number;
-    }
-
-    class Server extends NodeJS.EventEmitter {
-        constructor(options?: ConfigOptions | ConfigFile, callback?: ServerCallback);
-        /**
-         * Start the server
-         */
-        start(): void;
-        /**
-         * Get properties from the injector
-         * @param token
-         */
-        get(token: string): any;
-        /**
-         * Force a refresh of the file list
-         */
-        refreshFiles(): Promise<any>;
-
-        on(event: string, listener: (...args: any[]) => void): this;
-
-        /**
-         * Listen to the 'run_complete' event.
-         */
-        on(event: 'run_complete', listener: (browsers: any, results: TestResults) => void): this;
-
-        /**
-         * Backward-compatibility with karma-intellij bundled with WebStorm.
-         * Deprecated since version 0.13, to be removed in 0.14
-         */
-        // static start(): void;
-    }
-
-    type ServerCallback = (exitCode: number) => void;
-
-    interface Config {
-        set: (config: ConfigOptions) => void;
-        LOG_DISABLE: string;
-        LOG_ERROR: string;
-        LOG_WARN: string;
-        LOG_INFO: string;
-        LOG_DEBUG: string;
-    }
-
-    interface ConfigFile {
-        configFile: string;
-    }
-
-    interface ConfigOptions {
-        /**
-         * @description Enable or disable watching files and executing the tests whenever one of these files changes.
-         * @default true
-         */
-        autoWatch?: boolean;
-        /**
-         * @description When Karma is watching the files for changes, it tries to batch multiple changes into a single run
-         * so that the test runner doesn't try to start and restart running tests more than it should.
-         * The configuration setting tells Karma how long to wait (in milliseconds) after any changes have occurred
-         * before starting the test process again.
-         * @default 250
-         */
-        autoWatchBatchDelay?: number;
-        /**
-         * @default ''
-         * @description The root path location that will be used to resolve all relative paths defined in <code>files</code> and <code>exclude</code>.
-         * If the basePath configuration is a relative path then it will be resolved to
-         * the <code>__dirname</code> of the configuration file.
-         */
-        basePath?: string;
-        /**
-         * @default 2000
-         * @description How long does Karma wait for a browser to reconnect (in ms).
-         * <p>
-         * With a flaky connection it is pretty common that the browser disconnects,
-         * but the actual test execution is still running without any problems. Karma does not treat a disconnection
-         * as immediate failure and will wait <code>browserDisconnectTimeout</code> (ms).
-         * If the browser reconnects during that time, everything is fine.
-         * </p>
-         */
-        browserDisconnectTimeout?: number;
-        /**
-         * @default 0
-         * @description The number of disconnections tolerated.
-         * <p>
-         * The <code>disconnectTolerance</code> value represents the maximum number of tries a browser will attempt
-         * in the case of a disconnection. Usually any disconnection is considered a failure,
-         * but this option allows you to define a tolerance level when there is a flaky network link between
-         * the Karma server and the browsers.
-         * </p>
-         */
-        browserDisconnectTolerance?: number;
-        /**
-         * @default 10000
-         * @description How long will Karma wait for a message from a browser before disconnecting from it (in ms).
-         * <p>
-         * If, during test execution, Karma does not receive any message from a browser within
-         * <code>browserNoActivityTimeout</code> (ms), it will disconnect from the browser
-         * </p>
-         */
-        browserNoActivityTimeout?: number;
-        /**
-         * @default []
-         * Possible Values:
-         * <ul>
-         *     <li>Chrome (launcher comes installed with Karma)</li>
-         *     <li>ChromeCanary (launcher comes installed with Karma)</li>
-         *     <li>PhantomJS (launcher comes installed with Karma)</li>
-         *     <li>Firefox (launcher requires karma-firefox-launcher plugin)</li>
-         *     <li>Opera (launcher requires karma-opera-launcher plugin)</li>
-         *     <li>Internet Explorer (launcher requires karma-ie-launcher plugin)</li>
-         *     <li>Safari (launcher requires karma-safari-launcher plugin)</li>
-         * </ul>
-         * @description A list of browsers to launch and capture. When Karma starts up, it will also start up each browser
-         * which is placed within this setting. Once Karma is shut down, it will shut down these browsers as well.
-         * You can capture any browser manually by opening the browser and visiting the URL where
-         * the Karma web server is listening (by default it is <code>http://localhost:9876/</code>).
-         */
-        browsers?: string[];
-        /**
-         * @default 60000
-         * @description Timeout for capturing a browser (in ms).
-         * <p>
-         * The <code>captureTimeout</code> value represents the maximum boot-up time allowed for a
-         * browser to start and connect to Karma. If any browser does not get captured within the timeout, Karma
-         * will kill it and try to launch it again and, after three attempts to capture it, Karma will give up.
-         * </p>
-         */
-        captureTimeout?: number;
-        client?: ClientOptions;
-        /**
-         * @default true
-         * @description Enable or disable colors in the output (reporters and logs).
-         */
-        colors?: boolean;
-        /**
-         * @default 'Infinity'
-         * @description How many browsers Karma launches in parallel.
-         * Especially on services like SauceLabs and Browserstack, it makes sense only to launch a limited
-         * amount of browsers at once, and only start more when those have finished. Using this configuration,
-         * you can specify how many browsers should be running at once at any given point in time.
-         */
-        concurrency?: number;
-        customLaunchers?: { [key: string]: CustomLauncher };
-        /**
-         * @default []
-         * @description List of files/patterns to exclude from loaded files.
-         */
-        exclude?: string[];
-        /**
-         * @default []
-         * @description List of files/patterns to load in the browser.
-         */
-        files?: Array<FilePattern | string>;
-        /**
-         * @default []
-         * @description List of test frameworks you want to use. Typically, you will set this to ['jasmine'], ['mocha'] or ['qunit']...
-         * Please note just about all frameworks in Karma require an additional plugin/framework library to be installed (via NPM).
-         */
-        frameworks?: string[];
-        /**
-         * @default 'localhost'
-         * @description Hostname to be used when capturing browsers.
-         */
-        hostname?: string;
-        /**
-         * @default {}
-         * @description Options object to be used by Node's https class.
-         * Object description can be found in the
-         * [NodeJS.org API docs](https://nodejs.org/api/tls.html#tls_tls_createserver_options_secureconnectionlistener)
-         */
-        httpsServerOptions?: https.ServerOptions;
-        /**
-         * @default config.LOG_INFO
-         * Possible values:
-         * <ul>
-         *   <li>config.LOG_DISABLE</li>
-         *   <li>config.LOG_ERROR</li>
-         *   <li>config.LOG_WARN</li>
-         *   <li>config.LOG_INFO</li>
-         *   <li>config.LOG_DEBUG</li>
-         * </ul>
-         * @description Level of logging.
-         */
-        logLevel?: string;
-        /**
-         * @default [{type: 'console'}]
-         * @description A list of log appenders to be used. See the documentation for [log4js] for more information.
-         */
-        loggers?: { [name: string]: Appender } | Appender[];
-        /**
-         * @default []
-         * @description List of names of additional middleware you want the
-         * Karma server to use. Middleware will be used in the order listed.
-         * You must have installed the middleware via a plugin/framework
-         * (either inline or via NPM). Additional information can be found in
-         * [plugins](http://karma-runner.github.io/2.0/config/plugins.html).
-         * The plugin must provide an express/connect middleware function
-         * (details about this can be found in the
-         * [Express](http://expressjs.com/guide/using-middleware.html) docs).
-         */
-        middleware?: string[];
-        /**
-         * @default {}
-         * @description Redefine default mapping from file extensions to MIME-type.
-         * Set property name to required MIME, provide Array of extensions (without dots) as it's value.
-         */
-        mime?: {[type: string]: string[]};
-        /**
-         * @default ['karma-*']
-         * @description List of plugins to load. A plugin can be a string (in which case it will be required
-         * by Karma) or an inlined plugin - Object.
-         * By default, Karma loads all sibling NPM modules which have a name starting with karma-*.
-         * Note: Just about all plugins in Karma require an additional library to be installed (via NPM).
-         */
-        plugins?: any[];
-        /**
-         * @default 9876
-         * @description The port where the web server will be listening.
-         */
-        port?: number;
-        /**
-         * @default {'**\/*.coffee': 'coffee'}
-         * @description A map of preprocessors to use.
-         *
-         * Preprocessors can be loaded through [plugins].
-         *
-         * Note: Just about all preprocessors in Karma (other than CoffeeScript and some other defaults)
-         * require an additional library to be installed (via NPM).
-         *
-         * Be aware that preprocessors may be transforming the files and file types that are available at run time. For instance,
-         * if you are using the "coverage" preprocessor on your source files, if you then attempt to interactively debug
-         * your tests, you'll discover that your expected source code is completely changed from what you expected.  Because
-         * of that, you'll want to engineer this so that your automated builds use the coverage entry in the "reporters" list,
-         * but your interactive debugging does not.
-         *
-         */
-        preprocessors?: { [name: string]: string | string[] };
-        /**
-         * @default 'http:'
-         * Possible Values:
-         * <ul>
-         *   <li>http:</li>
-         *   <li>https:</li>
-         * </ul>
-         * @description Protocol used for running the Karma webserver.
-         * Determines the use of the Node http or https class.
-         * Note: Using <code>'https:'</code> requires you to specify <code>httpsServerOptions</code>.
-         */
-        protocol?: string;
-        /**
-         * @default {}
-         * @description A map of path-proxy pairs.
-         */
-        proxies?: { [path: string]: string };
-        /**
-         * @default true
-         * @description Whether or not Karma or any browsers should raise an error when an inavlid SSL certificate is found.
-         */
-        proxyValidateSSL?: boolean;
-        /**
-         * @default 0
-         * @description Karma will report all the tests that are slower than given time limit (in ms).
-         * This is disabled by default (since the default value is 0).
-         */
-        reportSlowerThan?: number;
-        /**
-         * @default ['progress']
-         * Possible Values:
-         * <ul>
-         *   <li>dots</li>
-         *   <li>progress</li>
-         * </ul>
-         * @description A list of reporters to use.
-         * Additional reporters, such as growl, junit, teamcity or coverage can be loaded through plugins.
-         * Note: Just about all additional reporters in Karma (other than progress) require an additional library to be installed (via NPM).
-         */
-        reporters?: string[];
-        /**
-         * @default false
-         * @description Continuous Integration mode.
-         * If true, Karma will start and capture all configured browsers, run tests and then exit with an exit code of 0 or 1 depending
-         * on whether all tests passed or any tests failed.
-         */
-        singleRun?: boolean;
-        /**
-         * @default ['polling', 'websocket']
-         * @description An array of allowed transport methods between the browser and testing server. This configuration setting
-         * is handed off to [socket.io](http://socket.io/) (which manages the communication
-         * between browsers and the testing server).
-         */
-        transports?: string[];
-        /**
-         * @default '/'
-         * @description The base url, where Karma runs.
-         * All of Karma's urls get prefixed with the urlRoot. This is helpful when using proxies, as
-         * sometimes you might want to proxy a url that is already taken by Karma.
-         */
-        urlRoot?: string;
-    }
-
-    interface ClientOptions {
-        /**
-         * @default undefined
-         * @description When karma run is passed additional arguments on the command-line, they
-         * are passed through to the test adapter as karma.config.args (an array of strings).
-         * The client.args option allows you to set this value for actions other than run.
-         * How this value is used is up to your test adapter - you should check your adapter's
-         * documentation to see how (and if) it uses this value.
-         */
-        args?: string[];
-        /**
-         * @default true
-         * @description Run the tests inside an iFrame or a new window
-         * If true, Karma runs the tests inside an iFrame. If false, Karma runs the tests in a new window. Some tests may not run in an
-         * iFrame and may need a new window to run.
-         */
-        useIframe?: boolean;
-        /**
-         * @default true
-         * @description Capture all console output and pipe it to the terminal.
-         */
-        captureConsole?: boolean;
-        /**
-         * @default false
-         * @description Run the tests on the same window as the client, without using iframe or a new window
-         */
-        runInParent?: boolean;
-        /**
-         * @default true
-         * @description Clear the context window
-         * If true, Karma clears the context window upon the completion of running the tests.
-         * If false, Karma does not clear the context window upon the completion of running the tests.
-         * Setting this to false is useful when embedding a Jasmine Spec Runner Template.
-         */
-        clearContext?: boolean;
-    }
-
-    interface FilePattern {
-        /**
-         * The pattern to use for matching. This property is mandatory.
-         */
-        pattern: string;
-        /**
-         * @default true
-         * @description If <code>autoWatch</code> is true all files that have set watched to true will be watched
-         * for changes.
-         */
-        watched?: boolean;
-        /**
-         * @default true
-         * @description Should the files be included in the browser using <script> tag? Use false if you want to
-         * load them manually, eg. using Require.js.
-         */
-        included?: boolean;
-        /**
-         * @default true
-         * @description Should the files be served by Karma's webserver?
-         */
-        served?: boolean;
-        /**
-         * @default false
-         * @description Should the files be served from disk on each request by Karma's webserver?
-         */
-        nocache?: boolean;
-    }
-
-    interface CustomLauncher {
-        base: string;
-        browserName?: string;
-        flags?: string[];
-        platform?: string;
-    }
-
-    namespace config {
-        function parseConfig(configFilePath: string, cliOptions: ConfigOptions): Config;
+        // TODO: Can this return value ever be typified?
+        launch(names: string[], protocol: string, hostname: string, port: number, urlRoot: string): any[];
+        kill(id: string, callback: () => void): boolean;
+        restart(id: string): boolean;
+        killAll(callback: () => void): void;
+        areAllCaptured(): boolean;
+        markCaptured(id: string): void;
     }
 }
 
-export = karma;
+/** @deprecated */
+export interface DeprecatedServer {
+    /** @deprecated */
+    start(options?: any, callback?: ServerCallback): void;
+}
+
+export interface Runner {
+    run(options?: ConfigOptions | ConfigFile, callback?: ServerCallback): void;
+}
+
+export interface Stopper {
+    /**
+     * This function will signal a running server to stop. The equivalent of karma stop.
+     */
+    stop(options?: ConfigOptions, callback?: ServerCallback): void;
+}
+
+export interface TestResults {
+    disconnected: boolean;
+    error: boolean;
+    exitCode: number;
+    failed: number;
+    success: number;
+}
+
+export class Server extends NodeJS.EventEmitter {
+    constructor(options?: ConfigOptions | ConfigFile, callback?: ServerCallback);
+    /**
+     * Start the server
+     */
+    start(): void;
+    /**
+     * Get properties from the injector
+     * @param token
+     */
+    get(token: string): any;
+    /**
+     * Force a refresh of the file list
+     */
+    refreshFiles(): Promise<any>;
+
+    on(event: string, listener: (...args: any[]) => void): this;
+
+    /**
+     * Listen to the 'run_complete' event.
+     */
+    on(event: 'run_complete', listener: (browsers: any, results: TestResults) => void): this;
+
+    /**
+     * Backward-compatibility with karma-intellij bundled with WebStorm.
+     * Deprecated since version 0.13, to be removed in 0.14
+     */
+    // static start(): void;
+}
+
+export type ServerCallback = (exitCode: number) => void;
+
+export interface Config {
+    set: (config: ConfigOptions) => void;
+    LOG_DISABLE: string;
+    LOG_ERROR: string;
+    LOG_WARN: string;
+    LOG_INFO: string;
+    LOG_DEBUG: string;
+}
+
+export interface ConfigFile {
+    configFile: string;
+}
+
+export interface ConfigOptions {
+    /**
+     * @description Enable or disable watching files and executing the tests whenever one of these files changes.
+     * @default true
+     */
+    autoWatch?: boolean;
+    /**
+     * @description When Karma is watching the files for changes, it tries to batch multiple changes into a single run
+     * so that the test runner doesn't try to start and restart running tests more than it should.
+     * The configuration setting tells Karma how long to wait (in milliseconds) after any changes have occurred
+     * before starting the test process again.
+     * @default 250
+     */
+    autoWatchBatchDelay?: number;
+    /**
+     * @default ''
+     * @description The root path location that will be used to resolve all relative paths defined in <code>files</code> and <code>exclude</code>.
+     * If the basePath configuration is a relative path then it will be resolved to
+     * the <code>__dirname</code> of the configuration file.
+     */
+    basePath?: string;
+    /**
+     * @default 2000
+     * @description How long does Karma wait for a browser to reconnect (in ms).
+     * <p>
+     * With a flaky connection it is pretty common that the browser disconnects,
+     * but the actual test execution is still running without any problems. Karma does not treat a disconnection
+     * as immediate failure and will wait <code>browserDisconnectTimeout</code> (ms).
+     * If the browser reconnects during that time, everything is fine.
+     * </p>
+     */
+    browserDisconnectTimeout?: number;
+    /**
+     * @default 0
+     * @description The number of disconnections tolerated.
+     * <p>
+     * The <code>disconnectTolerance</code> value represents the maximum number of tries a browser will attempt
+     * in the case of a disconnection. Usually any disconnection is considered a failure,
+     * but this option allows you to define a tolerance level when there is a flaky network link between
+     * the Karma server and the browsers.
+     * </p>
+     */
+    browserDisconnectTolerance?: number;
+    /**
+     * @default 10000
+     * @description How long will Karma wait for a message from a browser before disconnecting from it (in ms).
+     * <p>
+     * If, during test execution, Karma does not receive any message from a browser within
+     * <code>browserNoActivityTimeout</code> (ms), it will disconnect from the browser
+     * </p>
+     */
+    browserNoActivityTimeout?: number;
+    /**
+     * @default []
+     * Possible Values:
+     * <ul>
+     *     <li>Chrome (launcher comes installed with Karma)</li>
+     *     <li>ChromeCanary (launcher comes installed with Karma)</li>
+     *     <li>PhantomJS (launcher comes installed with Karma)</li>
+     *     <li>Firefox (launcher requires karma-firefox-launcher plugin)</li>
+     *     <li>Opera (launcher requires karma-opera-launcher plugin)</li>
+     *     <li>Internet Explorer (launcher requires karma-ie-launcher plugin)</li>
+     *     <li>Safari (launcher requires karma-safari-launcher plugin)</li>
+     * </ul>
+     * @description A list of browsers to launch and capture. When Karma starts up, it will also start up each browser
+     * which is placed within this setting. Once Karma is shut down, it will shut down these browsers as well.
+     * You can capture any browser manually by opening the browser and visiting the URL where
+     * the Karma web server is listening (by default it is <code>http://localhost:9876/</code>).
+     */
+    browsers?: string[];
+    /**
+     * @default 60000
+     * @description Timeout for capturing a browser (in ms).
+     * <p>
+     * The <code>captureTimeout</code> value represents the maximum boot-up time allowed for a
+     * browser to start and connect to Karma. If any browser does not get captured within the timeout, Karma
+     * will kill it and try to launch it again and, after three attempts to capture it, Karma will give up.
+     * </p>
+     */
+    captureTimeout?: number;
+    client?: ClientOptions;
+    /**
+     * @default true
+     * @description Enable or disable colors in the output (reporters and logs).
+     */
+    colors?: boolean;
+    /**
+     * @default 'Infinity'
+     * @description How many browsers Karma launches in parallel.
+     * Especially on services like SauceLabs and Browserstack, it makes sense only to launch a limited
+     * amount of browsers at once, and only start more when those have finished. Using this configuration,
+     * you can specify how many browsers should be running at once at any given point in time.
+     */
+    concurrency?: number;
+    customLaunchers?: { [key: string]: CustomLauncher };
+    /**
+     * @default []
+     * @description List of files/patterns to exclude from loaded files.
+     */
+    exclude?: string[];
+    /**
+     * @default []
+     * @description List of files/patterns to load in the browser.
+     */
+    files?: Array<FilePattern | string>;
+    /**
+     * @default []
+     * @description List of test frameworks you want to use. Typically, you will set this to ['jasmine'], ['mocha'] or ['qunit']...
+     * Please note just about all frameworks in Karma require an additional plugin/framework library to be installed (via NPM).
+     */
+    frameworks?: string[];
+    /**
+     * @default 'localhost'
+     * @description Hostname to be used when capturing browsers.
+     */
+    hostname?: string;
+    /**
+     * @default {}
+     * @description Options object to be used by Node's https class.
+     * Object description can be found in the
+     * [NodeJS.org API docs](https://nodejs.org/api/tls.html#tls_tls_createserver_options_secureconnectionlistener)
+     */
+    httpsServerOptions?: https.ServerOptions;
+    /**
+     * @default config.LOG_INFO
+     * Possible values:
+     * <ul>
+     *   <li>config.LOG_DISABLE</li>
+     *   <li>config.LOG_ERROR</li>
+     *   <li>config.LOG_WARN</li>
+     *   <li>config.LOG_INFO</li>
+     *   <li>config.LOG_DEBUG</li>
+     * </ul>
+     * @description Level of logging.
+     */
+    logLevel?: string;
+    /**
+     * @default [{type: 'console'}]
+     * @description A list of log appenders to be used. See the documentation for [log4js] for more information.
+     */
+    loggers?: { [name: string]: Appender } | Appender[];
+    /**
+     * @default []
+     * @description List of names of additional middleware you want the
+     * Karma server to use. Middleware will be used in the order listed.
+     * You must have installed the middleware via a plugin/framework
+     * (either inline or via NPM). Additional information can be found in
+     * [plugins](http://karma-runner.github.io/2.0/config/plugins.html).
+     * The plugin must provide an express/connect middleware function
+     * (details about this can be found in the
+     * [Express](http://expressjs.com/guide/using-middleware.html) docs).
+     */
+    middleware?: string[];
+    /**
+     * @default {}
+     * @description Redefine default mapping from file extensions to MIME-type.
+     * Set property name to required MIME, provide Array of extensions (without dots) as it's value.
+     */
+    mime?: {[type: string]: string[]};
+    /**
+     * @default ['karma-*']
+     * @description List of plugins to load. A plugin can be a string (in which case it will be required
+     * by Karma) or an inlined plugin - Object.
+     * By default, Karma loads all sibling NPM modules which have a name starting with karma-*.
+     * Note: Just about all plugins in Karma require an additional library to be installed (via NPM).
+     */
+    plugins?: any[];
+    /**
+     * @default 9876
+     * @description The port where the web server will be listening.
+     */
+    port?: number;
+    /**
+     * @default {'**\/*.coffee': 'coffee'}
+     * @description A map of preprocessors to use.
+     *
+     * Preprocessors can be loaded through [plugins].
+     *
+     * Note: Just about all preprocessors in Karma (other than CoffeeScript and some other defaults)
+     * require an additional library to be installed (via NPM).
+     *
+     * Be aware that preprocessors may be transforming the files and file types that are available at run time. For instance,
+     * if you are using the "coverage" preprocessor on your source files, if you then attempt to interactively debug
+     * your tests, you'll discover that your expected source code is completely changed from what you expected.  Because
+     * of that, you'll want to engineer this so that your automated builds use the coverage entry in the "reporters" list,
+     * but your interactive debugging does not.
+     *
+     */
+    preprocessors?: { [name: string]: string | string[] };
+    /**
+     * @default 'http:'
+     * Possible Values:
+     * <ul>
+     *   <li>http:</li>
+     *   <li>https:</li>
+     * </ul>
+     * @description Protocol used for running the Karma webserver.
+     * Determines the use of the Node http or https class.
+     * Note: Using <code>'https:'</code> requires you to specify <code>httpsServerOptions</code>.
+     */
+    protocol?: string;
+    /**
+     * @default {}
+     * @description A map of path-proxy pairs.
+     */
+    proxies?: { [path: string]: string };
+    /**
+     * @default true
+     * @description Whether or not Karma or any browsers should raise an error when an inavlid SSL certificate is found.
+     */
+    proxyValidateSSL?: boolean;
+    /**
+     * @default 0
+     * @description Karma will report all the tests that are slower than given time limit (in ms).
+     * This is disabled by default (since the default value is 0).
+     */
+    reportSlowerThan?: number;
+    /**
+     * @default ['progress']
+     * Possible Values:
+     * <ul>
+     *   <li>dots</li>
+     *   <li>progress</li>
+     * </ul>
+     * @description A list of reporters to use.
+     * Additional reporters, such as growl, junit, teamcity or coverage can be loaded through plugins.
+     * Note: Just about all additional reporters in Karma (other than progress) require an additional library to be installed (via NPM).
+     */
+    reporters?: string[];
+    /**
+     * @default false
+     * @description Continuous Integration mode.
+     * If true, Karma will start and capture all configured browsers, run tests and then exit with an exit code of 0 or 1 depending
+     * on whether all tests passed or any tests failed.
+     */
+    singleRun?: boolean;
+    /**
+     * @default ['polling', 'websocket']
+     * @description An array of allowed transport methods between the browser and testing server. This configuration setting
+     * is handed off to [socket.io](http://socket.io/) (which manages the communication
+     * between browsers and the testing server).
+     */
+    transports?: string[];
+    /**
+     * @default '/'
+     * @description The base url, where Karma runs.
+     * All of Karma's urls get prefixed with the urlRoot. This is helpful when using proxies, as
+     * sometimes you might want to proxy a url that is already taken by Karma.
+     */
+    urlRoot?: string;
+}
+
+export interface ClientOptions {
+    /**
+     * @default undefined
+     * @description When karma run is passed additional arguments on the command-line, they
+     * are passed through to the test adapter as karma.config.args (an array of strings).
+     * The client.args option allows you to set this value for actions other than run.
+     * How this value is used is up to your test adapter - you should check your adapter's
+     * documentation to see how (and if) it uses this value.
+     */
+    args?: string[];
+    /**
+     * @default true
+     * @description Run the tests inside an iFrame or a new window
+     * If true, Karma runs the tests inside an iFrame. If false, Karma runs the tests in a new window. Some tests may not run in an
+     * iFrame and may need a new window to run.
+     */
+    useIframe?: boolean;
+    /**
+     * @default true
+     * @description Capture all console output and pipe it to the terminal.
+     */
+    captureConsole?: boolean;
+    /**
+     * @default false
+     * @description Run the tests on the same window as the client, without using iframe or a new window
+     */
+    runInParent?: boolean;
+    /**
+     * @default true
+     * @description Clear the context window
+     * If true, Karma clears the context window upon the completion of running the tests.
+     * If false, Karma does not clear the context window upon the completion of running the tests.
+     * Setting this to false is useful when embedding a Jasmine Spec Runner Template.
+     */
+    clearContext?: boolean;
+}
+
+export interface FilePattern {
+    /**
+     * The pattern to use for matching. This property is mandatory.
+     */
+    pattern: string;
+    /**
+     * @default true
+     * @description If <code>autoWatch</code> is true all files that have set watched to true will be watched
+     * for changes.
+     */
+    watched?: boolean;
+    /**
+     * @default true
+     * @description Should the files be included in the browser using <script> tag? Use false if you want to
+     * load them manually, eg. using Require.js.
+     */
+    included?: boolean;
+    /**
+     * @default true
+     * @description Should the files be served by Karma's webserver?
+     */
+    served?: boolean;
+    /**
+     * @default false
+     * @description Should the files be served from disk on each request by Karma's webserver?
+     */
+    nocache?: boolean;
+}
+
+export interface CustomLauncher {
+    base: string;
+    browserName?: string;
+    flags?: string[];
+    platform?: string;
+}
+
+export namespace config {
+    function parseConfig(configFilePath: string, cliOptions: ConfigOptions): Config;
+}

From f7cefda5623914d09c6f0a2340b4c178aea959c1 Mon Sep 17 00:00:00 2001
From: Yaroslav Admin <devoto13@gmail.com>
Date: Tue, 27 Nov 2018 22:12:36 +0100
Subject: [PATCH 551/836] Fixed and corrected karma-coverage definitions

---
 types/karma-coverage/index.d.ts              | 23 +++-----
 types/karma-coverage/karma-coverage-tests.ts | 60 ++++++++++++--------
 2 files changed, 43 insertions(+), 40 deletions(-)

diff --git a/types/karma-coverage/index.d.ts b/types/karma-coverage/index.d.ts
index 50be80d5cf..8382ec7b12 100644
--- a/types/karma-coverage/index.d.ts
+++ b/types/karma-coverage/index.d.ts
@@ -1,27 +1,22 @@
-// Type definitions for karma-coverage v0.5.3
+// Type definitions for karma-coverage 1.1
 // Project: https://github.com/karma-runner/karma-coverage
 // Definitions by: Tanguy Krotoff <https://github.com/tkrotoff>
+//                 Yaroslav Admin <https://github.com/devoto13>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 
-import * as karma from 'karma';
+import 'karma';
 import * as istanbul from 'istanbul';
 
-declare namespace karmaCoverage {
-    interface Karma extends karma.Karma { }
-
-    interface Config extends karma.Config {
-        set: (config: ConfigOptions) => void;
-    }
-
-    interface ConfigOptions extends karma.ConfigOptions {
+declare module 'karma' {
+    interface ConfigOptions {
         /**
          * See https://github.com/karma-runner/karma-coverage/blob/master/docs/configuration.md
          */
-        coverageReporter?: (Reporter | Reporter[]);
+        coverageReporter?: KarmaCoverageReporter & { reporters?: KarmaCoverageReporter[] };
     }
 
-    interface Reporter {
+    interface KarmaCoverageReporter {
         type?: string;
         dir?: string;
         subdir?: string | ((browser: string) => string);
@@ -33,7 +28,3 @@ declare namespace karmaCoverage {
         [moreSettings: string]: any;
     }
 }
-
-declare var karmaCoverage: karmaCoverage.Karma;
-
-export = karmaCoverage;
diff --git a/types/karma-coverage/karma-coverage-tests.ts b/types/karma-coverage/karma-coverage-tests.ts
index 4f0b187a7a..36d7d85415 100644
--- a/types/karma-coverage/karma-coverage-tests.ts
+++ b/types/karma-coverage/karma-coverage-tests.ts
@@ -1,6 +1,6 @@
-import * as karma from 'karma-coverage';
+import * as karma from 'karma';
 
-// See https://github.com/karma-runner/karma-coverage/blob/v0.5.3/README.md#basic
+// See https://github.com/karma-runner/karma-coverage/blob/v1.1.2/README.md#basic
 module.exports = function(config: karma.Config) {
   config.set({
     files: [
@@ -20,13 +20,13 @@ module.exports = function(config: karma.Config) {
 
     // optionally, configure the reporter
     coverageReporter: {
-      type : 'html',
-      dir : 'coverage/'
+      type: 'html',
+      dir: 'coverage/'
     }
   });
 };
 
-// See https://github.com/karma-runner/karma-coverage/blob/v0.5.3/README.md#advanced-multiple-reporters
+// See https://github.com/karma-runner/karma-coverage/blob/v1.1.2/README.md#advanced-multiple-reporters
 module.exports = function(config: karma.Config) {
   config.set({
     files: [
@@ -56,7 +56,7 @@ module.exports = function(config: karma.Config) {
   });
 };
 
-// See https://github.com/karma-runner/karma-coverage/blob/v0.5.3/README.md#dont-minify-instrumenter-output
+// See https://github.com/karma-runner/karma-coverage/blob/v1.1.2/README.md#dont-minify-instrumenter-output
 module.exports = function(config: karma.Config) {
   config.set({
     coverageReporter: {
@@ -67,7 +67,7 @@ module.exports = function(config: karma.Config) {
   });
 };
 
-// See https://github.com/karma-runner/karma-coverage/blob/v0.5.3/docs/configuration.md#subdir
+// See https://github.com/karma-runner/karma-coverage/blob/v1.1.2/docs/configuration.md#subdir
 module.exports = function(config: karma.Config) {
   config.set({
     coverageReporter: {
@@ -93,7 +93,7 @@ module.exports = function(config: karma.Config) {
     coverageReporter: {
       dir: 'coverage',
       subdir: function(browser) {
-        // normalization process to keep a consistent browser name accross different
+        // normalization process to keep a consistent browser name across different
         // OS
         return browser.toLowerCase().split(/[ /-]/)[0];
       }
@@ -102,18 +102,18 @@ module.exports = function(config: karma.Config) {
   });
 };
 
-// See https://github.com/karma-runner/karma-coverage/blob/v0.5.3/docs/configuration.md#file
+// See https://github.com/karma-runner/karma-coverage/blob/v1.1.2/docs/configuration.md#file
 module.exports = function(config: karma.Config) {
   config.set({
     coverageReporter: {
-      type : 'text',
-      dir : 'coverage/',
-      file : 'coverage.txt'
+      type: 'text',
+      dir: 'coverage/',
+      file: 'coverage.txt'
     }
   });
 };
 
-// See https://github.com/karma-runner/karma-coverage/blob/v0.5.3/docs/configuration.md#check
+// See https://github.com/karma-runner/karma-coverage/blob/v1.1.2/docs/configuration.md#check
 module.exports = function(config: karma.Config) {
   config.set({
     coverageReporter: {
@@ -146,7 +146,7 @@ module.exports = function(config: karma.Config) {
   });
 };
 
-// See https://github.com/karma-runner/karma-coverage/blob/v0.5.3/docs/configuration.md#watermarks
+// See https://github.com/karma-runner/karma-coverage/blob/v1.1.2/docs/configuration.md#watermarks
 module.exports = function(config: karma.Config) {
   config.set({
     coverageReporter: {
@@ -160,24 +160,36 @@ module.exports = function(config: karma.Config) {
   });
 };
 
-// See https://github.com/karma-runner/karma-coverage/blob/v0.5.3/docs/configuration.md#sourcestore
-module.exports = function(config: karma.Config) {
+// See https://github.com/karma-runner/karma-coverage/blob/v1.1.2/docs/configuration.md#includeallsources
+module.exports = function (config: karma.Config) {
   config.set({
     coverageReporter: {
-      type : 'text',
-      dir : 'coverage/',
-      file : 'coverage.txt',
-      sourceStore : require('istanbul').Store.create('fslookup')
+      type: 'text',
+      dir: 'coverage/',
+      file: 'coverage.txt',
+      includeAllSources: true
     }
   });
 };
 
-// See https://github.com/karma-runner/karma-coverage/blob/v0.5.3/docs/configuration.md#reporters
+// See https://github.com/karma-runner/karma-coverage/blob/v1.1.2/docs/configuration.md#sourcestore
 module.exports = function(config: karma.Config) {
   config.set({
     coverageReporter: {
-      reporters:[
-        {type: 'html', dir:'coverage/'},
+      type: 'text',
+      dir: 'coverage/',
+      file: 'coverage.txt',
+      sourceStore: require('istanbul').Store.create('fslookup')
+    }
+  });
+};
+
+// See https://github.com/karma-runner/karma-coverage/blob/v1.1.2/docs/configuration.md#reporters
+module.exports = function(config: karma.Config) {
+  config.set({
+    coverageReporter: {
+      reporters: [
+        {type: 'html', dir: 'coverage/'},
         {type: 'teamcity'},
         {type: 'text-summary'}
       ],
@@ -185,7 +197,7 @@ module.exports = function(config: karma.Config) {
   });
 };
 
-// See https://github.com/karma-runner/karma-coverage/blob/v0.5.3/docs/configuration.md#instrumenter
+// See https://github.com/karma-runner/karma-coverage/blob/v1.1.2/docs/configuration.md#instrumenter
 module.exports = function(config: karma.Config) {
   config.set({
     coverageReporter: {

From 5bc22c159118f003bd6898338945e4e7930345a6 Mon Sep 17 00:00:00 2001
From: Robert Stigsson <robert.stigsson@gmail.com>
Date: Mon, 3 Dec 2018 09:04:56 +0100
Subject: [PATCH 552/836] recharts: added ReferenceArea.ifOverflow,
 ReferenceDot.ifOverflow and ReferenceLine.ifOverflow

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

diff --git a/types/recharts/index.d.ts b/types/recharts/index.d.ts
index 34e3cbcb88..d2cd6458d0 100644
--- a/types/recharts/index.d.ts
+++ b/types/recharts/index.d.ts
@@ -11,6 +11,7 @@
 //                 Paul Melnikow <https://github.com/paulmelnikow>
 //                 Harry Cruse <https://github.com/crusectrl>
 //                 Andrew Palugniok <https://github.com/apalugniok>
+//                 Robert Stigsson <https://github.com/RobertStigsson>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 
@@ -634,6 +635,7 @@ export interface ReferenceAreaProps extends Partial<PresentationAttributes> {
     yAxis?: object;
     isFront?: boolean;
     alwaysShow?: boolean;
+    ifOverflow?: 'hidden' | 'visible' | 'discard' | 'extendDomain'
     x1?: number | string;
     x2?: number | string;
     y1?: number | string;
@@ -657,6 +659,7 @@ export interface ReferenceDotProps extends EventAttributes, Partial<Presentation
     yAxis?: ReferenceDotAxisConfiguration;
     isFront?: boolean;
     alwaysShow?: boolean;
+    ifOverflow?: 'hidden' | 'visible' | 'discard' | 'extendDomain'
     x?: number | string;
     y?: number | string;
     xAxisId?: string | number;
@@ -677,6 +680,7 @@ export interface ReferenceLineProps extends Partial<PresentationAttributes<numbe
     yAxis?: object;
     isFront?: boolean;
     alwaysShow?: boolean;
+    ifOverflow?: 'hidden' | 'visible' | 'discard' | 'extendDomain'
     x?: number | string;
     y?: number | string;
     label?: string | number | ContentRenderer<any> | React.ReactElement<any>;

From 4ea0c9f150ab7aec3c4ba6f2ea9e9568c7e0951f Mon Sep 17 00:00:00 2001
From: Robert Stigsson <robert.stigsson@gmail.com>
Date: Mon, 3 Dec 2018 09:44:41 +0100
Subject: [PATCH 553/836] recharts: fixed issue with missing semi-colon

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

diff --git a/types/recharts/index.d.ts b/types/recharts/index.d.ts
index d2cd6458d0..7054b18e08 100644
--- a/types/recharts/index.d.ts
+++ b/types/recharts/index.d.ts
@@ -635,7 +635,7 @@ export interface ReferenceAreaProps extends Partial<PresentationAttributes> {
     yAxis?: object;
     isFront?: boolean;
     alwaysShow?: boolean;
-    ifOverflow?: 'hidden' | 'visible' | 'discard' | 'extendDomain'
+    ifOverflow?: 'hidden' | 'visible' | 'discard' | 'extendDomain';
     x1?: number | string;
     x2?: number | string;
     y1?: number | string;
@@ -659,7 +659,7 @@ export interface ReferenceDotProps extends EventAttributes, Partial<Presentation
     yAxis?: ReferenceDotAxisConfiguration;
     isFront?: boolean;
     alwaysShow?: boolean;
-    ifOverflow?: 'hidden' | 'visible' | 'discard' | 'extendDomain'
+    ifOverflow?: 'hidden' | 'visible' | 'discard' | 'extendDomain';
     x?: number | string;
     y?: number | string;
     xAxisId?: string | number;
@@ -680,7 +680,7 @@ export interface ReferenceLineProps extends Partial<PresentationAttributes<numbe
     yAxis?: object;
     isFront?: boolean;
     alwaysShow?: boolean;
-    ifOverflow?: 'hidden' | 'visible' | 'discard' | 'extendDomain'
+    ifOverflow?: 'hidden' | 'visible' | 'discard' | 'extendDomain';
     x?: number | string;
     y?: number | string;
     label?: string | number | ContentRenderer<any> | React.ReactElement<any>;

From a359aa88ddefb61792db576a4ca7ccb42e71a93b Mon Sep 17 00:00:00 2001
From: Thibault <contact@thibaultmeunier.com>
Date: Mon, 3 Dec 2018 08:49:55 +0000
Subject: [PATCH 554/836] [@types/web3] :arrow_up: Solidity compilers defines
 stateMutability for ABIDefinition

---
 types/web3/eth/abi.d.ts      |  1 +
 types/web3/test/abi-tests.ts | 89 ++++++++++++++++++++++++++++++++++++
 types/web3/tsconfig.json     |  3 +-
 types/web3/web3-tests.ts     |  3 ++
 4 files changed, 95 insertions(+), 1 deletion(-)
 create mode 100644 types/web3/test/abi-tests.ts

diff --git a/types/web3/eth/abi.d.ts b/types/web3/eth/abi.d.ts
index b103c9e4ce..dcf644e93a 100644
--- a/types/web3/eth/abi.d.ts
+++ b/types/web3/eth/abi.d.ts
@@ -1,6 +1,7 @@
 export interface ABIDefinition {
     constant?: boolean;
     payable?: boolean;
+    stateMutability?: "pure" | "view" | "nonpayable" | "payable";
     anonymous?: boolean;
     inputs?: Array<{ name: string; type: ABIDataTypes; indexed?: boolean }>;
     name?: string;
diff --git a/types/web3/test/abi-tests.ts b/types/web3/test/abi-tests.ts
new file mode 100644
index 0000000000..357c59f3c3
--- /dev/null
+++ b/types/web3/test/abi-tests.ts
@@ -0,0 +1,89 @@
+import { ABIDefinition } from "web3/eth/abi.d";
+
+export const OLD_ABI_STANDARD: ABIDefinition[] = [
+    {
+        constant: true,
+        payable: false,
+        inputs: [
+            {
+                name: "paramAddress",
+                type: "address"
+            }
+        ],
+        name: "function1",
+        outputs: [],
+        type: "function"
+    }, {
+        constant: true,
+        payable: false,
+        inputs: [],
+        name: "removeOwner",
+        outputs: [
+            {
+                name: "paramAddress",
+                type: "address"
+            }
+        ],
+        type: "function"
+    }, {
+        constant: false,
+        payable: false,
+        inputs: [],
+        name: "removeOwner",
+        outputs: [],
+        type: "function"
+    }, {
+        constant: false,
+        payable: true,
+        inputs: [],
+        name: "removeOwner",
+        outputs: [],
+        type: "function"
+    },
+];
+
+export const NEW_ABI_STANDARD: ABIDefinition[] = [
+    {
+        constant: true,
+        payable: false,
+        stateMutability: "view",
+        inputs: [
+            {
+                name: "paramAddress",
+                type: "address"
+            }
+        ],
+        name: "function1",
+        outputs: [],
+        type: "function"
+    }, {
+        constant: true,
+        payable: false,
+        stateMutability: "pure",
+        inputs: [],
+        name: "removeOwner",
+        outputs: [
+            {
+                name: "paramAddress",
+                type: "address"
+            }
+        ],
+        type: "function"
+    }, {
+        constant: false,
+        payable: false,
+        stateMutability: "nonpayable",
+        inputs: [],
+        name: "removeOwner",
+        outputs: [],
+        type: "function"
+    }, {
+        constant: false,
+        payable: true,
+        stateMutability: "payable",
+        inputs: [],
+        name: "removeOwner",
+        outputs: [],
+        type: "function"
+    },
+];
diff --git a/types/web3/tsconfig.json b/types/web3/tsconfig.json
index 42b54fc8c5..45fb60fda4 100644
--- a/types/web3/tsconfig.json
+++ b/types/web3/tsconfig.json
@@ -23,6 +23,7 @@
         "eth/accounts.d.ts",
         "eth/contract.d.ts",
         "eth/index.d.ts",
-        "eth/types.d.ts"
+        "eth/types.d.ts",
+        "test/abi-tests.ts"
     ]
 }
diff --git a/types/web3/web3-tests.ts b/types/web3/web3-tests.ts
index 170a8b22c3..746e199418 100644
--- a/types/web3/web3-tests.ts
+++ b/types/web3/web3-tests.ts
@@ -2,6 +2,7 @@ import Web3 = require("web3");
 import BigNumber = require("bn.js");
 import { TransactionReceipt } from "web3/types";
 import PromiEvent from "web3/promiEvent";
+import { NEW_ABI_STANDARD, OLD_ABI_STANDARD } from "web3/test/abi-tests";
 
 const contractAddress = "0xde0B295669a9FD93d5F28D9Ec85E40f4cb697BAe";
 
@@ -125,6 +126,8 @@ web3.eth.personal.unlockAccount(
 //
 // web3.eth.abi
 // --------------------------------------------------------------------------
+const myContractOldAbi = new web3.eth.Contract(OLD_ABI_STANDARD);
+const myContractNewAbi = new web3.eth.Contract(NEW_ABI_STANDARD);
 
 //
 // web3.bzz

From 1184370cda953a282150eea2c4e32e14d81279f3 Mon Sep 17 00:00:00 2001
From: tassadarliu <rhapsodyn@gmail.com>
Date: Mon, 3 Dec 2018 17:52:45 +0800
Subject: [PATCH 555/836] [Convict] get autocomplete for format

---
 types/convict/index.d.ts | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/types/convict/index.d.ts b/types/convict/index.d.ts
index 2c3dbf0547..8be23f1547 100644
--- a/types/convict/index.d.ts
+++ b/types/convict/index.d.ts
@@ -37,6 +37,20 @@ declare namespace convict {
         parse: (content: string) => any;
     }
 
+    type PredefinedFormat =
+        | '*'
+        | 'int'
+        | 'port'
+        | 'windows_named_pipe'
+        | 'port_or_windows_named_pipe'
+        | 'url'
+        | 'email'
+        | 'ipaddress'
+        | 'duration'
+        | 'timestamp'
+        | 'nat'
+        | String;
+
     interface SchemaObj<T = any> {
         default: T;
         doc?: string;
@@ -52,7 +66,7 @@ declare namespace convict {
          * If omitted, format will be set to the value of Object.prototype.toString.call
          * for the default value
          */
-        format?: string | any[] | ((val: any) => void);
+        format?: PredefinedFormat | any[] | ((val: any) => void);
         env?: string;
         arg?: string;
         sensitive?: boolean;

From aeeaa025d5799c6552a5ff4d77318af4c3c9f009 Mon Sep 17 00:00:00 2001
From: Benjamin Lupton <b@lupton.cc>
Date: Mon, 3 Dec 2018 20:53:58 +1100
Subject: [PATCH 556/836] ansicolors: support colors as functions

---
 types/ansicolors/index.d.ts | 73 +++++++++++++++++++------------------
 1 file changed, 37 insertions(+), 36 deletions(-)

diff --git a/types/ansicolors/index.d.ts b/types/ansicolors/index.d.ts
index e82fb47dd7..dd1a872e57 100644
--- a/types/ansicolors/index.d.ts
+++ b/types/ansicolors/index.d.ts
@@ -4,41 +4,42 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 interface Colors extends String {
-	white: Colors
-	black: Colors
-	blue: Colors
-	cyan: Colors
-	green: Colors
-	magenta: Colors
-	red: Colors
-	yellow: Colors
-	brightBlack: Colors
-	brightRed: Colors
-	brightGreen: Colors
-	brightYellow: Colors
-	brightBlue: Colors
-	brightMagenta: Colors
-	brightCyan: Colors
-	brightWhite: Colors
-	bgBlack: Colors
-	bgRed: Colors
-	bgGreen: Colors
-	bgYellow: Colors
-	bgBlue: Colors
-	bgMagenta: Colors
-	bgCyan: Colors
-	bgWhite: Colors
-	bgBrightBlack: Colors
-	bgBrightRed: Colors
-	bgBrightGreen: Colors
-	bgBrightYellow: Colors
-	bgBrightBlue: Colors
-	bgBrightMagenta: Colors
-	bgBrightCyan: Colors
-	bgBrightWhite: Colors
-	open: Colors
-	close: Colors
-	colors: Colors
+	(value: string): string
+	white: this
+	black: this
+	blue: this
+	cyan: this
+	green: this
+	magenta: this
+	red: this
+	yellow: this
+	brightBlack: this
+	brightRed: this
+	brightGreen: this
+	brightYellow: this
+	brightBlue: this
+	brightMagenta: this
+	brightCyan: this
+	brightWhite: this
+	bgBlack: this
+	bgRed: this
+	bgGreen: this
+	bgYellow: this
+	bgBlue: this
+	bgMagenta: this
+	bgCyan: this
+	bgWhite: this
+	bgBrightBlack: this
+	bgBrightRed: this
+	bgBrightGreen: this
+	bgBrightYellow: this
+	bgBrightBlue: this
+	bgBrightMagenta: this
+	bgBrightCyan: this
+	bgBrightWhite: this
+	open: this
+	close: this
+	colors: this
 }
-declare var colors: Colors
+declare const colors: Colors
 export default colors

From d654965211716edda15c5183fb58332760185896 Mon Sep 17 00:00:00 2001
From: craig bruce <craigbruce@craigs-MBP-2.lan>
Date: Mon, 3 Dec 2018 21:03:30 +1100
Subject: [PATCH 557/836] Expose modules globally as nested modules

---
 .../cast.framework.breaks.d.ts                |  169 +-
 .../cast.framework.d.ts                       | 1467 +++----
 .../cast.framework.events.d.ts                |  782 ++--
 .../cast.framework.messages.d.ts              | 3792 ++++++++---------
 .../cast.framework.system.d.ts                |  322 +-
 .../cast.framework.ui.d.ts                    |  362 +-
 .../chromecast-caf-receiver-tests.ts          |   68 +-
 types/chromecast-caf-receiver/index.d.ts      |    3 +
 8 files changed, 3468 insertions(+), 3497 deletions(-)

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

From c0c4189a262e2b0607736dc8d042dcc9b891bc6f Mon Sep 17 00:00:00 2001
From: Kobi Cohen <kobi.co@gigya-inc.com>
Date: Mon, 3 Dec 2018 12:04:55 +0200
Subject: [PATCH 558/836] updating isMatchWithCustomizer type to accept two
 more arguments: object and source per lodash docs
 https://lodash.com/docs/4.17.11#isMatchWith [add tests]

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

diff --git a/types/lodash/lodash-tests.ts b/types/lodash/lodash-tests.ts
index 4f7f229fe6..9d2547dcf4 100644
--- a/types/lodash/lodash-tests.ts
+++ b/types/lodash/lodash-tests.ts
@@ -4205,7 +4205,7 @@ fp.now(); // $ExpectType number
 
 // _.isMatchWith
 {
-    const testIsMatchCustiomizerFn = (value: any, other: any, indexOrKey: number|string|symbol) => true;
+    const testIsMatchCustiomizerFn = (value: any, other: any, indexOrKey: number|string|symbol, object: object, source: object) => true;
 
     _.isMatchWith({}, {}, testIsMatchCustiomizerFn); // $ExpectType boolean
     _({}).isMatchWith({}, testIsMatchCustiomizerFn); // $ExpectType boolean

From 77643fb3e533e7689a0b4a742c67b48e283ec353 Mon Sep 17 00:00:00 2001
From: craig bruce <craigbruce@craigs-MBP-2.lan>
Date: Mon, 3 Dec 2018 21:29:50 +1100
Subject: [PATCH 559/836] fix lint issues

---
 .../cast.framework.breaks.d.ts                |   2 -
 .../cast.framework.d.ts                       | 124 +++++++-----------
 .../cast.framework.ui.d.ts                    |   2 -
 types/chromecast-caf-receiver/index.d.ts      |  17 +--
 4 files changed, 57 insertions(+), 88 deletions(-)

diff --git a/types/chromecast-caf-receiver/cast.framework.breaks.d.ts b/types/chromecast-caf-receiver/cast.framework.breaks.d.ts
index 5ece1f15e9..bce1d6b71d 100644
--- a/types/chromecast-caf-receiver/cast.framework.breaks.d.ts
+++ b/types/chromecast-caf-receiver/cast.framework.breaks.d.ts
@@ -1,6 +1,5 @@
 import { Break, BreakClip } from "./cast.framework.messages";
 
-
 export as namespace breaks
 export class BreakSeekData {
     constructor(seekFrom: number, seekTo: number, breaks: Break[]);
@@ -88,4 +87,3 @@ export interface BreakManager {
         interceptor?: (trackingUrl: string) => void
     ): void;
 }
-
diff --git a/types/chromecast-caf-receiver/cast.framework.d.ts b/types/chromecast-caf-receiver/cast.framework.d.ts
index 6e2be61eb0..13d2e52ce0 100644
--- a/types/chromecast-caf-receiver/cast.framework.d.ts
+++ b/types/chromecast-caf-receiver/cast.framework.d.ts
@@ -3,34 +3,6 @@ import * as events from "./cast.framework.events";
 import * as messages from "./cast.framework.messages";
 import * as system from "./cast.framework.system";
 import * as ui from "./cast.framework.ui";
-import { EventType } from "./cast.framework.events";
-import {
-    PlayerState,
-    PlayStringId,
-    ErrorType,
-    ErrorReason,
-    IdleReason,
-    MessageType,
-    Track,
-    TextTrackStyle,
-    QueueItem,
-    LoadRequestData,
-    QueueData,
-    Break,
-    LiveSeekableRange,
-    MediaInformation,
-    ErrorData,
-    RequestData
-} from "./cast.framework.messages";
-import { BreakManager } from "./cast.framework.breaks";
-import { EventHandler, RequestHandler, BinaryHandler } from "./index";
-import {
-    EventType as SystemEventType,
-    ApplicationData,
-    Sender,
-    StandbyState,
-    SystemState
-} from "./cast.framework.system";
 
 export import breaks = breaks;
 export import events = events;
@@ -59,12 +31,12 @@ export class TextTracksManager {
     /**
      * Adds text tracks to the list.
      */
-    addTracks(tracks: Track[]): void;
+    addTracks(tracks: messages.Track[]): void;
 
     /**
      * Creates a text track.
      */
-    createTrack(): Track;
+    createTrack(): messages.Track;
 
     /**
      * Gets all active text ids.
@@ -74,27 +46,27 @@ export class TextTracksManager {
     /**
      * Gets all active text tracks.
      */
-    getActiveTracks(): Track[];
+    getActiveTracks(): messages.Track[];
 
     /**
      * Returns the current text track style.
      */
-    getTextTracksStyle(): TextTrackStyle;
+    getTextTracksStyle(): messages.TextTrackStyle;
 
     /**
      * Gets text track by id.
      */
-    getTrackById(id: number): Track;
+    getTrackById(id: number): messages.Track;
 
     /**
      * Returns all text tracks.
      */
-    getTracks(): Track[];
+    getTracks(): messages.Track[];
 
     /**
      * Gets text tracks by language.
      */
-    getTracksByLanguage(language: string): Track[];
+    getTracksByLanguage(language: string): messages.Track[];
 
     /**
      * Sets text tracks to be active by id.
@@ -109,7 +81,7 @@ export class TextTracksManager {
     /**
      * Sets text track style.
      */
-    setTextTrackStyle(style: TextTrackStyle): void;
+    setTextTrackStyle(style: messages.TextTrackStyle): void;
 }
 
 /**
@@ -121,7 +93,7 @@ export class QueueManager {
     /**
      * Returns the current queue item.
      */
-    getCurrentItem(): QueueItem;
+    getCurrentItem(): messages.QueueItem;
 
     /**
      * Returns the index of the current queue item.
@@ -131,12 +103,12 @@ export class QueueManager {
     /**
      * Returns the queue items.
      */
-    getItems(): QueueItem[];
+    getItems(): messages.QueueItem[];
 
     /**
      * Inserts items into the queue.
      */
-    insertItems(items: QueueItem[], insertBefore?: number): void;
+    insertItems(items: messages.QueueItem[], insertBefore?: number): void;
 
     /**
      * Removes items from the queue.
@@ -151,7 +123,7 @@ export class QueueManager {
     /**
      * Updates existing queue items by matching itemId.
      */
-    updateItems(items: QueueItem[]): void;
+    updateItems(items: messages.QueueItem[]): void;
 }
 
 /**
@@ -167,7 +139,7 @@ export class QueueBase {
         itemId: number,
         nextCount: number,
         prevCount: number
-    ): QueueItem[] | Promise<QueueItem[]>;
+    ): messages.QueueItem[] | Promise<messages.QueueItem[]>;
 
     /**
      * Initializes the queue with the requestData. This is called when a new LOAD request comes in to the receiver.
@@ -175,13 +147,13 @@ export class QueueBase {
      *  in the load request data.
      */
     initialize(
-        requestData: LoadRequestData
-    ): QueueData | Promise<QueueData>;
+        requestData: messages.LoadRequestData
+    ): messages.QueueData | Promise<messages.QueueData>;
 
     /**
      * Returns next items after the reference item; often the end of the current queue; called by the receiver MediaManager.
      */
-    nextItems(itemId?: number): QueueItem[] | Promise<QueueItem[]>;
+    nextItems(itemId?: number): messages.QueueItem[] | Promise<messages.QueueItem[]>;
 
     /**
      * Sets the current item with the itemId; called by the receiver MediaManager when it changes the current playing item.
@@ -192,7 +164,7 @@ export class QueueBase {
      * A callback for informing the following items have been inserted into the receiver queue in this session.
      *  A cloud based implementation can optionally choose to update its queue based on the new information.
      */
-    onItemsInserted(items: QueueItem[], insertBefore?: number): void;
+    onItemsInserted(items: messages.QueueItem[], insertBefore?: number): void;
 
     /**
      * A callback for informing the following items have been removed from the receiver queue in this session.
@@ -203,12 +175,12 @@ export class QueueBase {
     /**
      * Returns previous items before the reference item; often at the beginning of the queue; called by the receiver MediaManager.
      */
-    prevItems(itemId?: number): QueueItem[] | Promise<QueueItem[]>;
+    prevItems(itemId?: number): messages.QueueItem[] | Promise<messages.QueueItem[]>;
 
     /**
      * Shuffles the queue and returns new queue items. Returns null if the operation is not supported.
      */
-    shuffle(): QueueItem[] | Promise<QueueItem[]>;
+    shuffle(): messages.QueueItem[] | Promise<messages.QueueItem[]>;
 }
 
 /**
@@ -221,7 +193,7 @@ export class PlayerManager {
      * Adds an event listener for player event.
      */
     addEventListener: (
-        eventType: EventType | EventType[],
+        eventType: events.EventType | events.EventType[],
         eventListener: EventHandler
     ) => void;
 
@@ -250,12 +222,12 @@ export class PlayerManager {
     /**
      * Obtain the breaks (Ads) manager.
      */
-    getBreakManager(): BreakManager;
+    getBreakManager(): breaks.BreakManager;
 
     /**
      * Returns list of breaks.
      */
-    getBreaks(): Break[];
+    getBreaks(): messages.Break[];
 
     /**
      * Gets current time in sec of current media.
@@ -270,12 +242,12 @@ export class PlayerManager {
     /**
      * Returns live seekable range with start and end time in seconds. The values are media time based.
      */
-    getLiveSeekableRange(): LiveSeekableRange;
+    getLiveSeekableRange(): messages.LiveSeekableRange;
 
     /**
      * Gets media information of current media.
      */
-    getMediaInformation(): MediaInformation;
+    getMediaInformation(): messages.MediaInformation;
 
     /**
      * Returns playback configuration.
@@ -290,7 +262,7 @@ export class PlayerManager {
     /**
      * Gets player state.
      */
-    getPlayerState(): PlayerState;
+    getPlayerState(): messages.PlayerState;
 
     /**
      * Get the preferred playback rate. (Can be used on shutdown event to save latest preferred playback rate to a persistent storage;
@@ -313,7 +285,7 @@ export class PlayerManager {
     /**
      * Loads media.
      */
-    load(loadRequest: LoadRequestData): Promise<void>;
+    load(loadRequest: messages.LoadRequestData): Promise<void>;
 
     /**
      * Pauses currently playing media.
@@ -328,7 +300,7 @@ export class PlayerManager {
     /**
      * Requests a text string to be played back locally on the receiver device.
      */
-    playString(stringId: PlayStringId, args?: string[]): Promise<ErrorData>;
+    playString(stringId: messages.PlayStringId, args?: string[]): Promise<messages.ErrorData>;
 
     /**
      * Request Google Assistant to refresh the credentials. Only works if the original credentials came from the assistant.
@@ -339,7 +311,7 @@ export class PlayerManager {
      * Removes the event listener added for given player event. If event listener is not added; it will be ignored.
      */
     removeEventListener(
-        eventType: EventType | EventType[],
+        eventType: events.EventType | events.EventType[],
         eventListener: EventHandler
     ): void;
 
@@ -354,15 +326,15 @@ export class PlayerManager {
     sendError(
         senderId: string,
         requestId: number,
-        type: ErrorType,
-        reason?: ErrorReason,
+        type: messages.ErrorType,
+        reason?: messages.ErrorReason,
         customData?: any
     ): void;
 
     /**
      * Send local media request.
      */
-    sendLocalMediaRequest(request: RequestData): void;
+    sendLocalMediaRequest(request: messages.RequestData): void;
 
     /**
      * Sends a media status message to a specific sender.
@@ -381,7 +353,7 @@ export class PlayerManager {
      * it is only needed if they want to make the player go to IDLE in special circumstances and the default idleReason does not reflect their intended
      * behavior.
      */
-    setIdleReason(idleReason: IdleReason): void;
+    setIdleReason(idleReason: messages.IdleReason): void;
 
     /**
      * Sets MediaElement to use. If Promise of MediaElement is set; media begins playback after Promise is resolved.
@@ -392,7 +364,7 @@ export class PlayerManager {
      * Sets media information.
      */
     setMediaInformation(
-        mediaInformation: MediaInformation,
+        mediaInformation: messages.MediaInformation,
         opt_broadcast?: boolean
     ): void;
 
@@ -403,7 +375,7 @@ export class PlayerManager {
      */
     setMediaPlaybackInfoHandler(
         handler: (
-            loadRequestData: LoadRequestData,
+            loadRequestData: messages.LoadRequestData,
             playbackConfig: PlaybackConfig
         ) => void
     ): void;
@@ -413,7 +385,7 @@ export class PlayerManager {
      * of the media status. By default the media contentId is used as the content url.
      */
     setMediaUrlResolver(
-        resolver: (loadRequestData: LoadRequestData) => void
+        resolver: (loadRequestData: messages.LoadRequestData) => void
     ): void;
 
     /**
@@ -424,8 +396,8 @@ export class PlayerManager {
      * the load interceptor will be called for preload messages.
      */
     setMessageInterceptor(
-        type: MessageType,
-        interceptor: (requestData: RequestData) => Promise<any>
+        type: messages.MessageType,
+        interceptor: (requestData: messages.RequestData) => Promise<any>
     ): void;
 
     /**
@@ -652,7 +624,7 @@ export class CastReceiverContext {
      * Add listener to cast system events.
      */
     addEventListener(
-        type: SystemEventType | SystemEventType[],
+        type: system.EventType | system.EventType[],
         handler: EventHandler
     ): void;
 
@@ -670,7 +642,7 @@ export class CastReceiverContext {
     /**
      * Provides application information once the system is ready; otherwise it will be null.
      */
-    getApplicationData(): ApplicationData;
+    getApplicationData(): system.ApplicationData;
 
     /**
      * Provides device capabilities information once the system is ready; otherwise it will be null.
@@ -686,22 +658,22 @@ export class CastReceiverContext {
     /**
      * Get a sender by sender id
      */
-    getSender(senderId: string): Sender;
+    getSender(senderId: string): system.Sender;
 
     /**
      * Gets a list of currently-connected senders.
      */
-    getSenders(): Sender[];
+    getSenders(): system.Sender[];
 
     /**
      * Reports if the cast application's HDMI input is in standby.
      */
-    getStandbyState(): StandbyState;
+    getStandbyState(): system.StandbyState;
 
     /**
      * Provides application information about the system state.
      */
-    getSystemState(): SystemState;
+    getSystemState(): system.SystemState;
 
     /**
      * Reports if the cast application is the HDMI active input.
@@ -731,7 +703,7 @@ export class CastReceiverContext {
     /**
      * Remove listener to cast system events.
      */
-    removeEventListener(type: EventType, handler: EventHandler): void;
+    removeEventListener(type: system.EventType, handler: EventHandler): void;
 
     /**
      * Sends a message to a specific sender.
@@ -783,10 +755,10 @@ export class CastReceiverContext {
 export class AudioTracksManager {
     constructor(params: any);
     getActiveId(): number;
-    getActiveTrack(): Track;
-    getTrackById(id: number): Track;
-    getTracks(): Track[];
-    getTracksByLanguage(language: string): Track[];
+    getActiveTrack(): messages.Track;
+    getTrackById(id: number): messages.Track;
+    getTracks(): messages.Track[];
+    getTracksByLanguage(language: string): messages.Track[];
     setActiveById(id: number): void;
     setActiveByLanguage(language: string): void;
 }
diff --git a/types/chromecast-caf-receiver/cast.framework.ui.d.ts b/types/chromecast-caf-receiver/cast.framework.ui.d.ts
index 9647fdc0ef..cd3fb79e2a 100644
--- a/types/chromecast-caf-receiver/cast.framework.ui.d.ts
+++ b/types/chromecast-caf-receiver/cast.framework.ui.d.ts
@@ -1,7 +1,5 @@
 import { PlayerDataEventType } from "./cast.framework.ui";
 import { MediaMetadata } from "./cast.framework.messages";
-import { PlayerDataChangedEventHandler } from "./index";
-
 
 export as namespace ui
 export type ContentType = "video" | "audio" | "image";
diff --git a/types/chromecast-caf-receiver/index.d.ts b/types/chromecast-caf-receiver/index.d.ts
index c716ad89ea..444dba0af4 100644
--- a/types/chromecast-caf-receiver/index.d.ts
+++ b/types/chromecast-caf-receiver/index.d.ts
@@ -13,15 +13,16 @@
 
 import * as framework from "./cast.framework";
 import { PlayerDataChangedEvent } from './cast.framework.ui';
-import { NetworkRequestInfo } from './cast.framework';
 import { Event } from './cast.framework.events';
 
-
 export as namespace cast;
 export { framework };
-export type EventHandler = (event: Event) => void;
-export type PlayerDataChangedEventHandler = (
-    event: PlayerDataChangedEvent
-) => void;
-export type RequestHandler = (request: NetworkRequestInfo) => void;
-export type BinaryHandler = (data: Uint8Array) => Uint8Array;
+
+declare global {
+    type EventHandler = (event: Event) => void;
+    type PlayerDataChangedEventHandler = (
+        event: PlayerDataChangedEvent
+    ) => void;
+    type RequestHandler = (request: framework.NetworkRequestInfo) => void;
+    type BinaryHandler = (data: Uint8Array) => Uint8Array;
+}

From b405085866b0667cc4879a6013529255b071fbe5 Mon Sep 17 00:00:00 2001
From: Ceyhun Ozugur <ceyhunozugur@gmail.com>
Date: Mon, 3 Dec 2018 11:41:36 +0100
Subject: [PATCH 560/836] Add missing StorybookUIOptions params

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

diff --git a/types/storybook__react-native/index.d.ts b/types/storybook__react-native/index.d.ts
index 3f46866129..5c71878c0c 100644
--- a/types/storybook__react-native/index.d.ts
+++ b/types/storybook__react-native/index.d.ts
@@ -4,6 +4,7 @@
 //                 Anton Izmailov <https://github.com/wapgear>
 //                 Alec Hill <https://github.com/alechill>
 //                 Kyle Roach <https://github.com/iRoachie>
+//                 Ceyhun Ozugur <https://github.com/ceyhuno>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 
@@ -16,6 +17,12 @@ export interface StorybookUIOptions {
     host?: string;
     port?: number;
     query?: string;
+    isUIHidden?: boolean;
+    tabOpen?: number;
+    initialSelection?: object;
+    shouldPersistSelection?: boolean;
+    shouldDisableKeyboardAvoidingView?: boolean;
+    keyboardAvoidingViewVerticalOffset?: number;
 }
 
 export function getStorybookUI(

From df5456793b6f17352c30032132b1cd969e00f9fb Mon Sep 17 00:00:00 2001
From: Jessica <jessicamfranco3@gmail.com>
Date: Mon, 3 Dec 2018 19:43:34 +0900
Subject: [PATCH 561/836] Refactor Suspense to be augmentable

This is just so I can experiment with maxDuration locally with a type augmentation.
---
 types/react/index.d.ts | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/types/react/index.d.ts b/types/react/index.d.ts
index f525d7838c..431a1d75a4 100644
--- a/types/react/index.d.ts
+++ b/types/react/index.d.ts
@@ -322,11 +322,8 @@ declare namespace React {
     const Children: ReactChildren;
     const Fragment: ExoticComponent<{ children?: ReactNode }>;
     const StrictMode: ExoticComponent<{ children?: ReactNode }>;
-    /**
-     * This feature is not yet available for server-side rendering.
-     * Suspense support will be added in a later release.
-     */
-    const Suspense: ExoticComponent<{
+
+    interface SuspenseProps {
         children?: ReactNode
 
         /** A fallback react tree to show when a Suspense child (like React.lazy) suspends */
@@ -338,7 +335,12 @@ declare namespace React {
          * Not implemented yet, requires unstable_ConcurrentMode
          */
         // maxDuration?: number
-    }>;
+    }
+    /**
+     * This feature is not yet available for server-side rendering.
+     * Suspense support will be added in a later release.
+     */
+    const Suspense: ExoticComponent<SuspenseProps>;
     const version: string;
 
     //

From 29d5465467fa53b37c0f408192006552d1a9c2bc Mon Sep 17 00:00:00 2001
From: Ceyhun Ozugur <ceyhunozugur@gmail.com>
Date: Mon, 3 Dec 2018 12:05:36 +0100
Subject: [PATCH 562/836] Add docs

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

diff --git a/types/storybook__react-native/index.d.ts b/types/storybook__react-native/index.d.ts
index 5c71878c0c..fc308fa69b 100644
--- a/types/storybook__react-native/index.d.ts
+++ b/types/storybook__react-native/index.d.ts
@@ -11,17 +11,90 @@
 import * as React from 'react';
 
 export interface StorybookUIOptions {
+    /**
+     * display navigator and addons on the device
+     *
+     * @default true
+     */
     onDeviceUI?: boolean;
+
+    /**
+     * allows to display stories without running storybook server. Should be used with onDeviceUI
+     *
+     * @default false
+     */
     disableWebsockets?: boolean;
+
+    /**
+     * use wss/https instead of ws/http
+     *
+     * @default false
+     */
     secured?: boolean;
+
+    /**
+     * host to use
+     *
+     * @default NativeModules.SourceCode.scriptURL
+     */
     host?: string;
+
+    /**
+     * port to use
+     *
+     * @default 7007
+     */
     port?: number;
+
+    /**
+     * additional query string to pass to websockets
+     *
+     * @default ""
+     */
     query?: string;
+
+    /**
+     * should the ui be closed initialy.
+     *
+     * @default false
+     */
     isUIHidden?: boolean;
+
+    /**
+     * which tab should be open. -1 Navigator, 0 Preview, 1 Addons
+     *
+     * @default 0
+     */
     tabOpen?: number;
+
+    /**
+     * initialize storybook with a specific story.
+     * In case a valid object is passed, it will take precedence over `shouldPersistSelection`.
+     * ex: `{ kind: 'Knobs', story: 'with knobs' }`
+     *
+     * @default null
+     */
     initialSelection?: object;
+
+    /**
+     * initialize storybook with the last selected story.
+     *
+     * @default true
+     */
     shouldPersistSelection?: boolean;
+
+    /**
+     * disable KeyboardAvoidingView wrapping Storybook's view
+     *
+     * @default false
+     */
     shouldDisableKeyboardAvoidingView?: boolean;
+
+    /**
+     * this will set the keyboardverticaloffset (https://facebook.github.io/react-native/docs/keyboardavoidingview#keyboardverticaloffset) value for KeyboardAvoidingView wrapping Storybook's view
+     *
+     * @default 0
+     */
     keyboardAvoidingViewVerticalOffset?: number;
 }
 

From 470e25094b33b97ea72ec2a9041e79ae509d09fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Den=C3=A8le?= <remi@altirnao.com>
Date: Mon, 3 Dec 2018 12:07:53 +0100
Subject: [PATCH 563/836] JSDoc: describe default value of page.setCacheEnabled

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

diff --git a/types/puppeteer/index.d.ts b/types/puppeteer/index.d.ts
index e48e29b7ec..1e71d1da08 100644
--- a/types/puppeteer/index.d.ts
+++ b/types/puppeteer/index.d.ts
@@ -1624,7 +1624,7 @@ export interface Page extends EventEmitter, FrameBase {
 
   /**
    * Determines whether cache is enabled on the page.
-   * @param enabled Whether or not to enable cache on the page. Defaults to true.
+   * @param [enabled=true] Whether or not to enable cache on the page.
    */
   setCacheEnabled(enabled?: boolean): Promise<void>;
 

From d08aba397844405c08995fe0728d0d9c82ccf512 Mon Sep 17 00:00:00 2001
From: Jessica <jessicamfranco3@gmail.com>
Date: Mon, 3 Dec 2018 20:11:17 +0900
Subject: [PATCH 564/836] Fix overly permissible first argument to css,
 styled() and createGlobalStyle

---
 types/styled-components/index.d.ts     | 38 +++++------
 types/styled-components/test/index.tsx | 91 ++++++++++++++++++++++++--
 2 files changed, 103 insertions(+), 26 deletions(-)

diff --git a/types/styled-components/index.d.ts b/types/styled-components/index.d.ts
index 2f6fa61317..ca3ff22c0e 100644
--- a/types/styled-components/index.d.ts
+++ b/types/styled-components/index.d.ts
@@ -73,7 +73,7 @@ export type SimpleInterpolation =
     | InterpolationValue
     | FlattenSimpleInterpolation;
 // must be an interface to be self-referential
-interface FlattenSimpleInterpolation
+export interface FlattenSimpleInterpolation
     extends ReadonlyArray<SimpleInterpolation> {}
 
 export type InterpolationFunction<P> = (props: P) => Interpolation<P>;
@@ -176,10 +176,9 @@ export interface ThemedStyledFunctionBase<
     (
         first:
             | TemplateStringsArray
-            | NonNullable<
-                  Interpolation<
-                      ThemedStyledProps<StyledComponentPropsWithRef<C> & O, T>
-                  >
+            | CSSObject
+            | InterpolationFunction<
+                  ThemedStyledProps<StyledComponentPropsWithRef<C> & O, T>
               >,
         ...rest: Array<
             Interpolation<
@@ -187,17 +186,12 @@ export interface ThemedStyledFunctionBase<
             >
         >
     ): StyledComponent<C, T, O, A>;
-    // at least the first argument is required, whatever it is
     <U extends object>(
         first:
             | TemplateStringsArray
-            | NonNullable<
-                  Interpolation<
-                      ThemedStyledProps<
-                          StyledComponentPropsWithRef<C> & O & U,
-                          T
-                      >
-                  >
+            | CSSObject
+            | InterpolationFunction<
+                  ThemedStyledProps<StyledComponentPropsWithRef<C> & O & U, T>
               >,
         ...rest: Array<
             Interpolation<
@@ -288,19 +282,21 @@ export type StyledInterface = ThemedStyledInterface<DefaultTheme>;
 
 export interface BaseThemedCssFunction<T extends object> {
     (
-        first: TemplateStringsArray | NonNullable<SimpleInterpolation>,
+        first: TemplateStringsArray | CSSObject,
         ...interpolations: SimpleInterpolation[]
     ): FlattenSimpleInterpolation;
     (
         first:
             | TemplateStringsArray
-            | NonNullable<Interpolation<ThemedStyledProps<{}, T>>>,
+            | CSSObject
+            | InterpolationFunction<ThemedStyledProps<{}, T>>,
         ...interpolations: Array<Interpolation<ThemedStyledProps<{}, T>>>
     ): FlattenInterpolation<ThemedStyledProps<{}, T>>;
     <P extends object>(
         first:
             | TemplateStringsArray
-            | NonNullable<Interpolation<ThemedStyledProps<P, T>>>,
+            | CSSObject
+            | InterpolationFunction<ThemedStyledProps<P, T>>,
         ...interpolations: Array<Interpolation<ThemedStyledProps<P, T>>>
     ): FlattenInterpolation<ThemedStyledProps<P, T>>;
 }
@@ -333,7 +329,8 @@ export interface ThemedStyledComponentsModule<
     createGlobalStyle<P extends object = {}>(
         first:
             | TemplateStringsArray
-            | NonNullable<Interpolation<ThemedStyledProps<P, T>>>,
+            | CSSObject
+            | InterpolationFunction<ThemedStyledProps<P, T>>,
         ...interpolations: Array<Interpolation<ThemedStyledProps<P, T>>>
     ): GlobalStyleComponent<P, T>;
 
@@ -405,7 +402,8 @@ export function keyframes(
 export function createGlobalStyle<P extends object = {}>(
     first:
         | TemplateStringsArray
-        | NonNullable<Interpolation<ThemedStyledProps<P, DefaultTheme>>>,
+        | CSSObject
+        | InterpolationFunction<ThemedStyledProps<P, DefaultTheme>>,
     ...interpolations: Array<Interpolation<ThemedStyledProps<P, DefaultTheme>>>
 ): GlobalStyleComponent<P, DefaultTheme>;
 
@@ -468,7 +466,7 @@ export class StyleSheetManager extends React.Component<
  */
 // ONLY string literals and inline invocations of css`` are supported, anything else crashes the plugin
 export type CSSProp<T = AnyIfEmpty<DefaultTheme>> =
-      string |
-      FlattenInterpolation<ThemeProps<T>>;
+    | string
+    | FlattenInterpolation<ThemeProps<T>>;
 
 export default styled;
diff --git a/types/styled-components/test/index.tsx b/types/styled-components/test/index.tsx
index 2d70f74106..d382b42628 100644
--- a/types/styled-components/test/index.tsx
+++ b/types/styled-components/test/index.tsx
@@ -14,7 +14,10 @@ import styled, {
     withTheme,
     ThemeConsumer,
     StyledComponent,
-    ThemedStyledComponentsModule
+    ThemedStyledComponentsModule,
+    FlattenSimpleInterpolation,
+    SimpleInterpolation,
+    FlattenInterpolation
 } from "styled-components";
 import {} from "styled-components/cssprop";
 
@@ -101,13 +104,13 @@ const fadeIn = keyframes`
 `;
 
 const showAnimation = css`
-  opacity: 1;
-  transform: scale(1) translateY(0);
+    opacity: 1;
+    transform: scale(1) translateY(0);
 `;
 
 const hideAnimation = css`
-  opacity: 0;
-  transform: scale(0.95, 0.8) translateY(20px);
+    opacity: 0;
+    transform: scale(0.95, 0.8) translateY(20px);
 `;
 
 const entryAnimation = keyframes`
@@ -694,6 +697,8 @@ async function typedThemes() {
             return props.theme.color;
         }};
     `;
+    //  can't use a FlattenInterpolation as the first argument, would make broken css
+    // $ExpectError
     const ThemedDiv4 = styled.div(themedCss);
 
     const themedCssWithNesting = css(props => ({
@@ -714,7 +719,6 @@ async function typedThemes() {
                 <ThemedDiv />
                 <ThemedDiv2 />
                 <ThemedDiv3 />
-                <ThemedDiv4 />
                 <ThemeConsumer>
                     {theme => {
                         // $ExpectType string
@@ -867,3 +871,78 @@ function cssProp() {
         </>
     );
 }
+
+function validateArgumentsAndReturns() {
+    const t1: FlattenSimpleInterpolation[] = [
+        css({ color: "blue" }),
+        css`
+            color: blue;
+        `,
+        css`
+            color: ${"blue"};
+        `
+    ];
+    const t4: FlattenInterpolation<any> = [
+        css`
+            color: ${() => "blue"};
+        `,
+        css(() => ({ color: "blue" })),
+        css(
+            () =>
+                css`
+                    color: "blue";
+                `
+        )
+    ];
+
+    // if the first argument is array-like it's always treated as a string[], this breaks things
+    css(
+        // $ExpectError
+        css`
+            ${{ color: "blue" }}
+        `
+    );
+    // _technically_ valid as styled-components doesn't look at .raw but best not to support it
+    // $ExpectError
+    css([]);
+
+    styled.div({ color: "blue" });
+    styled.div(props => ({ color: props.theme.color }));
+    styled.div`
+        color: ${"blue"};
+    `;
+    // These don't work for the same reason css doesn't work
+    styled.div(
+        // $ExpectError
+        css`
+            ${{ color: "blue" }}
+        `
+    );
+    // $ExpectError
+    styled.div([]);
+
+    createGlobalStyle({
+        ":root": {
+            color: "blue"
+        }
+    });
+    createGlobalStyle`
+        :root {
+            color: blue;
+        }
+    `;
+    createGlobalStyle(() => ({
+        ":root": {
+            color: "blue"
+        }
+    }));
+    // these are invalid for the same reason as in styled.div
+    // $ExpectError
+    createGlobalStyle(css`
+        :root {
+            color: ${() => "blue"};
+        }
+    `);
+    // $ExpectError
+    createGlobalStyle([]);
+}

From eda0aeb732af70c9406e6369115a902825ff0e8e Mon Sep 17 00:00:00 2001
From: Jessica <jessicamfranco3@gmail.com>
Date: Mon, 3 Dec 2018 20:29:24 +0900
Subject: [PATCH 565/836] Fix lint warnings

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

diff --git a/types/react/index.d.ts b/types/react/index.d.ts
index 431a1d75a4..5be580c061 100644
--- a/types/react/index.d.ts
+++ b/types/react/index.d.ts
@@ -324,17 +324,17 @@ declare namespace React {
     const StrictMode: ExoticComponent<{ children?: ReactNode }>;
 
     interface SuspenseProps {
-        children?: ReactNode
+        children?: ReactNode;
 
         /** A fallback react tree to show when a Suspense child (like React.lazy) suspends */
-        fallback: NonNullable<ReactNode>|null
+        fallback: NonNullable<ReactNode>|null;
 
         // I tried looking at the code but I have no idea what it does.
         // https://github.com/facebook/react/issues/13206#issuecomment-432489986
         /**
          * Not implemented yet, requires unstable_ConcurrentMode
          */
-        // maxDuration?: number
+        // maxDuration?: number;
     }
     /**
      * This feature is not yet available for server-side rendering.

From f21619e43090a7a086f2ae54f021a0effa3ed59c Mon Sep 17 00:00:00 2001
From: polar-lukas <polar-lukas@users.noreply.github.com>
Date: Mon, 3 Dec 2018 15:04:41 +0100
Subject: [PATCH 566/836] make iframeResizer default export

"iframeResizer" is the default export of the typed library. Hence it should also be declared such.

If you try to require iframeResizer as AMD module, the function "iframeResizer" is not provided within an object but as function. Using the provided types results in an undefined propery "iframeResizer" on the "define"d object.
---
 types/iframe-resizer/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/iframe-resizer/index.d.ts b/types/iframe-resizer/index.d.ts
index 6e67a5b592..920c80b3a7 100644
--- a/types/iframe-resizer/index.d.ts
+++ b/types/iframe-resizer/index.d.ts
@@ -274,4 +274,4 @@ export interface IFrameScrollData {
   y: number;
 }
 
-export function iframeResizer(options: IFrameOptions, target: string | HTMLElement): IFrameComponent[];
+export default function iframeResizer(options: IFrameOptions, target: string | HTMLElement): IFrameComponent[];

From d661dca171cdfa9265171c3dec4880521e07972b Mon Sep 17 00:00:00 2001
From: polar-lukas <polar-lukas@users.noreply.github.com>
Date: Mon, 3 Dec 2018 15:24:07 +0100
Subject: [PATCH 567/836] iframe-resizer: update tests

forgot to update the tests...
---
 types/iframe-resizer/iframe-resizer-tests.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/iframe-resizer/iframe-resizer-tests.ts b/types/iframe-resizer/iframe-resizer-tests.ts
index 218a7f71cd..1efe701f9a 100644
--- a/types/iframe-resizer/iframe-resizer-tests.ts
+++ b/types/iframe-resizer/iframe-resizer-tests.ts
@@ -1,4 +1,4 @@
-import { IFrameComponent, IFrameOptions, iframeResizer } from "iframe-resizer";
+import iframeResizer, { IFrameComponent, IFrameOptions } from "iframe-resizer";
 
 function testOne(): void {
   const iframe: HTMLIFrameElement = document.createElement('iframe');

From db84d22b8b9b528f9708ced487b2cbf6c9d57ea3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ba=C4=8D=C3=ADk?= <honason@gmail.com>
Date: Mon, 3 Dec 2018 16:36:27 +0100
Subject: [PATCH 568/836] Improved param descriptions

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

diff --git a/types/react-native/index.d.ts b/types/react-native/index.d.ts
index 15423558e4..65ed1d3088 100644
--- a/types/react-native/index.d.ts
+++ b/types/react-native/index.d.ts
@@ -3631,9 +3631,15 @@ interface ImagePropsAndroid {
     fadeDuration?: number;
 
     /**
-     * Required sizes if using native image resources on Android
+     * Required if loading images via 'uri' from drawable folder on Android.
+     * Explanation: https://medium.com/@adamjacobb/react-native-performance-images-adf5843e120
      */
     width?: number;
+
+    /**
+     * Required if loading images via 'uri' from drawable folder on Android
+     * Explanation: https://medium.com/@adamjacobb/react-native-performance-images-adf5843e120
+     */
     height?: number;
 }
 

From 1e504ef4e33ca627a9cf4999581e00b4ab066087 Mon Sep 17 00:00:00 2001
From: AlexKlimenkov <shurick.klimenkov@gmail.com>
Date: Mon, 3 Dec 2018 19:06:13 +0300
Subject: [PATCH 569/836] [dhtmlxgantt] update typedefs to include changes up
 to dhtmlxgantt v6.0

---
 types/dhtmlxgantt/dhtmlxgantt-tests.ts |   4 +-
 types/dhtmlxgantt/index.d.ts           | 720 +++++++++++++++++++++----
 2 files changed, 604 insertions(+), 120 deletions(-)

diff --git a/types/dhtmlxgantt/dhtmlxgantt-tests.ts b/types/dhtmlxgantt/dhtmlxgantt-tests.ts
index 6ea32b509d..e31665d486 100644
--- a/types/dhtmlxgantt/dhtmlxgantt-tests.ts
+++ b/types/dhtmlxgantt/dhtmlxgantt-tests.ts
@@ -28,10 +28,12 @@ gantt.locale.labels.new_task = "New task";
 gantt.init("scheduler_here", start);
 gantt.load("/data/events");
 
+const wbs: string = gantt.getWBSCode(gantt.getTask(1));
+
 //events
 gantt.attachEvent("onBeforeLightbox", function (id?: string) {
 	gantt.showTask(id);
 });
 //gantt enterprise
 var gantt2 = Gantt.getGanttInstance();
-gantt2.config.api_date = "format";
+gantt2.config.xml_date = "format";
diff --git a/types/dhtmlxgantt/index.d.ts b/types/dhtmlxgantt/index.d.ts
index 79d02cc181..2ce8793a25 100644
--- a/types/dhtmlxgantt/index.d.ts
+++ b/types/dhtmlxgantt/index.d.ts
@@ -1,18 +1,12 @@
-// Type definitions for dhtmlxGantt 4.0.0
-// Project: http://dhtmlx.com/docs/products/dhtmlxGantt
+// Type definitions for dhtmlxGantt 6.0.0
+// Project: https://dhtmlx.com/docs/products/dhtmlxGantt
 // Definitions by: Maksim Kozhukh <https://github.com/mkozhukh>, Christophe Camicas <https://github.com/chriscamicas>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-
 type GanttCallback = (...args: any[]) => any;
-type GanttEventName = 'onAfterAutoSchedule'|'onAfterBatchUpdate'|'onAfterLightbox'|'onAfterLinkAdd'|'onAfterLinkDelete'|'onAfterLinkUpdate'|'onAfterRedo'|'onAfterTaskAdd'|'onAfterTaskAutoSchedule'|'onAfterTaskDelete'|'onAfterTaskDrag'|'onAfterTaskMove'|'onAfterTaskUpdate'|'onAfterUndo'|'onAjaxError'|'onBeforeAutoSchedule'|'onBeforeBatchUpdate'|'onBeforeCollapse'|'onBeforeDataRender'|'onBeforeExpand'|'onBeforeGanttReady'|'onBeforeGanttRender'|'onBeforeLightbox'|'onBeforeLinkAdd'|'onBeforeLinkDelete'|'onBeforeLinkDisplay'|'onBeforeLinkUpdate'|'onBeforeParse'|'onBeforeRedo'|'onBeforeRowDragEnd'|'onBeforeTaskAdd'|'onBeforeTaskAutoSchedule'|'onBeforeTaskChanged'|'onBeforeTaskDelete'|'onBeforeTaskDisplay'|'onBeforeTaskDrag'|'onBeforeTaskMove'|'onBeforeTaskSelected'|'onBeforeTaskUpdate'|'onBeforeUndo'|'onCircularLinkError'|'onClear'|'onCollapse'|'onColumnResize'|'onColumnResizeEnd'|'onColumnResizeStart'|'onContextMenu'|'onDataRender'|'onEmptyClick'|'onError'|'onExpand'|'onGanttReady'|'onGanttRender'|'onGanttScroll'|'onGridHeaderClick'|'onGridResize'|'onGridResizeEnd'|'onGridResizeStart'|'onLightbox'|'onLightboxButton'|'onLightboxCancel'|'onLightboxChange'|'onLightboxDelete'|'onLightboxSave'|'onLinkClick'|'onLinkDblClick'|'onLinkIdChange'|'onLinkValidation'|'onLoadEnd'|'onLoadStart'|'onMouseMove'|'onOptionsLoad'|'onParse'|'onRowDragEnd'|'onRowDragStart'|'onScaleAdjusted'|'onScaleClick'|'onTaskClick'|'onTaskClosed'|'onTaskCreated'|'onTaskDblClick'|'onTaskDrag'|'onTaskIdChange'|'onTaskLoading'|'onTaskOpened'|'onTaskRowClick'|'onTaskSelected'|'onTaskUnselected'|'onTemplatesReady';
+type GanttEventName = "onAfterAutoSchedule"|"onAfterBatchUpdate"|"onAfterLightbox"|"onAfterLinkAdd"|"onAfterLinkDelete"|"onAfterLinkUpdate"|"onAfterQuickInfo"|"onAfterRedo"|"onAfterSort"|"onAfterTaskAdd"|"onAfterTaskAutoSchedule"|"onAfterTaskDelete"|"onAfterTaskDrag"|"onAfterTaskMove"|"onAfterTaskUpdate"|"onAfterUndo"|"onAjaxError"|"onAutoScheduleCircularLink"|"onBeforeAutoSchedule"|"onBeforeBatchUpdate"|"onBeforeCollapse"|"onBeforeDataRender"|"onBeforeExpand"|"onBeforeGanttReady"|"onBeforeGanttRender"|"onBeforeLightbox"|"onBeforeLinkAdd"|"onBeforeLinkDelete"|"onBeforeLinkDisplay"|"onBeforeLinkUpdate"|"onBeforeMultiSelect"|"onBeforeParse"|"onBeforeRedo"|"onBeforeRedoStack"|"onBeforeRowDragEnd"|"onBeforeRowDragMove"|"onBeforeTaskAdd"|"onBeforeTaskAutoSchedule"|"onBeforeTaskChanged"|"onBeforeTaskDelete"|"onBeforeTaskDisplay"|"onBeforeTaskDrag"|"onBeforeTaskMove"|"onBeforeTaskMultiSelect"|"onBeforeTaskSelected"|"onBeforeTaskUpdate"|"onBeforeUndo"|"onBeforeUndoStack"|"onCircularLinkError"|"onClear"|"onCollapse"|"onColumnResize"|"onColumnResizeEnd"|"onColumnResizeStart"|"onContextMenu"|"onDataProcessorReady"|"onDataRender"|"onDestroy"|"onEmptyClick"|"onError"|"onExpand"|"onGanttLayoutReady"|"onGanttReady"|"onGanttRender"|"onGanttScroll"|"onGridHeaderClick"|"onGridResize"|"onGridResizeEnd"|"onGridResizeStart"|"onLightbox"|"onLightboxButton"|"onLightboxCancel"|"onLightboxChange"|"onLightboxDelete"|"onLightboxSave"|"onLinkClick"|"onLinkDblClick"|"onLinkIdChange"|"onLinkValidation"|"onLoadEnd"|"onLoadStart"|"onMouseMove"|"onMultiSelect"|"onOptionsLoad"|"onParse"|"onQuickInfo"|"onRowDragEnd"|"onRowDragStart"|"onScaleAdjusted"|"onScaleClick"|"onTaskClick"|"onTaskClosed"|"onTaskCreated"|"onTaskDblClick"|"onTaskDrag"|"onTaskIdChange"|"onTaskLoading"|"onTaskMultiSelect"|"onTaskOpened"|"onTaskRowClick"|"onTaskSelected"|"onTaskUnselected"|"onTemplatesReady";
 
 interface GanttTemplates {
-	/**
-	 * specifies the format of dates that are set by means of API methods. Used to parse incoming dates
-	 * @param date the date which needs formatting
-	*/
-	api_date(date: Date): string;
 
 	/**
 	 * specifies the content of start date or end date columns in grid
@@ -37,7 +31,7 @@ interface GanttTemplates {
 	drag_link(from: string|number, from_start: boolean, to: string|number, to_start: boolean): string;
 
 	/**
-	 * specifies the CSS class that will be applied to the link receiver (pop-up circle near the task bar)
+	 * specifies the CSS class that will be applied to the pop-up that appears when a user drags a link
 	 * @param from the id of the source task
 	 * @param from_start <i>true</i>, if the link is being dragged from the start of the  source task, <i>false</i> - if <br> from the end of the task
 	 * @param to the id of the target task( 'null' or 'undefined', if the target task isn't specified yet)
@@ -96,6 +90,42 @@ interface GanttTemplates {
 	*/
 	grid_row_class(start: Date, end: Date, task: any): string;
 
+	/**
+	 * defines the height of the filled area in the resourceHistogram
+	 * @param start_date start date of the scale cell
+	 * @param end_date end date of the scale cell
+	 * @param resource the resource object
+	 * @param tasks tasks that are assigned to the specified resource and overlap start/end dates of the cell
+	*/
+	histogram_cell_allocated(start_date: Date, end_date: Date, resource: any, tasks: any[]): void;
+
+	/**
+	 * specifies the height of the line that defines the available capacity of the resource
+	 * @param start_date start date of the scale cell
+	 * @param end_date end date of the scale cell
+	 * @param resource the resource object
+	 * @param tasks tasks that are assigned to the specified resource and overlap start/end dates of the cell
+	*/
+	histogram_cell_capacity(start_date: Date, end_date: Date, resource: any, tasks: any[]): void;
+
+	/**
+	 * defines the CSS class which is applied to a cell of the resource panel
+	 * @param start_date start date of the scale cell
+	 * @param end_date end date of the scale cell
+	 * @param resource the resource object
+	 * @param tasks tasks that are assigned to the specified resource and overlap start/end dates of the cell
+	*/
+	histogram_cell_class(start_date: Date, end_date: Date, resource: any, tasks: any[]): void;
+
+	/**
+	 * defines the label inside a cell
+	 * @param start_date start date of the scale cell
+	 * @param end_date end date of the scale cell
+	 * @param resource the resource object
+	 * @param tasks tasks that are assigned to the specified resource and overlap start/end dates of the cell
+	*/
+	histogram_cell_label(start_date: Date, end_date: Date, resource: any, tasks: any[]): void;
+
 	/**
 	 * specifies the CSS class that will be applied to a link
 	 * @param link the link object
@@ -148,6 +178,24 @@ interface GanttTemplates {
 	*/
 	quick_info_title(start: Date, end: Date, task: any): string;
 
+	/**
+	 * defines the CSS class names of cells in the resource timeline cells
+	 * @param start_date start date of the scale cell
+	 * @param end_date end date of the scale cell
+	 * @param resource the resource object
+	 * @param tasks tasks that are assigned to specified resource and overlap start/end dates of the cell
+	*/
+	resource_cell_class(start_date: Date, end_date: Date, resource: any, tasks: any[]): string;
+
+	/**
+	 * defines the HTML content of resource timeline cells
+	 * @param start_date start date of the scale cell
+	 * @param end_date end date of the scale cell
+	 * @param resource the resource object
+	 * @param tasks tasks that are assigned to specified resource and overlap start/end dates of the cell
+	*/
+	resource_cell_value(start_date: Date, end_date: Date, resource: any, tasks: any[]): string;
+
 	/**
 	 * specifies the CSS class that will be applied to cells of the time scale of the timeline area
 	 * @param date the date of a cell
@@ -165,7 +213,7 @@ interface GanttTemplates {
 	 * @param item the task object assigned to the row
 	 * @param date the date of a cell
 	*/
-	task_cell_class(item: Date, date: Date): string;
+	task_cell_class(item: any, date: Date): string;
 
 	/**
 	 * specifies the CSS class that will be applied to task bars
@@ -266,14 +314,9 @@ interface GanttTemplates {
 	 * @param task the task's object
 	*/
 	lightbox_header(start_date: Date, end_date: Date, task: any): string;
-
 }
 
 interface GanttConfigOptions {
-	/**
-	 * sets the date format for addTask() method to
-	*/
-	api_date: string;
 
 	/**
 	 * enables auto scheduling
@@ -281,7 +324,7 @@ interface GanttConfigOptions {
 	auto_scheduling: boolean;
 
 	/**
-	 * allows or forbids creation of links from parent tasks (projects) to their children
+	 * allows or forbids creating links from parent tasks (projects) to their children
 	*/
 	auto_scheduling_descendant_links: boolean;
 
@@ -290,16 +333,36 @@ interface GanttConfigOptions {
 	*/
 	auto_scheduling_initial: boolean;
 
+	/**
+	 * defines whether the whole project will be moved (see the details below)
+	*/
+	auto_scheduling_move_projects: boolean;
+
 	/**
 	 * enables the auto scheduling mode, in which tasks will always be rescheduled to the earliest possible date
 	*/
 	auto_scheduling_strict: boolean;
 
+	/**
+	 * automatically converts tasks with subtasks to projects and projects without subtasks back to tasks
+	*/
+	auto_types: boolean;
+
 	/**
 	 * enables automatic adjusting of the grid's columns to the grid's width
 	*/
 	autofit: boolean;
 
+	/**
+	 * enables autoscrolling while dragging a task or link out of the current browser screen
+	*/
+	autoscroll: boolean;
+
+	/**
+	 * defines the speed of autoscrolling (in ms) while dragging a task or link out of the current browser screen
+	*/
+	autoscroll_speed: number;
+
 	/**
 	 * forces the Gantt chart to automatically change its size to show all tasks without scrolling
 	*/
@@ -311,10 +374,15 @@ interface GanttConfigOptions {
 	autosize_min_width: number;
 
 	/**
-	 * enables the dynamic loading in the Gantt chart
+	 * enables dynamic loading in the Gantt chart
 	*/
 	branch_loading: boolean;
 
+	/**
+	 * specifies that the task has children that are not yet loaded from the backend
+	*/
+	branch_loading_property: string;
+
 	/**
 	 * stores a collection of buttons resided in the left bottom corner of the lightbox
 	*/
@@ -325,6 +393,16 @@ interface GanttConfigOptions {
 	*/
 	buttons_right: any[];
 
+	/**
+	 * changes the name of the property that affects binding of a calendar to a task/group of tasks
+	*/
+	calendar_property: string;
+
+	/**
+	 * enables cascade deleting of nested tasks and links
+	*/
+	cascade_delete: boolean;
+
 	/**
 	 * configures the columns of the table
 	*/
@@ -380,6 +458,11 @@ interface GanttConfigOptions {
 	*/
 	drag_progress: boolean;
 
+	/**
+	 * enables drag and drop of items of the project type
+	*/
+	drag_project: boolean;
+
 	/**
 	 * enables the possibility to resize tasks by drag-and-drop
 	*/
@@ -400,6 +483,11 @@ interface GanttConfigOptions {
 	*/
 	editable_property: string;
 
+	/**
+	 * an object that contains definitions of inline editors
+	*/
+	editor_types: any;
+
 	/**
 	 * sets the  end value of the time scale
 	*/
@@ -426,7 +514,7 @@ interface GanttConfigOptions {
 	grid_resizer_column_attribute: string;
 
 	/**
-	 * sets the maximum width of the grid
+	 * sets the width of the grid
 	*/
 	grid_width: number;
 
@@ -446,15 +534,30 @@ interface GanttConfigOptions {
 	initial_scroll: boolean;
 
 	/**
-	 * 'says' to preserve the initial grid's width during resizing the columns within
+	 * 'says' to preserve the initial grid's width while resizing columns within
 	*/
 	keep_grid_width: boolean;
 
+	/**
+	 * enables keyboard navigation in gantt
+	*/
+	keyboard_navigation: boolean;
+
+	/**
+	 * enables keyboard navigation by cells
+	*/
+	keyboard_navigation_cells: boolean;
+
 	/**
 	 * sets the name of the attribute of the task layer's DOM element
 	*/
 	layer_attribute: string;
 
+	/**
+	 * specifies the layout object
+	*/
+	layout: any;
+
 	/**
 	 * specifies the lightbox object
 	*/
@@ -496,7 +599,7 @@ interface GanttConfigOptions {
 	min_column_width: number;
 
 	/**
-	 * sets the minimum step (in milliseconds) for task's time values
+	 * Sets the minimum duration (in milliseconds) that can be set for a task during resizing.
 	*/
 	min_duration: number;
 
@@ -521,15 +624,20 @@ interface GanttConfigOptions {
 	open_tree_initially: boolean;
 
 	/**
-	 * activates the 'branch' mode that allows dragging tasks only within the parent branch
+	 * activates the 'branch' mode that allows reordering tasks within the same nesting level
 	*/
-	order_branch: boolean;
+	order_branch: string|boolean;
 
 	/**
-	 * activates the 'branch' mode that allows dragging tasks within the whole gantt
+	 * activates the 'branch' mode that allows reordering tasks within the whole gantt
 	*/
 	order_branch_free: boolean;
 
+	/**
+	 * adds an empty row into the end of the list of tasks to simplify tasks editing via keyboard
+	*/
+	placeholder_task: boolean;
+
 	/**
 	 * preserves the current position of the vertical and horizontal scrolls while re-drawing the gantt chart
 	*/
@@ -565,6 +673,26 @@ interface GanttConfigOptions {
 	*/
 	redo: boolean;
 
+	/**
+	 * defines a set of working calendars that can be assigned to a specific resource, e.g. a user
+	*/
+	resource_calendars: any;
+
+	/**
+	 * defines the property of a task object that stores a resource id associated with resourceGrid/Timeline/Histogram
+	*/
+	resource_property: string;
+
+	/**
+	 * tells the resource timeline to render elements and call templates for non-allocated cells
+	*/
+	resource_render_empty_cells: boolean;
+
+	/**
+	 * specifies the name of the dataStore connected to the resourceGrid/resourceTimeline/resourceHistogram views
+	*/
+	resource_store: string;
+
 	/**
 	 * sets the id of the virtual root element
 	*/
@@ -580,6 +708,11 @@ interface GanttConfigOptions {
 	*/
 	row_height: number;
 
+	/**
+	 * switches gantt to the right-to-left mode
+	*/
+	rtl: boolean;
+
 	/**
 	 * sets the height of the time scale and the header of the grid
 	*/
@@ -600,6 +733,11 @@ interface GanttConfigOptions {
 	*/
 	scroll_on_click: boolean;
 
+	/**
+	 * set the sizes of the vertical (width) and horizontal (height) scrolls
+	*/
+	scroll_size: number;
+
 	/**
 	 * enables selection of tasks in the Gantt chart
 	*/
@@ -665,6 +803,11 @@ interface GanttConfigOptions {
 	*/
 	smart_rendering: boolean;
 
+	/**
+	 * specifies that only visible part of the time scale is rendered on the screen
+	*/
+	smart_scales: boolean;
+
 	/**
 	 * enables sorting in the table
 	*/
@@ -676,7 +819,7 @@ interface GanttConfigOptions {
 	start_date: Date;
 
 	/**
-	 * sets the start day of weeks
+	 * sets the starting day of the week
 	*/
 	start_on_monday: boolean;
 
@@ -731,12 +874,12 @@ interface GanttConfigOptions {
 	tooltip_hide_timeout: number;
 
 	/**
-	 * sets the  the right (if positive) offset of the tooltip's position
+	 * sets the right (if positive) offset of the tooltip's position
 	*/
 	tooltip_offset_x: number;
 
 	/**
-	 * sets the  the top (if positive) offset of the tooltip's position
+	 * sets the top (if positive) offset of the tooltip's position
 	*/
 	tooltip_offset_y: number;
 
@@ -756,10 +899,15 @@ interface GanttConfigOptions {
 	touch_drag: number|boolean;
 
 	/**
-	 * enables/disables vibration while moving tasks on touch devices
+	 * returns vibration feedback before/after drag and drop on touch devices
 	*/
 	touch_feedback: boolean;
 
+	/**
+	 * defines the duration of vibration feedback before/after drag and drop on touch devices (in milliseconds)
+	*/
+	touch_feedback_duration: number;
+
 	/**
 	 * redefines functions responsible for displaying different types of tasks
 	*/
@@ -790,33 +938,33 @@ interface GanttConfigOptions {
 	*/
 	undo_types: any;
 
+	/**
+	 * enables WAI-ARIA support to make the component recognizable for screen readers
+	*/
+	wai_aria_attributes: boolean;
+
 	/**
 	 * enables calculating the duration of tasks in working time instead of calendar time
 	*/
 	work_time: boolean;
 
 	/**
-	 * sets the date format that is used to parse data from the data set
+	 * defines date formats that are used to parse data from a data set and to send data to a server
 	*/
 	xml_date: string;
-
 }
 
 interface GanttDateHelpers {
 	add(origin: Date, count: number, unit: string): Date;
 	copy(origin: Date): Date;
-
 	date_part(origin: Date): Date;
 	time_part(origin: Date): Date;
-
 	day_start(origin: Date): Date;
 	month_start(origin: Date): Date;
 	week_start(origin: Date): Date;
 	year_start(origin: Date): Date;
-
 	getISOWeek(origin: Date): number;
 	getUTCISOWeek(origin: Date): number;
-
 	date_to_str(format: string): any;
 	str_to_date(format: string): any;
 	convert_to_utc(origin: Date): Date;
@@ -828,8 +976,6 @@ interface GanttHotkeys {
 	edit_cancel: number;
 }
 
-//Gantt.locale
-
 interface GanttLocaleDate {
 	month_full: string[];
 	month_short: string[];
@@ -867,22 +1013,102 @@ interface GanttLocale {
 }
 
 interface GanttEnterprise {
-	/**
-	 * Creates a new instance of Gantt
-	 */
 	getGanttInstance(): GanttStatic;
 }
 
 interface GanttStatic {
-	templates: GanttTemplates;
-	config: GanttConfigOptions;
-	date: GanttDateHelpers;
-	keys: GanttHotkeys;
-	skin: string;
-	version: string;
-	locale: GanttLocale;
+
+	/**
+	 * redefines the default click behavior for buttons of the Gantt chart
+	*/
 	$click: any;
 
+	/**
+	 * dhtmlx ajax module
+	*/
+	ajax: any;
+
+	/**
+	 * the interface of the working calendar object
+	*/
+	calendar: any;
+
+	/**
+	 * defines configuration options for dates, scale, controls
+	*/
+	config: GanttConfigOptions;
+
+	/**
+	 * stores various constants to reduce the use of magic numbers in the code
+	*/
+	constants: any;
+
+	/**
+	 * a set of date formatting methods
+	*/
+	date: GanttDateHelpers;
+
+	/**
+	 * a set of flags which describe current environment
+	*/
+	env: any;
+
+	/**
+	 * an object that stores various extensions
+	*/
+	ext: any;
+
+	/**
+	 * specifies JSON serialization and parsing
+	*/
+	json: any;
+
+	/**
+	 * defines the hot keys for the Gantt chart
+	*/
+	keys: GanttHotkeys;
+
+	/**
+	 * a locale object (region-specific labels) of the Gantt chart
+	*/
+	locale: GanttLocale;
+
+	/**
+	 * specifies serialization and parsing in the XML format of dhtmlxGantt 1.0
+	*/
+	oldxml: any;
+
+	/**
+	 * returns the current skin of the Gantt chart
+	*/
+	skin: string;
+
+	/**
+	 * returns objects of the available skins
+	*/
+	skins: any;
+
+	/**
+	 * defines formatting templates for dates, titles, tooltips in the Gantt chart
+	*/
+	templates: GanttTemplates;
+
+	/**
+	 * returns the version of dhtmlxGantt
+	*/
+	version: string;
+
+	/**
+	 * specifies XML serialization and parsing
+	*/
+	xml: any;
+
+	/**
+	 * adds a calendar into Gantt
+	 * @param calendar an object with configuration of the calendar
+	*/
+	addCalendar(calendar: any): number;
+
 	/**
 	 * adds a new dependency link
 	 * @param link the link object
@@ -890,10 +1116,10 @@ interface GanttStatic {
 	addLink(link: any): string|number;
 
 	/**
-	 * displayes an additional layer with custom elements for a link in the timeline area
-	 * @param func a render function  or a config object
+	 * displays an additional layer with custom elements for a link in the timeline area
+	 * @param func a render function or a config object
 	*/
-	addLinkLayer(func: GanttCallback|any): string;
+	addLinkLayer(func: any): string;
 
 	/**
 	 * adds a marker to the timeline area
@@ -901,25 +1127,33 @@ interface GanttStatic {
 	*/
 	addMarker(marker: any): string;
 
+	/**
+	 * adds a new keyboard shortcut
+	 * @param shortcut the key name or the name of keys combination for a shortcut (<a href="desktop/keyboard_navigation.md#shortcutsyntax">shortcut syntax</a>)
+	 * @param handler the handler of the shortcut call
+	 * @param scope the name of the context element to attach the handler function to (<a href="desktop/keyboard_navigation.md#scopes">list of scopes</a>)
+	*/
+	addShortcut(shortcut: string, handler: GanttCallback, scope: string): void;
+
 	/**
 	 * adds a new task
 	 * @param task the task object
 	 * @param parent the parent's id
-	 * @param index optional, the position the task will be added into (0 or greater)
+	 * @param index optional, optional, the position the task will be added into (0 or greater)
 	*/
 	addTask(task: any, parent: string, index?: number): string|number;
 
 	/**
-	 * displayes an additional layer with custom elements for a task in the timeline area
-	 * @param func a render function  or a config object
+	 * displays an additional layer with custom elements for a task in the timeline area
+	 * @param func a render function or a config object
 	*/
-	addTaskLayer(func: GanttCallback|any): string;
+	addTaskLayer(func: any): string;
 
 	/**
 	 * calls an alert message box
 	 * @param config the alert box's configuration
 	*/
-	alert(config: any): void;
+	alert(config: any): HTMLElement;
 
 	/**
 	 * if the specified expression is false, an errorMessage is shown in the red popup at the top right corner of the screen
@@ -937,8 +1171,9 @@ interface GanttStatic {
 
 	/**
 	 * recalculates the schedule of the project
+	 * @param taskId optional, optional, the task id
 	*/
-	autoSchedule(): void;
+	autoSchedule(taskId?: string|number): void;
 
 	/**
 	 * updates multiple tasks/links at once
@@ -955,18 +1190,15 @@ interface GanttStatic {
 
 	/**
 	 * calculates the duration of a task
-	 * @param start the date when a task is scheduled to begin
-	 * @param end the date when a task is scheduled to be completed
+	 * @param config the <a href="#configurationobjectproperties">configuration object</a> of a time span
 	*/
-	calculateDuration(start: Date, end: Date): number;
+	calculateDuration(config: any): number;
 
 	/**
 	 * calculates the end date of a task
-	 * @param start the date when a task is scheduled to begin
-	 * @param duration the duration of a task
-	 * @param unit the time unit of the duration
+	 * @param config the <a href="#configurationobjectproperties">configuration object</a> of a time span
 	*/
-	calculateEndDate(start: Date, duration: number, unit: string): Date;
+	calculateEndDate(config: any): Date;
 
 	/**
 	 * calculates the level of a task
@@ -982,10 +1214,10 @@ interface GanttStatic {
 	callEvent(name: string, params: any[]): boolean;
 
 	/**
-	 * changes the name of the lighbox's structure defined for  of the task
-	 * @param id the task id
+	 * repaints the lighbox for the task according to its type
+	 * @param type the task type
 	*/
-	changeLightboxType(id: string|number): void;
+	changeLightboxType(type: string): void;
 
 	/**
 	 * changes the link's id
@@ -1008,10 +1240,20 @@ interface GanttStatic {
 	checkEvent(name: GanttEventName): boolean;
 
 	/**
-	 * removes all tasks from the Gantt chart
+	 * removes all tasks and additional elements (including markers) from the Gantt chart
 	*/
 	clearAll(): void;
 
+	/**
+	 * clears the stack of stored redo commands
+	*/
+	clearRedoStack(): void;
+
+	/**
+	 * clears the stack of stored undo commands
+	*/
+	clearUndoStack(): void;
+
 	/**
 	 * closes the branch with the specified id
 	 * @param id the branch id
@@ -1023,11 +1265,17 @@ interface GanttStatic {
 	*/
 	collapse(): void;
 
+	/**
+	 * returns the index of the column by the date
+	 * @param date a date object
+	*/
+	columnIndexByDate(date: Date): void;
+
 	/**
 	 * calls a confirm message box
 	 * @param config the confirm box's configuration
 	*/
-	confirm(config: any): void;
+	confirm(config: any): HTMLElement;
 
 	/**
 	 * creates a deep copy of provided object
@@ -1041,11 +1289,23 @@ interface GanttStatic {
 	*/
 	correctTaskWorkTime(task: any): void;
 
+	/**
+	 * creates a working calendar
+	 * @param parentCalendar optional, (optional) an existing calendar that is used for creating a new one on the base of it
+	*/
+	createCalendar(parentCalendar?: any): void;
+
+	/**
+	 * creates a datastore according to the provided configuration
+	 * @param config a configuration object of a datastore
+	*/
+	createDatastore(config: any): void;
+
 	/**
 	 * adds a new task and opens the lightbox to confirm
 	 * @param task the task object
 	 * @param parent the parent's id
-	 * @param index optional, the position the task will be added into (0 or greater)
+	 * @param index optional, optional, the position the task will be added into (0 or greater)
 	*/
 	createTask(task: any, parent: string, index?: number): string|number;
 
@@ -1056,7 +1316,7 @@ interface GanttStatic {
 	dataProcessor(url: string): void;
 
 	/**
-	 * returns the date of the specified horizontal position in the chart area
+	 * gets the date of the specified horizontal  position in the chart area
 	 * @param pos the relative horizontal position you want to know the date of
 	*/
 	dateFromPos(pos: number): Date;
@@ -1067,6 +1327,12 @@ interface GanttStatic {
 	*/
 	defined(task: any): boolean;
 
+	/**
+	 * deletes a task calendar by its id
+	 * @param id the id of the calendar
+	*/
+	deleteCalendar(id: string|number): void;
+
 	/**
 	 * deletes the specified dependency link
 	 * @param id the dependency link's id
@@ -1083,7 +1349,12 @@ interface GanttStatic {
 	 * deletes the specified  task
 	 * @param id the task's id
 	*/
-	deleteTask(id: string): void;
+	deleteTask(id: string|number): void;
+
+	/**
+	 * destroys the gantt instance
+	*/
+	destructor(): void;
 
 	/**
 	 * detaches all events from dhtmlxGantt (both custom and inner)
@@ -1096,6 +1367,14 @@ interface GanttStatic {
 	*/
 	detachEvent(id: string): void;
 
+	/**
+	 * iterates over all parent tasks of the specified task in the Gantt chart
+	 * @param code a function that will iterate over tasks. Takes a task object as a parameter
+	 * @param startTask the id of the item the parent tasks of which should be iterated over
+	 * @param master optional, the object, that 'this'  will refer to
+	*/
+	eachParent(code: GanttCallback, startTask: string|number, master?: any): void;
+
 	/**
 	 * iterates over all selected tasks in the Gantt chart
 	 * @param code a function that will iterate over tasks. Takes a task id as a parameter
@@ -1103,10 +1382,10 @@ interface GanttStatic {
 	eachSelectedTask(code: GanttCallback): void;
 
 	/**
-	 * iterates over specified tasks in the Gantt chart
+	 * iterates over all child tasks in the Gantt chart
 	 * @param code a function that will iterate over tasks. Takes a task object as a parameter
-	 * @param parent the parent id. If specified, the function will iterate over childs of the <br> specified parent
-	 * @param master the object, that 'this'  will refer to
+	 * @param parent optional, the parent id. If specified, the function will iterate over childs of the <br> specified parent
+	 * @param master optional, the object, that 'this'  will refer to
 	*/
 	eachTask(code: GanttCallback, parent?: string|number, master?: any): void;
 
@@ -1115,21 +1394,81 @@ interface GanttStatic {
 	 * @param node the HTML node or its id
 	 * @param event the name of an HTML event (without the 'on' prefix)
 	 * @param handler the event handler
-	 * @param master an object that the <i>this</i> keyword refers to
+	 * @param options optional, optional, the value of either the <i>useCapture</i> or <i>options</i> parameter. <a href="https://developer.mozilla.org/en-US/docs/Web/API/EventTarget/addEventListener">Read details</a>
 	*/
-	event(node: HTMLElement|string, event: string, handler: GanttCallback, master?: any): string;
+	event(node: HTMLElement|string, event: string, handler: GanttCallback, options?: any): void;
 
 	/**
 	 * removes an event handler from an HTML element
-	 * @param id the id of an event handler
+	 * @param node the HTML node or its id
+	 * @param event the name of an HTML event (without the 'on' prefix)
+	 * @param handler the event handler
+	 * @param options optional, optional, the value of either the <i>useCapture</i> or <i>options</i> parameter. <a href="https://developer.mozilla.org/en-US/docs/Web/API/EventTarget/removeEventListener">Read details</a>
 	*/
-	eventRemove(id: string): void;
+	eventRemove(node: HTMLElement|string, event: string, handler: GanttCallback, options?: any): void;
 
 	/**
 	 * expands gantt to the full screen mode
 	*/
 	expand(): void;
 
+	/**
+	 * exports data from the Gantt chart to an Excel document
+	 * @param _export_ an object with export settings (see the details)
+	*/
+	exportToExcel(_export_: any): void;
+
+	/**
+	 * exports data from the Gantt chart to an iCal string
+	 * @param _export_ an object with export settings (see the details)
+	*/
+	exportToICal(_export_: any): void;
+
+	/**
+	 * exports the structure and data of a Gantt chart into a JSON object
+	 * @param config an object with Gantt configuration
+	*/
+	exportToJSON(config: any): void;
+
+	/**
+	 * exports data from the Gantt chart to MS Project
+	 * @param _export_ an object with export settings (see the details)
+	*/
+	exportToMSProject(_export_: any): void;
+
+	/**
+	 * exports a Gantt chart into the PDF format
+	 * @param _export_ an object with export settings (see the details)
+	*/
+	exportToPDF(_export_: any): void;
+
+	/**
+	 * exports a Gantt chart into the PNG format
+	 * @param _export_ an object with export settings (see the details)
+	*/
+	exportToPNG(_export_: any): void;
+
+	/**
+	 * returns all dependency loops in the chart
+	*/
+	findCycles(): any[];
+
+	/**
+	 * sets focus on the gantt
+	*/
+	focus(): void;
+
+	/**
+	 * gets worktime calendar by id
+	 * @param calendarId the id of the global calendar or "global"
+	*/
+	getCalendar(calendarId: string|number): any;
+
+	/**
+	 * gets all the calendars added into Gantt
+	*/
+	getCalendars(): any[];
+
 	/**
 	 * returns the 1st-level child tasks of the specified parent branch
 	 * @param id the parent branch's id
@@ -1143,10 +1482,34 @@ interface GanttStatic {
 	getClosestWorkTime(config: any): Date;
 
 	/**
-	 * get the index of a task in the tree
+	 * returns the index of the column by its name
+	 * @param name the name of the column
+	*/
+	getColumnIndex(name: string): number;
+
+	/**
+	 * returns all tasks and links that a task is connected with
+	 * @param id optional, optional, the id of a task
+	*/
+	getConnectedGroup(id?: string|number): any;
+
+	/**
+	 * returns the configuration object of a datastore
+	 * @param name the name of the datastore
+	*/
+	getDatastore(name: string): any;
+
+	/**
+	 * returns the free slack of a task
+	 * @param task the object of a task
+	*/
+	getFreeSlack(task: any): number;
+
+	/**
+	 * gets the index of a task in the tree
 	 * @param id the task id
 	*/
-	getGlobalTaskIndex(id: string|number): void;
+	getGlobalTaskIndex(id: string|number): number;
 
 	/**
 	 * gets the configuration object of a column
@@ -1251,10 +1614,21 @@ interface GanttStatic {
 	getPrevSibling(id: string|number): string|number;
 
 	/**
-	 * returns the stack of stored redo commands
+	 * returns the stack of stored redo user actions
 	*/
 	getRedoStack(): any[];
 
+	/**
+	 * returns all tasks assigned to the resource
+	 * @param resourceId the id of the resource
+	*/
+	getResourceAssignments(resourceId: string|number): any[];
+
+	/**
+	 * returns the configuration of the time scale
+	*/
+	getScale(): any;
+
 	/**
 	 * returns the scroll position
 	*/
@@ -1263,13 +1637,20 @@ interface GanttStatic {
 	/**
 	 * returns the id of the selected task
 	*/
-	getSelectedId(): string|number;
+	getSelectedId(): string;
 
 	/**
 	 * returns an array of the currently selected tasks
 	*/
 	getSelectedTasks(): any[];
 
+	/**
+	 * gets a key navigation shortcut handler
+	 * @param shortcut the key name or the name of keys combination for a shortcut (<a href="desktop/keyboard_navigation.md#shortcutsyntax">shortcut syntax</a>)
+	 * @param scope the name of the context element to attach the handler function to (<a href="desktop/keyboard_navigation.md#scopes">list of scopes</a>)
+	*/
+	getShortcutHandler(shortcut: string, scope: string): GanttCallback;
+
 	/**
 	 * returns siblings of the specified  task (including itself)
 	 * @param id the task id
@@ -1290,30 +1671,66 @@ interface GanttStatic {
 
 	/**
 	 * calculates the combined start/end dates of tasks nested in a project or another task
-	 * @param task_id the task's id, api/gantt_root_id_config.md will be used if not specified
+	 * @param task_id optional, the task's id, api/gantt_root_id_config.md will be used if not specified
 	*/
 	getSubtaskDates(task_id?: string|number): any;
 
+	/**
+	 * calculates the combined duration of tasks nested in a project or another task.
+	 * @param task_id optional, the task's id, api/gantt_root_id_config.md will be used if not specified
+	*/
+	getSubtaskDuration(task_id?: string|number): number;
+
 	/**
 	 * returns the task object
 	 * @param id the task id
 	*/
 	getTask(id: string|number): any;
 
+	/**
+	 * finds a task by the specified criteria
+	 * @param propertyName the name of the property to match, or a filter function
+	 * @param propertyValue the property value
+	*/
+	getTaskBy(propertyName: string|GanttCallback, propertyValue: any): any[];
+
+	/**
+	 * returns a task by its index
+	 * @param index the task index in the tree (zero-based numbering)
+	*/
+	getTaskByIndex(index: number): any;
+
 	/**
 	 * returns a collection of tasks which occur during the specified period
-	 * @param from the start date of the period
-	 * @param to the end date of the period
+	 * @param from optional, the start date of the period
+	 * @param to optional, the end date of the period
 	*/
 	getTaskByTime(from?: Date, to?: Date): any[];
 
+	/**
+	 * returns a task by its WBS code
+	 * @param code the WBS code of the task
+	*/
+	getTaskByWBSCode(code: string): any;
+
+	/**
+	 * gets a calendar assigned to the specified task (a task level calendar)
+	 * @param task the object of a task
+	*/
+	getTaskCalendar(task: any): any;
+
 	/**
 	 * gets the number of tasks that are currently loaded in the gantt
 	*/
 	getTaskCount(): number;
 
 	/**
-	 * get the index of a task in the branch
+	 * returns the visible height of a task
+	*/
+	getTaskHeight(): number;
+
+	/**
+	 * gets the index of a task in the branch
 	 * @param id the task id
 	*/
 	getTaskIndex(id: string|number): number;
@@ -1345,7 +1762,19 @@ interface GanttStatic {
 	getTaskTop(id: number|string): number;
 
 	/**
-	 * returns the stack of stored undo commands
+	 * returns the type of a task
+	 * @param task the task object
+	*/
+	getTaskType(task: any): string;
+
+	/**
+	 * returns the total slack of a task
+	 * @param task the object of a task
+	*/
+	getTotalSlack(task: any): number;
+
+	/**
+	 * returns the stack of stored undo user actions
 	*/
 	getUndoStack(): any[];
 
@@ -1354,6 +1783,12 @@ interface GanttStatic {
 	*/
 	getVisibleTaskCount(): number;
 
+	/**
+	 * returns the WBS code (the outline number) of a task
+	 * @param task the object of a task
+	*/
+	getWBSCode(task: any): string;
+
 	/**
 	 * returns the working hours of the specified date
 	 * @param date a date to check
@@ -1374,7 +1809,7 @@ interface GanttStatic {
 
 	/**
 	 * hides the lightbox modal overlay that blocks interactions with the remaining screen
-	 * @param box an element to hide
+	 * @param box optional, an element to hide
 	*/
 	hideCover(box?: HTMLElement): void;
 
@@ -1388,11 +1823,23 @@ interface GanttStatic {
 	*/
 	hideQuickInfo(): void;
 
+	/**
+	 * converts an Excel file to JSON
+	 * @param config an object with configuration properties of an imported file
+	*/
+	importFromExcel(config: any): void;
+
+	/**
+	 * converts an XML or MPP MS Project file to JSON
+	 * @param config an object with configuration properties of an imported file
+	*/
+	importFromMSProject(config: any): void;
+
 	/**
 	 * constructor. Initializes a dhtmlxGantt object
 	 * @param container an HTML container ( or its id) where a dhtmlxGantt object will be initialized
-	 * @param from the start value of the time scale	(X&ndash;Axis)
-	 * @param to the end value of the time scale (X&ndash;Axis)
+	 * @param from optional, the start value of the time scale	(X&ndash;Axis)
+	 * @param to optional, the end value of the time scale (X&ndash;Axis)
 	*/
 	init(container: string|HTMLElement, from?: Date, to?: Date): void;
 
@@ -1403,6 +1850,12 @@ interface GanttStatic {
 	*/
 	isChildOf(childId: string|number, parentId: string|number): boolean;
 
+	/**
+	 * checks whether the link is circular
+	 * @param link the link object
+	*/
+	isCircularLink(link: any): boolean;
+
 	/**
 	 * checks whether the specified link is critical
 	 * @param link the link's object
@@ -1427,12 +1880,30 @@ interface GanttStatic {
 	*/
 	isLinkExists(id: string|number): boolean;
 
+	/**
+	 * checks whether the specified task or link is read-only
+	 * @param id the task/link id
+	*/
+	isReadonly(id: string|number): boolean;
+
 	/**
 	 * checks whether the specified task is currently selected
 	 * @param task the task's id
 	*/
 	isSelectedTask(task: string|number): boolean;
 
+	/**
+	 * checks whether the specified task is split
+	 * @param task the object of a task
+	*/
+	isSplitTask(task: any): boolean;
+
+	/**
+	 * checks whether the specified task is summary
+	 * @param task the object of a task
+	*/
+	isSummaryTask(task: any): boolean;
+
 	/**
 	 * checks whether the specified task exists
 	 * @param id the task id
@@ -1453,16 +1924,15 @@ interface GanttStatic {
 
 	/**
 	 * checks whether the specified date is working or not
-	 * @param date a date to check
-	 * @param timeunit a time unit: 'hour' or 'day'.<br> If not specified, the value of 'gantt.config.duration_unit'  is used
+	 * @param config the configuration object of a time span
 	*/
-	isWorkTime(date: Date, timeunit: string): boolean;
+	isWorkTime(config: any): boolean;
 
 	/**
 	 * loads data to the gantt from an external data source
 	 * @param url the server-side url (may be a static file or a server side script that outputs data)
-	 * @param type <i>('json', 'xml', 'oldxml')</i> the data type. The default value - <i>'json'</i>
-	 * @param callback the callback function
+	 * @param type optional, <i>('json', 'xml', 'oldxml')</i> the data type. The default value - <i>'json'</i>
+	 * @param callback optional, the callback function
 	*/
 	load(url: string, type?: string, callback?: GanttCallback): void;
 
@@ -1476,7 +1946,7 @@ interface GanttStatic {
 	 * calls a message box of the specified type
 	 * @param config the message box's configuration
 	*/
-	message(config: any): void;
+	message(config: any): HTMLElement;
 
 	/**
 	 * adds properties of the 'source' object into the 'target' object
@@ -1488,15 +1958,15 @@ interface GanttStatic {
 
 	/**
 	 * calls a modalbox
-	 * @param config the modal box' configuration
+	 * @param config the modal box's configuration
 	*/
-	modalbox(config: any): void;
+	modalbox(config: any): HTMLElement;
 
 	/**
 	 * moves a task to a new position
 	 * @param sid the id of the task to move
 	 * @param tindex the index of the position that the task will be moved to <br> (the index within a branch)
-	 * @param parent the parent id. If specified, the <b>tindex</b> will  refer to the  index in the <br> <b>'parent'</b> branch
+	 * @param parent optional, the parent id. If specified, the <b>tindex</b> will  refer to the  index in the <br> <b>'parent'</b> branch
 	*/
 	moveTask(sid: string|number, tindex: number, parent?: string|number): void;
 
@@ -1509,9 +1979,9 @@ interface GanttStatic {
 	/**
 	 * loads data from a client-side resource
 	 * @param url a string or object which represents data
-	 * @param type ( <i>'json', 'xml'</i> ) the data type. The default value - <i>'json'</i>
+	 * @param type optional, optional, (<i>'json', 'xml'</i>) the data type. The default value - <i>'json'</i>
 	*/
-	parse(url: string|any, type?: string): void;
+	parse(url: any, type?: string): void;
 
 	/**
 	 * gets the relative horizontal position of the specified date in the chart area
@@ -1538,8 +2008,9 @@ interface GanttStatic {
 	/**
 	 * refreshes the task and its related links
 	 * @param id the task id
+	 * @param refresh_links optional, optional, defines whether links related to the task should be refreshed, <em>true</em> by default
 	*/
-	refreshTask(id: string|number): void;
+	refreshTask(id: string|number, refresh_links?: boolean): void;
 
 	/**
 	 * removes the specified layer related to a link
@@ -1547,6 +2018,13 @@ interface GanttStatic {
 	*/
 	removeLinkLayer(layerId: string): void;
 
+	/**
+	 * removes a keyboard shortcut
+	 * @param shortcut the key name or the name of keys combination for a shortcut (<a href="desktop/keyboard_navigation.md#shortcutsyntax">shortcut syntax</a>)
+	 * @param scope the element to which the shortcut is attached (<a href="desktop/keyboard_navigation.md#scopes">list of scopes</a>)
+	*/
+	removeShortcut(shortcut: string, scope: any): void;
+
 	/**
 	 * removes the specified layer related to a task
 	 * @param layerId a DOM element that will be displayed in the layer
@@ -1569,7 +2047,7 @@ interface GanttStatic {
 	resetLightbox(): void;
 
 	/**
-	 * re-calculates the duration of a project task depending on dates its childs
+	 * re-calculates the duration of a project task depending on the dates of its children
 	 * @param task the task's object
 	*/
 	resetProjectDates(task: any): void;
@@ -1598,8 +2076,8 @@ interface GanttStatic {
 
 	/**
 	 * scrolls the Gantt container to the specified position
-	 * @param x the value of the horizontal scroll or 'null' (to not display the horizontal scroll)
-	 * @param y the value of the vertical scroll or 'null' (to not display the vertical scroll)
+	 * @param x value of horizontal scroll or 'null' (if the scroll position shouldn't be changed)
+	 * @param y value of vertical scroll or 'null' (if the scroll position shouldn't be changed)
 	*/
 	scrollTo(x: number, y: number): void;
 
@@ -1611,16 +2089,16 @@ interface GanttStatic {
 
 	/**
 	 * serializes the data into JSON or XML format
-	 * @param type the format that the data will be serialized into. <br> Possible values: 'json' (<i>default</i> ), 'xml'.
+	 * @param type optional, the format that the data will be serialized into. <br> Possible values: 'json' (<i>default</i> ), 'xml'.
 	*/
 	serialize(type?: string): void;
 
 	/**
 	 * returns a list of options
 	 * @param list_name the name of a list
-	 * @param options an array of options
+	 * @param options optional, an array of options
 	*/
-	serverList(list_name: string, options?: any[]): void;
+	serverList(list_name: string, options?: any[]): any[];
 
 	/**
 	 * set the parent for a task
@@ -1642,7 +2120,7 @@ interface GanttStatic {
 
 	/**
 	 * shows the lightbox modal overlay that blocks interactions with the remaining screen
-	 * @param box an element to hide
+	 * @param box optional, an element to hide
 	*/
 	showCover(box?: HTMLElement): void;
 
@@ -1671,11 +2149,11 @@ interface GanttStatic {
 	showTask(id: string|number): void;
 
 	/**
-	 * sorts the tasks in the grid
-	 * @param field the name of the column that the  grid will be sorted by or a custom <br> sorting function
-	 * @param desc specifies the sorting direction: <i>true</i> - descending sort and <i>false</i> - ascending<br> sort. By default, <i>false</i>
-	 * @param parent the id of the parent task. Specify the parameter if you want to sort tasks only in <br> the branch of the specified parent.
-	 * @param silent specifies whether rendering shall be invoked after reordering items
+	 * sorts tasks in the grid
+	 * @param field the name of the column that the  grid will be sorted by or a custom sorting function
+	 * @param desc optional, specifies the sorting direction: <i>true</i> - descending sort and <i>false</i> - ascending<br> sort. By default, <i>false</i>
+	 * @param parent optional, the id of the parent task. Specify the parameter if you want to sort tasks only in the branch of the specified parent.
+	 * @param silent optional, specifies whether rendering should be invoked after reordering items
 	*/
 	sort(field: string|GanttCallback, desc?: boolean, parent?: string|number, silent?: boolean): void;
 
@@ -1697,8 +2175,15 @@ interface GanttStatic {
 
 	/**
 	 * removes selection from the selected task
+	 * @param id optional, optional, the id of the task to remove selection from, see details
 	*/
-	unselectTask(): void;
+	unselectTask(id?: string|number): void;
+
+	/**
+	 * unsets a working time in the Gantt Chart
+	 * @param config the configuration object of a time span
+	*/
+	unsetWorkTime(config: any): void;
 
 	/**
 	 * updates the specified collection with new options
@@ -1724,11 +2209,8 @@ interface GanttStatic {
 	 * @param id the task id
 	*/
 	updateTask(id: string): void;
-
 }
 
-
-
 declare var gantt: GanttStatic;
 declare var Gantt: GanttEnterprise;
 
@@ -1737,5 +2219,5 @@ declare module "gantt" {
 }
 
 declare module "Gantt" {
-    export = GanttEnterprise;
-}
+    export = Gantt;
+}
\ No newline at end of file

From f76c861cc9a2aeeadf2e6373313b4b24f9549ba8 Mon Sep 17 00:00:00 2001
From: Tyler <tyler.evans116@gmail.com>
Date: Mon, 3 Dec 2018 09:23:25 -0700
Subject: [PATCH 570/836] drop children prop

---
 types/react-flatpickr/index.d.ts                |  1 -
 types/react-flatpickr/react-flatpickr-tests.tsx | 13 -------------
 2 files changed, 14 deletions(-)

diff --git a/types/react-flatpickr/index.d.ts b/types/react-flatpickr/index.d.ts
index 5e3b12fdf8..c867527b06 100644
--- a/types/react-flatpickr/index.d.ts
+++ b/types/react-flatpickr/index.d.ts
@@ -20,7 +20,6 @@ export interface DateTimePickerProps {
     onValueUpdate?: flatpickr.Options.Hook;
     onDayCreate?: flatpickr.Options.Hook;
     value?: string | Date | number | ReadonlyArray<string | Date | number>;
-    children?: JSX.Element | JSX.Element[];
 }
 
 export default class DatePicker extends Component<DateTimePickerProps> {}
diff --git a/types/react-flatpickr/react-flatpickr-tests.tsx b/types/react-flatpickr/react-flatpickr-tests.tsx
index c51f527707..7a1c64c266 100644
--- a/types/react-flatpickr/react-flatpickr-tests.tsx
+++ b/types/react-flatpickr/react-flatpickr-tests.tsx
@@ -40,16 +40,3 @@ const valueDateArrayElement = (
 const valueNumberArrayElement = (
     <DatePicker value={[1543516477474, 1544549477474]} />
 );
-
-const wrappedElement = (
-    <DatePicker>
-        <input type="text" />
-    </DatePicker>
-);
-
-const wrappedElements = (
-    <DatePicker>
-        <input type="text" />
-        <button data-clear>delete</button>
-    </DatePicker>
-);

From 6323a5a8f02b82c5723bc2d807a64f7c7536bdb0 Mon Sep 17 00:00:00 2001
From: AlexKlimenkov <shurick.klimenkov@gmail.com>
Date: Mon, 3 Dec 2018 19:43:42 +0300
Subject: [PATCH 571/836] [dhtmlxgantt] restore
 calculateDuration/calculateEndDate/isWorkTime signatures

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

diff --git a/types/dhtmlxgantt/index.d.ts b/types/dhtmlxgantt/index.d.ts
index 2ce8793a25..f2e322b0e3 100644
--- a/types/dhtmlxgantt/index.d.ts
+++ b/types/dhtmlxgantt/index.d.ts
@@ -1188,12 +1188,27 @@ interface GanttStatic {
 	*/
 	bind(method: GanttCallback, thisArg: any): GanttCallback;
 
+	/**
+	 * calculates the duration of a task
+	 * @param start the date when a task is scheduled to begin
+	 * @param end the date when a task is scheduled to be completed
+	*/
+	calculateDuration(start: Date, end: Date): number;
+
 	/**
 	 * calculates the duration of a task
 	 * @param config the <a href="#configurationobjectproperties">configuration object</a> of a time span
 	*/
 	calculateDuration(config: any): number;
 
+	/**
+	 * calculates the end date of a task
+	 * @param start the date when a task is scheduled to begin
+	 * @param duration the duration of a task
+	 * @param unit the time unit of the duration
+	*/
+	calculateEndDate(start: Date, duration: number, unit: string): Date;
+
 	/**
 	 * calculates the end date of a task
 	 * @param config the <a href="#configurationobjectproperties">configuration object</a> of a time span
@@ -1922,6 +1937,13 @@ interface GanttStatic {
 	*/
 	isUnscheduledTask(task: any): boolean;
 
+	/**
+	 * checks whether the specified date is working or not
+	 * @param date a date to check
+	 * @param timeunit a time unit: 'hour' or 'day'.<br> If not specified, the value of 'gantt.config.duration_unit'  is used
+	*/
+	isWorkTime(date: Date, timeunit: string): boolean;
+
 	/**
 	 * checks whether the specified date is working or not
 	 * @param config the configuration object of a time span

From 3c3c8d08c4731bb69d8a507a1a24741d107c7200 Mon Sep 17 00:00:00 2001
From: Jessica Franco <jessicamfranco3@gmail.com>
Date: Tue, 4 Dec 2018 02:12:08 +0900
Subject: [PATCH 572/836] Remove useMutationEffect (#31013)

https://github.com/facebook/react/pull/14336
---
 types/react/index.d.ts     | 11 -----------
 types/react/test/hooks.tsx |  4 +---
 2 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/types/react/index.d.ts b/types/react/index.d.ts
index f525d7838c..71885b7253 100644
--- a/types/react/index.d.ts
+++ b/types/react/index.d.ts
@@ -834,17 +834,6 @@ declare namespace React {
      */
     // TODO (TypeScript 3.0): <T extends unknown>
     function useRef<T>(initialValue: T|null): RefObject<T>;
-    /**
-     * The signature is identical to `useEffect`, but it fires synchronously during the same phase that
-     * React performs its DOM mutations, before sibling components have been updated. Use this to perform
-     * custom DOM mutations.
-     *
-     * Prefer the standard `useEffect` when possible to avoid blocking visual updates.
-     *
-     * @version experimental
-     * @see https://reactjs.org/docs/hooks-reference.html#usemutationeffect
-     */
-    function useMutationEffect(effect: EffectCallback, inputs?: InputIdentityList): void;
     /**
      * The signature is identical to `useEffect`, but it fires synchronously after all DOM mutations.
      * Use this to read layout from the DOM and synchronously re-render. Updates scheduled inside
diff --git a/types/react/test/hooks.tsx b/types/react/test/hooks.tsx
index c3495dd717..5239d3b522 100644
--- a/types/react/test/hooks.tsx
+++ b/types/react/test/hooks.tsx
@@ -95,11 +95,9 @@ function useEveryHook(ref: React.Ref<{ id: number }>|undefined): () => boolean {
     // $ExpectError
     React.useImperativeMethods(ref, () => ({}), [id]);
 
-    React.useMutationEffect(() => {
+    React.useLayoutEffect(() => {
         setState(1);
         setState(prevState => prevState - 1);
-    }, []);
-    React.useLayoutEffect(() => {
         didLayout.current = true;
     }, []);
     React.useEffect(() => {

From 90913fd842c38307b9a3ec9659e8c1695ddd8f6d Mon Sep 17 00:00:00 2001
From: Ilari Aarnio <ilari.aarnio@futurice.com>
Date: Mon, 3 Dec 2018 19:47:33 +0200
Subject: [PATCH 573/836] Enhance type definitions for boxes and options

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

diff --git a/types/imap-simple/index.d.ts b/types/imap-simple/index.d.ts
index a45629f234..398bcb6a26 100644
--- a/types/imap-simple/index.d.ts
+++ b/types/imap-simple/index.d.ts
@@ -52,8 +52,8 @@ export class ImapSimple extends NodeJS.EventEmitter {
     delBox(boxName: string): Promise<string>;
 
     /** Returns the full list of mailboxes (folders). Upon success, either the provided callback will be called with signature (err, boxes), or the returned promise will be resolved with boxes. Boxes is the exact object returned from the node-imap getBoxes() result. */
-    getBoxes(callback: (err: Error, boxes: any) => void): void;
-    getBoxes(): Promise<any>;
+    getBoxes(callback: (err: Error, boxes: Imap.MailBoxes) => void): void;
+    getBoxes(): Promise<Imap.MailBoxes>;
 
     /** Search for and retrieve mail in the previously opened mailbox. */
     search(searchCriteria: any[], fetchOptions: Imap.FetchOptions, callback: (err: Error, messages: Message[]) => void): void;
@@ -71,8 +71,8 @@ export class ImapSimple extends NodeJS.EventEmitter {
     addMessageLabel(source: string | string[], label: string | string[]): Promise<void>;
 
     /** Appends the argument message to the currently open mailbox or another mailbox. Message is a RFC-822 compatible MIME message. Valid options are mailbox, flags and date. When completed, either calls the provided callback with signature (err), or resolves the returned promise. */
-    append(message: any, options: any, callback: (err: Error) => void): void;
-    append(message: any, options: any): Promise<void>;
+    append(message: any, options: Imap.AppendOptions, callback: (err: Error) => void): void;
+    append(message: any, options: Imap.AppendOptions): Promise<void>;
 
     /** Moves the specified message(s) in the currently open mailbox to another mailbox. source corresponds to a node-imap MessageSource which specifies the messages to be moved. When completed, either calls the provided callback with signature (err), or resolves the returned promise. */
     moveMessage(source: string | string[], boxName: string, callback: (err: Error) => void): void;

From 5a68ad88cdaf234bc74ee5a767ba637f3c2ae680 Mon Sep 17 00:00:00 2001
From: Mark Wolff <marwolff@microsoft.com>
Date: Mon, 3 Dec 2018 09:50:02 -0800
Subject: [PATCH 574/836] Change jsdoc links to url links

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

diff --git a/types/applicationinsights-js/index.d.ts b/types/applicationinsights-js/index.d.ts
index ee509a0eb5..ea80ad1ddb 100644
--- a/types/applicationinsights-js/index.d.ts
+++ b/types/applicationinsights-js/index.d.ts
@@ -671,15 +671,15 @@ declare module Microsoft.ApplicationInsights {
         queue: Array<() => void>;
         /**
          * Starts the timer for tracking a page load time. Use this instead of `trackPageView` if you want to control when the page view timer starts and stops,
-         * but don't want to calculate the duration yourself. This method doesn't send any telemetry. Call `stopTrackPage` to log the end of the page view
+         * but don't want to calculate the duration yourself. This method doesn't send any telemetry. Call [`stopTrackPage`](https://github.com/Microsoft/ApplicationInsights-JS/blob/master/API-reference.md#stoptrackpage) to log the end of the page view
          * and send the event.
          * @param   name  A string that idenfities this item, unique within this HTML document. Defaults to the document title.
          */
         startTrackPage(name?: string): any;
         /**
-         * Stops the timer that was started by calling `startTrackPage` and sends the pageview load time telemetry with the specified properties and measurements.
+         * Stops the timer that was started by calling [`startTrackPage`](https://github.com/Microsoft/ApplicationInsights-JS/blob/master/API-reference.md#starttrackpage) and sends the pageview load time telemetry with the specified properties and measurements.
          * The duration of the page view will be the time between calling `startTrackPage` and `stopTrackPage`.
-         * @param   name  The string you used as the name in startTrackPage. Defaults to the document title.
+         * @param   name  The string you used as the name in `startTrackPage`. Defaults to the document title.
          * @param   url   String - a relative or absolute URL that identifies the page or other item. Defaults to the window location.
          * @param   properties  map[string, string] - additional data used to filter pages and metrics in the portal. Defaults to empty.
          * @param   measurements    map[string, number] - metrics associated with this page, displayed in Metrics Explorer on the portal. Defaults to empty.
@@ -691,7 +691,7 @@ declare module Microsoft.ApplicationInsights {
             measurements?: { [name: string]: number }): any;
         /**
          * Logs that a page or other item was viewed.
-         * @param   name  The string you used as the name in startTrackPage. Defaults to the document title.
+         * @param   name  The string you used as the name in `startTrackPage`. Defaults to the document title.
          * @param   url   String - a relative or absolute URL that identifies the page or other item. Defaults to the window location.
          * @param   properties  map[string, string] - additional data used to filter pages and metrics in the portal. Defaults to empty.
          * @param   measurements    map[string, number] - metrics associated with this page, displayed in Metrics Explorer on the portal. Defaults to empty.
@@ -703,13 +703,13 @@ declare module Microsoft.ApplicationInsights {
             properties?: { [name: string]: string },
             measurements?: { [name: string]: number }, duration?: number): any;
         /**
-         * Start timing an extended event. Call {@link stopTrackEvent} to log the event when it ends.
+         * Start timing an extended event. Call [`stopTrackEvent`](https://github.com/Microsoft/ApplicationInsights-JS/blob/master/API-reference.md#stoptrackevent) to log the event when it ends.
          * @param   name    A string that identifies this event uniquely within the document.
          */
         startTrackEvent(name: string): any;
         /**
-         * Log an extended event that you started timing with {@link startTrackEvent}.
-         * @param   name    The string you used to identify this event in startTrackEvent.
+         * Log an extended event that you started timing with [`startTrackEvent`](https://github.com/Microsoft/ApplicationInsights-JS/blob/master/API-reference.md#starttrackevent).
+         * @param   name    The string you used to identify this event in `startTrackEvent`.
          * @param   properties  map[string, string] - additional data used to filter events and metrics in the portal. Defaults to empty.
          * @param   measurements    map[string, number] - metrics associated with this event, displayed in Metrics Explorer on the portal. Defaults to empty.
          */

From f425f279923d7409a31bbdfdf2816db13ad454f4 Mon Sep 17 00:00:00 2001
From: arichter83 <36486293+arichter83@users.noreply.github.com>
Date: Mon, 3 Dec 2018 19:02:05 +0100
Subject: [PATCH 575/836] Changed filterBy

See https://github.com/ericgio/react-bootstrap-typeahead/blob/116c5cdc7443099a0455757558108c6082b347f1/docs/Upgrading.md#v30
---
 types/react-bootstrap-typeahead/index.d.ts          | 13 ++++++++++++-
 .../react-bootstrap-typeahead-tests.tsx             |  8 ++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/types/react-bootstrap-typeahead/index.d.ts b/types/react-bootstrap-typeahead/index.d.ts
index fa970bc5b3..d0bfcea9a7 100644
--- a/types/react-bootstrap-typeahead/index.d.ts
+++ b/types/react-bootstrap-typeahead/index.d.ts
@@ -3,12 +3,23 @@
 // Definitions by: Guymestef <https://github.com/Guymestef>
 //                 Rajab Shakirov <https://github.com/radziksh>
 //                 Paito Anderson <https://github.com/PaitoAnderson>
+//                 Andreas Richter <https://github.com/arichter83>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 // TODO: <Highlighter>, <Menu>, <MenuItem>, <Token> components
 
 import * as React from 'react';
 
+export interface TypeaheadFilterbyProps {
+  filterBy: string[];
+  labelKey: (string | (() => void));
+  multiple: boolean;
+  selected: any[];
+  caseSensitive: boolean;
+  ignoreDiacritics: boolean;
+  text: string;
+}
+
 export interface TypeaheadProps<T> {
     /* For localized accessibility: Should return a string indicating the number of results for screen readers. Receives the current results. */
     a11yNumResults?: () => void;
@@ -58,7 +69,7 @@ export interface TypeaheadProps<T> {
     emptyLabel?: string;
 
     /* Either an array of fields in option to search, or a custom filtering callback. */
-    filterBy?: (string[] | ((option: T | string, text: string) => boolean));
+    filterBy?: (string[] | ((option: T | string, props: TypeaheadFilterbyProps) => boolean));
 
     /* Highlights the menu item if there is only one result and allows selecting that item by hitting enter.
        Does not work with allowNew. */
diff --git a/types/react-bootstrap-typeahead/react-bootstrap-typeahead-tests.tsx b/types/react-bootstrap-typeahead/react-bootstrap-typeahead-tests.tsx
index 10237b1fa0..6c9143dfea 100644
--- a/types/react-bootstrap-typeahead/react-bootstrap-typeahead-tests.tsx
+++ b/types/react-bootstrap-typeahead/react-bootstrap-typeahead-tests.tsx
@@ -28,6 +28,14 @@ class BasicExample extends React.Component {
                     onInputChange={(value, e) => {}}
                     placeholder="Choose a state..."
                 />
+                <Typeahead
+                    labelKey="name"
+                    multiple={multiple}
+                    options={options}
+                    maxHeight='300px'
+                    filterBy={(option, props) => (props.text.indexOf(option) !== -1) }
+                    placeholder="Choose a state..."
+                />
             </div>
         );
     }

From 672ec749ab95fa2893469c2a2ebd6badb4336d58 Mon Sep 17 00:00:00 2001
From: arichter83 <36486293+arichter83@users.noreply.github.com>
Date: Mon, 3 Dec 2018 19:12:14 +0100
Subject: [PATCH 576/836] Increase version

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

diff --git a/types/react-bootstrap-typeahead/index.d.ts b/types/react-bootstrap-typeahead/index.d.ts
index d0bfcea9a7..89188c8b86 100644
--- a/types/react-bootstrap-typeahead/index.d.ts
+++ b/types/react-bootstrap-typeahead/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for react-bootstrap-typeahead 3.2
+// Type definitions for react-bootstrap-typeahead 3.2.2
 // Project: https://github.com/ericgio/react-bootstrap-typeahead
 // Definitions by: Guymestef <https://github.com/Guymestef>
 //                 Rajab Shakirov <https://github.com/radziksh>

From 4b872aca1265d8ba44347fbdc33c204d9c123f33 Mon Sep 17 00:00:00 2001
From: arichter83 <36486293+arichter83@users.noreply.github.com>
Date: Mon, 3 Dec 2018 19:19:10 +0100
Subject: [PATCH 577/836] Fixed version...

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

diff --git a/types/react-bootstrap-typeahead/index.d.ts b/types/react-bootstrap-typeahead/index.d.ts
index 89188c8b86..9fa23ac5f5 100644
--- a/types/react-bootstrap-typeahead/index.d.ts
+++ b/types/react-bootstrap-typeahead/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for react-bootstrap-typeahead 3.2.2
+// Type definitions for react-bootstrap-typeahead 3.3
 // Project: https://github.com/ericgio/react-bootstrap-typeahead
 // Definitions by: Guymestef <https://github.com/Guymestef>
 //                 Rajab Shakirov <https://github.com/radziksh>

From d944d9c929913c6c3bce93eea1ecc485dfa2bc5d Mon Sep 17 00:00:00 2001
From: arichter83 <36486293+arichter83@users.noreply.github.com>
Date: Mon, 3 Dec 2018 20:20:12 +0100
Subject: [PATCH 578/836] Added definitions for Highlighter, Menu and MenuItem

---
 types/react-bootstrap-typeahead/index.d.ts    | 56 +++++++++++++++----
 .../react-bootstrap-typeahead-tests.tsx       | 27 ++++++++-
 2 files changed, 72 insertions(+), 11 deletions(-)

diff --git a/types/react-bootstrap-typeahead/index.d.ts b/types/react-bootstrap-typeahead/index.d.ts
index 9fa23ac5f5..2c0495ce03 100644
--- a/types/react-bootstrap-typeahead/index.d.ts
+++ b/types/react-bootstrap-typeahead/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for react-bootstrap-typeahead 3.3
+// Type definitions for react-bootstrap-typeahead 3.4
 // Project: https://github.com/ericgio/react-bootstrap-typeahead
 // Definitions by: Guymestef <https://github.com/Guymestef>
 //                 Rajab Shakirov <https://github.com/radziksh>
@@ -6,18 +6,23 @@
 //                 Andreas Richter <https://github.com/arichter83>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
-// TODO: <Highlighter>, <Menu>, <MenuItem>, <Token> components
+// TODO: <Token> components
 
 import * as React from 'react';
+import * as CSS from 'csstype';
 
 export interface TypeaheadFilterbyProps {
-  filterBy: string[];
-  labelKey: (string | (() => void));
-  multiple: boolean;
-  selected: any[];
-  caseSensitive: boolean;
-  ignoreDiacritics: boolean;
-  text: string;
+    filterBy: string[];
+    labelKey: (string | (() => void));
+    multiple: boolean;
+    selected: any[];
+    caseSensitive: boolean;
+    ignoreDiacritics: boolean;
+    text: string;
+}
+
+export interface TypeaheadMenuProps<T> {
+    text: string;
 }
 
 export interface TypeaheadProps<T> {
@@ -149,7 +154,7 @@ export interface TypeaheadProps<T> {
     renderMenu?: (results: Array<T | string>, menuProps: any) => any;
 
     /* Provides a hook for customized rendering of menu item contents. */
-    renderMenuItemChildren?: (option: T, props: TypeaheadProps<T>, index: number) => any;
+    renderMenuItemChildren?: (option: T, props: TypeaheadMenuProps<T>, index: number) => any;
 
     /* Provides a hook for customized rendering of tokens when multiple selections are enabled. */
     renderToken?: (selectedItem: T | string, onRemove: () => void) => any;
@@ -184,3 +189,34 @@ export interface AsyncTypeaheadProps<T> extends TypeaheadProps<T> {
 }
 
 export const AsyncTypeahead: React.ClassicComponentClass<AsyncTypeaheadProps<any>>;
+
+export interface HighligherProps<T> {
+    key: string;
+    search: string;
+}
+
+export const Highlighter: React.ClassicComponentClass<HighligherProps<any>>;
+
+export interface MenuProps<T> {
+    id: string;
+    className?: string;
+    emptyLabel?: string;
+    innerRef?: string;
+    maxHeight?: string;
+    style?: CSS.Properties;
+}
+
+export const Menu: React.ClassicComponentClass<MenuProps<any>>;
+
+export interface MenuItemProps<T> {
+    option: T;
+    position: number;
+    label?: string;
+    active?: boolean;
+    className?: string;
+    disabled?: boolean;
+    onClick?: (e: Event) => any;
+    onMouseDown?: (e: Event) => any;
+}
+
+export const MenuItem: React.ClassicComponentClass<MenuItemProps<any>>;
diff --git a/types/react-bootstrap-typeahead/react-bootstrap-typeahead-tests.tsx b/types/react-bootstrap-typeahead/react-bootstrap-typeahead-tests.tsx
index 6c9143dfea..5fcbe15328 100644
--- a/types/react-bootstrap-typeahead/react-bootstrap-typeahead-tests.tsx
+++ b/types/react-bootstrap-typeahead/react-bootstrap-typeahead-tests.tsx
@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { Typeahead } from 'react-bootstrap-typeahead';
+import { Typeahead, Highlighter, Menu, MenuItem } from 'react-bootstrap-typeahead';
 
 const options = [
     { name: 'Alabama', population: 4780127, capital: 'Montgomery', region: 'South' },
@@ -36,6 +36,31 @@ class BasicExample extends React.Component {
                     filterBy={(option, props) => (props.text.indexOf(option) !== -1) }
                     placeholder="Choose a state..."
                 />
+                <Typeahead
+                    labelKey="name"
+                    options={options}
+                    placeholder="Choose a state..."
+                    renderMenuItemChildren={ (option, props, index) =>
+                        <Highlighter key="name" search={props.text}>
+                            {option.name}
+                        </Highlighter>
+                    }
+                />
+                <Typeahead
+                    labelKey="name"
+                    options={options}
+                    placeholder="Choose a state...">
+                    <Menu id="menu-id">
+                    {options.map((o, idx) => (
+                      <MenuItem
+                        key={idx}
+                        option={o}
+                        position={idx}>
+                        {o.name}
+                      </MenuItem>
+                    ))}
+                  </Menu>
+                </Typeahead>
             </div>
         );
     }

From 9240926c4bc7dfe6fb7bcf4175fb7be93f7b35ad Mon Sep 17 00:00:00 2001
From: feinoujc <feinoujc@users.noreply.github.com>
Date: Mon, 3 Dec 2018 14:28:35 -0500
Subject: [PATCH 579/836] bump other packages

---
 types/pollyjs__adapter-fetch/index.d.ts | 2 +-
 types/pollyjs__adapter/index.d.ts       | 2 +-
 types/pollyjs__persister-fs/index.d.ts  | 2 +-
 types/pollyjs__persister/index.d.ts     | 2 +-
 types/pollyjs__utils/index.d.ts         | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/types/pollyjs__adapter-fetch/index.d.ts b/types/pollyjs__adapter-fetch/index.d.ts
index 3d93435d51..d38313db9d 100644
--- a/types/pollyjs__adapter-fetch/index.d.ts
+++ b/types/pollyjs__adapter-fetch/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for @pollyjs/adapter-fetch 1.2
+// Type definitions for @pollyjs/adapter-fetch 1.3
 // Project: https://github.com/netflix/pollyjs/tree/master/packages/@pollyjs/adapter-fetch
 // Definitions by: feinoujc <https://github.com/feinoujc>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/pollyjs__adapter/index.d.ts b/types/pollyjs__adapter/index.d.ts
index b3810a67bb..0bc49fd73b 100644
--- a/types/pollyjs__adapter/index.d.ts
+++ b/types/pollyjs__adapter/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for @pollyjs/adapter 1.2
+// Type definitions for @pollyjs/adapter 1.3
 // Project: https://github.com/netflix/pollyjs/tree/master/packages/@pollyjs/adapter
 // Definitions by: feinoujc <https://github.com/feinoujc>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/pollyjs__persister-fs/index.d.ts b/types/pollyjs__persister-fs/index.d.ts
index 3d97b382f7..fc7f9ad656 100644
--- a/types/pollyjs__persister-fs/index.d.ts
+++ b/types/pollyjs__persister-fs/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for @pollyjs/persister-fs 1.2
+// Type definitions for @pollyjs/persister-fs 1.3
 // Project: https://github.com/netflix/pollyjs/tree/master/packages/@pollyjs/persister-fs
 // Definitions by: feinoujc <https://github.com/feinoujc>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/pollyjs__persister/index.d.ts b/types/pollyjs__persister/index.d.ts
index 45fc1fc250..87e1c27f5b 100644
--- a/types/pollyjs__persister/index.d.ts
+++ b/types/pollyjs__persister/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for @pollyjs/persister 1.2
+// Type definitions for @pollyjs/persister 1.3
 // Project: https://github.com/netflix/pollyjs/tree/master/packages/@pollyjs/persister
 // Definitions by: feinoujc <https://github.com/feinoujc>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/pollyjs__utils/index.d.ts b/types/pollyjs__utils/index.d.ts
index e87392fcee..ca3e7735ef 100644
--- a/types/pollyjs__utils/index.d.ts
+++ b/types/pollyjs__utils/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for @pollyjs/utils 1.2
+// Type definitions for @pollyjs/utils 1.3
 // Project: https://github.com/netflix/pollyjs/tree/master/packages/@pollyjs/utils
 // Definitions by: feinoujc <https://github.com/feinoujc>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped

From cddc81b89060175919cef11a02a6c65f6fd56500 Mon Sep 17 00:00:00 2001
From: Adam Misiorny <adam.misiorny@gmail.com>
Date: Mon, 3 Dec 2018 20:34:53 +0100
Subject: [PATCH 580/836] Fix name type

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

diff --git a/types/rosie/index.d.ts b/types/rosie/index.d.ts
index 63624ad3f2..01dc76c5af 100644
--- a/types/rosie/index.d.ts
+++ b/types/rosie/index.d.ts
@@ -166,7 +166,7 @@ declare namespace rosie {
      * @return {Factory}
      */
     sequence<K extends keyof T>(name: K, builder?: (i: number) => any): IFactory<T>;
-    sequence<K extends keyof T, D extends keyof T>(name: keyof T, dependencies: D[], builder: (i: number, ...args: any[]) => any): IFactory<T>;
+    sequence<K extends keyof T, D extends keyof T>(name: K, dependencies: D[], builder: (i: number, ...args: any[]) => any): IFactory<T>;
 
     /**
      * Sets a post-processor callback that will receive built objects and the

From 3ba1ae85e26eea8062509b406ad1baf9e5092355 Mon Sep 17 00:00:00 2001
From: arichter83 <36486293+arichter83@users.noreply.github.com>
Date: Mon, 3 Dec 2018 20:38:16 +0100
Subject: [PATCH 581/836] Added dependencies file

---
 types/react-bootstrap-typeahead/package.json | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 types/react-bootstrap-typeahead/package.json

diff --git a/types/react-bootstrap-typeahead/package.json b/types/react-bootstrap-typeahead/package.json
new file mode 100644
index 0000000000..4d9ec4a338
--- /dev/null
+++ b/types/react-bootstrap-typeahead/package.json
@@ -0,0 +1,6 @@
+{
+    "private": true,
+    "dependencies": {
+        "csstype": "^2.2.0"
+    }
+}

From 49afe7ce39261604a821ac875f57381375e58573 Mon Sep 17 00:00:00 2001
From: Dobes Vandermeer <dobesv@gmail.com>
Date: Mon, 3 Dec 2018 11:42:33 -0800
Subject: [PATCH 582/836] Update index.d.ts

Object -> object
---
 types/mongodb/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/mongodb/index.d.ts b/types/mongodb/index.d.ts
index 11d425dc30..8d549d4f49 100644
--- a/types/mongodb/index.d.ts
+++ b/types/mongodb/index.d.ts
@@ -1294,7 +1294,7 @@ export interface CollectionAggregationOptions {
      * Allow driver to bypass schema validation in MongoDB 3.2 or higher.
      */
     bypassDocumentValidation?: boolean;
-    hint?: string | Object;   
+    hint?: string | object;   
     raw?: boolean;
     promoteLongs?: boolean;
     promoteValues?: boolean;

From 8c94850f861a22d8bfe85fc1a2cbccbaa7fa99ac Mon Sep 17 00:00:00 2001
From: Mark Wolff <marwolff@microsoft.com>
Date: Mon, 3 Dec 2018 12:07:38 -0800
Subject: [PATCH 583/836] Revert md links

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

diff --git a/types/applicationinsights-js/index.d.ts b/types/applicationinsights-js/index.d.ts
index ea80ad1ddb..002a950637 100644
--- a/types/applicationinsights-js/index.d.ts
+++ b/types/applicationinsights-js/index.d.ts
@@ -671,13 +671,13 @@ declare module Microsoft.ApplicationInsights {
         queue: Array<() => void>;
         /**
          * Starts the timer for tracking a page load time. Use this instead of `trackPageView` if you want to control when the page view timer starts and stops,
-         * but don't want to calculate the duration yourself. This method doesn't send any telemetry. Call [`stopTrackPage`](https://github.com/Microsoft/ApplicationInsights-JS/blob/master/API-reference.md#stoptrackpage) to log the end of the page view
+         * but don't want to calculate the duration yourself. This method doesn't send any telemetry. Call `stopTrackPage` to log the end of the page view
          * and send the event.
          * @param   name  A string that idenfities this item, unique within this HTML document. Defaults to the document title.
          */
         startTrackPage(name?: string): any;
         /**
-         * Stops the timer that was started by calling [`startTrackPage`](https://github.com/Microsoft/ApplicationInsights-JS/blob/master/API-reference.md#starttrackpage) and sends the pageview load time telemetry with the specified properties and measurements.
+         * Stops the timer that was started by calling `startTrackPage` and sends the pageview load time telemetry with the specified properties and measurements.
          * The duration of the page view will be the time between calling `startTrackPage` and `stopTrackPage`.
          * @param   name  The string you used as the name in `startTrackPage`. Defaults to the document title.
          * @param   url   String - a relative or absolute URL that identifies the page or other item. Defaults to the window location.
@@ -703,12 +703,12 @@ declare module Microsoft.ApplicationInsights {
             properties?: { [name: string]: string },
             measurements?: { [name: string]: number }, duration?: number): any;
         /**
-         * Start timing an extended event. Call [`stopTrackEvent`](https://github.com/Microsoft/ApplicationInsights-JS/blob/master/API-reference.md#stoptrackevent) to log the event when it ends.
+         * Start timing an extended event. Call `stopTrackEvent` to log the event when it ends.
          * @param   name    A string that identifies this event uniquely within the document.
          */
         startTrackEvent(name: string): any;
         /**
-         * Log an extended event that you started timing with [`startTrackEvent`](https://github.com/Microsoft/ApplicationInsights-JS/blob/master/API-reference.md#starttrackevent).
+         * Log an extended event that you started timing with `startTrackEvent`.
          * @param   name    The string you used to identify this event in `startTrackEvent`.
          * @param   properties  map[string, string] - additional data used to filter events and metrics in the portal. Defaults to empty.
          * @param   measurements    map[string, number] - metrics associated with this event, displayed in Metrics Explorer on the portal. Defaults to empty.

From 55151250bf7bfc323aa397f67a7cd881f01ba934 Mon Sep 17 00:00:00 2001
From: Hernan Rajchert <hrajchert@gmail.com>
Date: Mon, 3 Dec 2018 18:20:46 -0300
Subject: [PATCH 584/836] fix: changed project url

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

diff --git a/types/unist/index.d.ts b/types/unist/index.d.ts
index 023b1c11e3..ee61686f93 100644
--- a/types/unist/index.d.ts
+++ b/types/unist/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for Unist 2.0
-// Project: https://github.com/syntax-tree/unist-ts
+// Project: https://github.com/syntax-tree/unist
 // Definitions by: bizen241 <https://github.com/bizen241>
 //                 Jun Lu <https://github.com/lujun2>
 //                 Hernan Rajchert <https://github.com/hrajchert>

From e6830ebd665443275d1f60d926f4df159d21362c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Alvergnat?= <toilal.dev@gmail.com>
Date: Sat, 17 Nov 2018 19:11:58 +0100
Subject: [PATCH 585/836] Upgrade yeoman-test to 2.0

This adds support for resolved and namespace options in run method, and sets some callback functions to optional.
---
 types/yeoman-test/index.d.ts           | 44 ++++++++++++++++++++------
 types/yeoman-test/yeoman-test-tests.ts |  5 +++
 2 files changed, 40 insertions(+), 9 deletions(-)

diff --git a/types/yeoman-test/index.d.ts b/types/yeoman-test/index.d.ts
index d6b2d50a09..abaad9ddb3 100644
--- a/types/yeoman-test/index.d.ts
+++ b/types/yeoman-test/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for yeoman-test 1.7
+// Type definitions for yeoman-test 2.0
 // Project: https://github.com/yeoman/yeoman-test
 // Definitions by: Ika <https://github.com/ikatyang>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -10,10 +10,17 @@ import Generator = require('yeoman-generator');
 export interface Dictionary<T> {
 	[key: string]: T;
 }
+
 export interface Constructor<T> {
 	new (...args: any[]): T;
 }
 
+// Environment from yeoman-environment
+export interface Env extends EventEmitter {
+	queues: string[];
+	enforceUpdate(env: Env): this;
+}
+
 /**
  * Dependecies can be path (autodiscovery) or an array [<generator>, <name>]
  */
@@ -37,7 +44,7 @@ export function setUpTestDirectory(dir: string): (done: (...args: any[]) => void
  * @param options - Grunt configuration
  * @param done  - callback to call on completion
  */
-export function gruntfile(options: Dictionary<any>, done: (...args: any[]) => void): void;
+export function gruntfile(options: Dictionary<any>, done?: (...args: any[]) => void): void;
 
 /**
  * Clean-up the test directory and cd into it.
@@ -49,7 +56,7 @@ export function gruntfile(options: Dictionary<any>, done: (...args: any[]) => vo
  *   fs.writeFileSync('testfile', 'Roses are red.');
  * });
  */
-export function testDirectory(dir: string, cb: (error?: any) => void): void;
+export function testDirectory(dir: string, cb?: (error?: any) => void): void;
 
 /**
  * Answer prompt questions for the passed-in generator
@@ -60,7 +67,7 @@ export function testDirectory(dir: string, cb: (error?: any) => void): void;
  * @example
  * mockPrompt(angular, {'bootstrap': 'Y', 'compassBoostrap': 'Y'});
  */
-export function mockPrompt(generator: Generator, answers: Dictionary<any>): void;
+export function mockPrompt(generator: Generator, answers: Generator.Answers): void;
 
 /**
  * Restore defaults prompts on a generator.
@@ -105,7 +112,7 @@ export function createGenerator(name: string, dependencies: Dependency[], args?:
  *
  * @param dependencies - paths to the generators dependencies
  */
-export function registerDependencies(env: any, dependencies: Dependency[]): void;
+export function registerDependencies(env: Env, dependencies: Dependency[]): void;
 
 /**
  * Run the provided Generator
@@ -118,7 +125,18 @@ export interface RunContextSettings {
 	 * Automatically run this generator in a tmp dir
 	 * @default true
 	 */
-	tmpdir: boolean;
+	tmpdir?: boolean;
+
+	/**
+	 * File path to the generator (only used if Generator is a constructor)
+	 */
+	resolved?: string;
+
+	/**
+	 * Namespace (only used if Generator is a constructor)
+	 * @default 'gen:test'
+	 */
+	namespace?: string;
 }
 
 export interface RunContextConstructor {
@@ -132,7 +150,15 @@ export interface RunContextConstructor {
 	new (Generator: string | Constructor<Generator>, settings?: RunContextSettings): RunContext;
 }
 
-export interface RunContext extends EventEmitter {
+export interface RunContext extends RunContextConstructor, EventEmitter {
+	ran: boolean;
+	inDirSet: boolean;
+	args: string[];
+	options: {};
+	answers: Generator.Answers;
+	localConfig: {};
+	dependencies: Dependency[];
+
 	/**
 	 * Hold the execution until the returned callback is triggered
 	 * @return Callback to notify the normal execution can resume
@@ -162,7 +188,7 @@ export interface RunContext extends EventEmitter {
 	 * @param [cb] - callback who'll receive the folder path as argument
 	 * @return run context instance
 	 */
-	inDir(dirPath: string, cb: (folderPath: string) => void): this;
+	inDir(dirPath: string, cb?: (folderPath: string) => void): this;
 
 	/**
 	 * Change directory without deleting directory content.
@@ -204,7 +230,7 @@ export interface RunContext extends EventEmitter {
 	 * Mock the prompt with dummy answers
 	 * @param  answers - Answers to the prompt questions
 	 */
-	withPrompts(answers: Dictionary<any>): this;
+	withPrompts(answers: Generator.Answers): this;
 
 	/**
 	 * Provide dependent generators
diff --git a/types/yeoman-test/yeoman-test-tests.ts b/types/yeoman-test/yeoman-test-tests.ts
index c5136c6089..2dba4923a2 100644
--- a/types/yeoman-test/yeoman-test-tests.ts
+++ b/types/yeoman-test/yeoman-test-tests.ts
@@ -57,6 +57,11 @@ helpers.run(path.join(__dirname, '../app')).withGenerators([
 	[helpers.createDummyGenerator(), 'karma:app'],
 ]);
 
+helpers.run(Generator, {
+	resolved: '../app',
+	namespace: 'custom:generator'
+});
+
 before(done => {
 	helpers.run(path.join(__dirname, '../app'))
 		.on('error', error => { /* ... */ })

From 23e34b72cd427c2423a686b3b1674d09a3469578 Mon Sep 17 00:00:00 2001
From: Prashanth <prsri@microsoft.com>
Date: Mon, 3 Dec 2018 16:01:26 -0800
Subject: [PATCH 586/836] Fix typo in index.d.ts: intsance -> instance

---
 types/socket.io/index.d.ts    | 2 +-
 types/socket.io/v1/index.d.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/types/socket.io/index.d.ts b/types/socket.io/index.d.ts
index f5e6c5fd00..70ef1d6a2c 100644
--- a/types/socket.io/index.d.ts
+++ b/types/socket.io/index.d.ts
@@ -169,7 +169,7 @@ declare namespace SocketIO {
 		listen( port: number, opts?: ServerOptions ): Server;
 
 		/**
-		 * Binds socket.io to an engine.io intsance
+		 * Binds socket.io to an engine.io instance
 		 * @param src The Engine.io (or compatible) server to bind to
 		 * @return This Server
 		 */
diff --git a/types/socket.io/v1/index.d.ts b/types/socket.io/v1/index.d.ts
index 95a9ff1b4f..191680df46 100644
--- a/types/socket.io/v1/index.d.ts
+++ b/types/socket.io/v1/index.d.ts
@@ -169,7 +169,7 @@ declare namespace SocketIO {
 		listen( port: number, opts?: ServerOptions ): Server;
 
 		/**
-		 * Binds socket.io to an engine.io intsance
+		 * Binds socket.io to an engine.io instance
 		 * @param src The Engine.io (or compatible) server to bind to
 		 * @return This Server
 		 */

From 525506704738c79063afbf3f333d3b897690f248 Mon Sep 17 00:00:00 2001
From: Crispino <gabriel.crispino@hotmail.com>
Date: Mon, 3 Dec 2018 21:38:27 -0300
Subject: [PATCH 587/836] Add mongoose's `deleteModel` function type
 definitions

---
 types/mongoose/index.d.ts           | 28 +++++++++++++++++++---------
 types/mongoose/mongoose-tests.ts    |  1 +
 types/mongoose/v4/index.d.ts        | 10 ++++++++++
 types/mongoose/v4/mongoose-tests.ts |  1 +
 4 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/types/mongoose/index.d.ts b/types/mongoose/index.d.ts
index 3672b75b8f..f08b8e0b5c 100644
--- a/types/mongoose/index.d.ts
+++ b/types/mongoose/index.d.ts
@@ -280,6 +280,16 @@ declare module "mongoose" {
       collection?: string
     ): U;
 
+    /**
+     * Removes the model named `name` from this connection, if it exists. You can
+     * use this function to clean up any models you created in your tests to
+     * prevent OverwriteModelErrors.
+     *
+     * @param name if string, the name of the model to remove. If regexp, removes all models whose name matches the regexp.
+     * @returns this
+     */
+    deleteModel(name: string | RegExp): Connection;
+
     /** Returns an array of model names created on this connection. */
     modelNames(): string[];
 
@@ -511,7 +521,7 @@ declare module "mongoose" {
     /**
      * section error/notFound.js
      * https://mongoosejs.com/docs/api.html#mongooseerror_MongooseError.DocumentNotFoundError
-     * 
+     *
      * An instance of this error class will be returned when `save()` fails
      * because the underlying
      * document was not found. The constructor takes one parameter, the
@@ -524,7 +534,7 @@ declare module "mongoose" {
     /**
      * section error/cast.js
      * https://mongoosejs.com/docs/api.html#mongooseerror_MongooseError.CastError
-     * 
+     *
      * An instance of this error class will be returned when mongoose failed to
      * cast a value.
      */
@@ -544,7 +554,7 @@ declare module "mongoose" {
     /**
      * section error/validation.js
      * https://mongoosejs.com/docs/api.html#mongooseerror_MongooseError.ValidationError
-     * 
+     *
      * An instance of this error class will be returned when [validation](http://mongoosejs.com/docs/validation.html) failed.
      */
     export class ValidationError extends Error {
@@ -565,7 +575,7 @@ declare module "mongoose" {
     /**
      * section error/validator.js
      * https://mongoosejs.com/docs/api.html#mongooseerror_MongooseError.ValidatorError
-     * 
+     *
      * A `ValidationError` has a hash of `errors` that contain individual `ValidatorError` instances
      */
     export class ValidatorError extends Error {
@@ -585,7 +595,7 @@ declare module "mongoose" {
     /**
      * section error/version.js
      * https://mongoosejs.com/docs/api.html#mongooseerror_MongooseError.VersionError
-     * 
+     *
      * An instance of this error class will be returned when you call `save()` after
      * the document in the database was changed in a potentially unsafe way. See
      * the [`versionKey` option](http://mongoosejs.com/docs/guide.html#versionKey) for more information.
@@ -600,7 +610,7 @@ declare module "mongoose" {
     /**
      * section error/parallelSave.js
      * https://mongoosejs.com/docs/api.html#mongooseerror_MongooseError.ParallelSaveError
-     * 
+     *
      * An instance of this error class will be returned when you call `save()` multiple
      * times on the same document in parallel. See the [FAQ](http://mongoosejs.com/docs/faq.html) for more
      * information.
@@ -612,7 +622,7 @@ declare module "mongoose" {
     /**
      * section error/overwriteModel.js
      * https://mongoosejs.com/docs/api.html#mongooseerror_MongooseError.OverwriteModelError
-     * 
+     *
      * Thrown when a model with the given name was already registered on the connection.
      * See [the FAQ about `OverwriteModelError`](http://mongoosejs.com/docs/faq.html#overwrite-model-error).
      */
@@ -623,7 +633,7 @@ declare module "mongoose" {
     /**
      * section error/missingSchema.js
      * https://mongoosejs.com/docs/api.html#mongooseerror_MongooseError.MissingSchemaError
-     * 
+     *
      * Thrown when you try to access a model that has not been registered yet
      */
     export class MissingSchemaError extends Error {
@@ -633,7 +643,7 @@ declare module "mongoose" {
     /**
      * section error/divergentArray.js
      * https://mongoosejs.com/docs/api.html#mongooseerror_MongooseError.DivergentArrayError
-     * 
+     *
      * An instance of this error will be returned if you used an array projection
      * and then modified the array in an unsafe way.
      */
diff --git a/types/mongoose/mongoose-tests.ts b/types/mongoose/mongoose-tests.ts
index f713ba8538..a660ce728f 100644
--- a/types/mongoose/mongoose-tests.ts
+++ b/types/mongoose/mongoose-tests.ts
@@ -145,6 +145,7 @@ conn1.close(function (err) {});
 conn1.close(true, function (err) {});
 conn1.collection('name').$format(999);
 conn1.model('myModel', new mongoose.Schema({}), 'myCol').find();
+conn1.deleteModel('myModel');
 conn1.models.myModel.findOne().exec();
 interface IStatics {
   staticMethod1: (a: number) => string;
diff --git a/types/mongoose/v4/index.d.ts b/types/mongoose/v4/index.d.ts
index ee3cd4c045..d8a9feb085 100644
--- a/types/mongoose/v4/index.d.ts
+++ b/types/mongoose/v4/index.d.ts
@@ -329,6 +329,16 @@ declare module "mongoose" {
       collection?: string
     ): U;
 
+    /**
+     * Removes the model named `name` from this connection, if it exists. You can
+     * use this function to clean up any models you created in your tests to
+     * prevent OverwriteModelErrors.
+     *
+     * @param name if string, the name of the model to remove. If regexp, removes all models whose name matches the regexp.
+     * @returns this
+     */
+    deleteModel(name: string | RegExp): Connection;
+
     /** Returns an array of model names created on this connection. */
     modelNames(): string[];
 
diff --git a/types/mongoose/v4/mongoose-tests.ts b/types/mongoose/v4/mongoose-tests.ts
index b2d2a834fd..633d3438a8 100644
--- a/types/mongoose/v4/mongoose-tests.ts
+++ b/types/mongoose/v4/mongoose-tests.ts
@@ -133,6 +133,7 @@ conn1.openSet('mongodb://localhost/test', 'db', {
 conn1.close().catch(function (err) {});
 conn1.collection('name').$format(999);
 conn1.model('myModel', new mongoose.Schema({}), 'myCol').find();
+conn1.deleteModel('myModel');
 interface IStatics {
   staticMethod1: (a: number) => string;
 }

From dfc87fffb7ba49a1affdd1a17027dbf04a38b416 Mon Sep 17 00:00:00 2001
From: Matthew Lilley <hello@matthewlilley.com>
Date: Tue, 4 Dec 2018 01:30:12 +0000
Subject: [PATCH 588/836] Add missing serializeState and deserializeState
 options

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

diff --git a/types/next-redux-wrapper/index.d.ts b/types/next-redux-wrapper/index.d.ts
index 16af858743..835a9762ca 100644
--- a/types/next-redux-wrapper/index.d.ts
+++ b/types/next-redux-wrapper/index.d.ts
@@ -19,6 +19,8 @@ declare namespace nextReduxWrapper {
     interface Options {
         storeKey?: string;
         debug?: boolean;
+        serializeState: any;
+        deserializeState: any;
     }
 
     interface StoreCreatorOptions<TInitialState, TStateProps, TDispatchProps, TOwnProps, TMergedProps> extends Options {

From e915faa5936d8290416e1dedf93be9a8d3afcba1 Mon Sep 17 00:00:00 2001
From: jfeinour <feinoujc@users.noreply.github.com>
Date: Mon, 3 Dec 2018 21:15:42 -0500
Subject: [PATCH 589/836] types for 'accept'

---
 types/accept/accept-tests.ts | 29 +++++++++++++++++++++++++++++
 types/accept/index.d.ts      | 21 +++++++++++++++++++++
 types/accept/tsconfig.json   | 23 +++++++++++++++++++++++
 types/accept/tslint.json     |  1 +
 4 files changed, 74 insertions(+)
 create mode 100644 types/accept/accept-tests.ts
 create mode 100644 types/accept/index.d.ts
 create mode 100644 types/accept/tsconfig.json
 create mode 100644 types/accept/tslint.json

diff --git a/types/accept/accept-tests.ts b/types/accept/accept-tests.ts
new file mode 100644
index 0000000000..011216ede4
--- /dev/null
+++ b/types/accept/accept-tests.ts
@@ -0,0 +1,29 @@
+import * as accept from 'accept';
+
+accept.charsets("iso-8859-5, unicode-1-1;q=0.8"); // charset === "iso-8859-5"
+accept.charset("iso-8859-5, unicode-1-1;q=0.8", ["unicode-1-1"]); // charset === "unicode-1-1"
+
+accept.encoding("gzip, deflate, sdch"); // encoding === "gzip"
+accept.encoding("gzip, deflate, sdch", ["deflate", "identity"]);
+
+const encodings = accept.encodings("compress;q=0.5, gzip;q=1.0"); // encodings === ["gzip", "compress", "identity"]
+encodings.lastIndexOf('');
+
+accept.language("en;q=0.7, en-GB;q=0.8");
+accept.language("en;q=0.7, en-GB;q=0.8", ["en-gb"]); // language === "en-GB"
+const languages = accept.languages("da, en;q=0.7, en-GB;q=0.8"); // languages === ["da", "en-GB", "en"]
+languages.lastIndexOf('');
+
+const mediaTypes = accept.mediaTypes("text/plain, application/json;q=0.5, text/html, */*;q=0.1");
+// mediaTypes === ["text/plain", "text/html", "application/json", "*/*"]
+mediaTypes.lastIndexOf('');
+const headers = {
+    accept: 'text/plain, application/json;q=0.5, text/html, */*;q=0.1',
+    'accept-language': 'da, en;q=0.7, en-GB;q=0.8'
+};
+
+const all = accept.parseAll(headers);
+all.charsets.length;
+all.encodings.length;
+all.languages.length;
+all.mediaTypes.length;
diff --git a/types/accept/index.d.ts b/types/accept/index.d.ts
new file mode 100644
index 0000000000..b067ea4306
--- /dev/null
+++ b/types/accept/index.d.ts
@@ -0,0 +1,21 @@
+// Type definitions for accept 3.1
+// Project: https://github.com/hapijs/accept#readme
+// Definitions by: feinoujc <https://github.com/feinoujc>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.1
+
+export function charset(charsetHeader?: string, preferences?: string[]): string;
+export function charsets(charsetHeader?: string): string[];
+export function encoding(encodingHeader?: string, preferences?: string[]): string;
+export function encodings(encodingHeader?: string): string[];
+export function language(languageHeader?: string, preferences?: string[]): string;
+export function languages(languageHeader?: string): string[];
+export function mediaTypes(mediaTypeHeader?: string): string[];
+export function parseAll(
+    headers: Record<string, string | string[] | undefined>
+): {
+    charsets: string[];
+    encodings: string[];
+    languages: string[];
+    mediaTypes: string[];
+};
diff --git a/types/accept/tsconfig.json b/types/accept/tsconfig.json
new file mode 100644
index 0000000000..cb192697d5
--- /dev/null
+++ b/types/accept/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "accept-tests.ts"
+    ]
+}
diff --git a/types/accept/tslint.json b/types/accept/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/accept/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From e3fd26e653b49682659f7441dd53996bb59afa00 Mon Sep 17 00:00:00 2001
From: Tim Trinidad <timtrinidad@gmail.com>
Date: Mon, 3 Dec 2018 22:50:08 -0500
Subject: [PATCH 590/836] [react-qr-reader] update type declaration to use
 CommonJs exports

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

diff --git a/types/react-qr-reader/index.d.ts b/types/react-qr-reader/index.d.ts
index de426667c0..908960f25c 100644
--- a/types/react-qr-reader/index.d.ts
+++ b/types/react-qr-reader/index.d.ts
@@ -6,11 +6,7 @@
 
 import * as React from "react";
 
-export as namespace QrReader;
-
-export default QrReader;
-
-export namespace QrReader {
+declare namespace QrReader {
   interface props {
     onScan: (data: string | null) => void;
     onError: (err: any) => void;
@@ -26,5 +22,8 @@ export namespace QrReader {
   }
 }
 
-declare class QrReader extends React.Component<QrReader.props> {
-}
+export as namespace QrReader;
+
+declare class QrReader extends React.Component<QrReader.props> {}
+
+export = QrReader;
diff --git a/types/react-qr-reader/react-qr-reader-tests.tsx b/types/react-qr-reader/react-qr-reader-tests.tsx
index 20632f8029..0a6796bfd9 100644
--- a/types/react-qr-reader/react-qr-reader-tests.tsx
+++ b/types/react-qr-reader/react-qr-reader-tests.tsx
@@ -1,5 +1,5 @@
 import * as React from "react";
-import QrReader from "react-qr-reader";
+import * as QrReader from "react-qr-reader";
 
 export class Test extends React.Component {
     render() {

From 00fcc6eca2eaa5ffca41eeec000ff80b349030bf Mon Sep 17 00:00:00 2001
From: Junyoung Choi <fluke8259@gmail.com>
Date: Tue, 4 Dec 2018 15:23:12 +0900
Subject: [PATCH 591/836] Add vfile-message

---
 types/vfile-message/index.d.ts             | 74 ++++++++++++++++++++++
 types/vfile-message/tsconfig.json          | 22 +++++++
 types/vfile-message/tslint.json            |  1 +
 types/vfile-message/vfile-message-tests.ts | 32 ++++++++++
 4 files changed, 129 insertions(+)
 create mode 100644 types/vfile-message/index.d.ts
 create mode 100644 types/vfile-message/tsconfig.json
 create mode 100644 types/vfile-message/tslint.json
 create mode 100644 types/vfile-message/vfile-message-tests.ts

diff --git a/types/vfile-message/index.d.ts b/types/vfile-message/index.d.ts
new file mode 100644
index 0000000000..a39d916a34
--- /dev/null
+++ b/types/vfile-message/index.d.ts
@@ -0,0 +1,74 @@
+// Type definitions for vfile-message 1.0
+// Project: https://github.com/vfile/vfile-message#readme
+// Definitions by: Junyoung Choi <https://github.com/rokt33r>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types='node' />
+
+import * as Unist from 'unist';
+
+declare namespace vfileMessage {
+    /**
+     * Create a virtual message.
+     */
+    interface VFileMessage extends Error {
+        /**
+         * Constructor of a message for `reason` at `position` from `origin`.
+         * When an error is passed in as `reason`, copies the `stack`.
+         *
+         * @param reason Reason for message (`string` or `Error`). Uses the stack and message of the error if given.
+         * @param position Place at which the message occurred in a file (`Node`, `Position`, or `Point`, optional).
+         * @param origin Place in code the message originates from (`string`, optional).
+         */
+        (reason: string | Error, position?: Unist.Node | Unist.Position | Unist.Point, origin?: string): VFileMessage
+        /**
+         * Category of message.
+         */
+        ruleId: string | null;
+        /**
+         * Reason for message.
+         */
+        reason: string;
+        /**
+         * Starting line of error.
+         */
+        line: number | null;
+        /**
+         * Starting column of error.
+         */
+        column: number | null;
+        /**
+         * Full range information, when available.
+         * Has start and end properties, both set to an object with line and column, set to number?.
+         */
+        location: Unist.Position;
+        /**
+         * Namespace of warning.
+         */
+        source: string | null;
+        /**
+         * If true, marks associated file as no longer processable.
+         */
+        fatal?: boolean | null;
+        /**
+         * You may add a file property with a path of a file (used throughout the VFile ecosystem).
+         */
+        file?: string;
+        /**
+         * You may add a note property with a long form description of the message (supported by vfile-reporter).
+         */
+        note?: string;
+        /**
+         * You may add a url property with a link to documentation for the message.
+         */
+        url?: string;
+        /**
+         * It’s OK to store custom data directly on the VMessage, some of those are handled by utilities.
+         */
+        [key: string]: unknown;
+    }
+}
+
+declare const vfileMessage: vfileMessage.VFileMessage;
+
+export = vfileMessage;
diff --git a/types/vfile-message/tsconfig.json b/types/vfile-message/tsconfig.json
new file mode 100644
index 0000000000..e740952e79
--- /dev/null
+++ b/types/vfile-message/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",
+        "vfile-message-tests.ts"
+    ]
+}
diff --git a/types/vfile-message/tslint.json b/types/vfile-message/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/vfile-message/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/vfile-message/vfile-message-tests.ts b/types/vfile-message/vfile-message-tests.ts
new file mode 100644
index 0000000000..ed9086631f
--- /dev/null
+++ b/types/vfile-message/vfile-message-tests.ts
@@ -0,0 +1,32 @@
+import vfileMessage = require('vfile-message');
+
+const message = vfileMessage('Error!');
+vfileMessage(new Error());
+vfileMessage('Error!', {
+  type: 'random node'
+});
+vfileMessage('Error!', {
+  start: {
+    line: 1,
+    column: 1
+  },
+  end: {
+    line: 1,
+    column: 1
+  }
+});
+vfileMessage('Error!', {
+  line: 1,
+  column: 1
+});
+vfileMessage('Error!', undefined, 'test');
+
+message.file = '';
+message.name = '';
+message.reason = '';
+message.message = '';
+message.stack = '';
+message.fatal = null;
+message.fatal = true;
+message.column = 1;
+message.line = 1;

From b2d0033fff089a6373666d8619449d77cc37c239 Mon Sep 17 00:00:00 2001
From: Junyoung Choi <fluke8259@gmail.com>
Date: Tue, 4 Dec 2018 15:25:15 +0900
Subject: [PATCH 592/836] Discard local type definitions in vfile

---
 types/vfile/index.d.ts     | 44 +++-----------------------------------
 types/vfile/vfile-tests.ts | 22 +++----------------
 2 files changed, 6 insertions(+), 60 deletions(-)

diff --git a/types/vfile/index.d.ts b/types/vfile/index.d.ts
index df729e0a49..d1f3321ab7 100644
--- a/types/vfile/index.d.ts
+++ b/types/vfile/index.d.ts
@@ -8,6 +8,7 @@
 /// <reference types='node' />
 
 import * as Unist from 'unist';
+import * as vfileMessage from 'vfile-message';
 
 declare namespace vfile {
     type VFileContents = string | Buffer;
@@ -29,45 +30,6 @@ declare namespace vfile {
         [key: string]: any;
     }
 
-    /**
-     * File-related message describing something at certain position.
-     */
-    interface VFileMessage {
-        /**
-         * File-path, when the message was triggered.
-         */
-        file: string;
-        /**
-         * Category of message.
-         */
-        ruleId: string | null;
-        /**
-         * Reason for message.
-         */
-        reason: string;
-        /**
-         * Starting line of error.
-         */
-        line: number | null;
-        /**
-         * Starting column of error.
-         */
-        column: number | null;
-        /**
-         * Full range information, when available.
-         * Has start and end properties, both set to an object with line and column, set to number?.
-         */
-        location: Unist.Position;
-        /**
-         * Namespace of warning.
-         */
-        source: string | null;
-        /**
-         * If true, marks associated file as no longer processable.
-         */
-        fatal?: boolean | null;
-    }
-
     /**
      * Associates a message with the file for `reason` at `position`.
      * When an error is passed in as `reason`, copies the stack.
@@ -76,7 +38,7 @@ declare namespace vfile {
      * @param position Place at which the message occurred in `vfile`.
      * @param ruleId Category of message.
      */
-    type Message = (reason: string, position?: Unist.Point | Unist.Position | NodeWithPosition, ruleId?: string) => VFileMessage;
+    type Message = (reason: string, position?: Unist.Point | Unist.Position | NodeWithPosition, ruleId?: string) => vfileMessage.VFileMessage;
     /**
      * Associates a fatal message with the file, then immediately throws it.
      * Note: fatal errors mean a file is no longer processable.
@@ -121,7 +83,7 @@ declare namespace vfile {
         /**
          * List of messages associated with the file.
          */
-        messages: VFileMessage[];
+        messages: vfileMessage.VFileMessage[];
         /**
          * Raw value.
          */
diff --git a/types/vfile/vfile-tests.ts b/types/vfile/vfile-tests.ts
index 5c14c8502b..36c0ac163e 100644
--- a/types/vfile/vfile-tests.ts
+++ b/types/vfile/vfile-tests.ts
@@ -1,5 +1,6 @@
 import vfile = require('vfile');
 import * as Unist from 'unist';
+import vfileMessage = require('vfile-message');
 
 // Instantiation
 const file: vfile.VFile = vfile();
@@ -15,24 +16,7 @@ file.dirname = '~';
 file.extname = '.md';
 file.basename = 'test.text';
 file.history = ['~/test.txt']; // => ['~/example.txt', '~/example.md', '~/index.text']
-file.messages = [{
-    file: '~/test.txt',
-    ruleId: '',
-    reason: '',
-    line: 1,
-    column: 1,
-    location: {
-        start: {
-            line: 1,
-            column: 1,
-        },
-        end: {
-            line: 1,
-            column: 1,
-        }
-    },
-    source: ''
-}];
+file.messages = [vfileMessage('random error')];
 
 const startPoint: Unist.Point = {
     line: 1,
@@ -46,7 +30,7 @@ const position: Unist.Position = {
     },
 };
 
-file.message('test', startPoint);
+const message: vfileMessage.VFileMessage = file.message('test', startPoint, 'test origin');
 file.message('test', position);
 file.message('test', {
     type: 'ramdom node',

From 10f75ca776a86365428d98762e361c95beed0afc Mon Sep 17 00:00:00 2001
From: Junyoung Choi <fluke8259@gmail.com>
Date: Tue, 4 Dec 2018 15:27:09 +0900
Subject: [PATCH 593/836] Fix type definition of info method

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

diff --git a/types/vfile/index.d.ts b/types/vfile/index.d.ts
index d1f3321ab7..1d0b9f76d9 100644
--- a/types/vfile/index.d.ts
+++ b/types/vfile/index.d.ts
@@ -55,7 +55,7 @@ declare namespace vfile {
      * @param position Place at which the message occurred in `vfile`.
      * @param ruleId Category of message.
      */
-    type Info = (reason: string, position?: Unist.Point | Unist.Position | NodeWithPosition, ruleId?: string) => void;
+    type Info = (reason: string, position?: Unist.Point | Unist.Position | NodeWithPosition, ruleId?: string) => vfileMessage.VFileMessage;
 
     /**
      * Convert contents of `vfile` to string.
diff --git a/types/vfile/vfile-tests.ts b/types/vfile/vfile-tests.ts
index 36c0ac163e..b89df6db23 100644
--- a/types/vfile/vfile-tests.ts
+++ b/types/vfile/vfile-tests.ts
@@ -40,6 +40,10 @@ file.message('test', {
 
 file.message('test', { start: 'invalid point' }); // $ExpectError
 
+file.fail('test');
+
+const infoMessage: vfileMessage.VFileMessage = file.info('test');
+
 // Using `data` prop
 interface CustomData {
     message: string;

From cad3854ae499b17e4ec6d21686806be042f5199e Mon Sep 17 00:00:00 2001
From: Junyoung Choi <fluke8259@gmail.com>
Date: Tue, 4 Dec 2018 15:34:21 +0900
Subject: [PATCH 594/836] Clean up methods of vfile

---
 types/vfile/index.d.ts | 68 +++++++++++++++++++-----------------------
 1 file changed, 31 insertions(+), 37 deletions(-)

diff --git a/types/vfile/index.d.ts b/types/vfile/index.d.ts
index 1d0b9f76d9..70ca5b8cd9 100644
--- a/types/vfile/index.d.ts
+++ b/types/vfile/index.d.ts
@@ -30,47 +30,11 @@ declare namespace vfile {
         [key: string]: any;
     }
 
-    /**
-     * Associates a message with the file for `reason` at `position`.
-     * When an error is passed in as `reason`, copies the stack.
-     * Each message has a `fatal` property which by default is set to `false` (ie. `warning`).
-     * @param reason Reason for message. Uses the stack and message of the error if given.
-     * @param position Place at which the message occurred in `vfile`.
-     * @param ruleId Category of message.
-     */
-    type Message = (reason: string, position?: Unist.Point | Unist.Position | NodeWithPosition, ruleId?: string) => vfileMessage.VFileMessage;
-    /**
-     * Associates a fatal message with the file, then immediately throws it.
-     * Note: fatal errors mean a file is no longer processable.
-     * Calls `message()` internally.
-     * @param reason Reason for message. Uses the stack and message of the error if given.
-     * @param position Place at which the message occurred in `vfile`.
-     * @param ruleId Category of message.
-     */
-    type Fail = (reason: string, position?: Unist.Point | Unist.Position | NodeWithPosition, ruleId?: string) => never;
-    /**
-     * Associates an informational message with the file, where `fatal` is set to `null`.
-     * Calls `message()` internally.
-     * @param reason Reason for message. Uses the stack and message of the error if given.
-     * @param position Place at which the message occurred in `vfile`.
-     * @param ruleId Category of message.
-     */
-    type Info = (reason: string, position?: Unist.Point | Unist.Position | NodeWithPosition, ruleId?: string) => vfileMessage.VFileMessage;
-
-    /**
-     * Convert contents of `vfile` to string.
-     * @param encoding If `contents` is a buffer, `encoding` is used to stringify buffers (default: `'utf8'`).
-     */
-    type ToString = (encoding?: BufferEncoding) => string;
-
     interface VFile {
         /**
          * @param options If `options` is `string` or `Buffer`, treats it as `{contents: options}`. If `options` is a `VFile`, returns it. All other options are set on the newly created `vfile`.
          */
         <F extends VFile>(input?: VFileContents | F | VFileOptions): F;
-        message: Message;
-        fail: Fail;
-        info: Info;
         /**
          * List of file-paths the file moved between.
          */
@@ -119,7 +83,37 @@ declare namespace vfile {
          * Defaults to `process.cwd()`.
          */
         cwd: string;
-        toString: ToString;
+        /**
+         * Convert contents of `vfile` to string.
+         * @param encoding If `contents` is a buffer, `encoding` is used to stringify buffers (default: `'utf8'`).
+         */
+        toString: (encoding?: BufferEncoding) => string;
+        /**
+         * Associates a message with the file for `reason` at `position`.
+         * When an error is passed in as `reason`, copies the stack.
+         * Each message has a `fatal` property which by default is set to `false` (ie. `warning`).
+         * @param reason Reason for message. Uses the stack and message of the error if given.
+         * @param position Place at which the message occurred in `vfile`.
+         * @param ruleId Category of message.
+         */
+        message: (reason: string, position?: Unist.Point | Unist.Position | NodeWithPosition, ruleId?: string) => vfileMessage.VFileMessage;
+        /**
+         * Associates a fatal message with the file, then immediately throws it.
+         * Note: fatal errors mean a file is no longer processable.
+         * Calls `message()` internally.
+         * @param reason Reason for message. Uses the stack and message of the error if given.
+         * @param position Place at which the message occurred in `vfile`.
+         * @param ruleId Category of message.
+         */
+        fail: (reason: string, position?: Unist.Point | Unist.Position | NodeWithPosition, ruleId?: string) => never;
+        /**
+         * Associates an informational message with the file, where `fatal` is set to `null`.
+         * Calls `message()` internally.
+         * @param reason Reason for message. Uses the stack and message of the error if given.
+         * @param position Place at which the message occurred in `vfile`.
+         * @param ruleId Category of message.
+         */
+        info: (reason: string, position?: Unist.Point | Unist.Position | NodeWithPosition, ruleId?: string) => vfileMessage.VFileMessage;
     }
 }
 

From eb8e55df7132099491e230fd516599fd309c0d50 Mon Sep 17 00:00:00 2001
From: Forzoom MBP <forzoom@163.com>
Date: Tue, 4 Dec 2018 14:35:18 +0800
Subject: [PATCH 595/836] fix: change onMenuShareQzone to onMenuShareQZone

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

diff --git a/types/wx-js-sdk-dt/index.d.ts b/types/wx-js-sdk-dt/index.d.ts
index cefc43887f..23b5388336 100644
--- a/types/wx-js-sdk-dt/index.d.ts
+++ b/types/wx-js-sdk-dt/index.d.ts
@@ -162,7 +162,7 @@ declare namespace wx {
     /**
      * 获取“分享到QQ空间”按钮点击状态及自定义分享内容接口
      */
-    function onMenuShareQzone(config: MenuShareWeibo): void;
+    function onMenuShareQZone(config: MenuShareWeibo): void;
 
     interface ChooseImageConfig {
         /**

From 3844e52c09e513a8edc6d4bdfb4b7d8216697aa0 Mon Sep 17 00:00:00 2001
From: Junyoung Choi <fluke8259@gmail.com>
Date: Tue, 4 Dec 2018 15:45:09 +0900
Subject: [PATCH 596/836] Fix lint errors of vfile-message

---
 types/vfile-message/index.d.ts    | 3 ++-
 types/vfile-message/tsconfig.json | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/types/vfile-message/index.d.ts b/types/vfile-message/index.d.ts
index a39d916a34..5f4467e007 100644
--- a/types/vfile-message/index.d.ts
+++ b/types/vfile-message/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/vfile/vfile-message#readme
 // Definitions by: Junyoung Choi <https://github.com/rokt33r>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 3.0
 
 /// <reference types='node' />
 
@@ -20,7 +21,7 @@ declare namespace vfileMessage {
          * @param position Place at which the message occurred in a file (`Node`, `Position`, or `Point`, optional).
          * @param origin Place in code the message originates from (`string`, optional).
          */
-        (reason: string | Error, position?: Unist.Node | Unist.Position | Unist.Point, origin?: string): VFileMessage
+        (reason: string | Error, position?: Unist.Node | Unist.Position | Unist.Point, origin?: string): VFileMessage;
         /**
          * Category of message.
          */
diff --git a/types/vfile-message/tsconfig.json b/types/vfile-message/tsconfig.json
index e740952e79..9e35438c08 100644
--- a/types/vfile-message/tsconfig.json
+++ b/types/vfile-message/tsconfig.json
@@ -7,6 +7,7 @@
         "noImplicitAny": true,
         "noImplicitThis": true,
         "strictNullChecks": true,
+        "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [
             "../"

From 0383646a99e5f7021f782b07ee7675176b016356 Mon Sep 17 00:00:00 2001
From: Junyoung Choi <fluke8259@gmail.com>
Date: Tue, 4 Dec 2018 15:49:05 +0900
Subject: [PATCH 597/836] Update and move vfile constructor description so it
 can be seen in vscode hint

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

diff --git a/types/vfile/index.d.ts b/types/vfile/index.d.ts
index 70ca5b8cd9..459223d4b9 100644
--- a/types/vfile/index.d.ts
+++ b/types/vfile/index.d.ts
@@ -32,6 +32,13 @@ declare namespace vfile {
 
     interface VFile {
         /**
+         * Create a new virtual file. If `options` is `string` or `Buffer`, treats it as `{contents: options}`.
+         * If `options` is a `VFile`, returns it. All other options are set on the newly created `vfile`.
+         *
+         * Path related properties are set in the following order (least specific to most specific): `history`, `path`, `basename`, `stem`, `extname`, `dirname`.
+         *
+         * It’s not possible to set either `dirname` or `extname` without setting either `history`, `path`, `basename`, or `stem` as well.
+         *
          * @param options If `options` is `string` or `Buffer`, treats it as `{contents: options}`. If `options` is a `VFile`, returns it. All other options are set on the newly created `vfile`.
          */
         <F extends VFile>(input?: VFileContents | F | VFileOptions): F;
@@ -117,11 +124,6 @@ declare namespace vfile {
     }
 }
 
-/**
- * Create a new virtual file.
- * Path related properties are set in the following order (least specific to most specific): `history`, `path`, `basename`, `stem`, `extname`, `dirname`.
- * It’s not possible to set either `dirname` or `extname` without setting either `history`, `path`, `basename`, or `stem` as well.
- */
 declare const vfile: vfile.VFile;
 
 export = vfile;

From 8144af436c041ca46587678cf907e81456fc4bf3 Mon Sep 17 00:00:00 2001
From: Junyoung Choi <fluke8259@gmail.com>
Date: Tue, 4 Dec 2018 16:27:52 +0900
Subject: [PATCH 598/836] Implement AnyNode type so position can accept any
 nodes

---
 types/vfile-message/index.d.ts |  6 +++++-
 types/vfile/index.d.ts         | 11 +++--------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/types/vfile-message/index.d.ts b/types/vfile-message/index.d.ts
index 5f4467e007..0ee47ee365 100644
--- a/types/vfile-message/index.d.ts
+++ b/types/vfile-message/index.d.ts
@@ -9,6 +9,10 @@
 import * as Unist from 'unist';
 
 declare namespace vfileMessage {
+    interface AnyNode extends Unist.Node{
+        [key: string]: unknown
+    }
+
     /**
      * Create a virtual message.
      */
@@ -21,7 +25,7 @@ declare namespace vfileMessage {
          * @param position Place at which the message occurred in a file (`Node`, `Position`, or `Point`, optional).
          * @param origin Place in code the message originates from (`string`, optional).
          */
-        (reason: string | Error, position?: Unist.Node | Unist.Position | Unist.Point, origin?: string): VFileMessage;
+        (reason: string | Error, position?: AnyNode | Unist.Position | Unist.Point, origin?: string): VFileMessage;
         /**
          * Category of message.
          */
diff --git a/types/vfile/index.d.ts b/types/vfile/index.d.ts
index 459223d4b9..efb07e288d 100644
--- a/types/vfile/index.d.ts
+++ b/types/vfile/index.d.ts
@@ -13,11 +13,6 @@ import * as vfileMessage from 'vfile-message';
 declare namespace vfile {
     type VFileContents = string | Buffer;
 
-    interface NodeWithPosition extends Unist.Node {
-        position: Unist.Position;
-        [key: string]: any;
-    }
-
     interface VFileOptions {
         contents?: VFileContents;
         path?: string;
@@ -103,7 +98,7 @@ declare namespace vfile {
          * @param position Place at which the message occurred in `vfile`.
          * @param ruleId Category of message.
          */
-        message: (reason: string, position?: Unist.Point | Unist.Position | NodeWithPosition, ruleId?: string) => vfileMessage.VFileMessage;
+        message: (reason: string, position?: Unist.Point | Unist.Position | vfileMessage.AnyNode, ruleId?: string) => vfileMessage.VFileMessage;
         /**
          * Associates a fatal message with the file, then immediately throws it.
          * Note: fatal errors mean a file is no longer processable.
@@ -112,7 +107,7 @@ declare namespace vfile {
          * @param position Place at which the message occurred in `vfile`.
          * @param ruleId Category of message.
          */
-        fail: (reason: string, position?: Unist.Point | Unist.Position | NodeWithPosition, ruleId?: string) => never;
+        fail: (reason: string, position?: Unist.Point | Unist.Position | vfileMessage.AnyNode, ruleId?: string) => never;
         /**
          * Associates an informational message with the file, where `fatal` is set to `null`.
          * Calls `message()` internally.
@@ -120,7 +115,7 @@ declare namespace vfile {
          * @param position Place at which the message occurred in `vfile`.
          * @param ruleId Category of message.
          */
-        info: (reason: string, position?: Unist.Point | Unist.Position | NodeWithPosition, ruleId?: string) => vfileMessage.VFileMessage;
+        info: (reason: string, position?: Unist.Point | Unist.Position | vfileMessage.AnyNode, ruleId?: string) => vfileMessage.VFileMessage;
     }
 }
 

From 1e39558ee2231ad3df45859b81031da4d6425042 Mon Sep 17 00:00:00 2001
From: Lukas Elmer <lukas.elmer@gmail.com>
Date: Tue, 4 Dec 2018 08:27:55 +0100
Subject: [PATCH 599/836] Remove redundant typing

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

diff --git a/types/superagent/index.d.ts b/types/superagent/index.d.ts
index c10ff467bb..7c1898cdc2 100644
--- a/types/superagent/index.d.ts
+++ b/types/superagent/index.d.ts
@@ -46,7 +46,7 @@ declare namespace request {
         // tslint:disable-next-line:unified-signatures
         (method: string, url: string): SuperAgentRequest;
 
-        agent(): this & Request & SuperAgent<SuperAgentRequest>;
+        agent(): this & Request;
         serialize: { [type: string]: Serializer };
         parse: { [type: string]: Parser };
     }

From 123806795f7fb7ba4ece861fc2975f14d3bd96f5 Mon Sep 17 00:00:00 2001
From: Junyoung Choi <fluke8259@gmail.com>
Date: Tue, 4 Dec 2018 16:28:43 +0900
Subject: [PATCH 600/836] Fix lint errors in vfile-message

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

diff --git a/types/vfile-message/index.d.ts b/types/vfile-message/index.d.ts
index 0ee47ee365..908f72027b 100644
--- a/types/vfile-message/index.d.ts
+++ b/types/vfile-message/index.d.ts
@@ -9,8 +9,8 @@
 import * as Unist from 'unist';
 
 declare namespace vfileMessage {
-    interface AnyNode extends Unist.Node{
-        [key: string]: unknown
+    interface AnyNode extends Unist.Node {
+        [key: string]: unknown;
     }
 
     /**

From 36367f80e85149a55c441cf10f7bb094816631e6 Mon Sep 17 00:00:00 2001
From: Uladzimir Havenchyk <uladzimir@toptal.com>
Date: Tue, 4 Dec 2018 10:53:55 +0300
Subject: [PATCH 601/836] Add type definitions for "koa-log" package

---
 types/koa-log/index.d.ts       | 33 +++++++++++++++++++++++++++++++++
 types/koa-log/koa-log-tests.ts | 10 ++++++++++
 types/koa-log/tsconfig.json    | 23 +++++++++++++++++++++++
 types/koa-log/tslint.json      |  1 +
 4 files changed, 67 insertions(+)
 create mode 100644 types/koa-log/index.d.ts
 create mode 100644 types/koa-log/koa-log-tests.ts
 create mode 100644 types/koa-log/tsconfig.json
 create mode 100644 types/koa-log/tslint.json

diff --git a/types/koa-log/index.d.ts b/types/koa-log/index.d.ts
new file mode 100644
index 0000000000..3e97ea155f
--- /dev/null
+++ b/types/koa-log/index.d.ts
@@ -0,0 +1,33 @@
+// Type definitions for koa-log 2.1
+// Project: https://github.com/vicanso/koa-log#readme
+// Definitions by: Uladzimir Havenchyk <https://github.com/havenchyk>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+import * as Koa from 'koa';
+
+declare function koaLog(type: string): Koa.Middleware;
+
+declare namespace koaLog {
+    namespace morgan {
+        function cookie(ctx: Koa.BaseContext, key: string): string;
+
+        function date(ctx: Koa.BaseContext, format: string): string;
+
+        function format(name: string): string;
+
+        function length(ctx: Koa.BaseContext): number | undefined;
+
+        function method(ctx: Koa.BaseContext): string;
+
+        function referrer(ctx: Koa.BaseContext): string;
+
+        function status(ctx: Koa.BaseContext): number;
+
+        function token(name: string, fn: (ctx: Koa.BaseContext) => string): void;
+
+        function url(ctx: Koa.BaseContext): string;
+    }
+}
+
+export = koaLog;
diff --git a/types/koa-log/koa-log-tests.ts b/types/koa-log/koa-log-tests.ts
new file mode 100644
index 0000000000..070ceabfe9
--- /dev/null
+++ b/types/koa-log/koa-log-tests.ts
@@ -0,0 +1,10 @@
+import Koa = require('koa');
+import koaLogger = require('koa-log');
+
+koaLogger.morgan.token('request-body', (ctx: Koa.BaseContext) => JSON.stringify(ctx.request.body));
+koaLogger.morgan.token('response-body', (ctx: Koa.BaseContext) => JSON.stringify(ctx.body));
+
+const app = new Koa();
+app.use(
+    koaLogger(':status :method :url took :response-time ms :request-body :response-body')
+);
diff --git a/types/koa-log/tsconfig.json b/types/koa-log/tsconfig.json
new file mode 100644
index 0000000000..2e32dbc373
--- /dev/null
+++ b/types/koa-log/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "koa-log-tests.ts"
+    ]
+}
diff --git a/types/koa-log/tslint.json b/types/koa-log/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/koa-log/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 2f0bb90c1610ef41f4b786ad2a67f081570c5282 Mon Sep 17 00:00:00 2001
From: Alex D'Andrea <alexander.dandrea@sick.de>
Date: Fri, 30 Nov 2018 17:06:10 +0100
Subject: [PATCH 602/836] Add function & interface declarations for CA handling

Namely:
- `pki.createCaStore()`
- `pki.verifyCertificateChain()`
- interface `CAStore`

... and fix a copy&paste error in the APIDoc of `pki.Certificate.setIssuer()`.
---
 types/node-forge/index.d.ts          | 13 ++++++++++++-
 types/node-forge/node-forge-tests.ts | 19 +++++++++++++++++++
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/types/node-forge/index.d.ts b/types/node-forge/index.d.ts
index 1a2b028a90..5e38861db0 100644
--- a/types/node-forge/index.d.ts
+++ b/types/node-forge/index.d.ts
@@ -67,6 +67,8 @@ declare module "node-forge" {
         function privateKeyFromPem(pem: PEM): PrivateKey;
         function certificateToPem(cert: Certificate, maxline?: number): PEM;
         function certificateFromPem(pem: PEM, computeHash?: boolean, strict?: boolean): Certificate;
+        function createCaStore(): CAStore;
+        function verifyCertificateChain(caStore: CAStore, chain: Certificate[], customVerifyCallback?: (verified: boolean | string, depth: number, chain: Certificate[]) => boolean): boolean;
 
         interface oids {
             [key: string]: string;
@@ -202,7 +204,7 @@ declare module "node-forge" {
              */
             setSubject(attrs: CertificateField[], uniqueId?: string): void;
             /**
-              * Sets the subject of this certificate.
+              * Sets the issuer of this certificate.
               *
               * @param attrs the array of subject attributes to use.
               * @param uniqueId an optional a unique ID to use.
@@ -244,6 +246,15 @@ declare module "node-forge" {
 
         }
 
+        interface CAStore {
+            addCertificate(cert: Certificate | string): any;
+            hasCertificate(cert: Certificate | string): boolean;
+            removeCertificate(cert: Certificate | string): Certificate | null;
+            listAllCertificates(): pki.Certificate[];
+            getIssuer(subject: Certificate): Certificate | null;
+            getBySubject(subject: string): Certificate | null;
+        }
+
         function certificateFromAsn1(obj: asn1.Asn1, computeHash?: boolean): Certificate;
 
         function decryptRsaPrivateKey(pem: PEM, passphrase?: string): PrivateKey;
diff --git a/types/node-forge/node-forge-tests.ts b/types/node-forge/node-forge-tests.ts
index a8d352ad1a..62f0718c21 100644
--- a/types/node-forge/node-forge-tests.ts
+++ b/types/node-forge/node-forge-tests.ts
@@ -203,3 +203,22 @@ if (forge.util.fillString('1', 5) !== '11111') throw Error('forge.util.fillStrin
         throw Error("rsa signature verification fail");
     }
 }
+
+{
+    const emptyStore = forge.pki.createCaStore();
+
+    const certificate = forge.pki.createCertificate();
+    const pem = forge.pki.certificateToPem(certificate);
+
+    const caStore = forge.pki.createCaStore();
+    caStore.addCertificate(certificate);
+    caStore.removeCertificate(certificate);
+
+    caStore.listAllCertificates();
+
+    caStore.removeCertificate(certificate);
+
+    forge.pki.verifyCertificateChain(caStore, [certificate], (verified, depth, chain) => {
+        return true;
+    });
+}

From b2e36c1f593ba01084bdb782c51df592dbfccbd9 Mon Sep 17 00:00:00 2001
From: Jan Dolezel <dolezel.jan@gmail.com>
Date: Tue, 4 Dec 2018 09:20:06 +0100
Subject: [PATCH 603/836] Updated types

---
 types/react-sortable-tree/index.d.ts          | 70 +++++++++++--------
 .../utils/tree-data-utils.d.ts                | 18 ++++-
 2 files changed, 54 insertions(+), 34 deletions(-)

diff --git a/types/react-sortable-tree/index.d.ts b/types/react-sortable-tree/index.d.ts
index bcc6596ee6..ed47df8460 100644
--- a/types/react-sortable-tree/index.d.ts
+++ b/types/react-sortable-tree/index.d.ts
@@ -46,6 +46,11 @@ export interface FullTree {
 
 export interface NodeData extends TreeNode, TreePath, TreeIndex { }
 
+export interface FlatDataItem extends TreeNode, TreePath {
+    lowerSiblingsCounts: number[];
+    parentNode: TreeItem;
+}
+
 export interface SearchData extends NodeData {
     searchQuery: any;
 }
@@ -61,6 +66,11 @@ export interface OnVisibilityToggleData extends FullTree, TreeNode {
     expanded: boolean;
 }
 
+export interface OnDragStateChangedData {
+    isDragging: boolean;
+    draggedNode: TreeItem;
+}
+
 interface PreviousAndNextLocation {
     prevTreeIndex: number;
     prevPath: NumberOrStringArray;
@@ -96,7 +106,7 @@ export interface NodeRendererProps {
     toggleChildrenVisibility?(data: NodeData): void;
     buttons?: JSX.Element[];
     className?: string;
-    style?: { [index: string]: any };
+    style?: React.CSSProperties;
     title?: (data: NodeData) => JSX.Element | JSX.Element;
     subtitle?: (data: NodeData) => JSX.Element | JSX.Element;
     icons?: JSX.Element[];
@@ -109,12 +119,12 @@ export interface NodeRendererProps {
 
     connectDragPreview: ConnectDragPreview;
     connectDragSource: ConnectDragSource;
-    parentNode?: { [index: string]: any };
+    parentNode?: TreeItem;
     startDrag: any;
     endDrag: any;
     isDragging: boolean;
     didDrop: boolean;
-    draggedNode?: { [index: string]: any };
+    draggedNode?: TreeItem;
     isOver: boolean;
     canDrop?: boolean;
 }
@@ -124,7 +134,7 @@ export type PlaceholderRenderer = React.ComponentClass<PlaceholderRendererProps>
 export interface PlaceholderRendererProps {
     isOver: boolean;
     canDrop: boolean;
-    draggedNode: { [index: string]: any };
+    draggedNode: TreeItem;
 }
 
 type NumberOrStringArray = Array<string | number>;
@@ -147,54 +157,52 @@ export interface TreeRendererProps {
     connectDropTarget: ConnectDropTarget;
     isOver: boolean;
     canDrop?: boolean;
-    draggedNode?: { [index: string]: any };
+    draggedNode?: TreeItem;
 
     // used in dndManager
-    getPrevRow: any; // @TODO what is this method?
+    getPrevRow: () => FlatDataItem | null;
     node: TreeItem;
     path: NumberOrStringArray;
 }
 
-export interface ThemeProps {
-    style?: { [index: string]: any };
-    innerStyle?: { [index: string]: any };
+interface ThemeTreeProps {
+    style?: React.CSSProperties
+    innerStyle?: React.CSSProperties
     reactVirtualizedListProps?: Partial<ListProps>;
     scaffoldBlockPxWidth?: number;
     slideRegionSize?: number;
     rowHeight?: ((info: Index) => number) | number;
-    treeNodeRenderer?: TreeRenderer;
     nodeContentRenderer?: NodeRenderer;
     placeholderRenderer?: PlaceholderRenderer;
 }
 
-export interface ReactSortableTreeProps {
+export interface ThemeProps extends ThemeTreeProps {
+    treeNodeRenderer?: TreeRenderer;
+}
+
+export interface ReactSortableTreeProps extends ThemeTreeProps {
     treeData: TreeItem[];
     onChange(treeData: TreeItem[]): void;
-    style?: { [index: string]: any };
-    className?: string;
-    innerStyle?: { [index: string]: any };
+    getNodeKey?(data: TreeNode & TreeIndex): string | number;
+    generateNodeProps?(data: ExtendedNodeData): { [index: string]: any };
+    onMoveNode?(data: NodeData & FullTree & OnMovePreviousAndNextLocation): void;
+    onVisibilityToggle?(data: OnVisibilityToggleData): void;
+    onDragStateChanged?(data: OnDragStateChangedData): void;
     maxDepth?: number;
+    rowDirection?: 'ltr' | 'rtl';
+    canDrag?: ((data: ExtendedNodeData) => boolean) | boolean;
+    canDrop?(data: OnDragPreviousAndNextLocation & NodeData): boolean;
+    canNodeHaveChildren?(node: TreeItem): boolean;
+    theme?: ThemeProps;
     searchMethod?(data: SearchData): boolean;
     searchQuery?: string | any;
     searchFocusOffset?: number;
-    searchFinishCallback?(matches: NodeData[]): void;
-    generateNodeProps?(data: ExtendedNodeData): { [index: string]: any };
-    getNodeKey?(data: TreeNode & TreeIndex): string | number;
-    onMoveNode?(data: NodeData & FullTree & OnMovePreviousAndNextLocation): void;
-    onVisibilityToggle?(data: OnVisibilityToggleData): void;
-    canDrag?: ((data: ExtendedNodeData) => boolean) | boolean;
-    canDrop?(data: OnDragPreviousAndNextLocation & NodeData): boolean;
-    reactVirtualizedListProps?: Partial<ListProps>;
-    rowHeight?: ((info: Index) => number) | number;
-    slideRegionSize?: number;
-    scaffoldBlockPxWidth?: number;
-    isVirtualized?: boolean;
-    nodeContentRenderer?: NodeRenderer;
-    dndType?: string;
-    placeholderRenderer?: PlaceholderRenderer;
-    theme?: ThemeProps;
-    shouldCopyOnOutsideDrop?: boolean | ((data: ShouldCopyData) => boolean);
     onlyExpandSearchedNodes?: boolean;
+    searchFinishCallback?(matches: NodeData[]): void;
+    dndType?: string;
+    shouldCopyOnOutsideDrop?: boolean | ((data: ShouldCopyData) => boolean);
+    className?: string;
+    isVirtualized?: boolean;
 }
 
 declare const SortableTree: React.ComponentClass<ReactSortableTreeProps>;
diff --git a/types/react-sortable-tree/utils/tree-data-utils.d.ts b/types/react-sortable-tree/utils/tree-data-utils.d.ts
index b9c7bb94a0..19b9dcf177 100644
--- a/types/react-sortable-tree/utils/tree-data-utils.d.ts
+++ b/types/react-sortable-tree/utils/tree-data-utils.d.ts
@@ -1,4 +1,4 @@
-import { FullTree, TreePath, TreeItem, TreeIndex, SearchData, NodeData, TreeNode } from '..';
+import { FullTree, TreePath, TreeItem, TreeIndex, SearchData, NodeData, TreeNode, FlatDataItem } from '..';
 
 export type GetNodeKeyFunction = (data: TreeIndex & TreeNode) => string | number;
 export type WalkAndMapFunctionParameters = FullTree & {getNodeKey: GetNodeKeyFunction, callback: Function, ignoreCollapsed?: boolean};
@@ -13,6 +13,11 @@ export function getVisibleNodeInfoAtIndex(
     }): TreeNode & TreePath & {lowerSiblingsCounts: number[]} | null;
 export function walk(data: WalkAndMapFunctionParameters): void;
 export function map(data: WalkAndMapFunctionParameters): TreeItem[];
+export function toggleExpandedForAll(
+    data: FullTree & {
+        expanded?: boolean,
+    },
+): TreeItem[];
 export function changeNodeAtPath(
     data: FullTree & TreePath & {
         newNode: Function | any,
@@ -26,12 +31,18 @@ export function removeNodeAtPath(
         ignoreCollapsed?: boolean,
     },
 ): TreeItem[];
+export function removeNode(
+    data: FullTree & TreePath & {
+        getNodeKey: GetNodeKeyFunction,
+        ignoreCollapsed?: boolean,
+    },
+): (FullTree & TreeNode & TreeIndex) | null;
 export function getNodeAtPath(
     data: FullTree & TreePath & {
         getNodeKey: GetNodeKeyFunction,
         ignoreCollapsed?: boolean,
     },
-): TreeNode & TreeIndex | null;
+): (TreeNode & TreeIndex) | null;
 export function addNodeUnderParent(
     data: FullTree & {
         newNode: TreeItem,
@@ -39,6 +50,7 @@ export function addNodeUnderParent(
         getNodeKey: GetNodeKeyFunction,
         ignoreCollapsed?: boolean,
         expandParent?: boolean,
+        addAsFirstChild?: boolean,
     },
 ): FullTree & TreeIndex;
 export function insertNode(
@@ -56,7 +68,7 @@ export function getFlatDataFromTree(
         getNodeKey: GetNodeKeyFunction,
         ignoreCollapsed?: boolean,
     },
-): Array<TreeNode & TreePath & {lowerSiblingsCounts: number[], parentNode: TreeItem}>;
+): Array<FlatDataItem>;
 export function getTreeFromFlatData(
     data: {
         flatData: FlattenedData,

From 9b44b24d63f883cbc8301ef4c1b7c30e170def74 Mon Sep 17 00:00:00 2001
From: Alex D'Andrea <alexander.dandrea@sick.de>
Date: Tue, 4 Dec 2018 09:25:52 +0100
Subject: [PATCH 604/836] Use void over any

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

diff --git a/types/node-forge/index.d.ts b/types/node-forge/index.d.ts
index 5e38861db0..d2fcddc2d9 100644
--- a/types/node-forge/index.d.ts
+++ b/types/node-forge/index.d.ts
@@ -247,7 +247,7 @@ declare module "node-forge" {
         }
 
         interface CAStore {
-            addCertificate(cert: Certificate | string): any;
+            addCertificate(cert: Certificate | string): void;
             hasCertificate(cert: Certificate | string): boolean;
             removeCertificate(cert: Certificate | string): Certificate | null;
             listAllCertificates(): pki.Certificate[];

From 6ca0152bcd4ea671c1e8d52c799a1cd1c1bb4b82 Mon Sep 17 00:00:00 2001
From: Ziyu Wang <odduid@gmail.com>
Date: Tue, 4 Dec 2018 19:42:08 +1100
Subject: [PATCH 605/836] fix selenium-webdriver logginng type

---
 types/selenium-webdriver/index.d.ts    | 33 ++++++++++++++++++++++++--
 types/selenium-webdriver/test/index.ts |  6 +++++
 2 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/types/selenium-webdriver/index.d.ts b/types/selenium-webdriver/index.d.ts
index aa8a696576..4fa0ccf7ac 100644
--- a/types/selenium-webdriver/index.d.ts
+++ b/types/selenium-webdriver/index.d.ts
@@ -4,7 +4,8 @@
 //   Yuki Kokubun <https://github.com/Kuniwak>,
 //   Craig Nishina <https://github.com/cnishina>,
 //   Simon Gellis <https://github.com/SupernaviX>,
-//   Ben Dixon <https://github.com/bendxn>
+//   Ben Dixon <https://github.com/bendxn>,
+//   Ziyu <https://github.com/oddui>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -540,7 +541,7 @@ export namespace logging {
      * @param {string} name the logger's name.
      * @return {!Logger} the requested logger.
      */
-    getLogger(name: string): Logger;
+    getLogger(name?: string): Logger;
 
     /**
      * Creates a new logger.
@@ -552,6 +553,34 @@ export namespace logging {
      */
     createLogger_(name: string, parent: Logger): Logger;
   }
+
+  /**
+   * Retrieves a named logger, creating it in the process. This function will
+   * implicitly create the requested logger, and any of its parents, if they
+   * do not yet exist.
+   *
+   * @param {string} name the logger's name.
+   * @return {!Logger} the requested logger.
+   */
+  function getLogger(name?: string): Logger;
+
+  /**
+   * Adds the console handler to the given logger. The console handler will log
+   * all messages using the JavaScript Console API.
+   *
+   * @param {Logger=} opt_logger The logger to add the handler to; defaults
+   *     to the root logger.
+   */
+  function addConsoleHandler(opt_logger?: Logger): void;
+
+  /**
+   * Removes the console log handler from the given logger.
+   *
+   * @param {Logger=} opt_logger The logger to remove the handler from; defaults
+   *     to the root logger.
+   * @see exports.addConsoleHandler
+   */
+  function removeConsoleHandler(opt_logger?: Logger): void;
 }
 
 export namespace promise {
diff --git a/types/selenium-webdriver/test/index.ts b/types/selenium-webdriver/test/index.ts
index f8decdace1..84ffc6a8c2 100644
--- a/types/selenium-webdriver/test/index.ts
+++ b/types/selenium-webdriver/test/index.ts
@@ -758,6 +758,12 @@ function TestLogging() {
     type = webdriver.logging.Type.DRIVER;
     type = webdriver.logging.Type.PERFORMANCE;
     type = webdriver.logging.Type.SERVER;
+
+    let logger: webdriver.logging.Logger = webdriver.logging.getLogger();
+    webdriver.logging.addConsoleHandler();
+    webdriver.logging.addConsoleHandler(logger);
+    webdriver.logging.removeConsoleHandler();
+    webdriver.logging.removeConsoleHandler(logger);
 }
 
 function TestLoggingEntry() {

From eb1f29cb8d023cb5ee81b85ecee3a3211456cdea Mon Sep 17 00:00:00 2001
From: Jan Dolezel <dolezel.jan@gmail.com>
Date: Tue, 4 Dec 2018 10:24:58 +0100
Subject: [PATCH 606/836] Fixed lint

---
 types/react-sortable-tree/index.d.ts                 | 4 ++--
 types/react-sortable-tree/utils/tree-data-utils.d.ts | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/types/react-sortable-tree/index.d.ts b/types/react-sortable-tree/index.d.ts
index ed47df8460..0c0cc075e2 100644
--- a/types/react-sortable-tree/index.d.ts
+++ b/types/react-sortable-tree/index.d.ts
@@ -166,8 +166,8 @@ export interface TreeRendererProps {
 }
 
 interface ThemeTreeProps {
-    style?: React.CSSProperties
-    innerStyle?: React.CSSProperties
+    style?: React.CSSProperties;
+    innerStyle?: React.CSSProperties;
     reactVirtualizedListProps?: Partial<ListProps>;
     scaffoldBlockPxWidth?: number;
     slideRegionSize?: number;
diff --git a/types/react-sortable-tree/utils/tree-data-utils.d.ts b/types/react-sortable-tree/utils/tree-data-utils.d.ts
index 19b9dcf177..b80e82dd81 100644
--- a/types/react-sortable-tree/utils/tree-data-utils.d.ts
+++ b/types/react-sortable-tree/utils/tree-data-utils.d.ts
@@ -68,7 +68,7 @@ export function getFlatDataFromTree(
         getNodeKey: GetNodeKeyFunction,
         ignoreCollapsed?: boolean,
     },
-): Array<FlatDataItem>;
+): FlatDataItem[];
 export function getTreeFromFlatData(
     data: {
         flatData: FlattenedData,

From bc05cf043193f7e163c3c6f68773b70c1fdb6384 Mon Sep 17 00:00:00 2001
From: Grzegorz Rozdzialik <voreny.gelio@gmail.com>
Date: Sun, 25 Nov 2018 19:28:42 +0100
Subject: [PATCH 607/836] fix react-table interface names, relax component
 props requirements

---
 types/react-table/lib/hoc/selectTable.d.ts | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/types/react-table/lib/hoc/selectTable.d.ts b/types/react-table/lib/hoc/selectTable.d.ts
index d70d84eb78..a128e221fa 100644
--- a/types/react-table/lib/hoc/selectTable.d.ts
+++ b/types/react-table/lib/hoc/selectTable.d.ts
@@ -12,7 +12,7 @@ export interface SelectInputComponentProps {
     row: any;
 }
 
-export interface SelectAllInputComponent {
+export interface SelectAllInputComponentProps {
     selectType: SelectType;
     checked: boolean;
     onClick: () => any;
@@ -28,7 +28,7 @@ export interface SelectTableAdditionalProps {
 
     selectAll?: boolean;
 
-    toggleAll?: SelectAllInputComponent['onClick'];
+    toggleAll?: SelectAllInputComponentProps['onClick'];
 
     toggleSelection?: SelectInputComponentProps['onClick'];
 
@@ -37,8 +37,10 @@ export interface SelectTableAdditionalProps {
      */
     selectType?: SelectType;
 
-    SelectInputComponent?: ComponentType<SelectInputComponentProps>;
-    SelectAllInputComponent?: ComponentType<SelectAllInputComponent>;
+    SelectInputComponent?: ComponentType<Partial<SelectInputComponentProps>>;
+    SelectAllInputComponent?: ComponentType<
+        Partial<SelectAllInputComponentProps>
+    >;
 }
 
 export interface SelectTableHOCOptions {

From 1180f3973af2ef648954249adfa4ae4ff7329514 Mon Sep 17 00:00:00 2001
From: Grzegorz Rozdzialik <voreny.gelio@gmail.com>
Date: Sun, 25 Nov 2018 19:41:27 +0100
Subject: [PATCH 608/836] [react-table] fix select table props, add tests

---
 types/react-table/index.d.ts                  |  6 ++++-
 types/react-table/lib/hoc/selectTable.d.ts    |  6 ++---
 types/react-table/test/select-table-tests.tsx | 27 +++++++++++++++++--
 3 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/types/react-table/index.d.ts b/types/react-table/index.d.ts
index d6b1679edd..b7192d3064 100644
--- a/types/react-table/index.d.ts
+++ b/types/react-table/index.d.ts
@@ -1,6 +1,10 @@
 // Type definitions for react-table 6.7
 // Project: https://github.com/react-tools/react-table
-// Definitions by: Roy Xue <https://github.com/royxue>, Pavel Sakalo <https://github.com/psakalo>, Krzysztof Porębski <https://github.com/Havret>, Andy S <https://github.com/andys8>
+// Definitions by: Roy Xue <https://github.com/royxue>,
+//                 Pavel Sakalo <https://github.com/psakalo>,
+//                 Krzysztof Porębski <https://github.com/Havret>,
+//                 Andy S <https://github.com/andys8>,
+//                 Grzegorz Rozdzialik <https://github.com/Gelio>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 import * as React from 'react';
diff --git a/types/react-table/lib/hoc/selectTable.d.ts b/types/react-table/lib/hoc/selectTable.d.ts
index a128e221fa..fd6d9bf42c 100644
--- a/types/react-table/lib/hoc/selectTable.d.ts
+++ b/types/react-table/lib/hoc/selectTable.d.ts
@@ -37,10 +37,8 @@ export interface SelectTableAdditionalProps {
      */
     selectType?: SelectType;
 
-    SelectInputComponent?: ComponentType<Partial<SelectInputComponentProps>>;
-    SelectAllInputComponent?: ComponentType<
-        Partial<SelectAllInputComponentProps>
-    >;
+    SelectInputComponent?: ComponentType<SelectInputComponentProps>;
+    SelectAllInputComponent?: ComponentType<SelectAllInputComponentProps>;
 }
 
 export interface SelectTableHOCOptions {
diff --git a/types/react-table/test/select-table-tests.tsx b/types/react-table/test/select-table-tests.tsx
index 1a1b231292..a4ed4d4f25 100644
--- a/types/react-table/test/select-table-tests.tsx
+++ b/types/react-table/test/select-table-tests.tsx
@@ -3,18 +3,41 @@ import * as ReactDOM from 'react-dom';
 
 import ReactTable, { Column } from 'react-table';
 import selectTableHOC, {
-    SelectTableAdditionalProps
+    SelectTableAdditionalProps,
+    SelectInputComponentProps,
+    SelectAllInputComponentProps
 } from 'react-table/lib/hoc/selectTable';
 
 const SelectTable = selectTableHOC(ReactTable);
 
+const SelectInput: React.StatelessComponent<SelectInputComponentProps> = ({
+    onClick,
+    id,
+    checked,
+    row
+}) => (
+    <input
+        type="checkbox"
+        onClick={e => onClick(id, e.shiftKey, row)}
+        checked={checked}
+    />
+);
+
+const SelectAllInput: React.StatelessComponent<
+    SelectAllInputComponentProps
+> = ({ onClick, checked }) => (
+    <input type="checkbox" onClick={onClick} checked={checked} />
+);
+
 const selectTableAdditionalProps: SelectTableAdditionalProps = {
     isSelected: () => true,
     keyField: 'id',
     selectAll: true,
     selectType: 'checkbox',
     toggleAll: () => null,
-    toggleSelection: () => null
+    toggleSelection: () => null,
+    SelectInputComponent: SelectInput,
+    SelectAllInputComponent: SelectAllInput
 };
 
 const data = [{ id: 1, name: 'Foo' }, { id: 2, name: 'Bar' }];

From 6ac8dea2213447ca6a8f431620d3184eeae7f025 Mon Sep 17 00:00:00 2001
From: Grzegorz Rozdzialik <voreny.gelio@gmail.com>
Date: Mon, 3 Dec 2018 19:09:19 +0100
Subject: [PATCH 609/836] add resolveData prop to react-table

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

diff --git a/types/react-table/index.d.ts b/types/react-table/index.d.ts
index b7192d3064..1afb6eb0fd 100644
--- a/types/react-table/index.d.ts
+++ b/types/react-table/index.d.ts
@@ -50,7 +50,7 @@ export interface SortingRule {
     desc?: true;
 }
 
-export interface TableProps<D = any> extends
+export interface TableProps<D = any, ResolvedData = D> extends
     Partial<TextProps>,
     Partial<ComponentDecoratorProps>,
     Partial<ControlledStateCallbackProps>,
@@ -60,6 +60,8 @@ export interface TableProps<D = any> extends
     /** Default: [] */
     data: D[];
 
+    resolveData?: (data: D[]) => ResolvedData[];
+
     /** Default: false */
     loading: boolean;
 
@@ -168,7 +170,7 @@ export interface TableProps<D = any> extends
     column: Partial<GlobalColumn>;
 
     /** Array of all Available Columns */
-    columns?: Array<Column<D>>;
+    columns?: Array<Column<ResolvedData>>;
 
     /** Expander defaults. */
     expanderDefaults: Partial<ExpanderDefaults>;
@@ -184,9 +186,9 @@ export interface TableProps<D = any> extends
 
     /** Control callback for functional rendering */
     children: (
-        state: FinalState<D>,
+        state: FinalState<ResolvedData>,
         makeTable: () => React.ReactElement<any>,
-        instance: Instance<D>
+        instance: Instance<ResolvedData>
     ) => React.ReactNode;
 }
 

From 823efa4650567f7cf040e6f6f0524df47ffbcd5e Mon Sep 17 00:00:00 2001
From: Jan Lohage <git@j2L4e.de>
Date: Tue, 4 Dec 2018 12:44:29 +0100
Subject: [PATCH 610/836] @feathersjs/feathers: make default export type
 generic

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

diff --git a/types/feathersjs__feathers/index.d.ts b/types/feathersjs__feathers/index.d.ts
index 5948eadc27..4da4dd49c6 100644
--- a/types/feathersjs__feathers/index.d.ts
+++ b/types/feathersjs__feathers/index.d.ts
@@ -12,7 +12,7 @@
 import { EventEmitter } from 'events';
 import * as self from '@feathersjs/feathers';
 
-declare const feathers: (() => Application<object>) & typeof self;
+declare const feathers: (<T = any>() => Application<T>) & typeof self;
 export default feathers;
 
 export const version: string;

From a7c4d2a685848521cd17b9e83b949e9605aa0f4a Mon Sep 17 00:00:00 2001
From: Jan Lohage <git@j2L4e.de>
Date: Tue, 4 Dec 2018 13:00:49 +0100
Subject: [PATCH 611/836] fix tests and linting

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

diff --git a/types/feathersjs__feathers/feathersjs__feathers-tests.ts b/types/feathersjs__feathers/feathersjs__feathers-tests.ts
index 7d0e961700..bf1cdf8aa7 100644
--- a/types/feathersjs__feathers/feathersjs__feathers-tests.ts
+++ b/types/feathersjs__feathers/feathersjs__feathers-tests.ts
@@ -9,7 +9,7 @@ interface Services {
     users: User;
 }
 
-const app = feathers() as Application<Services>;
+const app = feathers<Services>();
 
 app.service('users').get(0).then(u => {
     const user: User = u;
diff --git a/types/feathersjs__feathers/index.d.ts b/types/feathersjs__feathers/index.d.ts
index 4da4dd49c6..4746b29ff7 100644
--- a/types/feathersjs__feathers/index.d.ts
+++ b/types/feathersjs__feathers/index.d.ts
@@ -12,6 +12,7 @@
 import { EventEmitter } from 'events';
 import * as self from '@feathersjs/feathers';
 
+// tslint:disable-next-line no-unnecessary-generics
 declare const feathers: (<T = any>() => Application<T>) & typeof self;
 export default feathers;
 

From 1a87973fd7debd80f99331b895d2089de1470606 Mon Sep 17 00:00:00 2001
From: arichter83 <36486293+arichter83@users.noreply.github.com>
Date: Tue, 4 Dec 2018 13:49:24 +0100
Subject: [PATCH 612/836] Basic test with old declaration

---
 types/simpl-schema/index.d.ts            | 158 +++++++++++++++++++++++
 types/simpl-schema/simpl-schema-tests.ts |  90 +++++++++++++
 types/simpl-schema/tsconfig.json         |  23 ++++
 types/simpl-schema/tslint.json           |   1 +
 4 files changed, 272 insertions(+)
 create mode 100644 types/simpl-schema/index.d.ts
 create mode 100644 types/simpl-schema/simpl-schema-tests.ts
 create mode 100644 types/simpl-schema/tsconfig.json
 create mode 100644 types/simpl-schema/tslint.json

diff --git a/types/simpl-schema/index.d.ts b/types/simpl-schema/index.d.ts
new file mode 100644
index 0000000000..c90d2ba93b
--- /dev/null
+++ b/types/simpl-schema/index.d.ts
@@ -0,0 +1,158 @@
+// from https://github.com/aldeed/simple-schema-js/issues/90
+
+declare module "simpl-schema" {
+
+    export class ValidationContext {
+        constructor(ss: any);
+        addValidationErrors(errors: any): void;
+        clean(...args: any[]): any;
+        getErrorForKey(key: any, ...args: any[]): any;
+        isValid(): any;
+        keyErrorMessage(key: any, ...args: any[]): any;
+        keyIsInvalid(key: any, ...args: any[]): any;
+        reset(): void;
+        setValidationErrors(errors: any): void;
+        validate(obj: any, ...args: any[]): any;
+        validationErrors(): any;
+    }
+
+    interface SchemaDefinition {
+        type: any;
+        label?: string | Function;
+        optional?: boolean | Function;
+        min?: number | boolean | Date | Function;
+        max?: number | boolean | Date | Function;
+        minCount?: number | Function;
+        maxCount?: number | Function;
+        allowedValues?: any[] | Function;
+        decimal?: boolean;
+        exclusiveMax?: boolean;
+        exclusiveMin?: boolean;
+        regEx?: RegExp | RegExp[];
+        custom?: Function;
+        blackbox?: boolean;
+        autoValue?: Function;
+        defaultValue?: any;
+        trim?: boolean;
+    }
+
+    interface CleanOption {
+      filter?: boolean;
+      autoConvert?: boolean;
+      removeEmptyStrings?: boolean;
+      trimStrings?: boolean;
+      getAutoValues?: boolean;
+      isModifier?: boolean;
+      extendAutoValueContext?: boolean;
+    }
+
+    interface SimpleSchemaStatic {
+      new(schema: {[key: string]: SchemaDefinition} | any[]): SimpleSchemaStatic;
+      namedContext(name?: string): SimpleSchemaValidationContextStatic;
+      addValidator(validator: Function): any;
+      pick(...fields: string[]): SimpleSchemaStatic;
+      omit(...fields: string[]): SimpleSchemaStatic;
+      clean(doc: any, options?: CleanOption): any;
+      schema(key?: string): SchemaDefinition | SchemaDefinition[];
+      getDefinition(key: string, propList?: any, functionContext?: any): any;
+      keyIsInBlackBox(key: string): boolean;
+      labels(labels: {[key: string]: string}): void;
+      label(key: any): any;
+      Integer: RegExp;
+      messages(messages: any): any;
+      messageForError(type: any, key: any, def: any, value: any): string;
+      allowsKey(key: any): string;
+      newContext(): SimpleSchemaValidationContextStatic;
+      objectKeys(keyPrefix: any): any[];
+      validate(obj: any, options?: ValidationOption): void;
+      validator(options: ValidationOption): Function;
+      RegEx: {
+          Email: RegExp;
+          EmailWithTLD: RegExp;
+          Domain: RegExp;
+          WeakDomain: RegExp;
+          IP: RegExp;
+          IPv4: RegExp;
+          IPv6: RegExp;
+          Url: RegExp;
+          Id: RegExp;
+          ZipCode: RegExp;
+          Phone: RegExp;
+      };
+    }
+
+    interface ValidationOption {
+        modifier?: boolean;
+        upsert?: boolean;
+        clean?: boolean;
+        filter?: boolean;
+        upsertextendedCustomContext?: boolean;
+    }
+
+    interface SimpleSchemaValidationContextStatic {
+        validate(obj: any, options?: ValidationOption): boolean;
+        validateOne(doc: any, keyName: string, options?: ValidationOption): boolean;
+        resetValidation(): void;
+        isValid(): boolean;
+        invalidKeys(): { name: string; type: string; value?: any; }[];
+        addInvalidKeys(errors: { name: string, type: string; }[]): void;
+        keyIsInvalid(name: any): boolean;
+        keyErrorMessage(name: any): string;
+        getErrorObject(): any;
+    }
+
+    interface MongoObjectStatic {
+        forEachNode(func: Function, options?: {endPointsOnly: boolean;}): void;
+        getValueForPosition(position: string): any;
+        setValueForPosition(position: string, value: any): void;
+        removeValueForPosition(position: string): void;
+        getKeyForPosition(position: string): any;
+        getGenericKeyForPosition(position: string): any;
+        getInfoForKey(key: string): any;
+        getPositionForKey(key: string): string;
+        getPositionsForGenericKey(key: string): string[];
+        getValueForKey(key: string): any;
+        addKey(key: string, val: any, op: string): any;
+        removeGenericKeys(keys: string[]): void;
+        removeGenericKey(key: string): void;
+        removeKey(key: string): void;
+        removeKeys(keys: string[]): void;
+        filterGenericKeys(test: Function): void;
+        setValueForKey(key: string, val: any): void;
+        setValueForGenericKey(key: string, val: any): void;
+        getObject(): any;
+        getFlatObject(options?: {keepArrays?: boolean}): any;
+        affectsKey(key: string): any;
+        affectsGenericKey(key: string): any;
+        affectsGenericKeyImplicit(key: string): any;
+    }
+
+    export const SimpleSchema: SimpleSchemaStatic;
+    export const SimpleSchemaValidationContext: SimpleSchemaValidationContextStatic;
+    export const MongoObject: MongoObjectStatic;
+
+    export interface SimpleSchema {
+      debug: boolean;
+      addValidator(validator: Function): any;
+      extendOptions(options: {[key: string]: any}): void;
+      messages(messages: any): void;
+      RegEx: {
+          Email: RegExp;
+          Domain: RegExp;
+          WeakDomain: RegExp;
+          IP: RegExp;
+          IPv4: RegExp;
+          IPv6: RegExp;
+          Url: RegExp;
+          Id: RegExp;
+          ZipCode: RegExp;
+          Phone: RegExp;
+      };
+    }
+
+    export interface MongoObject {
+      expandKey(val: any, key: string, obj: any): void;
+    }
+
+    export default SimpleSchema;
+}
diff --git a/types/simpl-schema/simpl-schema-tests.ts b/types/simpl-schema/simpl-schema-tests.ts
new file mode 100644
index 0000000000..6081a5a11b
--- /dev/null
+++ b/types/simpl-schema/simpl-schema-tests.ts
@@ -0,0 +1,90 @@
+import SimpleSchema from 'simpl-schema';
+
+const StringSchema = new SimpleSchema({
+    basicString: {
+      type: String
+    },
+    limitedString: {
+      type: String,
+      allowedValues: ['pro', 'con']
+    },
+    regExpString: {
+      type: String,
+      regEx: SimpleSchema.RegEx.Id
+  },
+  title: {
+    type: String,
+    label: "Argument",
+    custom: function () {
+      var text = this.value;
+      if(text.length > 10) return { type: SimpleSchema.ErrorTypes.MAX_STRING, max: 10 };
+    }
+  },
+});
+
+StringSchema.validate({
+    basicString: "Test",
+    limitedString: "pro",
+    regExpString: "id"
+});
+
+    /*
+    ,
+    title: {
+      type: String,
+      label: "Argument",
+      custom: function () {
+        var text = this.value;
+        text = text.replace(/https?:\/\/(www\.)?([-a-zA-Z0-9@:%._\+~#=]{2,256}\.[a-z]{2,6})\b([-a-zA-Z0-9@:%_\+.~#?&//=]*)/gi, '$2');
+
+        if(text.length > MAX_ARGUMENT_LENGTH) return { type: SimpleSchema.ErrorTypes.MAX_STRING, max: MAX_ARGUMENT_LENGTH }
+        else if(text.length < MIN_ARGUMENT_LENGTH) return { type: SimpleSchema.ErrorTypes.MIN_STRING, min: MIN_ARGUMENT_LENGTH }
+      }
+    },
+    questionId: {
+      type: String,
+      regEx: SimpleSchema.RegEx.Id
+    },
+    side: {
+      type: String,
+      allowedValues: ['pro', 'con']
+    },
+    userId: {
+      type: String,
+      regEx: SimpleSchema.RegEx.Id
+    },
+    createdAt: {
+      type: Date,
+      autoValue: () => new Date(),
+    },
+    clapCount: {
+      type: SimpleSchema.Integer,
+      defaultValue: 0
+    },
+    highlight: {
+      type: Array,
+      optional: true
+    },
+    'highlight.$': {
+      type: Object
+    },
+    'highlight.$.start': SimpleSchema.Integer,
+    'highlight.$.end': SimpleSchema.Integer,
+    'highlight.$.text': {
+      type: String,
+      trim: false
+    }
+    */
+    /*
+    ,
+    {
+        clean: {
+            filter: true,
+            autoConvert: true,
+            removeEmptyStrings: true,
+            trimStrings: true,
+            getAutoValues: true,
+            removeNullsFromArrays: true,
+        }
+    }
+    */
diff --git a/types/simpl-schema/tsconfig.json b/types/simpl-schema/tsconfig.json
new file mode 100644
index 0000000000..d079496f4e
--- /dev/null
+++ b/types/simpl-schema/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "simpl-schema-tests.ts"
+    ]
+}
diff --git a/types/simpl-schema/tslint.json b/types/simpl-schema/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/simpl-schema/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From dec806bdf66ddee26ce8e6ded3590c814946c577 Mon Sep 17 00:00:00 2001
From: arichter83 <36486293+arichter83@users.noreply.github.com>
Date: Tue, 4 Dec 2018 13:50:26 +0100
Subject: [PATCH 613/836] Move out of module

---
 types/simpl-schema/index.d.ts | 307 +++++++++++++++++-----------------
 1 file changed, 152 insertions(+), 155 deletions(-)

diff --git a/types/simpl-schema/index.d.ts b/types/simpl-schema/index.d.ts
index c90d2ba93b..97411f4463 100644
--- a/types/simpl-schema/index.d.ts
+++ b/types/simpl-schema/index.d.ts
@@ -1,158 +1,155 @@
 // from https://github.com/aldeed/simple-schema-js/issues/90
 
-declare module "simpl-schema" {
-
-    export class ValidationContext {
-        constructor(ss: any);
-        addValidationErrors(errors: any): void;
-        clean(...args: any[]): any;
-        getErrorForKey(key: any, ...args: any[]): any;
-        isValid(): any;
-        keyErrorMessage(key: any, ...args: any[]): any;
-        keyIsInvalid(key: any, ...args: any[]): any;
-        reset(): void;
-        setValidationErrors(errors: any): void;
-        validate(obj: any, ...args: any[]): any;
-        validationErrors(): any;
-    }
-
-    interface SchemaDefinition {
-        type: any;
-        label?: string | Function;
-        optional?: boolean | Function;
-        min?: number | boolean | Date | Function;
-        max?: number | boolean | Date | Function;
-        minCount?: number | Function;
-        maxCount?: number | Function;
-        allowedValues?: any[] | Function;
-        decimal?: boolean;
-        exclusiveMax?: boolean;
-        exclusiveMin?: boolean;
-        regEx?: RegExp | RegExp[];
-        custom?: Function;
-        blackbox?: boolean;
-        autoValue?: Function;
-        defaultValue?: any;
-        trim?: boolean;
-    }
-
-    interface CleanOption {
-      filter?: boolean;
-      autoConvert?: boolean;
-      removeEmptyStrings?: boolean;
-      trimStrings?: boolean;
-      getAutoValues?: boolean;
-      isModifier?: boolean;
-      extendAutoValueContext?: boolean;
-    }
-
-    interface SimpleSchemaStatic {
-      new(schema: {[key: string]: SchemaDefinition} | any[]): SimpleSchemaStatic;
-      namedContext(name?: string): SimpleSchemaValidationContextStatic;
-      addValidator(validator: Function): any;
-      pick(...fields: string[]): SimpleSchemaStatic;
-      omit(...fields: string[]): SimpleSchemaStatic;
-      clean(doc: any, options?: CleanOption): any;
-      schema(key?: string): SchemaDefinition | SchemaDefinition[];
-      getDefinition(key: string, propList?: any, functionContext?: any): any;
-      keyIsInBlackBox(key: string): boolean;
-      labels(labels: {[key: string]: string}): void;
-      label(key: any): any;
-      Integer: RegExp;
-      messages(messages: any): any;
-      messageForError(type: any, key: any, def: any, value: any): string;
-      allowsKey(key: any): string;
-      newContext(): SimpleSchemaValidationContextStatic;
-      objectKeys(keyPrefix: any): any[];
-      validate(obj: any, options?: ValidationOption): void;
-      validator(options: ValidationOption): Function;
-      RegEx: {
-          Email: RegExp;
-          EmailWithTLD: RegExp;
-          Domain: RegExp;
-          WeakDomain: RegExp;
-          IP: RegExp;
-          IPv4: RegExp;
-          IPv6: RegExp;
-          Url: RegExp;
-          Id: RegExp;
-          ZipCode: RegExp;
-          Phone: RegExp;
-      };
-    }
-
-    interface ValidationOption {
-        modifier?: boolean;
-        upsert?: boolean;
-        clean?: boolean;
-        filter?: boolean;
-        upsertextendedCustomContext?: boolean;
-    }
-
-    interface SimpleSchemaValidationContextStatic {
-        validate(obj: any, options?: ValidationOption): boolean;
-        validateOne(doc: any, keyName: string, options?: ValidationOption): boolean;
-        resetValidation(): void;
-        isValid(): boolean;
-        invalidKeys(): { name: string; type: string; value?: any; }[];
-        addInvalidKeys(errors: { name: string, type: string; }[]): void;
-        keyIsInvalid(name: any): boolean;
-        keyErrorMessage(name: any): string;
-        getErrorObject(): any;
-    }
-
-    interface MongoObjectStatic {
-        forEachNode(func: Function, options?: {endPointsOnly: boolean;}): void;
-        getValueForPosition(position: string): any;
-        setValueForPosition(position: string, value: any): void;
-        removeValueForPosition(position: string): void;
-        getKeyForPosition(position: string): any;
-        getGenericKeyForPosition(position: string): any;
-        getInfoForKey(key: string): any;
-        getPositionForKey(key: string): string;
-        getPositionsForGenericKey(key: string): string[];
-        getValueForKey(key: string): any;
-        addKey(key: string, val: any, op: string): any;
-        removeGenericKeys(keys: string[]): void;
-        removeGenericKey(key: string): void;
-        removeKey(key: string): void;
-        removeKeys(keys: string[]): void;
-        filterGenericKeys(test: Function): void;
-        setValueForKey(key: string, val: any): void;
-        setValueForGenericKey(key: string, val: any): void;
-        getObject(): any;
-        getFlatObject(options?: {keepArrays?: boolean}): any;
-        affectsKey(key: string): any;
-        affectsGenericKey(key: string): any;
-        affectsGenericKeyImplicit(key: string): any;
-    }
-
-    export const SimpleSchema: SimpleSchemaStatic;
-    export const SimpleSchemaValidationContext: SimpleSchemaValidationContextStatic;
-    export const MongoObject: MongoObjectStatic;
-
-    export interface SimpleSchema {
-      debug: boolean;
-      addValidator(validator: Function): any;
-      extendOptions(options: {[key: string]: any}): void;
-      messages(messages: any): void;
-      RegEx: {
-          Email: RegExp;
-          Domain: RegExp;
-          WeakDomain: RegExp;
-          IP: RegExp;
-          IPv4: RegExp;
-          IPv6: RegExp;
-          Url: RegExp;
-          Id: RegExp;
-          ZipCode: RegExp;
-          Phone: RegExp;
-      };
-    }
-
-    export interface MongoObject {
-      expandKey(val: any, key: string, obj: any): void;
-    }
-
-    export default SimpleSchema;
+export class ValidationContext {
+    constructor(ss: any);
+    addValidationErrors(errors: any): void;
+    clean(...args: any[]): any;
+    getErrorForKey(key: any, ...args: any[]): any;
+    isValid(): any;
+    keyErrorMessage(key: any, ...args: any[]): any;
+    keyIsInvalid(key: any, ...args: any[]): any;
+    reset(): void;
+    setValidationErrors(errors: any): void;
+    validate(obj: any, ...args: any[]): any;
+    validationErrors(): any;
 }
+
+interface SchemaDefinition {
+    type: any;
+    label?: string | Function;
+    optional?: boolean | Function;
+    min?: number | boolean | Date | Function;
+    max?: number | boolean | Date | Function;
+    minCount?: number | Function;
+    maxCount?: number | Function;
+    allowedValues?: any[] | Function;
+    decimal?: boolean;
+    exclusiveMax?: boolean;
+    exclusiveMin?: boolean;
+    regEx?: RegExp | RegExp[];
+    custom?: Function;
+    blackbox?: boolean;
+    autoValue?: Function;
+    defaultValue?: any;
+    trim?: boolean;
+}
+
+interface CleanOption {
+  filter?: boolean;
+  autoConvert?: boolean;
+  removeEmptyStrings?: boolean;
+  trimStrings?: boolean;
+  getAutoValues?: boolean;
+  isModifier?: boolean;
+  extendAutoValueContext?: boolean;
+}
+
+interface SimpleSchemaStatic {
+  new(schema: {[key: string]: SchemaDefinition} | any[]): SimpleSchemaStatic;
+  namedContext(name?: string): SimpleSchemaValidationContextStatic;
+  addValidator(validator: Function): any;
+  pick(...fields: string[]): SimpleSchemaStatic;
+  omit(...fields: string[]): SimpleSchemaStatic;
+  clean(doc: any, options?: CleanOption): any;
+  schema(key?: string): SchemaDefinition | SchemaDefinition[];
+  getDefinition(key: string, propList?: any, functionContext?: any): any;
+  keyIsInBlackBox(key: string): boolean;
+  labels(labels: {[key: string]: string}): void;
+  label(key: any): any;
+  Integer: RegExp;
+  messages(messages: any): any;
+  messageForError(type: any, key: any, def: any, value: any): string;
+  allowsKey(key: any): string;
+  newContext(): SimpleSchemaValidationContextStatic;
+  objectKeys(keyPrefix: any): any[];
+  validate(obj: any, options?: ValidationOption): void;
+  validator(options: ValidationOption): Function;
+  RegEx: {
+      Email: RegExp;
+      EmailWithTLD: RegExp;
+      Domain: RegExp;
+      WeakDomain: RegExp;
+      IP: RegExp;
+      IPv4: RegExp;
+      IPv6: RegExp;
+      Url: RegExp;
+      Id: RegExp;
+      ZipCode: RegExp;
+      Phone: RegExp;
+  };
+}
+
+interface ValidationOption {
+    modifier?: boolean;
+    upsert?: boolean;
+    clean?: boolean;
+    filter?: boolean;
+    upsertextendedCustomContext?: boolean;
+}
+
+interface SimpleSchemaValidationContextStatic {
+    validate(obj: any, options?: ValidationOption): boolean;
+    validateOne(doc: any, keyName: string, options?: ValidationOption): boolean;
+    resetValidation(): void;
+    isValid(): boolean;
+    invalidKeys(): { name: string; type: string; value?: any; }[];
+    addInvalidKeys(errors: { name: string, type: string; }[]): void;
+    keyIsInvalid(name: any): boolean;
+    keyErrorMessage(name: any): string;
+    getErrorObject(): any;
+}
+
+interface MongoObjectStatic {
+    forEachNode(func: Function, options?: {endPointsOnly: boolean;}): void;
+    getValueForPosition(position: string): any;
+    setValueForPosition(position: string, value: any): void;
+    removeValueForPosition(position: string): void;
+    getKeyForPosition(position: string): any;
+    getGenericKeyForPosition(position: string): any;
+    getInfoForKey(key: string): any;
+    getPositionForKey(key: string): string;
+    getPositionsForGenericKey(key: string): string[];
+    getValueForKey(key: string): any;
+    addKey(key: string, val: any, op: string): any;
+    removeGenericKeys(keys: string[]): void;
+    removeGenericKey(key: string): void;
+    removeKey(key: string): void;
+    removeKeys(keys: string[]): void;
+    filterGenericKeys(test: Function): void;
+    setValueForKey(key: string, val: any): void;
+    setValueForGenericKey(key: string, val: any): void;
+    getObject(): any;
+    getFlatObject(options?: {keepArrays?: boolean}): any;
+    affectsKey(key: string): any;
+    affectsGenericKey(key: string): any;
+    affectsGenericKeyImplicit(key: string): any;
+}
+
+export const SimpleSchema: SimpleSchemaStatic;
+export const SimpleSchemaValidationContext: SimpleSchemaValidationContextStatic;
+export const MongoObject: MongoObjectStatic;
+
+export interface SimpleSchema {
+  debug: boolean;
+  addValidator(validator: Function): any;
+  extendOptions(options: {[key: string]: any}): void;
+  messages(messages: any): void;
+  RegEx: {
+      Email: RegExp;
+      Domain: RegExp;
+      WeakDomain: RegExp;
+      IP: RegExp;
+      IPv4: RegExp;
+      IPv6: RegExp;
+      Url: RegExp;
+      Id: RegExp;
+      ZipCode: RegExp;
+      Phone: RegExp;
+  };
+}
+
+export interface MongoObject {
+  expandKey(val: any, key: string, obj: any): void;
+}
+
+export default SimpleSchema;

From fe1b9d65058b43a13bd1fbe955df3c3fa3b767c4 Mon Sep 17 00:00:00 2001
From: Leon Rinkel <leon@rinkel.me>
Date: Tue, 4 Dec 2018 14:16:26 +0100
Subject: [PATCH 614/836] Updated type definitions for rethinkdb

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

diff --git a/types/rethinkdb/index.d.ts b/types/rethinkdb/index.d.ts
index 87293230a9..d54856f08c 100644
--- a/types/rethinkdb/index.d.ts
+++ b/types/rethinkdb/index.d.ts
@@ -377,7 +377,7 @@ declare module "rethinkdb" {
 
         /**
          * Turn a sequence into an array or object, necessary when merging a sequence.
-         * 
+         *
          * See: https://www.rethinkdb.com/api/javascript/coerce_to/
          */
         coerceTo(key: 'array'): Expression<any[]>;
@@ -539,6 +539,7 @@ declare module "rethinkdb" {
         le(value: T): Expression<boolean>;
 
         add(n: number): Expression<number>;
+        add(n: Expression<number>): Expression<number>;
 
         /**
          * Subtract two numbers.

From 98c3b9c6af9d4405288399a7a6af2ab9fb7b65ae Mon Sep 17 00:00:00 2001
From: Alan Plum <me@pluma.io>
Date: Tue, 4 Dec 2018 15:03:02 +0100
Subject: [PATCH 615/836] Simplify types

---
 types/json_ml/index.d.ts       |  8 +-------
 types/json_ml/json_ml-tests.ts | 26 +++++++++++++++++---------
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/types/json_ml/index.d.ts b/types/json_ml/index.d.ts
index ba53b84cb4..e2eb2c7af4 100644
--- a/types/json_ml/index.d.ts
+++ b/types/json_ml/index.d.ts
@@ -5,13 +5,7 @@
 
 /// <reference types="cheerio" />
 
-export type Node = string | Element;
-export type SimpleElement = [string, Attributes] | [string];
-export interface NodeList extends Array<Node> {}
-export type Element = SimpleElement & NodeList;
-export interface Attributes {
-    [key: string]: string;
-}
+export type Node = string | [string, ...any[]];
 export function parse(xml: string, trim?: boolean): Node[];
 export function stringify(
     object: Node[],
diff --git a/types/json_ml/json_ml-tests.ts b/types/json_ml/json_ml-tests.ts
index ecc84d9d8b..05ca64da4a 100644
--- a/types/json_ml/json_ml-tests.ts
+++ b/types/json_ml/json_ml-tests.ts
@@ -1,12 +1,20 @@
 /// <reference types="node" />
-import { Attributes, Element, Node, parse, stringify } from "json_ml";
+import { Node, parse, stringify } from "json_ml";
 
-const nodes: Node[] = parse("<ul><li>hello</li></ul>");
-const node1: Node = nodes[0];
-if (typeof node1 !== "string") {
-    const el: Element = node1;
-    const attrs = el[1] as Attributes;
-    console.log(el[0], attrs);
-}
+const nodes: Node[] = parse(
+    '<ul><li style="color:red">First Item</li><li title="Some hover text." style="color:green">Second Item</li><li><span class="code-example-third">Third</span>Item</li></ul>'
+);
+stringify(nodes, el => (el.is("li") ? null : el), 2);
 
-console.log(stringify(nodes, el => (el.is("li") ? null : el), 2));
+stringify(
+    [
+        [
+            "ul",
+            ["li", { style: "color: red" }],
+            ["li", { title: "Some hover text", style: "color: green" }],
+            ["li", ["span", { class: "code-example-third" }]]
+        ]
+    ],
+    null,
+    2
+);

From eae28b274e9bb589252eb928dd80b2992d01f09e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABtan=20Maisse?= <gmaisse@leadformance.com>
Date: Sat, 17 Nov 2018 12:59:44 +0100
Subject: [PATCH 616/836] Add new attributes and bump type definition version
 to 4.0

---
 types/storybook__addon-options/index.d.ts     |  7 +++-
 .../storybook__addon-options-tests.ts         | 38 ++++++++++---------
 2 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/types/storybook__addon-options/index.d.ts b/types/storybook__addon-options/index.d.ts
index ec3ba1e252..968b003543 100644
--- a/types/storybook__addon-options/index.d.ts
+++ b/types/storybook__addon-options/index.d.ts
@@ -1,13 +1,14 @@
-// Type definitions for @storybook/addon-options 3.2
+// Type definitions for @storybook/addon-options 4.0
 // Project: https://github.com/storybooks/storybook
 // Definitions by: Joscha Feth <https://github.com/joscha>
 //                 Simon Helle Nielsen <https://github.com/simonhn>
 //                 A.MacLeay <https://github.com/amacleay>
+//                 Gaetan Maisse <https://github.com/gaetanmaisse>
 //                 Adam Misiorny <https://github.com/adam187>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 
-import { StoryDecorator } from "@storybook/react";
+import { StoryDecorator } from '@storybook/react';
 
 export interface Options {
     name?: string;
@@ -23,7 +24,9 @@ export interface Options {
     sortStoriesByKind?: boolean;
     hierarchySeparator?: RegExp | string;
     hierarchyRootSeparator?: RegExp | string;
+    sidebarAnimations?: boolean;
     selectedAddonPanel?: string;
+    enableShortcuts?: boolean;
 }
 
 /**
diff --git a/types/storybook__addon-options/storybook__addon-options-tests.ts b/types/storybook__addon-options/storybook__addon-options-tests.ts
index 1fc49d18e0..4321ecd72d 100644
--- a/types/storybook__addon-options/storybook__addon-options-tests.ts
+++ b/types/storybook__addon-options/storybook__addon-options-tests.ts
@@ -1,5 +1,23 @@
-import { setOptions, withOptions } from '@storybook/addon-options';
 import { addDecorator } from '@storybook/react';
+import { setOptions, withOptions } from '@storybook/addon-options';
+
+addDecorator(
+  withOptions({
+    name: 'My Storybook',
+    url: 'https://example.com',
+    goFullScreen: false,
+    showStoriesPanel: false,
+    showAddonPanel: false,
+    showSearchBox: false,
+    addonPanelInRight: false,
+    sortStoriesByKind: false,
+    hierarchySeparator: /\//,
+    hierarchyRootSeparator: /\|/,
+    sidebarAnimations: false,
+    selectedAddonPanel: 'storybook/actions/action-panel',
+    enableShortcuts: false
+  })
+);
 
 setOptions({
   name: 'My Storybook',
@@ -12,7 +30,9 @@ setOptions({
   sortStoriesByKind: false,
   hierarchySeparator: /\//,
   hierarchyRootSeparator: /\|/,
+  sidebarAnimations: false,
   selectedAddonPanel: 'storybook/actions/action-panel',
+  enableShortcuts: false
 });
 
 setOptions({
@@ -32,19 +52,3 @@ setOptions({
   hierarchySeparator: '.',
   hierarchyRootSeparator: '#',
 });
-
-addDecorator(
-    withOptions({
-        name: "My Storybook",
-        url: "https://example.com",
-        goFullScreen: false,
-        showStoriesPanel: false,
-        showAddonPanel: false,
-        showSearchBox: false,
-        addonPanelInRight: false,
-        sortStoriesByKind: false,
-        hierarchySeparator: /\//,
-        hierarchyRootSeparator: /\|/,
-        selectedAddonPanel: "storybook/actions/action-panel"
-    })
-);

From 08fe7e0d496f4d082123e4ec4a86e00a6c92db22 Mon Sep 17 00:00:00 2001
From: "Lukaschenko, Konstantin" <k.lukaschenko@controlexpert.com>
Date: Tue, 4 Dec 2018 15:42:26 +0100
Subject: [PATCH 617/836] added tdsloader (autodesk 3ds max) support to three
 js.

---
 types/three/index.d.ts                        |   2 +
 .../three/test/examples/loaders/tdsloader.ts  |  14 ++
 types/three/three-tdsloader.d.ts              | 195 ++++++++++++++++++
 types/three/tsconfig.json                     |   1 +
 4 files changed, 212 insertions(+)
 create mode 100644 types/three/test/examples/loaders/tdsloader.ts
 create mode 100644 types/three/three-tdsloader.d.ts

diff --git a/types/three/index.d.ts b/types/three/index.d.ts
index b8c5dfa961..2e4cad4929 100644
--- a/types/three/index.d.ts
+++ b/types/three/index.d.ts
@@ -23,6 +23,7 @@
 //                 Dilip Ramirez <https://github.com/Dukuo>
 //                 Julian Strecker <https://github.com/JulianSSS>
 //                 Zhang Hao <https://github.com/devilsparta>
+//                 Konstantin Lukaschenko <https://github.com/KonstantinLukaschenko>
 // Definitions: https://github.com//DefinitelyTyped
 // TypeScript Version: 2.8
 
@@ -34,6 +35,7 @@ export * from "./three-copyshader";
 export * from "./three-css3drenderer";
 export * from "./three-ctmloader";
 export * from "./three-ddsloader";
+export * from "./three-tdsloader";
 export * from "./three-dragcontrols";
 export * from "./three-editorcontrols";
 export * from "./three-effectcomposer";
diff --git a/types/three/test/examples/loaders/tdsloader.ts b/types/three/test/examples/loaders/tdsloader.ts
new file mode 100644
index 0000000000..72666d4003
--- /dev/null
+++ b/types/three/test/examples/loaders/tdsloader.ts
@@ -0,0 +1,14 @@
+import * as THREE from '../../../index'
+
+const onSuccess = (object3D: THREE.Object3D) => {};
+const onProgress = (progress: ProgressEvent) => {};
+const onError = (event: ErrorEvent) => {};
+
+() => {
+    new THREE.TDSLoader(THREE).load(
+        'folder/file.3ds',
+        onSuccess,
+        onProgress,
+        onError
+    );
+}
\ No newline at end of file
diff --git a/types/three/three-tdsloader.d.ts b/types/three/three-tdsloader.d.ts
new file mode 100644
index 0000000000..3cd9df6443
--- /dev/null
+++ b/types/three/three-tdsloader.d.ts
@@ -0,0 +1,195 @@
+// https://github.com/mrdoob/three.js/blob/master/examples/js/loaders/TDSLoader.js
+
+import * as THREE from "./index";
+
+export class TDSLoader {
+  constructor(three: typeof THREE);
+
+  /**
+   * Load 3ds file from url.
+   *
+   * @param url URL for the file.
+   * @param onLoad onLoad callback, receives group object3D as argument.
+   * @param onProgress onProgress callback.
+   * @param onError onError callback.
+   */
+  load: (url: string, onLoad: (object3D: THREE.Object3D) => void, onProgress?: (progress: ProgressEvent) => void, onError?: (event: ErrorEvent) => void) => void;
+
+  /**
+   * Parse arraybuffer data and load 3ds file.
+   *
+   * @param arraybuffer Arraybuffer data to be loaded.
+   * @param path Path for external resources.
+   * @return Group loaded from 3ds file.
+   */
+  parse: (arraybuffer: ArrayBuffer, path: string) => THREE.Object3D;
+
+  /**
+   * Decode file content to read 3ds data.
+   *
+   * @param arraybuffer Arraybuffer data to be loaded.
+   */
+  readFile: (arraybuffer: ArrayBuffer, path: string) => void;
+
+  /**
+   * Read mesh data chunk.
+   *
+   * @param data Dataview in use.
+   */
+  readMeshData: (data: DataView, path: string) => void;
+
+  /**
+   * Read named object chunk.
+   *
+   * @param data Dataview in use.
+   */
+  readNamedobject: (data: DataView) => void;
+
+  /**
+   * Read material data chunk and add it to the material list.
+   *
+   * @param data Dataview in use.
+   */
+  readMaterialEntry: (data: DataView, path: string) => void;
+
+  /**
+   * Read mesh data chunk.
+   *
+   * @param data Dataview in use.
+   */
+  readMesh: (data: DataView) => void;
+
+  /**
+   * Read face array data chunk.
+   *
+   * @param data Dataview in use.
+   * @param mesh Mesh to be filled with the data read.
+   */
+  readFaceArray: (data: DataView, mesh: THREE.Mesh) => void;
+
+  /**
+   * Read texture map data chunk.
+   *
+   * @param data Dataview in use.
+   * @return Texture read from this data chunk.
+   */
+  readMap: (data: DataView, path: string) => THREE.Texture;
+
+  /**
+   * Read material group data chunk.
+   *
+   * @param data Dataview in use.
+   * @return object with name and index of the object.
+   */
+  readMaterialGroup: (data: DataView) => object;
+
+  /**
+   * Read a color value.
+   *
+   * @param data Dataview.
+   * @return Color value read..
+   */
+  readColor: (data: DataView) => THREE.Color;
+
+  /**
+   * Read next chunk of data.
+   *
+   * @param data Dataview.
+   * @return Chunk of data read.
+   */
+  readChunk: (data: DataView) => object;
+
+  /**
+   * Set position to the end of the current chunk of data.
+   *
+   * @param chunk Data chunk.
+   */
+  endChunk: (chunk: object) => void;
+
+  /**
+   * Move to the next data chunk.
+   *
+   * @param data Dataview.
+   * @param chunk Data chunk.
+   */
+  nextChunk: (data: DataView, chunk: object) => number;
+
+  /**
+   * Reset dataview position.
+   */
+  resetPosition: () => void;
+
+  /**
+   * Read byte value.
+   *
+   * @param data Dataview to read data from.
+   * @return Data read from the dataview.
+   */
+  readByte: (data: DataView) => number;
+
+  /**
+   * Read 32 bit float value.
+   *
+   * @param data Dataview to read data from.
+   * @return Data read from the dataview.
+   */
+  readFloat: (data: DataView) => number;
+
+  /**
+   * Read 32 bit signed integer value.
+   *
+   * @param data Dataview to read data from.
+   * @return Data read from the dataview.
+   */
+  readInt: (data: DataView) => number;
+
+  /**
+   * Read 16 bit signed integer value.
+   *
+   * @param data Dataview to read data from.
+   * @return Data read from the dataview.
+   */
+  readShort: (data: DataView) => number;
+
+  /**
+   * Read 64 bit unsigned integer value.
+   *
+   * @param data Dataview to read data from.
+   * @return Data read from the dataview.
+   */
+  readDWord: (data: DataView) => number;
+
+  /**
+   * Read 32 bit unsigned integer value.
+   *
+   * @param data Dataview to read data from.
+   * @return Data read from the dataview.
+   */
+  readWord: (data: DataView) => number;
+
+  /**
+   * Read string value.
+   *
+   * @param data Dataview to read data from.
+   * @param maxLength Max size of the string to be read.
+   * @return Data read from the dataview.
+   */
+  readString: (data: DataView, maxLength: number) => string;
+
+  /**
+   * Set resource path used to determine the file path to attached resources.
+   *
+   * @param path Path to resources.
+   * @return Self for chaining.
+   */
+  setPath: (path: string) => TDSLoader;
+
+  /**
+   * Print debug message to the console.
+   *
+   * Is controlled by a flag to show or hide debug messages.
+   *
+   * @param message Debug message to print to the console.
+   */
+  debugMessage: (message: string) => void;
+}
\ No newline at end of file
diff --git a/types/three/tsconfig.json b/types/three/tsconfig.json
index a7a79e68f5..814dd8f824 100644
--- a/types/three/tsconfig.json
+++ b/types/three/tsconfig.json
@@ -57,6 +57,7 @@
         "test/examples/ctm/ctmloader.ts",
         "test/examples/octree.ts",
         "test/examples/loaders/webgl_loader_obj_mtl.ts",
+        "test/examples/loaders/tdsloader.ts",
         "test/examples/exporters/gltf-exporter.ts",
         "test/webvr/webvr.ts"
     ]

From b37be32b6890ab5e1269ba03d4cfbabb7a530848 Mon Sep 17 00:00:00 2001
From: MichaelTsafrir <michaeltsafrir@gmail.com>
Date: Tue, 4 Dec 2018 16:45:20 +0200
Subject: [PATCH 618/836] Added missing blendStroke property to PieProps

blendStroke property exists in the pie component, yet is not recognized by the ts definition
---
 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 34e3cbcb88..6426e0de5f 100644
--- a/types/recharts/index.d.ts
+++ b/types/recharts/index.d.ts
@@ -447,6 +447,7 @@ export interface PieProps extends EventAttributes, Partial<PresentationAttribute
     } | React.ReactElement<any> | ContentRenderer<any> | boolean;
     activeShape?: object | ContentRenderer<any> | React.ReactElement<any>;
     activeIndex?: number | number[];
+    blendStroke?: boolean;
 }
 
 export class Pie extends React.Component<PieProps> { }

From acbff25eb48b184944d57bcf9918c5309a427160 Mon Sep 17 00:00:00 2001
From: "Lukaschenko, Konstantin" <k.lukaschenko@controlexpert.com>
Date: Tue, 4 Dec 2018 15:54:40 +0100
Subject: [PATCH 619/836] enhance reference.

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

diff --git a/types/three/three-tdsloader.d.ts b/types/three/three-tdsloader.d.ts
index 3cd9df6443..c1911a7003 100644
--- a/types/three/three-tdsloader.d.ts
+++ b/types/three/three-tdsloader.d.ts
@@ -1,4 +1,4 @@
-// https://github.com/mrdoob/three.js/blob/master/examples/js/loaders/TDSLoader.js
+// https://github.com/codetheorist/three-tds-loader/blob/master/src/index.js
 
 import * as THREE from "./index";
 

From 7b8c006a78eed82402b8ba6b8decb88736aa5ef6 Mon Sep 17 00:00:00 2001
From: Simon Schick <demwizzy@gmail.com>
Date: Tue, 4 Dec 2018 07:53:23 -0800
Subject: [PATCH 620/836] feat(puppeteer): add device descriptors

---
 types/puppeteer/DeviceDescriptors.d.ts | 22 ++++++++++++++++++++++
 types/puppeteer/puppeteer-tests.ts     |  2 ++
 types/puppeteer/tsconfig.json          |  1 +
 3 files changed, 25 insertions(+)
 create mode 100644 types/puppeteer/DeviceDescriptors.d.ts

diff --git a/types/puppeteer/DeviceDescriptors.d.ts b/types/puppeteer/DeviceDescriptors.d.ts
new file mode 100644
index 0000000000..e457748fda
--- /dev/null
+++ b/types/puppeteer/DeviceDescriptors.d.ts
@@ -0,0 +1,22 @@
+declare namespace devices {
+  interface Viewport {
+    width: number;
+    height: number;
+    deviceScaleFactor: number;
+    isMobile: boolean;
+    hasTouch: boolean;
+    isLandscape: boolean;
+  }
+
+  interface Device {
+    name: string;
+    userAgent: string;
+    viewport: Viewport;
+  }
+}
+
+declare const devices: {
+  [key: string]: devices.Device;
+};
+
+export = devices;
diff --git a/types/puppeteer/puppeteer-tests.ts b/types/puppeteer/puppeteer-tests.ts
index b708f1bc0c..66f8575583 100644
--- a/types/puppeteer/puppeteer-tests.ts
+++ b/types/puppeteer/puppeteer-tests.ts
@@ -1,5 +1,6 @@
 import * as puppeteer from "puppeteer";
 import { TimeoutError } from "puppeteer/Errors";
+import * as Devices from "puppeteer/DeviceDescriptors";
 
 // Accessibility
 
@@ -118,6 +119,7 @@ puppeteer.launch().then(async browser => {
   });
 
   await page.emulateMedia("screen");
+  await page.emulate(Devices['test']);
   await page.pdf({ path: "page.pdf" });
 
   await page.setRequestInterception(true);
diff --git a/types/puppeteer/tsconfig.json b/types/puppeteer/tsconfig.json
index f253604e14..57b57e65aa 100644
--- a/types/puppeteer/tsconfig.json
+++ b/types/puppeteer/tsconfig.json
@@ -21,6 +21,7 @@
     },
     "files": [
         "Errors.d.ts",
+        "DeviceDescriptors.d.ts",
         "index.d.ts",
         "puppeteer-tests.ts"
     ]

From 3161ba19195b79562c5d6d4dd03421a3cd81f339 Mon Sep 17 00:00:00 2001
From: "Lukaschenko, Konstantin" <k.lukaschenko@controlexpert.com>
Date: Tue, 4 Dec 2018 17:23:02 +0100
Subject: [PATCH 621/836] added types for three-tds-loader.

---
 types/three-tds-loader/index.d.ts             | 200 ++++++++++++++++++
 .../three-tds-loader-tests.ts                 |  15 ++
 types/three-tds-loader/tsconfig.json          |  24 +++
 types/three-tds-loader/tslint.json            |   1 +
 4 files changed, 240 insertions(+)
 create mode 100644 types/three-tds-loader/index.d.ts
 create mode 100644 types/three-tds-loader/three-tds-loader-tests.ts
 create mode 100644 types/three-tds-loader/tsconfig.json
 create mode 100644 types/three-tds-loader/tslint.json

diff --git a/types/three-tds-loader/index.d.ts b/types/three-tds-loader/index.d.ts
new file mode 100644
index 0000000000..379a2de8af
--- /dev/null
+++ b/types/three-tds-loader/index.d.ts
@@ -0,0 +1,200 @@
+// Type definitions for three-tds-loader 1.1
+// Project: https://github.com/codetheorist/three-tds-loader
+// Definitions by: Konstantin Lukaschenko <https://github.com/KonstantinLukaschenko>
+//                 Stefan Schönsee <https://github.com/sschoensee>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
+
+import * as THREE from 'three';
+
+export default class TDSLoader {
+    constructor(three: typeof THREE);
+
+    /**
+     * Load 3ds file from url.
+     *
+     * @param url URL for the file.
+     * @param onLoad onLoad callback, receives group object3D as argument.
+     * @param onProgress onProgress callback.
+     * @param onError onError callback.
+     */
+    load: (url: string, onLoad: (object3D: THREE.Object3D) => void, onProgress?: (progress: ProgressEvent) => void, onError?: (event: ErrorEvent) => void) => void;
+
+    /**
+     * Parse arraybuffer data and load 3ds file.
+     *
+     * @param arraybuffer Arraybuffer data to be loaded.
+     * @param path Path for external resources.
+     * @return Group loaded from 3ds file.
+     */
+    parse: (arraybuffer: ArrayBuffer, path: string) => THREE.Object3D;
+
+    /**
+     * Decode file content to read 3ds data.
+     *
+     * @param arraybuffer Arraybuffer data to be loaded.
+     */
+    readFile: (arraybuffer: ArrayBuffer, path: string) => void;
+
+    /**
+     * Read mesh data chunk.
+     *
+     * @param data Dataview in use.
+     */
+    readMeshData: (data: DataView, path: string) => void;
+
+    /**
+     * Read named object chunk.
+     *
+     * @param data Dataview in use.
+     */
+    readNamedobject: (data: DataView) => void;
+
+    /**
+     * Read material data chunk and add it to the material list.
+     *
+     * @param data Dataview in use.
+     */
+    readMaterialEntry: (data: DataView, path: string) => void;
+
+    /**
+     * Read mesh data chunk.
+     *
+     * @param data Dataview in use.
+     */
+    readMesh: (data: DataView) => void;
+
+    /**
+     * Read face array data chunk.
+     *
+     * @param data Dataview in use.
+     * @param mesh Mesh to be filled with the data read.
+     */
+    readFaceArray: (data: DataView, mesh: THREE.Mesh) => void;
+
+    /**
+     * Read texture map data chunk.
+     *
+     * @param data Dataview in use.
+     * @return Texture read from this data chunk.
+     */
+    readMap: (data: DataView, path: string) => THREE.Texture;
+
+    /**
+     * Read material group data chunk.
+     *
+     * @param data Dataview in use.
+     * @return object with name and index of the object.
+     */
+    readMaterialGroup: (data: DataView) => object;
+
+    /**
+     * Read a color value.
+     *
+     * @param data Dataview.
+     * @return Color value read..
+     */
+    readColor: (data: DataView) => THREE.Color;
+
+    /**
+     * Read next chunk of data.
+     *
+     * @param data Dataview.
+     * @return Chunk of data read.
+     */
+    readChunk: (data: DataView) => object;
+
+    /**
+     * Set position to the end of the current chunk of data.
+     *
+     * @param chunk Data chunk.
+     */
+    endChunk: (chunk: object) => void;
+
+    /**
+     * Move to the next data chunk.
+     *
+     * @param data Dataview.
+     * @param chunk Data chunk.
+     */
+    nextChunk: (data: DataView, chunk: object) => number;
+
+    /**
+     * Reset dataview position.
+     */
+    resetPosition: () => void;
+
+    /**
+     * Read byte value.
+     *
+     * @param data Dataview to read data from.
+     * @return Data read from the dataview.
+     */
+    readByte: (data: DataView) => number;
+
+    /**
+     * Read 32 bit float value.
+     *
+     * @param data Dataview to read data from.
+     * @return Data read from the dataview.
+     */
+    readFloat: (data: DataView) => number;
+
+    /**
+     * Read 32 bit signed integer value.
+     *
+     * @param data Dataview to read data from.
+     * @return Data read from the dataview.
+     */
+    readInt: (data: DataView) => number;
+
+    /**
+     * Read 16 bit signed integer value.
+     *
+     * @param data Dataview to read data from.
+     * @return Data read from the dataview.
+     */
+    readShort: (data: DataView) => number;
+
+    /**
+     * Read 64 bit unsigned integer value.
+     *
+     * @param data Dataview to read data from.
+     * @return Data read from the dataview.
+     */
+    readDWord: (data: DataView) => number;
+
+    /**
+     * Read 32 bit unsigned integer value.
+     *
+     * @param data Dataview to read data from.
+     * @return Data read from the dataview.
+     */
+    readWord: (data: DataView) => number;
+
+    /**
+     * Read string value.
+     *
+     * @param data Dataview to read data from.
+     * @param maxLength Max size of the string to be read.
+     * @return Data read from the dataview.
+     */
+    readString: (data: DataView, maxLength: number) => string;
+
+    /**
+     * Set resource path used to determine the file path to attached resources.
+     *
+     * @param path Path to resources.
+     * @return Self for chaining.
+     */
+    setPath: (path: string) => TDSLoader;
+
+    /**
+     * Print debug message to the console.
+     *
+     * Is controlled by a flag to show or hide debug messages.
+     *
+     * @param message Debug message to print to the console.
+     */
+    debugMessage: (message: string) => void;
+}
diff --git a/types/three-tds-loader/three-tds-loader-tests.ts b/types/three-tds-loader/three-tds-loader-tests.ts
new file mode 100644
index 0000000000..f61eeb92e3
--- /dev/null
+++ b/types/three-tds-loader/three-tds-loader-tests.ts
@@ -0,0 +1,15 @@
+import * as THREE from 'three';
+import TDSLoader from 'three-tds-loader';
+
+const loader = new TDSLoader(THREE);
+
+const onSuccess = (object3D: THREE.Object3D) => {};
+const onProgress = (progress: ProgressEvent) => {};
+const onError = (event: ErrorEvent) => {};
+
+loader.load(
+    'folder/file.3ds',
+    onSuccess,
+    onProgress,
+    onError
+);
diff --git a/types/three-tds-loader/tsconfig.json b/types/three-tds-loader/tsconfig.json
new file mode 100644
index 0000000000..cab037513c
--- /dev/null
+++ b/types/three-tds-loader/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "three-tds-loader-tests.ts"
+    ]
+}
diff --git a/types/three-tds-loader/tslint.json b/types/three-tds-loader/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/three-tds-loader/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From bb24e03c2562980f80ff243656740865ce28b773 Mon Sep 17 00:00:00 2001
From: Vincent Pizzo <vincent.pizzo@singlewire.com>
Date: Tue, 4 Dec 2018 08:39:02 -0800
Subject: [PATCH 622/836] Message should accept string or function

---
 types/yup/index.d.ts   | 58 ++++++++++++++++++++++--------------------
 types/yup/yup-tests.ts | 46 +++++++++++++++++++++++++++++++++
 2 files changed, 76 insertions(+), 28 deletions(-)

diff --git a/types/yup/index.d.ts b/types/yup/index.d.ts
index 821b0e3526..5d8713db68 100644
--- a/types/yup/index.d.ts
+++ b/types/yup/index.d.ts
@@ -5,6 +5,7 @@
 //                 Moreton Bay Regional Council <https://github.com/MoretonBayRC>,
 //                 Sindre Seppola <https://github.com/sseppola>
 //                 Yash Kulshrestha <https://github.com/YashdalfTheGray>
+//                 Vincent Pizzo <https://github.com/vincentjames501>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
 
@@ -47,6 +48,9 @@ export type AnySchemaConstructor =
     | ArraySchemaConstructor
     | ObjectSchemaConstructor;
 
+export type TestOptionsMessage = string
+    | ((params: object & Partial<TestMessageParams>) => string);
+
 export interface Schema<T> {
     clone(): this;
     label(label: string): this;
@@ -67,11 +71,11 @@ export interface Schema<T> {
     withMutation(fn: (current: this) => void): void;
     default(value?: any): this;
     nullable(isNullable: boolean): this;
-    required(message?: string): this;
+    required(message?: TestOptionsMessage): this;
     notRequired(): this;
-    typeError(message?: string): this;
-    oneOf(arrayOfValues: any[], message?: string): this;
-    notOneOf(arrayOfValues: any[], message?: string): this;
+    typeError(message?: TestOptionsMessage): this;
+    oneOf(arrayOfValues: any[], message?: TestOptionsMessage): this;
+    notOneOf(arrayOfValues: any[], message?: TestOptionsMessage): this;
     when(keys: string | any[], builder: WhenOptions<this>): this;
     test(
         name: string,
@@ -102,20 +106,20 @@ export interface StringSchemaConstructor {
 }
 
 export interface StringSchema extends Schema<string> {
-    min(limit: number | Ref, message?: string): StringSchema;
-    max(limit: number | Ref, message?: string): StringSchema;
+    min(limit: number | Ref, message?: TestOptionsMessage): StringSchema;
+    max(limit: number | Ref, message?: TestOptionsMessage): StringSchema;
     matches(
         regex: RegExp,
         messageOrOptions?:
-            | string
-            | { message?: string; excludeEmptyString?: boolean }
+            | TestOptionsMessage
+            | { message?: TestOptionsMessage; excludeEmptyString?: boolean }
     ): StringSchema;
-    email(message?: string): StringSchema;
-    url(message?: string): StringSchema;
+    email(message?: TestOptionsMessage): StringSchema;
+    url(message?: TestOptionsMessage): StringSchema;
     ensure(): StringSchema;
-    trim(message?: string): StringSchema;
-    lowercase(message?: string): StringSchema;
-    uppercase(message?: string): StringSchema;
+    trim(message?: TestOptionsMessage): StringSchema;
+    lowercase(message?: TestOptionsMessage): StringSchema;
+    uppercase(message?: TestOptionsMessage): StringSchema;
 }
 
 export interface NumberSchemaConstructor {
@@ -124,13 +128,13 @@ export interface NumberSchemaConstructor {
 }
 
 export interface NumberSchema extends Schema<number> {
-    min(limit: number | Ref, message?: string): NumberSchema;
-    max(limit: number | Ref, message?: string): NumberSchema;
-    lessThan(limit: number | Ref, message?: string): NumberSchema;
-    moreThan(limit: number | Ref, message?: string): NumberSchema;
-    positive(message?: string): NumberSchema;
-    negative(message?: string): NumberSchema;
-    integer(message?: string): NumberSchema;
+    min(limit: number | Ref, message?: TestOptionsMessage): NumberSchema;
+    max(limit: number | Ref, message?: TestOptionsMessage): NumberSchema;
+    lessThan(limit: number | Ref, message?: TestOptionsMessage): NumberSchema;
+    moreThan(limit: number | Ref, message?: TestOptionsMessage): NumberSchema;
+    positive(message?: TestOptionsMessage): NumberSchema;
+    negative(message?: TestOptionsMessage): NumberSchema;
+    integer(message?: TestOptionsMessage): NumberSchema;
     truncate(): NumberSchema;
     round(type: "floor" | "ceil" | "trunc" | "round"): NumberSchema;
 }
@@ -149,8 +153,8 @@ export interface DateSchemaConstructor {
 }
 
 export interface DateSchema extends Schema<Date> {
-    min(limit: Date | string | Ref, message?: string): DateSchema;
-    max(limit: Date | string | Ref, message?: string): DateSchema;
+    min(limit: Date | string | Ref, message?: TestOptionsMessage): DateSchema;
+    max(limit: Date | string | Ref, message?: TestOptionsMessage): DateSchema;
 }
 
 export interface ArraySchemaConstructor {
@@ -160,8 +164,8 @@ export interface ArraySchemaConstructor {
 
 export interface ArraySchema<T> extends Schema<T[]> {
     of<U>(type: Schema<U>): ArraySchema<U>;
-    min(limit: number | Ref, message?: string): ArraySchema<T>;
-    max(limit: number | Ref, message?: string): ArraySchema<T>;
+    min(limit: number | Ref, message?: TestOptionsMessage): ArraySchema<T>;
+    max(limit: number | Ref, message?: TestOptionsMessage): ArraySchema<T>;
     ensure(): ArraySchema<T>;
     compact(rejector?: (value: any) => boolean): ArraySchema<T>;
 }
@@ -177,7 +181,7 @@ export interface ObjectSchema<T> extends Schema<T> {
         noSortEdges?: Array<[string, string]>
     ): ObjectSchema<T>;
     from(fromKey: string, toKey: string, alias?: boolean): ObjectSchema<T>;
-    noUnknown(onlyKnownKeys?: boolean, message?: string): ObjectSchema<T>;
+    noUnknown(onlyKnownKeys?: boolean, message?: TestOptionsMessage): ObjectSchema<T>;
     transformKeys(callback: (key: any) => any): void;
     camelCase(): ObjectSchema<T>;
     constantCase(): ObjectSchema<T>;
@@ -256,9 +260,7 @@ export interface TestOptions {
     /**
      * The validation error message
      */
-    message?:
-        | string
-        | ((params: object & Partial<TestMessageParams>) => string);
+    message?: TestOptionsMessage;
 
     /**
      * Values passed to message for interpolation
diff --git a/types/yup/yup-tests.ts b/types/yup/yup-tests.ts
index efef78d319..4a6ecae98f 100644
--- a/types/yup/yup-tests.ts
+++ b/types/yup/yup-tests.ts
@@ -126,10 +126,15 @@ mixed.default(() => ({ number: 5 }));
 mixed.default();
 mixed.nullable(true);
 mixed.required();
+mixed.required('Foo');
+mixed.required(() => 'Foo');
 mixed.notRequired(); // $ExpectType MixedSchema
 mixed.typeError("type error");
+mixed.typeError(() => "type error");
 mixed.oneOf(["hello", "world"], "message");
+mixed.oneOf(["hello", "world"], () => "message");
 mixed.notOneOf(["hello", "world"], "message");
+mixed.notOneOf(["hello", "world"], () => "message");
 mixed.when("isBig", {
     is: value => true,
     then: yup.number().min(5),
@@ -255,26 +260,56 @@ yup.object()
 const strSchema = yup.string(); // $ExpectType StringSchema
 strSchema.isValid("hello"); // => true
 strSchema.required();
+strSchema.required("req");
+strSchema.required(() => "req");
 strSchema.min(5, "message");
+strSchema.min(5, () => "message");
 strSchema.max(5, "message");
+strSchema.max(5, () => "message");
 strSchema.matches(/(hi|bye)/);
+strSchema.matches(/(hi|bye)/, "invalid");
+strSchema.matches(/(hi|bye)/, () => "invalid");
 strSchema.email();
+strSchema.email("invalid");
+strSchema.email(() => "invalid");
 strSchema.url();
+strSchema.url("bad url");
+strSchema.url(() => "bad url");
 strSchema.ensure();
 strSchema.trim();
+strSchema.trim("trimmed");
+strSchema.trim(() => "trimmed");
 strSchema.lowercase();
+strSchema.lowercase("lower");
+strSchema.lowercase(() => "lower");
 strSchema.uppercase();
+strSchema.uppercase("upper");
+strSchema.uppercase(() => "upper");
 
 // Number schema
 const numSchema = yup.number(); // $ExpectType NumberSchema
 numSchema.isValid(10); // => true
+numSchema.min(5);
 numSchema.min(5, "message");
+numSchema.min(5, () => "message");
+numSchema.max(5);
 numSchema.max(5, "message");
+numSchema.max(5, () => "message");
 numSchema.positive();
+numSchema.positive("pos");
+numSchema.positive(() => "pos");
 numSchema.negative();
+numSchema.negative("neg");
+numSchema.negative(() => "neg");
 numSchema.lessThan(5);
+numSchema.lessThan(5, "lt");
+numSchema.lessThan(5, () => "lt");
 numSchema.moreThan(5);
+numSchema.moreThan(5, "mt");
+numSchema.moreThan(5, () => "mt");
 numSchema.integer();
+numSchema.integer("int");
+numSchema.integer(() => "int");
 numSchema.truncate();
 numSchema.round("floor");
 numSchema
@@ -293,17 +328,27 @@ dateSchema.min(new Date());
 dateSchema.min("2017-11-12");
 dateSchema.min(new Date(), "message");
 dateSchema.min("2017-11-12", "message");
+dateSchema.min("2017-11-12", () => "message");
 dateSchema.max(new Date());
 dateSchema.max("2017-11-12");
 dateSchema.max(new Date(), "message");
 dateSchema.max("2017-11-12", "message");
+dateSchema.max("2017-11-12", () => "message");
 
 // Array Schema
 const arrSchema = yup.array().of(yup.number().min(2));
 arrSchema.isValid([2, 3]); // => true
 arrSchema.isValid([1, -24]); // => false
 arrSchema.required();
+arrSchema.required("req");
+arrSchema.required(() => "req");
 arrSchema.ensure();
+arrSchema.max(5);
+arrSchema.max(5, "max");
+arrSchema.max(5, () => "max");
+arrSchema.min(5);
+arrSchema.min(5, "min");
+arrSchema.min(5, () => "min");
 arrSchema.compact(value => value === null);
 
 yup.array(); // $ExpectType ArraySchema<{}>
@@ -334,6 +379,7 @@ objSchema.from("prop", "myProp", true);
 objSchema.noUnknown();
 objSchema.noUnknown(true);
 objSchema.noUnknown(true, "message");
+objSchema.noUnknown(true, () => "message");
 objSchema.transformKeys(key => key.toUpperCase());
 objSchema.camelCase();
 objSchema.constantCase();

From 85aef6800f1be89ac31513f6efcfd4124a86c1e5 Mon Sep 17 00:00:00 2001
From: Silas Rech <silas@panascais.net>
Date: Tue, 4 Dec 2018 17:53:55 +0100
Subject: [PATCH 623/836] [hapi-auth-cookie] add typings

---
 .../hapi-auth-cookie-tests.ts                 |  33 ++++
 types/hapi-auth-cookie/index.d.ts             | 142 ++++++++++++++++++
 types/hapi-auth-cookie/tsconfig.json          |  23 +++
 types/hapi-auth-cookie/tslint.json            |   1 +
 4 files changed, 199 insertions(+)
 create mode 100644 types/hapi-auth-cookie/hapi-auth-cookie-tests.ts
 create mode 100644 types/hapi-auth-cookie/index.d.ts
 create mode 100644 types/hapi-auth-cookie/tsconfig.json
 create mode 100644 types/hapi-auth-cookie/tslint.json

diff --git a/types/hapi-auth-cookie/hapi-auth-cookie-tests.ts b/types/hapi-auth-cookie/hapi-auth-cookie-tests.ts
new file mode 100644
index 0000000000..155bb928e3
--- /dev/null
+++ b/types/hapi-auth-cookie/hapi-auth-cookie-tests.ts
@@ -0,0 +1,33 @@
+import * as hapi from 'hapi';
+import * as auth from 'hapi-auth-cookie';
+
+const server = new hapi.Server({ port: 8000 });
+
+server.register({
+    plugin: auth,
+});
+
+const options: auth.Options = {
+    clearInvalid: true,
+    cookie:       'session',
+    domain:       '.typescript.org',
+    keepAlive:    true,
+    password:     'abcdef',
+    redirectTo:   '/login',
+    isSecure:     true,
+    appendNext:   false,
+    ttl:          259200000,
+    validateFunc: async () => {
+        return { valid: true };
+    },
+};
+
+server.auth.strategy('session', 'cookie', options);
+
+server.route({ method: 'get', path: '/', handler: async (request) => {
+    request.cookieAuth.set('key', 'value');
+    request.cookieAuth.set({ user: request.params.user });
+    request.cookieAuth.clear();
+    request.cookieAuth.clear('key');
+    request.cookieAuth.ttl(1000);
+}});
diff --git a/types/hapi-auth-cookie/index.d.ts b/types/hapi-auth-cookie/index.d.ts
new file mode 100644
index 0000000000..8184ffd2fe
--- /dev/null
+++ b/types/hapi-auth-cookie/index.d.ts
@@ -0,0 +1,142 @@
+// Type definitions for hapi-auth-cookie 9.1
+// Project: https://github.com/hapijs/hapi-auth-cookie
+// Definitions by: Silas Rech <https://github.com/lenovouser>
+//                 Simon Schick <https://github.com/SimonSchick>
+//                 Matt Erickson <https://github.com/Mutmatt>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
+
+import { Request, ResponseObject, Plugin, ResponseToolkit, AuthCredentials, ServerStateCookieOptions } from 'hapi';
+
+declare module 'hapi' {
+    interface ServerAuth {
+        strategy(name: string, scheme: 'cookie', options?: hapiAuthCookie.Options): void;
+    }
+
+    interface PluginSpecificConfiguration {
+        'hapi-auth-cookie'?: {
+            redirectTo?: boolean;
+        };
+    }
+
+    interface Request {
+        cookieAuth: {
+            set(session: object): void;
+            set(key: string, value: object | string): void;
+            clear(key?: string): void;
+            ttl(milliseconds: number): void;
+        };
+    }
+}
+
+declare namespace hapiAuthCookie {
+    interface ValidateResponse { valid: boolean; credentials?: AuthCredentials; }
+    type ValidateFunction = (request?: Request, session?: object) => Promise<ValidateResponse>;
+    type RedirectToFunction = (request?: Request) => void;
+
+    /**
+     * Options passed to 'hapi.auth.strategy' when this plugin is used
+     */
+    interface Options {
+        /**
+         * The cookie name.
+         *
+         * @default 'sid'
+         */
+        cookie?: string;
+
+        /**
+         * Used for Iron cookie encoding.
+         * Should be at least 32 characters long.
+         */
+        password: string;
+
+        /**
+         * Sets the cookie expires time in milliseconds.
+         * Required when 'keepAlive' is true.
+         * Defaults to single browser session (ends when browser closes).
+         */
+        ttl?: number;
+
+        /**
+         * Sets the cookie Domain value.
+         * Defaults to none.
+         */
+        domain?: string;
+
+        /**
+         * Sets the cookie path value.
+         *
+         * @default '/'
+         */
+        path?: string;
+
+        /**
+         * Any authentication cookie that fails validation will be marked as expired in the response and cleared.
+         *
+         * @default false
+         */
+        clearInvalid?: boolean;
+
+        /**
+         * Automatically sets the session cookie after validation to extend the current session for a new TTL duration.
+         *
+         * @default false
+         */
+        keepAlive?: boolean;
+
+        /**
+         * If false omitted.
+         * Other options Strict or Lax.
+         *
+         * @default 'Strict'
+         */
+        isSameSite?: ServerStateCookieOptions['isSameSite'];
+
+        /**
+         * If false, the cookie is allowed to be transmitted over insecure connections which exposes it to attacks.
+         *
+         * @default true
+         */
+        isSecure?: boolean;
+
+        /**
+         * If false, the cookie will not include the 'HttpOnly' flag.
+         *
+         * @default true
+         */
+        isHttpOnly?: boolean;
+
+        /**
+         * Login URI or function that returns a URI to redirect unauthenticated requests to.
+         * Note that it will only trigger when the authentication mode is 'required'.
+         * Defaults to no redirection.
+         */
+        redirectTo?: string | RedirectToFunction;
+
+        /**
+         * Only works if 'redirectTo' is true
+         * If set to true, a string, or an object, appends the current request path to the query component of the 'redirectTo' URI.
+         */
+        appendNext?: boolean | string;
+
+        /**
+         * An optional session validation function used to validate the content of the session cookie on each request.
+         * Used to verify that the internal session state is still valid (e.g. user account still exists).
+         */
+        validateFunc?: ValidateFunction;
+
+        /**
+         * A name to use with decorating the request object.
+         * Using multiple decorator names for separate authentication strategies could allow a developer to call the methods for the wrong strategy.
+         * Potentially resulting in unintended authorized access.
+         *
+         * @default 'cookieAuth'
+         */
+        requestDecoratorName?: string;
+    }
+}
+
+declare const hapiAuthCookie: Plugin<void>;
+
+export = hapiAuthCookie;
diff --git a/types/hapi-auth-cookie/tsconfig.json b/types/hapi-auth-cookie/tsconfig.json
new file mode 100644
index 0000000000..ae04bf4a42
--- /dev/null
+++ b/types/hapi-auth-cookie/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "hapi-auth-cookie-tests.ts"
+    ]
+}
diff --git a/types/hapi-auth-cookie/tslint.json b/types/hapi-auth-cookie/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/hapi-auth-cookie/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 35d220e617240652c73768d8282b684f96e36840 Mon Sep 17 00:00:00 2001
From: Dimitri Benin <dimitri.benin@gmail.com>
Date: Mon, 26 Nov 2018 22:21:48 +0100
Subject: [PATCH 624/836] Add types for randombytes

---
 types/randombytes/index.d.ts           | 12 ++++++++++++
 types/randombytes/randombytes-tests.ts | 11 +++++++++++
 types/randombytes/tsconfig.json        | 23 +++++++++++++++++++++++
 types/randombytes/tslint.json          |  1 +
 4 files changed, 47 insertions(+)
 create mode 100644 types/randombytes/index.d.ts
 create mode 100644 types/randombytes/randombytes-tests.ts
 create mode 100644 types/randombytes/tsconfig.json
 create mode 100644 types/randombytes/tslint.json

diff --git a/types/randombytes/index.d.ts b/types/randombytes/index.d.ts
new file mode 100644
index 0000000000..049f893870
--- /dev/null
+++ b/types/randombytes/index.d.ts
@@ -0,0 +1,12 @@
+// Type definitions for randombytes 2.0
+// Project: https://github.com/crypto-browserify/randombytes
+// Definitions by: BendingBender <https://github.com/BendingBender>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+import { randomBytes as _randomBytes } from 'crypto';
+
+export = randomBytes;
+
+declare const randomBytes: typeof _randomBytes;
diff --git a/types/randombytes/randombytes-tests.ts b/types/randombytes/randombytes-tests.ts
new file mode 100644
index 0000000000..583fa685ec
--- /dev/null
+++ b/types/randombytes/randombytes-tests.ts
@@ -0,0 +1,11 @@
+import randomBytes = require('randombytes');
+
+// $ExpectType Buffer
+randomBytes(16);
+// $ExpectType void
+randomBytes(16, (err, resp) => {
+    // $ExpectType Error | null
+    err;
+    // $ExpectType Buffer
+    resp;
+});
diff --git a/types/randombytes/tsconfig.json b/types/randombytes/tsconfig.json
new file mode 100644
index 0000000000..31ecde389d
--- /dev/null
+++ b/types/randombytes/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "randombytes-tests.ts"
+    ]
+}
diff --git a/types/randombytes/tslint.json b/types/randombytes/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/randombytes/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From e7f4d0148e3d4e7e3e60a68f83ab5c02b3f114b4 Mon Sep 17 00:00:00 2001
From: Ivan Fernandes <ivandalcantara@gmail.com>
Date: Tue, 4 Dec 2018 16:16:29 -0200
Subject: [PATCH 625/836] add missing scopeSeparator option and tests

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

diff --git a/types/passport-oauth2/index.d.ts b/types/passport-oauth2/index.d.ts
index c3723b50b7..a6d519bf6a 100644
--- a/types/passport-oauth2/index.d.ts
+++ b/types/passport-oauth2/index.d.ts
@@ -67,6 +67,7 @@ declare namespace OAuth2Strategy {
         callbackURL?: string;
         customHeaders?: OutgoingHttpHeaders;
         scope?: string | string[];
+        scopeSeparator?: string;
         sessionKey?: string;
         store?: StateStore;
         state?: any;
diff --git a/types/passport-oauth2/passport-oauth2-tests.ts b/types/passport-oauth2/passport-oauth2-tests.ts
index 864b2cb9d6..57dcfa56d9 100644
--- a/types/passport-oauth2/passport-oauth2-tests.ts
+++ b/types/passport-oauth2/passport-oauth2-tests.ts
@@ -1,5 +1,5 @@
 import OAuth2Strategy = require('passport-oauth2');
-import { Strategy, StrategyOptions, StrategyOptionsWithRequest, VerifyCallback, AuthorizationError, TokenError, InternalOAuthError } from 'passport-oauth2';
+import { Strategy, StrategyOptions, StrategyOptionsWithRequest, VerifyCallback, AuthorizationError, TokenError, InternalOAuthError, Metadata, StateStore, StateStoreStoreCallback, StateStoreVerifyCallback } from 'passport-oauth2';
 import { Strategy as PassportStrategy } from 'passport';
 import { Request } from 'express';
 
@@ -56,3 +56,34 @@ class MyStrategy extends OAuth2Strategy {
         this._oauth2.get('http://www.example.com/profile', 'token', (err, result, response) => response);
     }
 }
+
+const metadata: Metadata = {
+    authorizationURL: 'http://www.example.com/auth',
+    clientID: 'dummy',
+    tokenURL: 'http://www.example.com/token'
+}
+
+class MyStore implements StateStore {
+    store(req: Request, meta: StateStoreStoreCallback | Metadata, callback?: StateStoreStoreCallback): void {}
+    verify(req: Request, state: string, meta: StateStoreVerifyCallback | Metadata, callback?: StateStoreVerifyCallback): void {}
+}
+
+const myStore = new MyStore;
+
+const strategyOptions3: StrategyOptions = {
+    authorizationURL: 'http://www.example.com/auth',
+    clientID: 'dummy',
+    clientSecret: 'secret',
+    tokenURL: 'http://www.example.com/token',
+    callbackURL: 'http://www.example.com/callback',
+    customHeaders: {
+        'content-type': 'text/html'
+    },
+    scope: ['scope1', 'scope2'],
+    scopeSeparator: ' ',
+    sessionKey: 'oauth',
+    state: {id: 1},
+    store: myStore
+};
+
+const strategy5: Strategy = new Strategy(strategyOptions3, verifyFunction2);

From ee619a0597282ea6de017ff65ec13523dc5c9d38 Mon Sep 17 00:00:00 2001
From: Ivan Fernandes <ivandalcantara@gmail.com>
Date: Tue, 4 Dec 2018 16:19:40 -0200
Subject: [PATCH 626/836] correcting code style

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

diff --git a/types/passport-oauth2/index.d.ts b/types/passport-oauth2/index.d.ts
index a6d519bf6a..cd78f377c2 100644
--- a/types/passport-oauth2/index.d.ts
+++ b/types/passport-oauth2/index.d.ts
@@ -40,7 +40,7 @@ declare namespace OAuth2Strategy {
     }
 
     type StateStoreStoreCallback = (err: Error | null, state: any) => void;
-    type StateStoreVerifyCallback = (err: Error, ok: boolean, state: any) => void
+    type StateStoreVerifyCallback = (err: Error, ok: boolean, state: any) => void;
 
     interface StateStore {
         store(req: Request, callback: StateStoreStoreCallback): void;
diff --git a/types/passport-oauth2/passport-oauth2-tests.ts b/types/passport-oauth2/passport-oauth2-tests.ts
index 57dcfa56d9..30faeebda0 100644
--- a/types/passport-oauth2/passport-oauth2-tests.ts
+++ b/types/passport-oauth2/passport-oauth2-tests.ts
@@ -1,5 +1,6 @@
 import OAuth2Strategy = require('passport-oauth2');
-import { Strategy, StrategyOptions, StrategyOptionsWithRequest, VerifyCallback, AuthorizationError, TokenError, InternalOAuthError, Metadata, StateStore, StateStoreStoreCallback, StateStoreVerifyCallback } from 'passport-oauth2';
+import { Strategy, StrategyOptions, StrategyOptionsWithRequest, VerifyCallback, AuthorizationError, TokenError,
+    InternalOAuthError, Metadata, StateStore, StateStoreStoreCallback, StateStoreVerifyCallback } from 'passport-oauth2';
 import { Strategy as PassportStrategy } from 'passport';
 import { Request } from 'express';
 
@@ -61,14 +62,14 @@ const metadata: Metadata = {
     authorizationURL: 'http://www.example.com/auth',
     clientID: 'dummy',
     tokenURL: 'http://www.example.com/token'
-}
+};
 
 class MyStore implements StateStore {
     store(req: Request, meta: StateStoreStoreCallback | Metadata, callback?: StateStoreStoreCallback): void {}
     verify(req: Request, state: string, meta: StateStoreVerifyCallback | Metadata, callback?: StateStoreVerifyCallback): void {}
 }
 
-const myStore = new MyStore;
+const myStore = new MyStore();
 
 const strategyOptions3: StrategyOptions = {
     authorizationURL: 'http://www.example.com/auth',

From d41d8be7e0642bab9a770f5c8609b9bdaa107a71 Mon Sep 17 00:00:00 2001
From: Max Bernardy <max@titanvest.com>
Date: Tue, 4 Dec 2018 13:57:49 -0500
Subject: [PATCH 627/836] Correct types for user.archive,
 requestPermanentDeletion, and requestPermanentDeletionByParams

---
 types/intercom-client/index.d.ts | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/types/intercom-client/index.d.ts b/types/intercom-client/index.d.ts
index b776165c55..f897622894 100644
--- a/types/intercom-client/index.d.ts
+++ b/types/intercom-client/index.d.ts
@@ -59,9 +59,14 @@ export class Users {
 
     scroll: Scroll<User>;
 
-    archive(): Promise<User>;
+    archive(identifier: UserIdentifier): Promise<ApiResponse<User>>;
+    archive(identifier: UserIdentifier, cb: callback<ApiResponse<User>>): void;
 
-    requestPermanentDeletion(): Promise<{id: number}>;
+    requestPermanentDeletion(id: string): Promise<{ id: number }>;
+    requestPermanentDeletion(id: string, cb: callback<{ id: number }>): void;
+
+    requestPermanentDeletionByParams(identifier: UserIdentifier): Promise<{ id: number }>;
+    requestPermanentDeletionByParams(identifier: UserIdentifier, cb: callback<{ id: number }>): void;
 }
 
 export class Companies {

From f304573e356f9f89125ba2ef8397216e7fe1a953 Mon Sep 17 00:00:00 2001
From: Ivan Fernandes <ivandalcantara@gmail.com>
Date: Tue, 4 Dec 2018 17:06:54 -0200
Subject: [PATCH 628/836] removing type utilities in favor of a simpler
 solution

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

diff --git a/types/passport-bnet/index.d.ts b/types/passport-bnet/index.d.ts
index c8e6dd923c..e7ffaaedce 100644
--- a/types/passport-bnet/index.d.ts
+++ b/types/passport-bnet/index.d.ts
@@ -12,15 +12,11 @@ declare class BnetStrategy extends OAuth2Strategy {
 }
 
 declare namespace BnetStrategy {
-
-    //Utility types for excluding properties from interfaces
-    type Diff<T extends string | number | symbol, U extends string | number | symbol> = ({ [P in T]: P } & { [P in U]: never } & { [x: string]: never })[T];
-    type Omit<T, K extends keyof T> = Pick<T, Diff<keyof T, K>>; 
-
     // passport--bnet accepts any options that passport-oauth2 accepts, but add the option region and makes authorizationURL and tokenURL optional
-    interface _BaseBnetOptions 
-        extends Partial<Pick<_StrategyOptionsBase, 'authorizationURL' | 'tokenURL'>>, Omit<_StrategyOptionsBase, 'authorizationURL' | 'tokenURL'> {
-    
+    interface _BaseBnetOptions extends Partial<_StrategyOptionsBase> {
+        clientID: string;
+        clientSecret: string;
+
         region?: string;
     }
 
diff --git a/types/passport-bnet/passport-bnet-tests.ts b/types/passport-bnet/passport-bnet-tests.ts
index 06c0ffccec..b02cf40519 100644
--- a/types/passport-bnet/passport-bnet-tests.ts
+++ b/types/passport-bnet/passport-bnet-tests.ts
@@ -6,11 +6,9 @@ import { Strategy as OAuth2Strategy, VerifyCallback } from "passport-oauth2";
 import { Request } from "express";
 
 const strategyOptions1: StrategyOptions = {
-    authorizationURL: 'http://www.example.com/auth',
     callbackURL: 'http://www.example.com/callback',
     clientID: 'dummy',
     clientSecret: 'secret',
-    tokenURL: 'http://www.example.com/token',
     region: 'us',
     scope: "email",
     scopeSeparator: ' ',

From 074b604db4be04a98acf359069adaff1b49d8c23 Mon Sep 17 00:00:00 2001
From: arichter83 <36486293+arichter83@users.noreply.github.com>
Date: Tue, 4 Dec 2018 20:12:29 +0100
Subject: [PATCH 629/836] Basic version of Simpl-Schema definition

---
 types/simpl-schema/index.d.ts            | 100 ++++++++++++++++-------
 types/simpl-schema/simpl-schema-tests.ts |  34 ++++----
 2 files changed, 90 insertions(+), 44 deletions(-)

diff --git a/types/simpl-schema/index.d.ts b/types/simpl-schema/index.d.ts
index 97411f4463..32dd8d7b66 100644
--- a/types/simpl-schema/index.d.ts
+++ b/types/simpl-schema/index.d.ts
@@ -1,4 +1,8 @@
-// from https://github.com/aldeed/simple-schema-js/issues/90
+// Type definitions for simpl-schema 0.1
+// Project: https://github.com/aldeed/simple-schema-js
+// Definitions by: Andreas Richter <https://github.com/arichter83>
+//                 Qkramer <https://github.com/Qkramer>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 export class ValidationContext {
     constructor(ss: any);
@@ -14,40 +18,45 @@ export class ValidationContext {
     validationErrors(): any;
 }
 
+interface CustomValidationContext {
+    value: any;
+}
+
 interface SchemaDefinition {
     type: any;
-    label?: string | Function;
-    optional?: boolean | Function;
-    min?: number | boolean | Date | Function;
-    max?: number | boolean | Date | Function;
-    minCount?: number | Function;
-    maxCount?: number | Function;
-    allowedValues?: any[] | Function;
+    label?: string | (() => string);
+    optional?: boolean | (() => boolean);
+    min?: number | boolean | Date | (() => number | boolean | Date);
+    max?: number | boolean | Date | (() => number | boolean | Date);
+    minCount?: number | (() => number);
+    maxCount?: number | (() => number);
+    allowedValues?: any[] | (() => any[]);
     decimal?: boolean;
     exclusiveMax?: boolean;
     exclusiveMin?: boolean;
     regEx?: RegExp | RegExp[];
-    custom?: Function;
+    custom?: () => any;
     blackbox?: boolean;
-    autoValue?: Function;
+    autoValue?: () => any;
     defaultValue?: any;
     trim?: boolean;
 }
 
 interface CleanOption {
-  filter?: boolean;
-  autoConvert?: boolean;
-  removeEmptyStrings?: boolean;
-  trimStrings?: boolean;
-  getAutoValues?: boolean;
-  isModifier?: boolean;
-  extendAutoValueContext?: boolean;
+    filter?: boolean;
+    autoConvert?: boolean;
+    removeEmptyStrings?: boolean;
+    trimStrings?: boolean;
+    getAutoValues?: boolean;
+    isModifier?: boolean;
+    extendAutoValueContext?: boolean;
 }
 
+// ???
 interface SimpleSchemaStatic {
-  new(schema: {[key: string]: SchemaDefinition} | any[]): SimpleSchemaStatic;
+  new(schema: {[key: string]: SchemaDefinition} | any[]): SimpleSchema;
   namedContext(name?: string): SimpleSchemaValidationContextStatic;
-  addValidator(validator: Function): any;
+  addValidator(validator: () => boolean): any;
   pick(...fields: string[]): SimpleSchemaStatic;
   omit(...fields: string[]): SimpleSchemaStatic;
   clean(doc: any, options?: CleanOption): any;
@@ -63,7 +72,7 @@ interface SimpleSchemaStatic {
   newContext(): SimpleSchemaValidationContextStatic;
   objectKeys(keyPrefix: any): any[];
   validate(obj: any, options?: ValidationOption): void;
-  validator(options: ValidationOption): Function;
+  validator(options: ValidationOption): () => boolean;
   RegEx: {
       Email: RegExp;
       EmailWithTLD: RegExp;
@@ -77,6 +86,25 @@ interface SimpleSchemaStatic {
       ZipCode: RegExp;
       Phone: RegExp;
   };
+  ErrorTypes: {
+      REQUIRED: string,
+      MIN_STRING: string,
+      MAX_STRING: string,
+      MIN_NUMBER: string,
+      MAX_NUMBER: string,
+      MIN_NUMBER_EXCLUSIVE: string,
+      MAX_NUMBER_EXCLUSIVE: string,
+      MIN_DATE: string,
+      MAX_DATE: string,
+      BAD_DATE: string,
+      MIN_COUNT: string,
+      MAX_COUNT: string,
+      MUST_BE_INTEGER: string,
+      VALUE_NOT_ALLOWED: string,
+      EXPECTED_TYPE: string,
+      FAILED_REGULAR_EXPRESSION: string,
+      KEY_NOT_IN_SCHEMA: string
+  };
 }
 
 interface ValidationOption {
@@ -87,20 +115,31 @@ interface ValidationOption {
     upsertextendedCustomContext?: boolean;
 }
 
+interface SimpleSchemaValidationContextStaticKeys {
+    name: string;
+    type: string;
+    value?: any;
+}
+
+interface SimpleSchemaError {
+    name: string;
+    type: string;
+}
+
 interface SimpleSchemaValidationContextStatic {
     validate(obj: any, options?: ValidationOption): boolean;
     validateOne(doc: any, keyName: string, options?: ValidationOption): boolean;
     resetValidation(): void;
     isValid(): boolean;
-    invalidKeys(): { name: string; type: string; value?: any; }[];
-    addInvalidKeys(errors: { name: string, type: string; }[]): void;
+    invalidKeys(): SimpleSchemaValidationContextStaticKeys[];
+    addInvalidKeys(errors: SimpleSchemaError[]): void;
     keyIsInvalid(name: any): boolean;
     keyErrorMessage(name: any): string;
     getErrorObject(): any;
 }
 
 interface MongoObjectStatic {
-    forEachNode(func: Function, options?: {endPointsOnly: boolean;}): void;
+    forEachNode(func: (() => void), options?: {endPointsOnly: boolean}): void;
     getValueForPosition(position: string): any;
     setValueForPosition(position: string, value: any): void;
     removeValueForPosition(position: string): void;
@@ -115,7 +154,7 @@ interface MongoObjectStatic {
     removeGenericKey(key: string): void;
     removeKey(key: string): void;
     removeKeys(keys: string[]): void;
-    filterGenericKeys(test: Function): void;
+    filterGenericKeys(test: (() => boolean)): void;
     setValueForKey(key: string, val: any): void;
     setValueForGenericKey(key: string, val: any): void;
     getObject(): any;
@@ -130,11 +169,12 @@ export const SimpleSchemaValidationContext: SimpleSchemaValidationContextStatic;
 export const MongoObject: MongoObjectStatic;
 
 export interface SimpleSchema {
-  debug: boolean;
-  addValidator(validator: Function): any;
-  extendOptions(options: {[key: string]: any}): void;
-  messages(messages: any): void;
-  RegEx: {
+    debug: boolean;
+    validate(obj: any, options?: ValidationOption): void;
+    addValidator(validator: () => boolean): any;
+    extendOptions(options: {[key: string]: any}): void;
+    messages(messages: any): void;
+    RegEx: {
       Email: RegExp;
       Domain: RegExp;
       WeakDomain: RegExp;
@@ -145,7 +185,7 @@ export interface SimpleSchema {
       Id: RegExp;
       ZipCode: RegExp;
       Phone: RegExp;
-  };
+    };
 }
 
 export interface MongoObject {
diff --git a/types/simpl-schema/simpl-schema-tests.ts b/types/simpl-schema/simpl-schema-tests.ts
index 6081a5a11b..3c40f0c4bb 100644
--- a/types/simpl-schema/simpl-schema-tests.ts
+++ b/types/simpl-schema/simpl-schema-tests.ts
@@ -2,24 +2,30 @@ import SimpleSchema from 'simpl-schema';
 
 const StringSchema = new SimpleSchema({
     basicString: {
-      type: String
+        type: String
     },
     limitedString: {
-      type: String,
-      allowedValues: ['pro', 'con']
+        type: String,
+        allowedValues: ['pro', 'con']
     },
     regExpString: {
-      type: String,
-      regEx: SimpleSchema.RegEx.Id
-  },
-  title: {
-    type: String,
-    label: "Argument",
-    custom: function () {
-      var text = this.value;
-      if(text.length > 10) return { type: SimpleSchema.ErrorTypes.MAX_STRING, max: 10 };
-    }
-  },
+        type: String,
+        regEx: SimpleSchema.RegEx.Id
+    },
+    createdAt: {
+        type: Date,
+        autoValue: () => new Date(),
+    },
+    title: {
+        type: String,
+        label: "Argument",
+        /* TODO, this does not work: "The containing arrow function captures the global value of 'this' which implicitly has type 'any'."
+        custom: () => {
+          const text = this.value;
+          if (text.length > 10) return { type: SimpleSchema.ErrorTypes.MAX_STRING, max: 10 };
+        }
+        */
+    },
 });
 
 StringSchema.validate({

From b5088e9b92f809bbdef5e51deed7847bb836178c Mon Sep 17 00:00:00 2001
From: Alex Duka <aduka@alteryx.com>
Date: Tue, 4 Dec 2018 21:36:47 +0200
Subject: [PATCH 630/836] added types to `rabbitmq-schema`

---
 types/rabbitmq-schema/index.d.ts              | 72 +++++++++++++++++++
 .../rabbitmq-schema/rabbitmq-schema-tests.ts  | 37 ++++++++++
 types/rabbitmq-schema/tsconfig.json           | 22 ++++++
 types/rabbitmq-schema/tslint.json             |  1 +
 4 files changed, 132 insertions(+)
 create mode 100644 types/rabbitmq-schema/index.d.ts
 create mode 100644 types/rabbitmq-schema/rabbitmq-schema-tests.ts
 create mode 100644 types/rabbitmq-schema/tsconfig.json
 create mode 100644 types/rabbitmq-schema/tslint.json

diff --git a/types/rabbitmq-schema/index.d.ts b/types/rabbitmq-schema/index.d.ts
new file mode 100644
index 0000000000..ccd76b68c5
--- /dev/null
+++ b/types/rabbitmq-schema/index.d.ts
@@ -0,0 +1,72 @@
+// Type definitions for rabbitmq-schema 2.0
+// Project: https://github.com/tjmehta/rabbitmq-schema
+// Definitions by: Alex Duka <https://github.com/rulezzz1987>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare namespace rabbitMqSchemaNc {
+  interface Binding {
+    destination: Topology;
+    source: Exchange;
+    args?: object;
+    routingPattern?: string;
+  }
+
+  interface TopicBinding extends Binding {
+    routingPattern: string;
+  }
+
+  interface DirectBinding extends Binding {
+    routingPattern: string;
+  }
+
+
+  interface Topology {
+    options?: object;
+  }
+
+  interface Exchange extends Topology {
+    exchange: string;
+    type: string;
+    bindings: Binding[];
+  }
+
+  interface FanoutExchange extends Exchange {
+    type: 'fanout';
+  }
+
+  interface TopicExchange extends Exchange {
+    type: 'topic';
+    bindings: TopicBinding[];
+  }
+
+  interface DirectExchange extends Exchange {
+    type: 'direct';
+    bindings: DirectBinding[];
+  }
+
+  interface Queue extends Topology {
+    queue: string;
+    messageSchema: object;
+  }
+
+  interface RabbitMQSchema {
+    new (schema: Topology | Topology[], parentPath?: string): RabbitMQSchema;
+
+    getExchanges(): Exchange[];
+    getBindings(): Binding[];
+    getQueues(): Queue[];
+    getDirectBindings(): DirectBinding[];
+
+    validate(schema: Topology | Topology[], parentPath?: string): void;
+    validateMessage<T>(exchangeName: string, routingPattern: string, message: T): T;
+
+    getQueueByName(name: string): Queue | void;
+    getExchangeByName(name: string): Exchange | void;
+  }
+
+}
+
+declare module 'rabbitmq-schema' {
+  const schema: rabbitMqSchemaNc.RabbitMQSchema;
+  export = schema;
+}
\ No newline at end of file
diff --git a/types/rabbitmq-schema/rabbitmq-schema-tests.ts b/types/rabbitmq-schema/rabbitmq-schema-tests.ts
new file mode 100644
index 0000000000..50b36b2e21
--- /dev/null
+++ b/types/rabbitmq-schema/rabbitmq-schema-tests.ts
@@ -0,0 +1,37 @@
+import RabbitMqSchema = require('rabbitmq-schema');
+
+const topology: rabbitMqSchemaNc.Topology = {
+  exchange: 'images',
+  type: 'topic',
+  vhost: '/',
+  bindings: [
+    {
+      routingPattern: 'images.jpeg.get',
+      destination: {
+        queue: 'images.image.get',
+        messageSchema: {
+          type: 'object',
+          properties: {
+            testMsg: {
+              type: "string"
+            }
+          }
+        },
+        args: { 'message-ttl': 10000 }
+      }
+    }
+  ]
+}
+
+const rabbitSchema = new RabbitMqSchema(topology, '');
+
+const exchanges: rabbitMqSchemaNc.Exchange[] = rabbitSchema.getExchanges();
+const bindings: rabbitMqSchemaNc.Binding[] = rabbitSchema.getBindings();
+const queues: rabbitMqSchemaNc.Queue[] = rabbitSchema.getQueues();
+const directBindings: rabbitMqSchemaNc.DirectBinding[] = rabbitSchema.getDirectBindings();
+
+const jpgQueue: rabbitMqSchemaNc.Queue = rabbitSchema.getQueueByName('images.jpeg.get');
+const exchange: rabbitMqSchemaNc.Exchange = rabbitSchema.getExchangeByName('images');
+
+rabbitSchema.validate(topology);
+rabbitSchema.validateMessage('images', 'images.jpeg.get', {testMsg: 'ok'});
\ No newline at end of file
diff --git a/types/rabbitmq-schema/tsconfig.json b/types/rabbitmq-schema/tsconfig.json
new file mode 100644
index 0000000000..96c7293272
--- /dev/null
+++ b/types/rabbitmq-schema/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",
+        "rabbitmq-schema-tests.ts"
+    ]
+}
diff --git a/types/rabbitmq-schema/tslint.json b/types/rabbitmq-schema/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/rabbitmq-schema/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 3863ea9f8d4b67f002c6faeb64ab54be8d27361a Mon Sep 17 00:00:00 2001
From: arichter83 <36486293+arichter83@users.noreply.github.com>
Date: Tue, 4 Dec 2018 20:45:23 +0100
Subject: [PATCH 631/836] Remove simpl-schema from master PR, and move to new
 one

---
 types/simpl-schema/index.d.ts            | 195 -----------------------
 types/simpl-schema/simpl-schema-tests.ts |  96 -----------
 types/simpl-schema/tsconfig.json         |  23 ---
 types/simpl-schema/tslint.json           |   1 -
 4 files changed, 315 deletions(-)
 delete mode 100644 types/simpl-schema/index.d.ts
 delete mode 100644 types/simpl-schema/simpl-schema-tests.ts
 delete mode 100644 types/simpl-schema/tsconfig.json
 delete mode 100644 types/simpl-schema/tslint.json

diff --git a/types/simpl-schema/index.d.ts b/types/simpl-schema/index.d.ts
deleted file mode 100644
index 32dd8d7b66..0000000000
--- a/types/simpl-schema/index.d.ts
+++ /dev/null
@@ -1,195 +0,0 @@
-// Type definitions for simpl-schema 0.1
-// Project: https://github.com/aldeed/simple-schema-js
-// Definitions by: Andreas Richter <https://github.com/arichter83>
-//                 Qkramer <https://github.com/Qkramer>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-export class ValidationContext {
-    constructor(ss: any);
-    addValidationErrors(errors: any): void;
-    clean(...args: any[]): any;
-    getErrorForKey(key: any, ...args: any[]): any;
-    isValid(): any;
-    keyErrorMessage(key: any, ...args: any[]): any;
-    keyIsInvalid(key: any, ...args: any[]): any;
-    reset(): void;
-    setValidationErrors(errors: any): void;
-    validate(obj: any, ...args: any[]): any;
-    validationErrors(): any;
-}
-
-interface CustomValidationContext {
-    value: any;
-}
-
-interface SchemaDefinition {
-    type: any;
-    label?: string | (() => string);
-    optional?: boolean | (() => boolean);
-    min?: number | boolean | Date | (() => number | boolean | Date);
-    max?: number | boolean | Date | (() => number | boolean | Date);
-    minCount?: number | (() => number);
-    maxCount?: number | (() => number);
-    allowedValues?: any[] | (() => any[]);
-    decimal?: boolean;
-    exclusiveMax?: boolean;
-    exclusiveMin?: boolean;
-    regEx?: RegExp | RegExp[];
-    custom?: () => any;
-    blackbox?: boolean;
-    autoValue?: () => any;
-    defaultValue?: any;
-    trim?: boolean;
-}
-
-interface CleanOption {
-    filter?: boolean;
-    autoConvert?: boolean;
-    removeEmptyStrings?: boolean;
-    trimStrings?: boolean;
-    getAutoValues?: boolean;
-    isModifier?: boolean;
-    extendAutoValueContext?: boolean;
-}
-
-// ???
-interface SimpleSchemaStatic {
-  new(schema: {[key: string]: SchemaDefinition} | any[]): SimpleSchema;
-  namedContext(name?: string): SimpleSchemaValidationContextStatic;
-  addValidator(validator: () => boolean): any;
-  pick(...fields: string[]): SimpleSchemaStatic;
-  omit(...fields: string[]): SimpleSchemaStatic;
-  clean(doc: any, options?: CleanOption): any;
-  schema(key?: string): SchemaDefinition | SchemaDefinition[];
-  getDefinition(key: string, propList?: any, functionContext?: any): any;
-  keyIsInBlackBox(key: string): boolean;
-  labels(labels: {[key: string]: string}): void;
-  label(key: any): any;
-  Integer: RegExp;
-  messages(messages: any): any;
-  messageForError(type: any, key: any, def: any, value: any): string;
-  allowsKey(key: any): string;
-  newContext(): SimpleSchemaValidationContextStatic;
-  objectKeys(keyPrefix: any): any[];
-  validate(obj: any, options?: ValidationOption): void;
-  validator(options: ValidationOption): () => boolean;
-  RegEx: {
-      Email: RegExp;
-      EmailWithTLD: RegExp;
-      Domain: RegExp;
-      WeakDomain: RegExp;
-      IP: RegExp;
-      IPv4: RegExp;
-      IPv6: RegExp;
-      Url: RegExp;
-      Id: RegExp;
-      ZipCode: RegExp;
-      Phone: RegExp;
-  };
-  ErrorTypes: {
-      REQUIRED: string,
-      MIN_STRING: string,
-      MAX_STRING: string,
-      MIN_NUMBER: string,
-      MAX_NUMBER: string,
-      MIN_NUMBER_EXCLUSIVE: string,
-      MAX_NUMBER_EXCLUSIVE: string,
-      MIN_DATE: string,
-      MAX_DATE: string,
-      BAD_DATE: string,
-      MIN_COUNT: string,
-      MAX_COUNT: string,
-      MUST_BE_INTEGER: string,
-      VALUE_NOT_ALLOWED: string,
-      EXPECTED_TYPE: string,
-      FAILED_REGULAR_EXPRESSION: string,
-      KEY_NOT_IN_SCHEMA: string
-  };
-}
-
-interface ValidationOption {
-    modifier?: boolean;
-    upsert?: boolean;
-    clean?: boolean;
-    filter?: boolean;
-    upsertextendedCustomContext?: boolean;
-}
-
-interface SimpleSchemaValidationContextStaticKeys {
-    name: string;
-    type: string;
-    value?: any;
-}
-
-interface SimpleSchemaError {
-    name: string;
-    type: string;
-}
-
-interface SimpleSchemaValidationContextStatic {
-    validate(obj: any, options?: ValidationOption): boolean;
-    validateOne(doc: any, keyName: string, options?: ValidationOption): boolean;
-    resetValidation(): void;
-    isValid(): boolean;
-    invalidKeys(): SimpleSchemaValidationContextStaticKeys[];
-    addInvalidKeys(errors: SimpleSchemaError[]): void;
-    keyIsInvalid(name: any): boolean;
-    keyErrorMessage(name: any): string;
-    getErrorObject(): any;
-}
-
-interface MongoObjectStatic {
-    forEachNode(func: (() => void), options?: {endPointsOnly: boolean}): void;
-    getValueForPosition(position: string): any;
-    setValueForPosition(position: string, value: any): void;
-    removeValueForPosition(position: string): void;
-    getKeyForPosition(position: string): any;
-    getGenericKeyForPosition(position: string): any;
-    getInfoForKey(key: string): any;
-    getPositionForKey(key: string): string;
-    getPositionsForGenericKey(key: string): string[];
-    getValueForKey(key: string): any;
-    addKey(key: string, val: any, op: string): any;
-    removeGenericKeys(keys: string[]): void;
-    removeGenericKey(key: string): void;
-    removeKey(key: string): void;
-    removeKeys(keys: string[]): void;
-    filterGenericKeys(test: (() => boolean)): void;
-    setValueForKey(key: string, val: any): void;
-    setValueForGenericKey(key: string, val: any): void;
-    getObject(): any;
-    getFlatObject(options?: {keepArrays?: boolean}): any;
-    affectsKey(key: string): any;
-    affectsGenericKey(key: string): any;
-    affectsGenericKeyImplicit(key: string): any;
-}
-
-export const SimpleSchema: SimpleSchemaStatic;
-export const SimpleSchemaValidationContext: SimpleSchemaValidationContextStatic;
-export const MongoObject: MongoObjectStatic;
-
-export interface SimpleSchema {
-    debug: boolean;
-    validate(obj: any, options?: ValidationOption): void;
-    addValidator(validator: () => boolean): any;
-    extendOptions(options: {[key: string]: any}): void;
-    messages(messages: any): void;
-    RegEx: {
-      Email: RegExp;
-      Domain: RegExp;
-      WeakDomain: RegExp;
-      IP: RegExp;
-      IPv4: RegExp;
-      IPv6: RegExp;
-      Url: RegExp;
-      Id: RegExp;
-      ZipCode: RegExp;
-      Phone: RegExp;
-    };
-}
-
-export interface MongoObject {
-  expandKey(val: any, key: string, obj: any): void;
-}
-
-export default SimpleSchema;
diff --git a/types/simpl-schema/simpl-schema-tests.ts b/types/simpl-schema/simpl-schema-tests.ts
deleted file mode 100644
index 3c40f0c4bb..0000000000
--- a/types/simpl-schema/simpl-schema-tests.ts
+++ /dev/null
@@ -1,96 +0,0 @@
-import SimpleSchema from 'simpl-schema';
-
-const StringSchema = new SimpleSchema({
-    basicString: {
-        type: String
-    },
-    limitedString: {
-        type: String,
-        allowedValues: ['pro', 'con']
-    },
-    regExpString: {
-        type: String,
-        regEx: SimpleSchema.RegEx.Id
-    },
-    createdAt: {
-        type: Date,
-        autoValue: () => new Date(),
-    },
-    title: {
-        type: String,
-        label: "Argument",
-        /* TODO, this does not work: "The containing arrow function captures the global value of 'this' which implicitly has type 'any'."
-        custom: () => {
-          const text = this.value;
-          if (text.length > 10) return { type: SimpleSchema.ErrorTypes.MAX_STRING, max: 10 };
-        }
-        */
-    },
-});
-
-StringSchema.validate({
-    basicString: "Test",
-    limitedString: "pro",
-    regExpString: "id"
-});
-
-    /*
-    ,
-    title: {
-      type: String,
-      label: "Argument",
-      custom: function () {
-        var text = this.value;
-        text = text.replace(/https?:\/\/(www\.)?([-a-zA-Z0-9@:%._\+~#=]{2,256}\.[a-z]{2,6})\b([-a-zA-Z0-9@:%_\+.~#?&//=]*)/gi, '$2');
-
-        if(text.length > MAX_ARGUMENT_LENGTH) return { type: SimpleSchema.ErrorTypes.MAX_STRING, max: MAX_ARGUMENT_LENGTH }
-        else if(text.length < MIN_ARGUMENT_LENGTH) return { type: SimpleSchema.ErrorTypes.MIN_STRING, min: MIN_ARGUMENT_LENGTH }
-      }
-    },
-    questionId: {
-      type: String,
-      regEx: SimpleSchema.RegEx.Id
-    },
-    side: {
-      type: String,
-      allowedValues: ['pro', 'con']
-    },
-    userId: {
-      type: String,
-      regEx: SimpleSchema.RegEx.Id
-    },
-    createdAt: {
-      type: Date,
-      autoValue: () => new Date(),
-    },
-    clapCount: {
-      type: SimpleSchema.Integer,
-      defaultValue: 0
-    },
-    highlight: {
-      type: Array,
-      optional: true
-    },
-    'highlight.$': {
-      type: Object
-    },
-    'highlight.$.start': SimpleSchema.Integer,
-    'highlight.$.end': SimpleSchema.Integer,
-    'highlight.$.text': {
-      type: String,
-      trim: false
-    }
-    */
-    /*
-    ,
-    {
-        clean: {
-            filter: true,
-            autoConvert: true,
-            removeEmptyStrings: true,
-            trimStrings: true,
-            getAutoValues: true,
-            removeNullsFromArrays: true,
-        }
-    }
-    */
diff --git a/types/simpl-schema/tsconfig.json b/types/simpl-schema/tsconfig.json
deleted file mode 100644
index d079496f4e..0000000000
--- a/types/simpl-schema/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "simpl-schema-tests.ts"
-    ]
-}
diff --git a/types/simpl-schema/tslint.json b/types/simpl-schema/tslint.json
deleted file mode 100644
index 3db14f85ea..0000000000
--- a/types/simpl-schema/tslint.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "extends": "dtslint/dt.json" }

From e2a4a22af587be3c8b0e885a6bd6aa39ef580970 Mon Sep 17 00:00:00 2001
From: arichter83 <36486293+arichter83@users.noreply.github.com>
Date: Tue, 4 Dec 2018 20:58:56 +0100
Subject: [PATCH 632/836] Revert "Added dependencies file"

This reverts commit 3ba1ae85e26eea8062509b406ad1baf9e5092355.
---
 types/react-bootstrap-typeahead/package.json | 6 ------
 1 file changed, 6 deletions(-)
 delete mode 100644 types/react-bootstrap-typeahead/package.json

diff --git a/types/react-bootstrap-typeahead/package.json b/types/react-bootstrap-typeahead/package.json
deleted file mode 100644
index 4d9ec4a338..0000000000
--- a/types/react-bootstrap-typeahead/package.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "private": true,
-    "dependencies": {
-        "csstype": "^2.2.0"
-    }
-}

From 1d261238349a1013a4495654a1dd187bbfa64a1d Mon Sep 17 00:00:00 2001
From: arichter83 <36486293+arichter83@users.noreply.github.com>
Date: Tue, 4 Dec 2018 21:00:21 +0100
Subject: [PATCH 633/836] Revert "Added definitions for Highlighter, Menu and
 MenuItem"

This reverts commit d944d9c929913c6c3bce93eea1ecc485dfa2bc5d.
---
 types/react-bootstrap-typeahead/index.d.ts    | 56 ++++---------------
 .../react-bootstrap-typeahead-tests.tsx       | 27 +--------
 2 files changed, 11 insertions(+), 72 deletions(-)

diff --git a/types/react-bootstrap-typeahead/index.d.ts b/types/react-bootstrap-typeahead/index.d.ts
index 2c0495ce03..9fa23ac5f5 100644
--- a/types/react-bootstrap-typeahead/index.d.ts
+++ b/types/react-bootstrap-typeahead/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for react-bootstrap-typeahead 3.4
+// Type definitions for react-bootstrap-typeahead 3.3
 // Project: https://github.com/ericgio/react-bootstrap-typeahead
 // Definitions by: Guymestef <https://github.com/Guymestef>
 //                 Rajab Shakirov <https://github.com/radziksh>
@@ -6,23 +6,18 @@
 //                 Andreas Richter <https://github.com/arichter83>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
-// TODO: <Token> components
+// TODO: <Highlighter>, <Menu>, <MenuItem>, <Token> components
 
 import * as React from 'react';
-import * as CSS from 'csstype';
 
 export interface TypeaheadFilterbyProps {
-    filterBy: string[];
-    labelKey: (string | (() => void));
-    multiple: boolean;
-    selected: any[];
-    caseSensitive: boolean;
-    ignoreDiacritics: boolean;
-    text: string;
-}
-
-export interface TypeaheadMenuProps<T> {
-    text: string;
+  filterBy: string[];
+  labelKey: (string | (() => void));
+  multiple: boolean;
+  selected: any[];
+  caseSensitive: boolean;
+  ignoreDiacritics: boolean;
+  text: string;
 }
 
 export interface TypeaheadProps<T> {
@@ -154,7 +149,7 @@ export interface TypeaheadProps<T> {
     renderMenu?: (results: Array<T | string>, menuProps: any) => any;
 
     /* Provides a hook for customized rendering of menu item contents. */
-    renderMenuItemChildren?: (option: T, props: TypeaheadMenuProps<T>, index: number) => any;
+    renderMenuItemChildren?: (option: T, props: TypeaheadProps<T>, index: number) => any;
 
     /* Provides a hook for customized rendering of tokens when multiple selections are enabled. */
     renderToken?: (selectedItem: T | string, onRemove: () => void) => any;
@@ -189,34 +184,3 @@ export interface AsyncTypeaheadProps<T> extends TypeaheadProps<T> {
 }
 
 export const AsyncTypeahead: React.ClassicComponentClass<AsyncTypeaheadProps<any>>;
-
-export interface HighligherProps<T> {
-    key: string;
-    search: string;
-}
-
-export const Highlighter: React.ClassicComponentClass<HighligherProps<any>>;
-
-export interface MenuProps<T> {
-    id: string;
-    className?: string;
-    emptyLabel?: string;
-    innerRef?: string;
-    maxHeight?: string;
-    style?: CSS.Properties;
-}
-
-export const Menu: React.ClassicComponentClass<MenuProps<any>>;
-
-export interface MenuItemProps<T> {
-    option: T;
-    position: number;
-    label?: string;
-    active?: boolean;
-    className?: string;
-    disabled?: boolean;
-    onClick?: (e: Event) => any;
-    onMouseDown?: (e: Event) => any;
-}
-
-export const MenuItem: React.ClassicComponentClass<MenuItemProps<any>>;
diff --git a/types/react-bootstrap-typeahead/react-bootstrap-typeahead-tests.tsx b/types/react-bootstrap-typeahead/react-bootstrap-typeahead-tests.tsx
index 5fcbe15328..6c9143dfea 100644
--- a/types/react-bootstrap-typeahead/react-bootstrap-typeahead-tests.tsx
+++ b/types/react-bootstrap-typeahead/react-bootstrap-typeahead-tests.tsx
@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { Typeahead, Highlighter, Menu, MenuItem } from 'react-bootstrap-typeahead';
+import { Typeahead } from 'react-bootstrap-typeahead';
 
 const options = [
     { name: 'Alabama', population: 4780127, capital: 'Montgomery', region: 'South' },
@@ -36,31 +36,6 @@ class BasicExample extends React.Component {
                     filterBy={(option, props) => (props.text.indexOf(option) !== -1) }
                     placeholder="Choose a state..."
                 />
-                <Typeahead
-                    labelKey="name"
-                    options={options}
-                    placeholder="Choose a state..."
-                    renderMenuItemChildren={ (option, props, index) =>
-                        <Highlighter key="name" search={props.text}>
-                            {option.name}
-                        </Highlighter>
-                    }
-                />
-                <Typeahead
-                    labelKey="name"
-                    options={options}
-                    placeholder="Choose a state...">
-                    <Menu id="menu-id">
-                    {options.map((o, idx) => (
-                      <MenuItem
-                        key={idx}
-                        option={o}
-                        position={idx}>
-                        {o.name}
-                      </MenuItem>
-                    ))}
-                  </Menu>
-                </Typeahead>
             </div>
         );
     }

From 66aa94c11c723e0409ac274b4f62a0d4f3d20dab Mon Sep 17 00:00:00 2001
From: arichter83 <36486293+arichter83@users.noreply.github.com>
Date: Tue, 4 Dec 2018 21:00:59 +0100
Subject: [PATCH 634/836] Revert "Fixed version..."

This reverts commit 4b872aca1265d8ba44347fbdc33c204d9c123f33.
---
 types/react-bootstrap-typeahead/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/react-bootstrap-typeahead/index.d.ts b/types/react-bootstrap-typeahead/index.d.ts
index 9fa23ac5f5..89188c8b86 100644
--- a/types/react-bootstrap-typeahead/index.d.ts
+++ b/types/react-bootstrap-typeahead/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for react-bootstrap-typeahead 3.3
+// Type definitions for react-bootstrap-typeahead 3.2.2
 // Project: https://github.com/ericgio/react-bootstrap-typeahead
 // Definitions by: Guymestef <https://github.com/Guymestef>
 //                 Rajab Shakirov <https://github.com/radziksh>

From bc6d1691571d6e8fe6808fe075d3249e3b5fd185 Mon Sep 17 00:00:00 2001
From: arichter83 <36486293+arichter83@users.noreply.github.com>
Date: Tue, 4 Dec 2018 21:01:03 +0100
Subject: [PATCH 635/836] Revert "Increase version"

This reverts commit 672ec749ab95fa2893469c2a2ebd6badb4336d58.
---
 types/react-bootstrap-typeahead/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/react-bootstrap-typeahead/index.d.ts b/types/react-bootstrap-typeahead/index.d.ts
index 89188c8b86..d0bfcea9a7 100644
--- a/types/react-bootstrap-typeahead/index.d.ts
+++ b/types/react-bootstrap-typeahead/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for react-bootstrap-typeahead 3.2.2
+// Type definitions for react-bootstrap-typeahead 3.2
 // Project: https://github.com/ericgio/react-bootstrap-typeahead
 // Definitions by: Guymestef <https://github.com/Guymestef>
 //                 Rajab Shakirov <https://github.com/radziksh>

From 40dac65f4ed3e1cd7151714a2a9c88d44b7bbc00 Mon Sep 17 00:00:00 2001
From: arichter83 <36486293+arichter83@users.noreply.github.com>
Date: Tue, 4 Dec 2018 21:01:06 +0100
Subject: [PATCH 636/836] Revert "Changed filterBy"

This reverts commit f425f279923d7409a31bbdfdf2816db13ad454f4.
---
 types/react-bootstrap-typeahead/index.d.ts          | 13 +------------
 .../react-bootstrap-typeahead-tests.tsx             |  8 --------
 2 files changed, 1 insertion(+), 20 deletions(-)

diff --git a/types/react-bootstrap-typeahead/index.d.ts b/types/react-bootstrap-typeahead/index.d.ts
index d0bfcea9a7..fa970bc5b3 100644
--- a/types/react-bootstrap-typeahead/index.d.ts
+++ b/types/react-bootstrap-typeahead/index.d.ts
@@ -3,23 +3,12 @@
 // Definitions by: Guymestef <https://github.com/Guymestef>
 //                 Rajab Shakirov <https://github.com/radziksh>
 //                 Paito Anderson <https://github.com/PaitoAnderson>
-//                 Andreas Richter <https://github.com/arichter83>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 // TODO: <Highlighter>, <Menu>, <MenuItem>, <Token> components
 
 import * as React from 'react';
 
-export interface TypeaheadFilterbyProps {
-  filterBy: string[];
-  labelKey: (string | (() => void));
-  multiple: boolean;
-  selected: any[];
-  caseSensitive: boolean;
-  ignoreDiacritics: boolean;
-  text: string;
-}
-
 export interface TypeaheadProps<T> {
     /* For localized accessibility: Should return a string indicating the number of results for screen readers. Receives the current results. */
     a11yNumResults?: () => void;
@@ -69,7 +58,7 @@ export interface TypeaheadProps<T> {
     emptyLabel?: string;
 
     /* Either an array of fields in option to search, or a custom filtering callback. */
-    filterBy?: (string[] | ((option: T | string, props: TypeaheadFilterbyProps) => boolean));
+    filterBy?: (string[] | ((option: T | string, text: string) => boolean));
 
     /* Highlights the menu item if there is only one result and allows selecting that item by hitting enter.
        Does not work with allowNew. */
diff --git a/types/react-bootstrap-typeahead/react-bootstrap-typeahead-tests.tsx b/types/react-bootstrap-typeahead/react-bootstrap-typeahead-tests.tsx
index 6c9143dfea..10237b1fa0 100644
--- a/types/react-bootstrap-typeahead/react-bootstrap-typeahead-tests.tsx
+++ b/types/react-bootstrap-typeahead/react-bootstrap-typeahead-tests.tsx
@@ -28,14 +28,6 @@ class BasicExample extends React.Component {
                     onInputChange={(value, e) => {}}
                     placeholder="Choose a state..."
                 />
-                <Typeahead
-                    labelKey="name"
-                    multiple={multiple}
-                    options={options}
-                    maxHeight='300px'
-                    filterBy={(option, props) => (props.text.indexOf(option) !== -1) }
-                    placeholder="Choose a state..."
-                />
             </div>
         );
     }

From d01679afa6d11acd93f6adaa914d2ab74cf52afd Mon Sep 17 00:00:00 2001
From: arichter83 <36486293+arichter83@users.noreply.github.com>
Date: Tue, 4 Dec 2018 21:02:19 +0100
Subject: [PATCH 637/836]  Basic version of Simpl-Schema definition

---
 types/simpl-schema/index.d.ts            | 195 +++++++++++++++++++++++
 types/simpl-schema/simpl-schema-tests.ts |  96 +++++++++++
 types/simpl-schema/tsconfig.json         |  23 +++
 types/simpl-schema/tslint.json           |   1 +
 4 files changed, 315 insertions(+)
 create mode 100644 types/simpl-schema/index.d.ts
 create mode 100644 types/simpl-schema/simpl-schema-tests.ts
 create mode 100644 types/simpl-schema/tsconfig.json
 create mode 100644 types/simpl-schema/tslint.json

diff --git a/types/simpl-schema/index.d.ts b/types/simpl-schema/index.d.ts
new file mode 100644
index 0000000000..32dd8d7b66
--- /dev/null
+++ b/types/simpl-schema/index.d.ts
@@ -0,0 +1,195 @@
+// Type definitions for simpl-schema 0.1
+// Project: https://github.com/aldeed/simple-schema-js
+// Definitions by: Andreas Richter <https://github.com/arichter83>
+//                 Qkramer <https://github.com/Qkramer>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export class ValidationContext {
+    constructor(ss: any);
+    addValidationErrors(errors: any): void;
+    clean(...args: any[]): any;
+    getErrorForKey(key: any, ...args: any[]): any;
+    isValid(): any;
+    keyErrorMessage(key: any, ...args: any[]): any;
+    keyIsInvalid(key: any, ...args: any[]): any;
+    reset(): void;
+    setValidationErrors(errors: any): void;
+    validate(obj: any, ...args: any[]): any;
+    validationErrors(): any;
+}
+
+interface CustomValidationContext {
+    value: any;
+}
+
+interface SchemaDefinition {
+    type: any;
+    label?: string | (() => string);
+    optional?: boolean | (() => boolean);
+    min?: number | boolean | Date | (() => number | boolean | Date);
+    max?: number | boolean | Date | (() => number | boolean | Date);
+    minCount?: number | (() => number);
+    maxCount?: number | (() => number);
+    allowedValues?: any[] | (() => any[]);
+    decimal?: boolean;
+    exclusiveMax?: boolean;
+    exclusiveMin?: boolean;
+    regEx?: RegExp | RegExp[];
+    custom?: () => any;
+    blackbox?: boolean;
+    autoValue?: () => any;
+    defaultValue?: any;
+    trim?: boolean;
+}
+
+interface CleanOption {
+    filter?: boolean;
+    autoConvert?: boolean;
+    removeEmptyStrings?: boolean;
+    trimStrings?: boolean;
+    getAutoValues?: boolean;
+    isModifier?: boolean;
+    extendAutoValueContext?: boolean;
+}
+
+// ???
+interface SimpleSchemaStatic {
+  new(schema: {[key: string]: SchemaDefinition} | any[]): SimpleSchema;
+  namedContext(name?: string): SimpleSchemaValidationContextStatic;
+  addValidator(validator: () => boolean): any;
+  pick(...fields: string[]): SimpleSchemaStatic;
+  omit(...fields: string[]): SimpleSchemaStatic;
+  clean(doc: any, options?: CleanOption): any;
+  schema(key?: string): SchemaDefinition | SchemaDefinition[];
+  getDefinition(key: string, propList?: any, functionContext?: any): any;
+  keyIsInBlackBox(key: string): boolean;
+  labels(labels: {[key: string]: string}): void;
+  label(key: any): any;
+  Integer: RegExp;
+  messages(messages: any): any;
+  messageForError(type: any, key: any, def: any, value: any): string;
+  allowsKey(key: any): string;
+  newContext(): SimpleSchemaValidationContextStatic;
+  objectKeys(keyPrefix: any): any[];
+  validate(obj: any, options?: ValidationOption): void;
+  validator(options: ValidationOption): () => boolean;
+  RegEx: {
+      Email: RegExp;
+      EmailWithTLD: RegExp;
+      Domain: RegExp;
+      WeakDomain: RegExp;
+      IP: RegExp;
+      IPv4: RegExp;
+      IPv6: RegExp;
+      Url: RegExp;
+      Id: RegExp;
+      ZipCode: RegExp;
+      Phone: RegExp;
+  };
+  ErrorTypes: {
+      REQUIRED: string,
+      MIN_STRING: string,
+      MAX_STRING: string,
+      MIN_NUMBER: string,
+      MAX_NUMBER: string,
+      MIN_NUMBER_EXCLUSIVE: string,
+      MAX_NUMBER_EXCLUSIVE: string,
+      MIN_DATE: string,
+      MAX_DATE: string,
+      BAD_DATE: string,
+      MIN_COUNT: string,
+      MAX_COUNT: string,
+      MUST_BE_INTEGER: string,
+      VALUE_NOT_ALLOWED: string,
+      EXPECTED_TYPE: string,
+      FAILED_REGULAR_EXPRESSION: string,
+      KEY_NOT_IN_SCHEMA: string
+  };
+}
+
+interface ValidationOption {
+    modifier?: boolean;
+    upsert?: boolean;
+    clean?: boolean;
+    filter?: boolean;
+    upsertextendedCustomContext?: boolean;
+}
+
+interface SimpleSchemaValidationContextStaticKeys {
+    name: string;
+    type: string;
+    value?: any;
+}
+
+interface SimpleSchemaError {
+    name: string;
+    type: string;
+}
+
+interface SimpleSchemaValidationContextStatic {
+    validate(obj: any, options?: ValidationOption): boolean;
+    validateOne(doc: any, keyName: string, options?: ValidationOption): boolean;
+    resetValidation(): void;
+    isValid(): boolean;
+    invalidKeys(): SimpleSchemaValidationContextStaticKeys[];
+    addInvalidKeys(errors: SimpleSchemaError[]): void;
+    keyIsInvalid(name: any): boolean;
+    keyErrorMessage(name: any): string;
+    getErrorObject(): any;
+}
+
+interface MongoObjectStatic {
+    forEachNode(func: (() => void), options?: {endPointsOnly: boolean}): void;
+    getValueForPosition(position: string): any;
+    setValueForPosition(position: string, value: any): void;
+    removeValueForPosition(position: string): void;
+    getKeyForPosition(position: string): any;
+    getGenericKeyForPosition(position: string): any;
+    getInfoForKey(key: string): any;
+    getPositionForKey(key: string): string;
+    getPositionsForGenericKey(key: string): string[];
+    getValueForKey(key: string): any;
+    addKey(key: string, val: any, op: string): any;
+    removeGenericKeys(keys: string[]): void;
+    removeGenericKey(key: string): void;
+    removeKey(key: string): void;
+    removeKeys(keys: string[]): void;
+    filterGenericKeys(test: (() => boolean)): void;
+    setValueForKey(key: string, val: any): void;
+    setValueForGenericKey(key: string, val: any): void;
+    getObject(): any;
+    getFlatObject(options?: {keepArrays?: boolean}): any;
+    affectsKey(key: string): any;
+    affectsGenericKey(key: string): any;
+    affectsGenericKeyImplicit(key: string): any;
+}
+
+export const SimpleSchema: SimpleSchemaStatic;
+export const SimpleSchemaValidationContext: SimpleSchemaValidationContextStatic;
+export const MongoObject: MongoObjectStatic;
+
+export interface SimpleSchema {
+    debug: boolean;
+    validate(obj: any, options?: ValidationOption): void;
+    addValidator(validator: () => boolean): any;
+    extendOptions(options: {[key: string]: any}): void;
+    messages(messages: any): void;
+    RegEx: {
+      Email: RegExp;
+      Domain: RegExp;
+      WeakDomain: RegExp;
+      IP: RegExp;
+      IPv4: RegExp;
+      IPv6: RegExp;
+      Url: RegExp;
+      Id: RegExp;
+      ZipCode: RegExp;
+      Phone: RegExp;
+    };
+}
+
+export interface MongoObject {
+  expandKey(val: any, key: string, obj: any): void;
+}
+
+export default SimpleSchema;
diff --git a/types/simpl-schema/simpl-schema-tests.ts b/types/simpl-schema/simpl-schema-tests.ts
new file mode 100644
index 0000000000..3c40f0c4bb
--- /dev/null
+++ b/types/simpl-schema/simpl-schema-tests.ts
@@ -0,0 +1,96 @@
+import SimpleSchema from 'simpl-schema';
+
+const StringSchema = new SimpleSchema({
+    basicString: {
+        type: String
+    },
+    limitedString: {
+        type: String,
+        allowedValues: ['pro', 'con']
+    },
+    regExpString: {
+        type: String,
+        regEx: SimpleSchema.RegEx.Id
+    },
+    createdAt: {
+        type: Date,
+        autoValue: () => new Date(),
+    },
+    title: {
+        type: String,
+        label: "Argument",
+        /* TODO, this does not work: "The containing arrow function captures the global value of 'this' which implicitly has type 'any'."
+        custom: () => {
+          const text = this.value;
+          if (text.length > 10) return { type: SimpleSchema.ErrorTypes.MAX_STRING, max: 10 };
+        }
+        */
+    },
+});
+
+StringSchema.validate({
+    basicString: "Test",
+    limitedString: "pro",
+    regExpString: "id"
+});
+
+    /*
+    ,
+    title: {
+      type: String,
+      label: "Argument",
+      custom: function () {
+        var text = this.value;
+        text = text.replace(/https?:\/\/(www\.)?([-a-zA-Z0-9@:%._\+~#=]{2,256}\.[a-z]{2,6})\b([-a-zA-Z0-9@:%_\+.~#?&//=]*)/gi, '$2');
+
+        if(text.length > MAX_ARGUMENT_LENGTH) return { type: SimpleSchema.ErrorTypes.MAX_STRING, max: MAX_ARGUMENT_LENGTH }
+        else if(text.length < MIN_ARGUMENT_LENGTH) return { type: SimpleSchema.ErrorTypes.MIN_STRING, min: MIN_ARGUMENT_LENGTH }
+      }
+    },
+    questionId: {
+      type: String,
+      regEx: SimpleSchema.RegEx.Id
+    },
+    side: {
+      type: String,
+      allowedValues: ['pro', 'con']
+    },
+    userId: {
+      type: String,
+      regEx: SimpleSchema.RegEx.Id
+    },
+    createdAt: {
+      type: Date,
+      autoValue: () => new Date(),
+    },
+    clapCount: {
+      type: SimpleSchema.Integer,
+      defaultValue: 0
+    },
+    highlight: {
+      type: Array,
+      optional: true
+    },
+    'highlight.$': {
+      type: Object
+    },
+    'highlight.$.start': SimpleSchema.Integer,
+    'highlight.$.end': SimpleSchema.Integer,
+    'highlight.$.text': {
+      type: String,
+      trim: false
+    }
+    */
+    /*
+    ,
+    {
+        clean: {
+            filter: true,
+            autoConvert: true,
+            removeEmptyStrings: true,
+            trimStrings: true,
+            getAutoValues: true,
+            removeNullsFromArrays: true,
+        }
+    }
+    */
diff --git a/types/simpl-schema/tsconfig.json b/types/simpl-schema/tsconfig.json
new file mode 100644
index 0000000000..d079496f4e
--- /dev/null
+++ b/types/simpl-schema/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "simpl-schema-tests.ts"
+    ]
+}
diff --git a/types/simpl-schema/tslint.json b/types/simpl-schema/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/simpl-schema/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From aecc62b24ec21fc324edb746ce659cd70b1fbd45 Mon Sep 17 00:00:00 2001
From: Max Bernardy <max@titanvest.com>
Date: Tue, 4 Dec 2018 16:02:26 -0500
Subject: [PATCH 638/836] Add Leads

---
 types/intercom-client/Lead.d.ts  | 53 ++++++++++++++++++++++++++++++++
 types/intercom-client/index.d.ts | 31 +++++++++++++++++--
 2 files changed, 82 insertions(+), 2 deletions(-)
 create mode 100644 types/intercom-client/Lead.d.ts

diff --git a/types/intercom-client/Lead.d.ts b/types/intercom-client/Lead.d.ts
new file mode 100644
index 0000000000..97285c36fe
--- /dev/null
+++ b/types/intercom-client/Lead.d.ts
@@ -0,0 +1,53 @@
+import { Company } from "./Company";
+import { Avatar, LocationData, Segment, SocialProfile, Tag } from './User';
+
+export type LeadIdentifier = { "id": string } | { "user_id": string };
+
+export interface Lead {
+  "type": "user" | "contact",
+  readonly "id": string,
+  "user_id": string | null,
+  "email": string | null,
+  "app_id"?: string,
+  "phone": string | null,
+  "name": string | null,
+  readonly "updated_at": number,
+  "last_seen_ip": string | null,
+  "unsubscribed_from_emails": boolean,
+  "last_request_at": number | null,
+  "signed_up_at": number | null,
+  readonly "created_at": number,
+  "session_count": number,
+  "user_agent_data": string | null,
+  "pseudonym": string | null,
+  "anonymous": boolean,
+  "custom_attributes": {
+    [key: string]: any
+  },
+  "avatar": Avatar,
+  "location_data": LocationData | {},
+  "social_profiles": {
+    "type": "social_profile.list",
+    "social_profiles": SocialProfile[]
+  },
+  "companies": {
+    "type": "company.list",
+    "companies": Company[]
+  },
+  "segments": {
+    "type": "segment.list",
+    "segments": Segment[]
+
+  },
+  "tags": {
+    "type": "tag.list",
+    "tags": Tag[]
+  }
+}
+
+export interface List {
+  "type": "user.list",
+  "total_count": number,
+  "contacts": Lead[],
+  "pages": { "next"?: string, "page": number, "per_page": number, "total_pages": number }
+}
diff --git a/types/intercom-client/index.d.ts b/types/intercom-client/index.d.ts
index f897622894..890dabcfb2 100644
--- a/types/intercom-client/index.d.ts
+++ b/types/intercom-client/index.d.ts
@@ -6,6 +6,7 @@
 /// <reference types="node" />
 
 import { List as UserList, User, UserIdentifier } from './User';
+import { List as LeadList, Lead, LeadIdentifier } from './Lead';
 import { CompanyIdentifier, List as CompanyList, Company } from './Company';
 import { TagIdentifier, List as TagList, Tag, TagOper } from './Tag';
 import { List as EventList, Event, ListParam as EventListParam } from './Event';
@@ -33,6 +34,8 @@ export class Client {
     companies: Companies;
     tags: Tags;
     events: Events;
+    contacts: Leads;
+    leads: Leads;
 }
 
 export class ApiResponse<T> extends IncomingMessage {
@@ -51,8 +54,8 @@ export class Users {
     find(identifier: UserIdentifier): Promise<ApiResponse<User>>;
     find(identifier: UserIdentifier, cb: callback<ApiResponse<User>>): void;
 
-    list(): Promise<ApiResponse<User>>;
-    list(cb: callback<ApiResponse<User>>): void;
+    list(): Promise<ApiResponse<UserList>>;
+    list(cb: callback<ApiResponse<UserList>>): void;
 
     listBy(params: {tag_id?: string, segment_id?: string}): Promise<ApiResponse<UserList>>;
     listBy(params: {tag_id?: string, segment_id?: string}, cb: callback<ApiResponse<UserList>>): void;
@@ -69,6 +72,30 @@ export class Users {
     requestPermanentDeletionByParams(identifier: UserIdentifier, cb: callback<{ id: number }>): void;
 }
 
+export class Leads {
+    create(user: Partial<Lead>): Promise<ApiResponse<Lead>>;
+    create(user: Partial<Lead>, cb: callback<ApiResponse<Lead>>): void;
+
+    update(user: UserIdentifier & Partial<Lead>): Promise<ApiResponse<Lead>>;
+    update(user: UserIdentifier & Partial<Lead>, cb: callback<ApiResponse<Lead>>): void;
+
+    list(): Promise<ApiResponse<LeadList>>;
+    list(cb: callback<ApiResponse<LeadList>>): void;
+
+    listBy(params: { email?: string, tag_id?: string, segment_id?: string }): Promise<ApiResponse<LeadList>>;
+    listBy(params: { email?: string, tag_id?: string, segment_id?: string }, cb: callback<ApiResponse<LeadList>>): void;
+
+    find(identifier: LeadIdentifier): Promise<ApiResponse<Lead>>
+    find(identifier: LeadIdentifier, cb: callback<ApiResponse<Lead>>): void;
+
+    delete(id: string): Promise<ApiResponse<Lead>>;
+    delete(id: string, cb: callback<ApiResponse<Lead>>): void;
+
+    convert(params: { contact: LeadIdentifier, user: UserIdentifier }): Promise<ApiResponse<Lead>>;
+    convert(params: { contact: LeadIdentifier, user: UserIdentifier }, cb: callback<ApiResponse<Lead>>): void;
+
+}
+
 export class Companies {
     create(company: CompanyIdentifier & Partial<Company>): Promise<ApiResponse<Company>>;
     create(company: CompanyIdentifier & Partial<Company>, cb: callback<ApiResponse<Company>>): void;

From d193908af2783f374190537c35a971750153ddf0 Mon Sep 17 00:00:00 2001
From: Max Bernardy <max@titanvest.com>
Date: Tue, 4 Dec 2018 16:10:59 -0500
Subject: [PATCH 639/836] Fix param name

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

diff --git a/types/intercom-client/index.d.ts b/types/intercom-client/index.d.ts
index 890dabcfb2..8c81fd989c 100644
--- a/types/intercom-client/index.d.ts
+++ b/types/intercom-client/index.d.ts
@@ -73,11 +73,11 @@ export class Users {
 }
 
 export class Leads {
-    create(user: Partial<Lead>): Promise<ApiResponse<Lead>>;
-    create(user: Partial<Lead>, cb: callback<ApiResponse<Lead>>): void;
+    create(lead: Partial<Lead>): Promise<ApiResponse<Lead>>;
+    create(lead: Partial<Lead>, cb: callback<ApiResponse<Lead>>): void;
 
-    update(user: UserIdentifier & Partial<Lead>): Promise<ApiResponse<Lead>>;
-    update(user: UserIdentifier & Partial<Lead>, cb: callback<ApiResponse<Lead>>): void;
+    update(lead: UserIdentifier & Partial<Lead>): Promise<ApiResponse<Lead>>;
+    update(lead: UserIdentifier & Partial<Lead>, cb: callback<ApiResponse<Lead>>): void;
 
     list(): Promise<ApiResponse<LeadList>>;
     list(cb: callback<ApiResponse<LeadList>>): void;

From 8224466cf9c14356ec77c4a5d18aca9e4715c384 Mon Sep 17 00:00:00 2001
From: Max Bernardy <max@titanvest.com>
Date: Tue, 4 Dec 2018 16:14:01 -0500
Subject: [PATCH 640/836] Tweak Lead interface

---
 types/intercom-client/Lead.d.ts | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/types/intercom-client/Lead.d.ts b/types/intercom-client/Lead.d.ts
index 97285c36fe..b8403f775c 100644
--- a/types/intercom-client/Lead.d.ts
+++ b/types/intercom-client/Lead.d.ts
@@ -8,19 +8,14 @@ export interface Lead {
   readonly "id": string,
   "user_id": string | null,
   "email": string | null,
-  "app_id"?: string,
   "phone": string | null,
   "name": string | null,
   readonly "updated_at": number,
   "last_seen_ip": string | null,
   "unsubscribed_from_emails": boolean,
   "last_request_at": number | null,
-  "signed_up_at": number | null,
   readonly "created_at": number,
-  "session_count": number,
   "user_agent_data": string | null,
-  "pseudonym": string | null,
-  "anonymous": boolean,
   "custom_attributes": {
     [key: string]: any
   },
@@ -42,7 +37,8 @@ export interface Lead {
   "tags": {
     "type": "tag.list",
     "tags": Tag[]
-  }
+  },
+  "referrer": string | null,
 }
 
 export interface List {

From b9ca29afba5459e1826c8427c961c724fea98c3a Mon Sep 17 00:00:00 2001
From: Mike Wickett <mike@wickett.ca>
Date: Tue, 4 Dec 2018 11:51:04 -0500
Subject: [PATCH 641/836] Add inlineLexer function to marked types

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

diff --git a/types/marked/index.d.ts b/types/marked/index.d.ts
index d558348db9..7eddfb4919 100644
--- a/types/marked/index.d.ts
+++ b/types/marked/index.d.ts
@@ -1,8 +1,9 @@
-// Type definitions for Marked 0.4
+// Type definitions for Marked 0.5
 // Project: https://github.com/markedjs/marked
 // Definitions by: William Orr <https://github.com/worr>
 //                 BendingBender <https://github.com/BendingBender>
 //                 CrossR <https://github.com/CrossR>
+//                 Mike Wickett <https://github.com/mwickett>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 export as namespace marked;
@@ -34,6 +35,15 @@ declare namespace marked {
      */
     function lexer(src: string, options?: MarkedOptions): TokensList;
 
+    /**
+     * @param src String of markdown source to be compiled
+     * @param links Array of links
+     * @param options Hash of options
+     * @return String of compiled HTML
+     */
+
+    function inlineLexer(src: string, links: string[], options?: MarkedOptions): string;
+
     /**
      * Compiles markdown to HTML.
      *

From b7a61e55c8406749b2ef9ef32ed612b9c0dd96b6 Mon Sep 17 00:00:00 2001
From: Konstantin Lukaschenko <k.lukaschenko@googlemail.com>
Date: Tue, 4 Dec 2018 22:30:53 +0100
Subject: [PATCH 642/836] enhance module definition.

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

diff --git a/types/three-tds-loader/index.d.ts b/types/three-tds-loader/index.d.ts
index 379a2de8af..33e679a377 100644
--- a/types/three-tds-loader/index.d.ts
+++ b/types/three-tds-loader/index.d.ts
@@ -7,7 +7,9 @@
 
 import * as THREE from 'three';
 
-export default class TDSLoader {
+export = TDSLoader;
+
+declare class TDSLoader {
     constructor(three: typeof THREE);
 
     /**
diff --git a/types/three-tds-loader/three-tds-loader-tests.ts b/types/three-tds-loader/three-tds-loader-tests.ts
index f61eeb92e3..a4e9d61797 100644
--- a/types/three-tds-loader/three-tds-loader-tests.ts
+++ b/types/three-tds-loader/three-tds-loader-tests.ts
@@ -1,5 +1,5 @@
 import * as THREE from 'three';
-import TDSLoader from 'three-tds-loader';
+import TDSLoader = require('three-tds-loader');
 
 const loader = new TDSLoader(THREE);
 

From 4ca42304a5ea6ce7429dce947b65be1459083811 Mon Sep 17 00:00:00 2001
From: Justin Francos <jf@justinfrancos.com>
Date: Tue, 4 Dec 2018 16:54:53 -0500
Subject: [PATCH 643/836] update MongoStore to include close()

as per:
https://github.com/jdesboeufs/connect-mongo/blob/9cbc56d5c35ce0a169ba4290549793979955433e/src/index.js#L315
---
 types/connect-mongo/index.d.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/types/connect-mongo/index.d.ts b/types/connect-mongo/index.d.ts
index ea39a13f42..7173cb50dc 100644
--- a/types/connect-mongo/index.d.ts
+++ b/types/connect-mongo/index.d.ts
@@ -110,6 +110,7 @@ declare namespace connectMongo {
         length: (callback: (err: any, length: number) => void) => void;
         clear: (callback?: (err?: any) => void) => void;
         touch: (sid: string, session: Express.SessionData, callback?: (err: any) => void) => void;
+        close: () => void;
     }
 }
 

From 734b931c87758515eac1db3dab4f53a826db5aff Mon Sep 17 00:00:00 2001
From: TeamworkGuy2 <straitfrommars@rocketmail.com>
Date: Tue, 4 Dec 2018 22:06:53 +0000
Subject: [PATCH 644/836] [shasum] Add shasum@1.0 definition

---
 types/shasum/index.d.ts      | 14 ++++++++++++++
 types/shasum/shasum-tests.ts |  7 +++++++
 types/shasum/tsconfig.json   | 23 +++++++++++++++++++++++
 types/shasum/tslint.json     |  1 +
 4 files changed, 45 insertions(+)
 create mode 100644 types/shasum/index.d.ts
 create mode 100644 types/shasum/shasum-tests.ts
 create mode 100644 types/shasum/tsconfig.json
 create mode 100644 types/shasum/tslint.json

diff --git a/types/shasum/index.d.ts b/types/shasum/index.d.ts
new file mode 100644
index 0000000000..500c811d07
--- /dev/null
+++ b/types/shasum/index.d.ts
@@ -0,0 +1,14 @@
+// Type definitions for shasum 1.0
+// Project: https://github.com/dominictarr/shasum
+// Definitions by: TeamworkGuy2 <https://github.com/TeamworkGuy2>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/**
+ * Single function that return the sha1sum. Installing this is just a little bit quicker than reading the crypto documentation.
+ *   var shasum = require('shasum')
+ *   shasum(string || buffer || object)
+ * It also works in the browser with browserify.
+ */
+declare function shasum(str: any, alg?: string | null, format?: "hex" | "latin1" | "base64"): string;
+
+export = shasum;
diff --git a/types/shasum/shasum-tests.ts b/types/shasum/shasum-tests.ts
new file mode 100644
index 0000000000..01c0ba32fc
--- /dev/null
+++ b/types/shasum/shasum-tests.ts
@@ -0,0 +1,7 @@
+import shasum = require("shasum");
+
+function test(): string {
+    const res1 = shasum("source");
+    const res2 = shasum({ prop: "source" }, null, "hex");
+    return res1 || res2;
+}
diff --git a/types/shasum/tsconfig.json b/types/shasum/tsconfig.json
new file mode 100644
index 0000000000..a0be2a9c4b
--- /dev/null
+++ b/types/shasum/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "shasum-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/shasum/tslint.json b/types/shasum/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/shasum/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From f24094176065b5757b817f420b86f86729ae9fd9 Mon Sep 17 00:00:00 2001
From: Ivan Fernandes <ivandalcantara@gmail.com>
Date: Tue, 4 Dec 2018 20:10:08 -0200
Subject: [PATCH 645/836] changing github2 customHeaders option to correct type

---
 types/passport-github2/index.d.ts | 6 ++++--
 types/passport-oauth2/index.d.ts  | 1 +
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/types/passport-github2/index.d.ts b/types/passport-github2/index.d.ts
index 0b2c1f6a5d..4ca8e93124 100644
--- a/types/passport-github2/index.d.ts
+++ b/types/passport-github2/index.d.ts
@@ -3,12 +3,14 @@
 // Definitions by: Yasunori Ohoka <https://github.com/yasupeke>
 //                 Maarten Mulders <https://github.com/mthmulders>
 //                 Christoph Werner <https://github.com/codepunkt>
+//                 Ivan Fernandes <https://github.com/ivan94>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 
 import passport = require('passport');
 import oauth2 = require('passport-oauth2');
 import express = require('express');
+import { OutgoingHttpHeaders } from 'http';
 
 export interface Profile extends passport.Profile {
     profileUrl: string;
@@ -25,7 +27,7 @@ export interface StrategyOption extends passport.AuthenticateOptions {
     authorizationURL?: string;
     tokenURL?: string;
     scopeSeparator?: string;
-    customHeaders?: string;
+    customHeaders?: OutgoingHttpHeaders;
     userProfileURL?: string;
 }
 
@@ -46,7 +48,7 @@ export interface _StrategyOptionsBase extends OAuth2StrategyOptionsWithoutRequir
     authorizationURL?: string;
     tokenURL?: string;
     scopeSeparator?: string;
-    customHeaders?: string;
+    customHeaders?: OutgoingHttpHeaders;
     userProfileURL?: string;
 }
 
diff --git a/types/passport-oauth2/index.d.ts b/types/passport-oauth2/index.d.ts
index cd78f377c2..28a1a06348 100644
--- a/types/passport-oauth2/index.d.ts
+++ b/types/passport-oauth2/index.d.ts
@@ -3,6 +3,7 @@
 // Definitions by: Pasi Eronen <https://github.com/pasieronen>
 //                 Wang Zishi <https://github.com/WangZishi>
 //                 Eduardo AC <https://github.com/EduardoAC>
+//                 Ivan Fernandes <https://github.com/ivan94>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 

From 3a3cfab723c1559cfa995c43f24b8b6017be3acf Mon Sep 17 00:00:00 2001
From: Max Bernardy <max@titanvest.com>
Date: Tue, 4 Dec 2018 17:21:15 -0500
Subject: [PATCH 646/836] correct type

---
 types/intercom-client/Lead.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/intercom-client/Lead.d.ts b/types/intercom-client/Lead.d.ts
index b8403f775c..aa4e4a2cfa 100644
--- a/types/intercom-client/Lead.d.ts
+++ b/types/intercom-client/Lead.d.ts
@@ -4,7 +4,7 @@ import { Avatar, LocationData, Segment, SocialProfile, Tag } from './User';
 export type LeadIdentifier = { "id": string } | { "user_id": string };
 
 export interface Lead {
-  "type": "user" | "contact",
+  "type": "contact",
   readonly "id": string,
   "user_id": string | null,
   "email": string | null,

From 53ddbc865809cedd7e91bf173df78fe44735a7f2 Mon Sep 17 00:00:00 2001
From: Avi Vahl <avi.vahl@wix.com>
Date: Wed, 5 Dec 2018 00:47:46 +0200
Subject: [PATCH 647/836] puppeteer: allow disabling default viewport null
 disables the default viewport (verified locally). comment already mentions
 that, but it wasn't accepted in the type.

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

diff --git a/types/puppeteer/index.d.ts b/types/puppeteer/index.d.ts
index ff05cc4de0..2051603f69 100644
--- a/types/puppeteer/index.d.ts
+++ b/types/puppeteer/index.d.ts
@@ -2044,7 +2044,7 @@ export interface BrowserOptions {
      * @default false
      */
     isLandscape?: boolean;
-  };
+  } | null;
   /**
    * Slows down Puppeteer operations by the specified amount of milliseconds.
    * Useful so that you can see what is going on.
diff --git a/types/puppeteer/puppeteer-tests.ts b/types/puppeteer/puppeteer-tests.ts
index b708f1bc0c..1f587d470e 100644
--- a/types/puppeteer/puppeteer-tests.ts
+++ b/types/puppeteer/puppeteer-tests.ts
@@ -200,6 +200,13 @@ puppeteer.launch().then(async browser => {
   browser.close();
 })();
 
+// Launching with default viewport disabled
+(async () => {
+  await puppeteer.launch({
+    defaultViewport: null
+  });
+})();
+
 // Test v0.12 features
 (async () => {
   const browser = await puppeteer.launch({

From ce4d4743b791628819b26327c19169bb9f25f687 Mon Sep 17 00:00:00 2001
From: Alex Duka <aduka@alteryx.com>
Date: Wed, 5 Dec 2018 00:50:04 +0200
Subject: [PATCH 648/836] improved tests and typings

---
 types/rabbitmq-schema/index.d.ts              | 96 +++++++++----------
 .../rabbitmq-schema/rabbitmq-schema-tests.ts  | 29 ++----
 2 files changed, 54 insertions(+), 71 deletions(-)

diff --git a/types/rabbitmq-schema/index.d.ts b/types/rabbitmq-schema/index.d.ts
index ccd76b68c5..a577d9c36a 100644
--- a/types/rabbitmq-schema/index.d.ts
+++ b/types/rabbitmq-schema/index.d.ts
@@ -4,69 +4,69 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 declare namespace rabbitMqSchemaNc {
-  interface Binding {
-    destination: Topology;
-    source: Exchange;
-    args?: object;
-    routingPattern?: string;
-  }
+    interface Binding {
+        destination: Topology;
+        source: Exchange;
+        args?: object;
+        routingPattern?: string;
+    }
 
-  interface TopicBinding extends Binding {
-    routingPattern: string;
-  }
+    interface TopicBinding extends Binding {
+        routingPattern: string;
+    }
 
-  interface DirectBinding extends Binding {
-    routingPattern: string;
-  }
+    interface DirectBinding extends Binding {
+        routingPattern: string;
+    }
 
 
-  interface Topology {
-    options?: object;
-  }
+    interface Topology {
+        options?: object;
+    }
 
-  interface Exchange extends Topology {
-    exchange: string;
-    type: string;
-    bindings: Binding[];
-  }
+    interface Exchange extends Topology {
+        exchange: string;
+        type: string;
+        bindings: Binding[];
+    }
 
-  interface FanoutExchange extends Exchange {
-    type: 'fanout';
-  }
+    interface FanoutExchange extends Exchange {
+        type: 'fanout';
+    }
 
-  interface TopicExchange extends Exchange {
-    type: 'topic';
-    bindings: TopicBinding[];
-  }
+    interface TopicExchange extends Exchange {
+        type: 'topic';
+        bindings: TopicBinding[];
+    }
 
-  interface DirectExchange extends Exchange {
-    type: 'direct';
-    bindings: DirectBinding[];
-  }
+    interface DirectExchange extends Exchange {
+        type: 'direct';
+        bindings: DirectBinding[];
+    }
 
-  interface Queue extends Topology {
-    queue: string;
-    messageSchema: object;
-  }
+    interface Queue extends Topology {
+        queue: string;
+        messageSchema: object;
+    }
 
-  interface RabbitMQSchema {
-    new (schema: Topology | Topology[], parentPath?: string): RabbitMQSchema;
+    interface RabbitMQSchema {
+        new (schema: Topology | Topology[], parentPath?: string): RabbitMQSchema;
 
-    getExchanges(): Exchange[];
-    getBindings(): Binding[];
-    getQueues(): Queue[];
-    getDirectBindings(): DirectBinding[];
+        getExchanges(): Exchange[];
+        getBindings(): Binding[];
+        getQueues(): Queue[];
+        getDirectBindings(): DirectBinding[];
 
-    validate(schema: Topology | Topology[], parentPath?: string): void;
-    validateMessage<T>(exchangeName: string, routingPattern: string, message: T): T;
+        validate(schema: Topology | Topology[], parentPath?: string): void;
+        validateMessage<T>(exchangeName: string, routingPattern: string, message: T): T;
 
-    getQueueByName(name: string): Queue | void;
-    getExchangeByName(name: string): Exchange | void;
-  }
+        getQueueByName(name: string): Queue | void;
+        getExchangeByName(name: string): Exchange | void;
+    }
 
 }
 
 declare module 'rabbitmq-schema' {
-  const schema: rabbitMqSchemaNc.RabbitMQSchema;
-  export = schema;
+    const schema: rabbitMqSchemaNc.RabbitMQSchema;
+    export = schema;
 }
\ No newline at end of file
diff --git a/types/rabbitmq-schema/rabbitmq-schema-tests.ts b/types/rabbitmq-schema/rabbitmq-schema-tests.ts
index 50b36b2e21..e02dc29bae 100644
--- a/types/rabbitmq-schema/rabbitmq-schema-tests.ts
+++ b/types/rabbitmq-schema/rabbitmq-schema-tests.ts
@@ -1,27 +1,10 @@
 import RabbitMqSchema = require('rabbitmq-schema');
 
-const topology: rabbitMqSchemaNc.Topology = {
+const topology: rabbitMqSchemaNc.Exchange = {
   exchange: 'images',
   type: 'topic',
-  vhost: '/',
-  bindings: [
-    {
-      routingPattern: 'images.jpeg.get',
-      destination: {
-        queue: 'images.image.get',
-        messageSchema: {
-          type: 'object',
-          properties: {
-            testMsg: {
-              type: "string"
-            }
-          }
-        },
-        args: { 'message-ttl': 10000 }
-      }
-    }
-  ]
-}
+  bindings: []
+};
 
 const rabbitSchema = new RabbitMqSchema(topology, '');
 
@@ -30,8 +13,8 @@ const bindings: rabbitMqSchemaNc.Binding[] = rabbitSchema.getBindings();
 const queues: rabbitMqSchemaNc.Queue[] = rabbitSchema.getQueues();
 const directBindings: rabbitMqSchemaNc.DirectBinding[] = rabbitSchema.getDirectBindings();
 
-const jpgQueue: rabbitMqSchemaNc.Queue = rabbitSchema.getQueueByName('images.jpeg.get');
-const exchange: rabbitMqSchemaNc.Exchange = rabbitSchema.getExchangeByName('images');
+const jpgQueue: rabbitMqSchemaNc.Queue | unknown = rabbitSchema.getQueueByName('images.jpeg.get');
+const exchange: rabbitMqSchemaNc.Exchange | unknown = rabbitSchema.getExchangeByName('images');
 
 rabbitSchema.validate(topology);
-rabbitSchema.validateMessage('images', 'images.jpeg.get', {testMsg: 'ok'});
\ No newline at end of file
+rabbitSchema.validateMessage('images', 'images.jpeg.get', {testMsg: 'ok'});

From 89f8981d7941ccdc5ba0680ff05c2068e112abfe Mon Sep 17 00:00:00 2001
From: Dimitri Benin <dimitri.benin@gmail.com>
Date: Tue, 4 Dec 2018 23:52:20 +0100
Subject: [PATCH 649/836] Add types for interpret

---
 types/interpret/index.d.ts         | 26 ++++++++++++++++
 types/interpret/interpret-tests.ts | 50 ++++++++++++++++++++++++++++++
 types/interpret/tsconfig.json      | 23 ++++++++++++++
 types/interpret/tslint.json        |  1 +
 4 files changed, 100 insertions(+)
 create mode 100644 types/interpret/index.d.ts
 create mode 100644 types/interpret/interpret-tests.ts
 create mode 100644 types/interpret/tsconfig.json
 create mode 100644 types/interpret/tslint.json

diff --git a/types/interpret/index.d.ts b/types/interpret/index.d.ts
new file mode 100644
index 0000000000..de51c842f8
--- /dev/null
+++ b/types/interpret/index.d.ts
@@ -0,0 +1,26 @@
+// Type definitions for interpret 1.1
+// Project: https://github.com/tkellen/node-interpret
+// Definitions by: BendingBender <https://github.com/BendingBender>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+export interface Hook {
+    (m: { extensions: string } | NodeModule): any;
+    install(m?: { extension: string; [key: string]: any }): void;
+}
+
+export type RegisterFn = (hook: Hook) => void;
+
+export interface ExtensionDescriptor {
+    module: string;
+    register: RegisterFn;
+}
+
+export type Extension = string | ExtensionDescriptor | Array<string | ExtensionDescriptor>;
+export interface Extensions {
+    [extension: string]: Extension | null;
+}
+
+export const extensions: Extensions;
+export const jsVariants: Extensions;
diff --git a/types/interpret/interpret-tests.ts b/types/interpret/interpret-tests.ts
new file mode 100644
index 0000000000..2ac4cc0081
--- /dev/null
+++ b/types/interpret/interpret-tests.ts
@@ -0,0 +1,50 @@
+import { extensions, jsVariants, Extensions } from 'interpret';
+
+// $ExpectType Extensions
+extensions;
+// $ExpectType Extensions
+jsVariants;
+
+const myExts: Extensions = {
+    '.babel.js': [
+        {
+            module: 'babel-register',
+            register(hook) {
+                hook({ extensions: '.js' });
+            },
+        },
+    ],
+    '.co': 'coco',
+    '.coffee': ['coffeescript/register', 'coffee-script/register', 'coffeescript', 'coffee-script'],
+    '.esm.js': {
+        module: 'esm',
+        register(hook) {
+            const esmLoader = hook(module);
+            require.extensions['.js'] = esmLoader('module')._extensions['.js'];
+        },
+    },
+    '.js': null,
+    '.jsx': [
+        {
+            module: 'node-jsx',
+            register(hook) {
+                hook.install({ extension: '.jsx', harmony: true });
+            },
+        },
+    ],
+    '.toml': {
+        module: 'toml-require',
+        register(hook) {
+            hook.install();
+        },
+    },
+    '.ts': [
+        'typescript-require',
+        {
+            module: '@babel/register',
+            register(hook) {
+                hook({ extensions: '.ts' });
+            },
+        },
+    ],
+};
diff --git a/types/interpret/tsconfig.json b/types/interpret/tsconfig.json
new file mode 100644
index 0000000000..970cf59fd9
--- /dev/null
+++ b/types/interpret/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "interpret-tests.ts"
+    ]
+}
diff --git a/types/interpret/tslint.json b/types/interpret/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/interpret/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From c85e8d550f1679ea945d820313f05a9cc1d8ce0f Mon Sep 17 00:00:00 2001
From: Alex Duka <aduka@alteryx.com>
Date: Wed, 5 Dec 2018 00:56:07 +0200
Subject: [PATCH 650/836] added strictFunctionTypes option to tsconfig

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

diff --git a/types/rabbitmq-schema/tsconfig.json b/types/rabbitmq-schema/tsconfig.json
index 96c7293272..81e519bb47 100644
--- a/types/rabbitmq-schema/tsconfig.json
+++ b/types/rabbitmq-schema/tsconfig.json
@@ -4,6 +4,7 @@
         "lib": [
             "es6"
         ],
+        "strictFunctionTypes": true,
         "noImplicitAny": true,
         "noImplicitThis": true,
         "strictNullChecks": true,

From 14300e779916b1f19be8334f4a5c135de76d464b Mon Sep 17 00:00:00 2001
From: Alex Duka <aduka@alteryx.com>
Date: Wed, 5 Dec 2018 01:45:49 +0200
Subject: [PATCH 651/836] fix tslint issues, updated tests

---
 types/rabbitmq-schema/index.d.ts              | 128 +++++++++---------
 .../rabbitmq-schema/rabbitmq-schema-tests.ts  |  20 ++-
 2 files changed, 72 insertions(+), 76 deletions(-)

diff --git a/types/rabbitmq-schema/index.d.ts b/types/rabbitmq-schema/index.d.ts
index a577d9c36a..29c12b3c99 100644
--- a/types/rabbitmq-schema/index.d.ts
+++ b/types/rabbitmq-schema/index.d.ts
@@ -3,70 +3,70 @@
 // Definitions by: Alex Duka <https://github.com/rulezzz1987>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare namespace rabbitMqSchemaNc {
-    interface Binding {
-        destination: Topology;
-        source: Exchange;
-        args?: object;
-        routingPattern?: string;
-    }
-
-    interface TopicBinding extends Binding {
-        routingPattern: string;
-    }
-
-    interface DirectBinding extends Binding {
-        routingPattern: string;
-    }
-
-
-    interface Topology {
-        options?: object;
-    }
-
-    interface Exchange extends Topology {
-        exchange: string;
-        type: string;
-        bindings: Binding[];
-    }
-
-    interface FanoutExchange extends Exchange {
-        type: 'fanout';
-    }
-
-    interface TopicExchange extends Exchange {
-        type: 'topic';
-        bindings: TopicBinding[];
-    }
-
-    interface DirectExchange extends Exchange {
-        type: 'direct';
-        bindings: DirectBinding[];
-    }
-
-    interface Queue extends Topology {
-        queue: string;
-        messageSchema: object;
-    }
-
-    interface RabbitMQSchema {
-        new (schema: Topology | Topology[], parentPath?: string): RabbitMQSchema;
-
-        getExchanges(): Exchange[];
-        getBindings(): Binding[];
-        getQueues(): Queue[];
-        getDirectBindings(): DirectBinding[];
-
-        validate(schema: Topology | Topology[], parentPath?: string): void;
-        validateMessage<T>(exchangeName: string, routingPattern: string, message: T): T;
-
-        getQueueByName(name: string): Queue | void;
-        getExchangeByName(name: string): Exchange | void;
-    }
 
+interface Binding {
+    destination: Topology;
+    source: Exchange;
+    args?: object;
+    routingPattern?: string;
 }
 
-declare module 'rabbitmq-schema' {
-    const schema: rabbitMqSchemaNc.RabbitMQSchema;
-    export = schema;
-}
\ No newline at end of file
+interface TopicBinding extends Binding {
+    routingPattern: string;
+}
+
+interface DirectBinding extends Binding {
+    routingPattern: string;
+}
+
+
+interface Topology {
+    options?: object;
+}
+
+interface Exchange extends Topology {
+    exchange: string;
+    type: string;
+    bindings: Binding[];
+}
+
+interface FanoutExchange extends Exchange {
+    type: 'fanout';
+}
+
+interface TopicExchange extends Exchange {
+    type: 'topic';
+    bindings: TopicBinding[];
+}
+
+interface DirectExchange extends Exchange {
+    type: 'direct';
+    bindings: DirectBinding[];
+}
+
+interface Queue extends Topology {
+    queue: string;
+    messageSchema: object;
+}
+
+declare class RabbitMQSchema {
+    constructor(schema: Topology | Topology[], parentPath?: string);
+
+    getExchanges(): Exchange[];
+
+    getBindings(): Binding[];
+
+    getQueues(): Queue[];
+
+    getDirectBindings(): DirectBinding[];
+
+    validate(schema: Topology | Topology[], parentPath?: string): void;
+
+    validateMessage<T>(exchangeName: string, routingPattern: string, message: T): T;
+
+    getQueueByName(name: string): Queue | void;
+
+    getExchangeByName(name: string): Exchange | void;
+}
+
+export = RabbitMQSchema;
\ No newline at end of file
diff --git a/types/rabbitmq-schema/rabbitmq-schema-tests.ts b/types/rabbitmq-schema/rabbitmq-schema-tests.ts
index e02dc29bae..067c9c3c5a 100644
--- a/types/rabbitmq-schema/rabbitmq-schema-tests.ts
+++ b/types/rabbitmq-schema/rabbitmq-schema-tests.ts
@@ -1,20 +1,16 @@
 import RabbitMqSchema = require('rabbitmq-schema');
 
-const topology: rabbitMqSchemaNc.Exchange = {
-  exchange: 'images',
-  type: 'topic',
-  bindings: []
-};
+const topology = {};
 
-const rabbitSchema = new RabbitMqSchema(topology, '');
+const rabbitSchema = new RabbitMqSchema({}, '');
 
-const exchanges: rabbitMqSchemaNc.Exchange[] = rabbitSchema.getExchanges();
-const bindings: rabbitMqSchemaNc.Binding[] = rabbitSchema.getBindings();
-const queues: rabbitMqSchemaNc.Queue[] = rabbitSchema.getQueues();
-const directBindings: rabbitMqSchemaNc.DirectBinding[] = rabbitSchema.getDirectBindings();
+rabbitSchema.getExchanges();
+rabbitSchema.getBindings();
+rabbitSchema.getQueues();
+rabbitSchema.getDirectBindings();
 
-const jpgQueue: rabbitMqSchemaNc.Queue | unknown = rabbitSchema.getQueueByName('images.jpeg.get');
-const exchange: rabbitMqSchemaNc.Exchange | unknown = rabbitSchema.getExchangeByName('images');
+rabbitSchema.getQueueByName('images.jpeg.get');
+rabbitSchema.getExchangeByName('images');
 
 rabbitSchema.validate(topology);
 rabbitSchema.validateMessage('images', 'images.jpeg.get', {testMsg: 'ok'});

From 539736fa10140c46156aa34e4918a4648ca3c72c Mon Sep 17 00:00:00 2001
From: Alex Duka <aduka@alteryx.com>
Date: Wed, 5 Dec 2018 01:52:42 +0200
Subject: [PATCH 652/836] fixed linting issues, ts version > 2.2

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

diff --git a/types/rabbitmq-schema/index.d.ts b/types/rabbitmq-schema/index.d.ts
index 29c12b3c99..e2814066ee 100644
--- a/types/rabbitmq-schema/index.d.ts
+++ b/types/rabbitmq-schema/index.d.ts
@@ -1,9 +1,9 @@
+// TypeScript Version: 2.2' just under the header.
 // Type definitions for rabbitmq-schema 2.0
 // Project: https://github.com/tjmehta/rabbitmq-schema
 // Definitions by: Alex Duka <https://github.com/rulezzz1987>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-
 interface Binding {
     destination: Topology;
     source: Exchange;
@@ -19,7 +19,6 @@ interface DirectBinding extends Binding {
     routingPattern: string;
 }
 
-
 interface Topology {
     options?: object;
 }
@@ -69,4 +68,4 @@ declare class RabbitMQSchema {
     getExchangeByName(name: string): Exchange | void;
 }
 
-export = RabbitMQSchema;
\ No newline at end of file
+export = RabbitMQSchema;

From 83debe8fbdfb225dfbfc0dd3ebe4dffdd3e7a673 Mon Sep 17 00:00:00 2001
From: Alex Duka <aduka@alteryx.com>
Date: Wed, 5 Dec 2018 01:57:10 +0200
Subject: [PATCH 653/836] ts version > 2.2

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

diff --git a/types/rabbitmq-schema/index.d.ts b/types/rabbitmq-schema/index.d.ts
index e2814066ee..49d20ea14b 100644
--- a/types/rabbitmq-schema/index.d.ts
+++ b/types/rabbitmq-schema/index.d.ts
@@ -1,8 +1,8 @@
-// TypeScript Version: 2.2' just under the header.
 // Type definitions for rabbitmq-schema 2.0
 // Project: https://github.com/tjmehta/rabbitmq-schema
 // Definitions by: Alex Duka <https://github.com/rulezzz1987>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
 interface Binding {
     destination: Topology;

From fe58906ce37ef41075bbf68e3209962d6a1dc3c1 Mon Sep 17 00:00:00 2001
From: Dimitri Benin <dimitri.benin@gmail.com>
Date: Wed, 5 Dec 2018 01:17:22 +0100
Subject: [PATCH 654/836] Add types for flagged-respawn

---
 .../flagged-respawn/flagged-respawn-tests.ts  | 14 +++++++++++
 types/flagged-respawn/index.d.ts              | 24 +++++++++++++++++++
 types/flagged-respawn/tsconfig.json           | 23 ++++++++++++++++++
 types/flagged-respawn/tslint.json             |  1 +
 4 files changed, 62 insertions(+)
 create mode 100644 types/flagged-respawn/flagged-respawn-tests.ts
 create mode 100644 types/flagged-respawn/index.d.ts
 create mode 100644 types/flagged-respawn/tsconfig.json
 create mode 100644 types/flagged-respawn/tslint.json

diff --git a/types/flagged-respawn/flagged-respawn-tests.ts b/types/flagged-respawn/flagged-respawn-tests.ts
new file mode 100644
index 0000000000..12f949f9fb
--- /dev/null
+++ b/types/flagged-respawn/flagged-respawn-tests.ts
@@ -0,0 +1,14 @@
+import flaggedRespawn = require('flagged-respawn');
+
+const flags = ['--flag'];
+
+flaggedRespawn(flags, process.argv, (ready, child, argv) => {
+    // $ExpectType boolean
+    ready;
+    // $ExpectType Process
+    child;
+    // $ExpectType string[]
+    argv;
+});
+flaggedRespawn(flags, process.argv, '--flag', () => {});
+flaggedRespawn(flags, process.argv, ['--flag'], () => {});
diff --git a/types/flagged-respawn/index.d.ts b/types/flagged-respawn/index.d.ts
new file mode 100644
index 0000000000..eea62b2e8c
--- /dev/null
+++ b/types/flagged-respawn/index.d.ts
@@ -0,0 +1,24 @@
+// Type definitions for flagged-respawn 1.0
+// Project: https://github.com/js-cli/js-flagged-respawn
+// Definitions by: BendingBender <https://github.com/BendingBender>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+export = flaggedRespawn;
+
+declare function flaggedRespawn(
+    flags: string[],
+    argv: string[],
+    callback: flaggedRespawn.Callback
+): void;
+declare function flaggedRespawn(
+    flags: string[],
+    argv: string[],
+    forcedFlags: string | string[],
+    callback: flaggedRespawn.Callback
+): void;
+
+declare namespace flaggedRespawn {
+    type Callback = (ready: boolean, proc: NodeJS.Process, argv: string[]) => void;
+}
diff --git a/types/flagged-respawn/tsconfig.json b/types/flagged-respawn/tsconfig.json
new file mode 100644
index 0000000000..91fce74324
--- /dev/null
+++ b/types/flagged-respawn/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "flagged-respawn-tests.ts"
+    ]
+}
diff --git a/types/flagged-respawn/tslint.json b/types/flagged-respawn/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/flagged-respawn/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 57130b66948fb84ede0ee3f92dac60e45afd0c29 Mon Sep 17 00:00:00 2001
From: Craig Bruce <craig@craig-bruce.com>
Date: Wed, 5 Dec 2018 11:25:09 +1100
Subject: [PATCH 655/836] Add test to help differentiate between different
 import techniques

---
 .../chromecast-caf-receiver-tests.ts          | 37 +++++++++++++------
 1 file changed, 26 insertions(+), 11 deletions(-)

diff --git a/types/chromecast-caf-receiver/chromecast-caf-receiver-tests.ts b/types/chromecast-caf-receiver/chromecast-caf-receiver-tests.ts
index 6660a058ad..8d12320e0a 100644
--- a/types/chromecast-caf-receiver/chromecast-caf-receiver-tests.ts
+++ b/types/chromecast-caf-receiver/chromecast-caf-receiver-tests.ts
@@ -1,29 +1,44 @@
-const breaksEvent = new cast.framework.events.BreaksEvent('BREAK_STARTED');
-breaksEvent.breakId = 'some-break-id';
-breaksEvent.breakClipId = 'some-break-clip-id';
+import { MediaMetadata } from "chromecast-caf-receiver/cast.framework.messages";
+
+// The following test showcases how you can import individual types directly from the namespace:
+
+const mediaMetadata = new MediaMetadata();
+mediaMetadata.metadataType = "TV_SHOW";
+
+// The following tests showcase how you can globally access 'cast' types using
+// the nested namespace style. This is the preferred method as it
+// conforms exactly to the CAF documentation.
+
+const breaksEvent = new cast.framework.events.BreaksEvent("BREAK_STARTED");
+breaksEvent.breakId = "some-break-id";
+breaksEvent.breakClipId = "some-break-clip-id";
 
 const track = new cast.framework.messages.Track(1, "TEXT");
 const breakClip = new cast.framework.messages.BreakClip("id");
 const adBreak = new cast.framework.messages.Break("id", ["id"], 1);
-const rEvent = new cast.framework.events.RequestEvent("BITRATE_CHANGED", { requestId: 2 });
+const rEvent = new cast.framework.events.RequestEvent("BITRATE_CHANGED", {
+    requestId: 2
+});
 const pManager = new cast.framework.PlayerManager();
-pManager.addEventListener("STALLED", () => { });
+pManager.addEventListener("STALLED", () => {});
 const ttManager = new cast.framework.TextTracksManager();
 const qManager = new cast.framework.QueueManager();
 const qBase = new cast.framework.QueueBase();
 const items = qBase.fetchItems(1, 3, 4);
 const breakSeekData = new cast.framework.breaks.BreakSeekData(0, 100, []);
-const breakClipLoadContext = new cast.framework.breaks.BreakClipLoadInterceptorContext(adBreak);
+const breakClipLoadContext = new cast.framework.breaks.BreakClipLoadInterceptorContext(
+    adBreak
+);
 const breakManager: cast.framework.breaks.BreakManager = {
     getBreakById: () => adBreak,
     getBreakClipById: () => breakClip,
     getBreakClips: () => [breakClip],
     getBreaks: () => [adBreak],
     getPlayWatchedBreak: () => true,
-    setBreakClipLoadInterceptor: () => { },
-    setBreakSeekInterceptor: () => { },
-    setPlayWatchedBreak: () => { },
-    setVastTrackingInterceptor: () => { }
+    setBreakClipLoadInterceptor: () => {},
+    setBreakSeekInterceptor: () => {},
+    setPlayWatchedBreak: () => {},
+    setVastTrackingInterceptor: () => {}
 };
 
 const lrd: cast.framework.messages.LoadRequestData = {
@@ -76,4 +91,4 @@ const pData: cast.framework.ui.PlayerData = {
     whenSkippable: 321
 };
 const binder = new cast.framework.ui.PlayerDataBinder(pData);
-binder.addEventListener("ANY_CHANGE", e => { });
+binder.addEventListener("ANY_CHANGE", e => {});

From 6a11af78c9f8d8f78c9ae611464f305b11139e62 Mon Sep 17 00:00:00 2001
From: Dimitri Benin <dimitri.benin@gmail.com>
Date: Wed, 5 Dec 2018 01:30:16 +0100
Subject: [PATCH 656/836] Add types for v8flags

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

diff --git a/types/v8flags/index.d.ts b/types/v8flags/index.d.ts
new file mode 100644
index 0000000000..409b51d60b
--- /dev/null
+++ b/types/v8flags/index.d.ts
@@ -0,0 +1,13 @@
+// Type definitions for v8flags 3.1
+// Project: https://github.com/tkellen/node-v8flags
+// Definitions by: BendingBender <https://github.com/BendingBender>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export = v8flags;
+
+declare function v8flags(cb: (err: any, flags: string[]) => void): void;
+
+declare namespace v8flags {
+    const configfile: string;
+    const configPath: string;
+}
diff --git a/types/v8flags/tsconfig.json b/types/v8flags/tsconfig.json
new file mode 100644
index 0000000000..e0673d15d0
--- /dev/null
+++ b/types/v8flags/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "v8flags-tests.ts"
+    ]
+}
diff --git a/types/v8flags/tslint.json b/types/v8flags/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/v8flags/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/v8flags/v8flags-tests.ts b/types/v8flags/v8flags-tests.ts
new file mode 100644
index 0000000000..cc95ac734d
--- /dev/null
+++ b/types/v8flags/v8flags-tests.ts
@@ -0,0 +1,6 @@
+import v8flags = require('v8flags');
+
+v8flags((err, results) => {
+    // $ExpectType string[]
+    results;
+});

From 5b92e6f79cd8c387921efa99dda8aa6b923f877d Mon Sep 17 00:00:00 2001
From: Craig Bruce <craig@craig-bruce.com>
Date: Wed, 5 Dec 2018 11:32:33 +1100
Subject: [PATCH 657/836] Had do disable tslint rules for global import in
 tests as it defeats the object

---
 .../chromecast-caf-receiver-tests.ts          | 20 ++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/types/chromecast-caf-receiver/chromecast-caf-receiver-tests.ts b/types/chromecast-caf-receiver/chromecast-caf-receiver-tests.ts
index 8d12320e0a..0df790c5f7 100644
--- a/types/chromecast-caf-receiver/chromecast-caf-receiver-tests.ts
+++ b/types/chromecast-caf-receiver/chromecast-caf-receiver-tests.ts
@@ -2,33 +2,45 @@ import { MediaMetadata } from "chromecast-caf-receiver/cast.framework.messages";
 
 // The following test showcases how you can import individual types directly from the namespace:
 
-const mediaMetadata = new MediaMetadata();
+const mediaMetadata = new MediaMetadata("GENERIC");
 mediaMetadata.metadataType = "TV_SHOW";
 
 // The following tests showcase how you can globally access 'cast' types using
 // the nested namespace style. This is the preferred method as it
 // conforms exactly to the CAF documentation.
 
+// tslint:disable-next-line
 const breaksEvent = new cast.framework.events.BreaksEvent("BREAK_STARTED");
 breaksEvent.breakId = "some-break-id";
 breaksEvent.breakClipId = "some-break-clip-id";
 
+// tslint:disable-next-line
 const track = new cast.framework.messages.Track(1, "TEXT");
+// tslint:disable-next-line
 const breakClip = new cast.framework.messages.BreakClip("id");
+// tslint:disable-next-line
 const adBreak = new cast.framework.messages.Break("id", ["id"], 1);
+// tslint:disable-next-line
 const rEvent = new cast.framework.events.RequestEvent("BITRATE_CHANGED", {
     requestId: 2
 });
+// tslint:disable-next-line
 const pManager = new cast.framework.PlayerManager();
 pManager.addEventListener("STALLED", () => {});
+// tslint:disable-next-line
 const ttManager = new cast.framework.TextTracksManager();
+// tslint:disable-next-line
 const qManager = new cast.framework.QueueManager();
+// tslint:disable-next-line
 const qBase = new cast.framework.QueueBase();
 const items = qBase.fetchItems(1, 3, 4);
+// tslint:disable-next-line
 const breakSeekData = new cast.framework.breaks.BreakSeekData(0, 100, []);
+// tslint:disable-next-line
 const breakClipLoadContext = new cast.framework.breaks.BreakClipLoadInterceptorContext(
     adBreak
 );
+// tslint:disable-next-line
 const breakManager: cast.framework.breaks.BreakManager = {
     getBreakById: () => adBreak,
     getBreakClipById: () => breakClip,
@@ -41,6 +53,7 @@ const breakManager: cast.framework.breaks.BreakManager = {
     setVastTrackingInterceptor: () => {}
 };
 
+// tslint:disable-next-line
 const lrd: cast.framework.messages.LoadRequestData = {
     requestId: 1,
     activeTrackIds: [1, 2],
@@ -58,6 +71,7 @@ const lrd: cast.framework.messages.LoadRequestData = {
     queueData: {}
 };
 
+// tslint:disable-next-line
 const appData: cast.framework.system.ApplicationData = {
     id: () => "id",
     launchingSenderId: () => "launch-id",
@@ -66,8 +80,10 @@ const appData: cast.framework.system.ApplicationData = {
     sessionId: () => 1
 };
 
+// tslint:disable-next-line
 const readyEvent = new cast.framework.system.ReadyEvent(appData);
 const data = readyEvent.data;
+// tslint:disable-next-line
 const pData: cast.framework.ui.PlayerData = {
     breakPercentagePositions: [1],
     contentType: "video",
@@ -79,6 +95,7 @@ const pData: cast.framework.ui.PlayerData = {
     isLive: true,
     isPlayingBreak: false,
     isSeeking: true,
+    // tslint:disable-next-line
     metadata: new cast.framework.messages.MediaMetadata("GENERIC"),
     nextSubtitle: "sub",
     nextThumbnailUrl: "url",
@@ -90,5 +107,6 @@ const pData: cast.framework.ui.PlayerData = {
     title: "title",
     whenSkippable: 321
 };
+// tslint:disable-next-line
 const binder = new cast.framework.ui.PlayerDataBinder(pData);
 binder.addEventListener("ANY_CHANGE", e => {});

From 57b78900c18241543bc0657972ae935769438015 Mon Sep 17 00:00:00 2001
From: Dimitri Benin <dimitri.benin@gmail.com>
Date: Wed, 5 Dec 2018 02:08:09 +0100
Subject: [PATCH 658/836] Add types for fined

---
 types/fined/fined-tests.ts | 18 ++++++++++++++++++
 types/fined/index.d.ts     | 23 +++++++++++++++++++++++
 types/fined/tsconfig.json  | 23 +++++++++++++++++++++++
 types/fined/tslint.json    |  1 +
 4 files changed, 65 insertions(+)
 create mode 100644 types/fined/fined-tests.ts
 create mode 100644 types/fined/index.d.ts
 create mode 100644 types/fined/tsconfig.json
 create mode 100644 types/fined/tslint.json

diff --git a/types/fined/fined-tests.ts b/types/fined/fined-tests.ts
new file mode 100644
index 0000000000..5ee4e79bc6
--- /dev/null
+++ b/types/fined/fined-tests.ts
@@ -0,0 +1,18 @@
+import fined = require('fined');
+
+// $ExpectType Result | null
+fined({ path: 'path/to/file', extensions: ['.js', '.json'] });
+
+const opts = {
+    name: '.app',
+    cwd: '.',
+    extensions: {
+        rc: 'default-rc-loader',
+        '.yml': 'default-yml-loader',
+    },
+};
+
+fined({ path: '.' }, opts);
+fined({ path: '~', extensions: { rc: 'some-special-rc-loader' } }, opts);
+fined({ path: '~' }, {});
+fined({ path: '~' }, { extensions: '.ext' });
diff --git a/types/fined/index.d.ts b/types/fined/index.d.ts
new file mode 100644
index 0000000000..e19bad318a
--- /dev/null
+++ b/types/fined/index.d.ts
@@ -0,0 +1,23 @@
+// Type definitions for fined 1.1
+// Project: https://github.com/js-cli/fined#readme
+// Definitions by: BendingBender <https://github.com/BendingBender>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export = fined;
+
+declare function fined(path: string | fined.PathSpec, opts?: fined.PathSpec): fined.Result | null;
+
+declare namespace fined {
+    interface PathSpec {
+        path?: string;
+        name?: string;
+        extensions?: string | string[] | { [extension: string]: string };
+        cwd?: string;
+        findUp?: boolean;
+    }
+
+    interface Result {
+        path: string;
+        extension: string | { [extension: string]: string };
+    }
+}
diff --git a/types/fined/tsconfig.json b/types/fined/tsconfig.json
new file mode 100644
index 0000000000..ce11eba9be
--- /dev/null
+++ b/types/fined/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "fined-tests.ts"
+    ]
+}
diff --git a/types/fined/tslint.json b/types/fined/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/fined/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 9be998dd15a67fbae8b3abe19ec8ef6d64775803 Mon Sep 17 00:00:00 2001
From: tassadarliu <rhapsodyn@gmail.com>
Date: Wed, 5 Dec 2018 10:05:27 +0800
Subject: [PATCH 659/836] add other ctors

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

diff --git a/types/convict/index.d.ts b/types/convict/index.d.ts
index 8be23f1547..fd605f5077 100644
--- a/types/convict/index.d.ts
+++ b/types/convict/index.d.ts
@@ -49,7 +49,11 @@ declare namespace convict {
         | 'duration'
         | 'timestamp'
         | 'nat'
-        | String;
+        | String
+        | Object
+        | Number
+        | RegExp
+        | Boolean;
 
     interface SchemaObj<T = any> {
         default: T;

From 31ce11023c76648245baacec6dbe51778a10d7e2 Mon Sep 17 00:00:00 2001
From: Malash <i@malash.me>
Date: Wed, 5 Dec 2018 11:04:01 +0800
Subject: [PATCH 660/836] fix wrong type in weixin-app

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

diff --git a/types/weixin-app/index.d.ts b/types/weixin-app/index.d.ts
index 2e2eb35481..408e434441 100644
--- a/types/weixin-app/index.d.ts
+++ b/types/weixin-app/index.d.ts
@@ -3306,7 +3306,7 @@ declare namespace wx {
 	function openCard(options: OpenCardOptions): void;
 
 	interface OpenSettingOptions extends BaseOptions {
-		success?(res: { authSetting: { [key in Scope]: string} }): void;
+		success?(res: { authSetting: { [key in Scope]: boolean } }): void;
 	}
 	/**
 	 * 调起客户端小程序设置界面，返回用户设置的操作结果。

From c5b361c9d1cd5092ec3c4ebb3c946ea1e8cbb5b4 Mon Sep 17 00:00:00 2001
From: Junyoung Choi <fluke8259@gmail.com>
Date: Wed, 5 Dec 2018 12:55:08 +0900
Subject: [PATCH 661/836] Add unknown props to Node

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

diff --git a/types/unist/index.d.ts b/types/unist/index.d.ts
index ee61686f93..a7f6cc639d 100644
--- a/types/unist/index.d.ts
+++ b/types/unist/index.d.ts
@@ -26,6 +26,8 @@ export interface Node {
      * Must not be present if a node is generated.
      */
     position?: Position;
+
+    [key: string]: unknown;
 }
 
 /**

From 95f292b29e49669cea79eb318de4945b9bf9853a Mon Sep 17 00:00:00 2001
From: Junyoung Choi <fluke8259@gmail.com>
Date: Wed, 5 Dec 2018 12:55:18 +0900
Subject: [PATCH 662/836] Discard AnyNode type

---
 types/vfile-message/index.d.ts | 6 +-----
 types/vfile/index.d.ts         | 6 +++---
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/types/vfile-message/index.d.ts b/types/vfile-message/index.d.ts
index 908f72027b..5f4467e007 100644
--- a/types/vfile-message/index.d.ts
+++ b/types/vfile-message/index.d.ts
@@ -9,10 +9,6 @@
 import * as Unist from 'unist';
 
 declare namespace vfileMessage {
-    interface AnyNode extends Unist.Node {
-        [key: string]: unknown;
-    }
-
     /**
      * Create a virtual message.
      */
@@ -25,7 +21,7 @@ declare namespace vfileMessage {
          * @param position Place at which the message occurred in a file (`Node`, `Position`, or `Point`, optional).
          * @param origin Place in code the message originates from (`string`, optional).
          */
-        (reason: string | Error, position?: AnyNode | Unist.Position | Unist.Point, origin?: string): VFileMessage;
+        (reason: string | Error, position?: Unist.Node | Unist.Position | Unist.Point, origin?: string): VFileMessage;
         /**
          * Category of message.
          */
diff --git a/types/vfile/index.d.ts b/types/vfile/index.d.ts
index efb07e288d..aec7ca88f9 100644
--- a/types/vfile/index.d.ts
+++ b/types/vfile/index.d.ts
@@ -98,7 +98,7 @@ declare namespace vfile {
          * @param position Place at which the message occurred in `vfile`.
          * @param ruleId Category of message.
          */
-        message: (reason: string, position?: Unist.Point | Unist.Position | vfileMessage.AnyNode, ruleId?: string) => vfileMessage.VFileMessage;
+        message: (reason: string, position?: Unist.Point | Unist.Position | Unist.Node, ruleId?: string) => vfileMessage.VFileMessage;
         /**
          * Associates a fatal message with the file, then immediately throws it.
          * Note: fatal errors mean a file is no longer processable.
@@ -107,7 +107,7 @@ declare namespace vfile {
          * @param position Place at which the message occurred in `vfile`.
          * @param ruleId Category of message.
          */
-        fail: (reason: string, position?: Unist.Point | Unist.Position | vfileMessage.AnyNode, ruleId?: string) => never;
+        fail: (reason: string, position?: Unist.Point | Unist.Position | Unist.Node, ruleId?: string) => never;
         /**
          * Associates an informational message with the file, where `fatal` is set to `null`.
          * Calls `message()` internally.
@@ -115,7 +115,7 @@ declare namespace vfile {
          * @param position Place at which the message occurred in `vfile`.
          * @param ruleId Category of message.
          */
-        info: (reason: string, position?: Unist.Point | Unist.Position | vfileMessage.AnyNode, ruleId?: string) => vfileMessage.VFileMessage;
+        info: (reason: string, position?: Unist.Point | Unist.Position | Unist.Node, ruleId?: string) => vfileMessage.VFileMessage;
     }
 }
 

From 980d2c30563cd8825c947ae72c33337307d0c3a6 Mon Sep 17 00:00:00 2001
From: dominikeinkemmer <dominik_einkemmer@gmx.at>
Date: Wed, 5 Dec 2018 14:03:01 +0900
Subject: [PATCH 663/836] add missing methods to typings

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

diff --git a/types/jest-when/index.d.ts b/types/jest-when/index.d.ts
index af62a95830..f484502f4d 100644
--- a/types/jest-when/index.d.ts
+++ b/types/jest-when/index.d.ts
@@ -8,6 +8,11 @@
 
 export interface PartialMockInstance<T> {
   mockReturnValue: jest.MockInstance<T>['mockReturnValue'];
+  mockReturnValueOnce: jest.MockInstance<T>['mockReturnValueOnce'];
+  mockResolvedValue: jest.MockInstance<T>['mockResolvedValue'];
+  mockResolvedValueOnce: jest.MockInstance<T>['mockResolvedValueOnce'];
+  mockRejectedValue: jest.MockInstance<T>['mockRejectedValue'];
+  mockRejectedValueOnce: jest.MockInstance<T>['mockRejectedValueOnce'];
 }
 
 export interface When {

From 3c1d73bddbe0f8b771798a2ce355846425b6f3e5 Mon Sep 17 00:00:00 2001
From: Minjie Shen <minjie@canva.com>
Date: Wed, 5 Dec 2018 16:57:56 +1100
Subject: [PATCH 664/836] Add typing for netease-captcha package

---
 types/netease-captcha/index.d.ts              | 72 +++++++++++++++++++
 .../netease-captcha/netease-captcha-tests.ts  | 21 ++++++
 types/netease-captcha/tsconfig.json           | 22 ++++++
 types/netease-captcha/tslint.json             |  1 +
 4 files changed, 116 insertions(+)
 create mode 100644 types/netease-captcha/index.d.ts
 create mode 100644 types/netease-captcha/netease-captcha-tests.ts
 create mode 100644 types/netease-captcha/tsconfig.json
 create mode 100644 types/netease-captcha/tslint.json

diff --git a/types/netease-captcha/index.d.ts b/types/netease-captcha/index.d.ts
new file mode 100644
index 0000000000..7a199b6d85
--- /dev/null
+++ b/types/netease-captcha/index.d.ts
@@ -0,0 +1,72 @@
+// Type definitions for netease-captcha x.x
+// Project: https://cstaticdun.126.net/load.min.js
+// Definitions by: Minjie Shen <https://github.com/norubidium>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+declare interface Window {
+    initNECaptcha?: NeteaseCaptcha.InitFunction;
+}
+
+declare namespace NeteaseCaptcha {
+    declare type InitFunction = (config: Config, onLoad?: onLoad, onError?: onError) => void;
+
+    declare type Config = {
+        /**
+         * Verification code id
+         */
+        captchaId: string,
+
+        /**
+         * Selector string or HTMLElement to render widget into
+         */
+        element: string | HTMLElement,
+
+        /**
+         * Defaults to 'float' on desktop, and 'popup' on mobile
+         */
+        mode?: 'float' | 'embed' | 'popup',
+
+        /**
+         * Defaults to page protocol
+         */
+        protocol?: 'http' | 'https',
+
+        /**
+         * Defaults to 'auto'
+         */
+        width?: number | string,
+
+        /**
+         * Defaults to 'zh-CN'
+         */
+        lang?: 'zh-CN' | 'en';
+
+        onReady?(instance: Instance): void;
+
+        onVerify?(error: any, data: Data): void;
+    };
+
+    type Instance = {
+        /**
+         * Refresh the instance to get new verification information
+         */
+        refresh(): void;
+
+        /**
+         * Destroy the current instance
+         */
+        destroy(): void;
+
+        /**
+         * Available when the mode is set to 'popup' - opens the popup to accept verification
+         */
+        popUp?(): void;
+    };
+
+    type Data = { validate: string };
+
+    type onLoad = (instance: Instance) => void;
+
+    type onError = (error: any) => void;
+}
diff --git a/types/netease-captcha/netease-captcha-tests.ts b/types/netease-captcha/netease-captcha-tests.ts
new file mode 100644
index 0000000000..05ed51c2bb
--- /dev/null
+++ b/types/netease-captcha/netease-captcha-tests.ts
@@ -0,0 +1,21 @@
+const config : NeteaseCaptcha.Config = {
+        captchaId: 'FAKE ID',
+        element: '#captcha',
+        mode: 'popup',
+        protocol: 'https',
+        width: '200px',
+        lang: 'en',
+        onVerify: (error: any, data?: NeteaseCaptcha.Data) => {
+            console.log(error, data);
+        }
+    };
+
+const onLoad : NeteaseCaptcha.onLoad = (instance : NeteaseCaptcha.Instance) => void {
+    instance.refresh();
+    instance.destroy();
+}
+
+function init(initNECaptcha : NeteaseCaptcha.InitFunction) => void {
+    initNECaptcha(config, onLoad);
+}
+
diff --git a/types/netease-captcha/tsconfig.json b/types/netease-captcha/tsconfig.json
new file mode 100644
index 0000000000..67a7f5dd64
--- /dev/null
+++ b/types/netease-captcha/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",
+        "netease-captcha-tests.ts"
+    ]
+}
diff --git a/types/netease-captcha/tslint.json b/types/netease-captcha/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/netease-captcha/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 1b11a2dd3567606a25656c3a32137515127290b7 Mon Sep 17 00:00:00 2001
From: Ben Talbot <ben@tbotlabs.com>
Date: Tue, 4 Dec 2018 22:10:35 -0800
Subject: [PATCH 665/836] Add types for @google-cloud/kms

---
 .../google-cloud__kms-tests.ts                | 117 ++++++++
 types/google-cloud__kms/index.d.ts            | 275 ++++++++++++++++++
 types/google-cloud__kms/tsconfig.json         |  28 ++
 types/google-cloud__kms/tslint.json           |   7 +
 4 files changed, 427 insertions(+)
 create mode 100644 types/google-cloud__kms/google-cloud__kms-tests.ts
 create mode 100644 types/google-cloud__kms/index.d.ts
 create mode 100644 types/google-cloud__kms/tsconfig.json
 create mode 100644 types/google-cloud__kms/tslint.json

diff --git a/types/google-cloud__kms/google-cloud__kms-tests.ts b/types/google-cloud__kms/google-cloud__kms-tests.ts
new file mode 100644
index 0000000000..e3f6648310
--- /dev/null
+++ b/types/google-cloud__kms/google-cloud__kms-tests.ts
@@ -0,0 +1,117 @@
+import kms = require('@google-cloud/kms');
+
+let kmsClientV1: kms.v1.KeyManagementServiceClient;
+kmsClientV1 = new kms.v1.KeyManagementServiceClient();
+
+const credentials = {
+	type: 'service_account',
+	project_id: '****',
+	private_key_id: '****',
+	private_key: '****',
+	client_email: '****',
+	client_id: '****',
+	auth_uri: 'https://accounts.google.com/o/oauth2/auth',
+	token_uri: 'https://oauth2.googleapis.com/token',
+	auth_provider_x509_cert_url: 'https://www.googleapis.com/oauth2/v1/certs',
+	client_x509_cert_url: '****'
+};
+
+let kmsClient: kms.KeyManagementServiceClient;
+kmsClient = new kms.KeyManagementServiceClient({ credentials });
+
+async function exampleListKeyRings() {
+	const locationPath = kmsClient.locationPath('[PROJECT_ID]', '[LOCATION]');
+	const [ asyncKeyRings ] = await kmsClient.listKeyRings({parent: locationPath});
+	if  (asyncKeyRings.length > 0) {
+		const keyRing = asyncKeyRings[ 0 ];
+		console.log(`KeyRing: ${keyRing.name}`);
+	}
+
+	kmsClient.listKeyRings({parent: locationPath}, (err, [ callbackKeyRings ]) => {
+		if  (callbackKeyRings.length > 0) {
+			const keyRing = callbackKeyRings[ 0 ];
+			console.log(`KeyRing: ${keyRing.name}`);
+		}
+	});
+
+	kmsClient.listKeyRings({parent: locationPath}, { timeout: 1000 }, (err, [ callbackWithOptionsKeyRings ]) => {
+		if  (callbackWithOptionsKeyRings.length > 0) {
+			const keyRing = callbackWithOptionsKeyRings[ 0 ];
+			console.log(`KeyRing: ${keyRing.name}`);
+		}
+	});
+}
+
+async function exampleListCryptoKeys() {
+	const keyRingPath = kmsClient.keyRingPath('[PROJECT_ID]', '[LOCATION]', '[KEYRING_ID]');
+	const [ asyncKeys ] = await kmsClient.listCryptoKeys({parent: keyRingPath});
+	if (asyncKeys.length > 0) {
+		const key = asyncKeys[ 0 ];
+		console.log(`CryptoKey: ${key.name} Version: ${key.primary.name}`);
+	}
+
+	kmsClient.listCryptoKeys({parent: keyRingPath}, (err, [ callbackKeys ]) => {
+		if  (callbackKeys.length > 0) {
+			const key = callbackKeys[ 0 ];
+			console.log(`CryptoKey: ${key.name} Version: ${key.primary.name}`);
+		}
+	});
+
+	kmsClient.listCryptoKeys({parent: keyRingPath}, { timeout: 1000 }, (err, [ callbackWithOptionsKeys ]) => {
+		if  (callbackWithOptionsKeys.length > 0) {
+			const key = callbackWithOptionsKeys[ 0 ];
+			console.log(`CryptoKey: ${key.name} Version: ${key.primary.name}`);
+		}
+	});
+}
+
+async function exampleEncrypt() {
+	const formattedName = kmsClient.cryptoKeyPath('[PROJECT_ID]', '[LOCATION]', '[KEYRING_ID]', '[KEY_ID]');
+	const unencryptedText = new Buffer('Hello World');
+
+	const [ asyncEncryptResult ] = await kmsClient.encrypt({ name: formattedName, plaintext: unencryptedText.toString('base64') });
+	if (asyncEncryptResult != null) {
+		console.log(`Encrypted: ${asyncEncryptResult.ciphertext.toString('base64')}`);
+	}
+
+	kmsClient.encrypt({ name: formattedName, plaintext: unencryptedText.toString('base64') }, (err, [ callbackEncryptResult ]) => {
+		if (callbackEncryptResult != null) {
+			console.log(`Encrypted: ${callbackEncryptResult.ciphertext.toString('base64')}`);
+		}
+	});
+
+	kmsClient.encrypt({ name: formattedName, plaintext: unencryptedText.toString('base64') }, { timeout: 1000 }, (err, [ callbackWithOptionsEncryptResult ]) => {
+		if (callbackWithOptionsEncryptResult != null) {
+			console.log(`Encrypted: ${callbackWithOptionsEncryptResult.ciphertext.toString('base64')}`);
+		}
+	});
+}
+
+async function exampleDecrypt() {
+	// Example pulling a file from Cloud Storage
+	// const secretsStorage = new Storage({ credentials });
+	// const bucket = secretsStorage.bucket('[KMS_STORAGE_BUCKET]');
+	// const filePath = '[PATH_TO_KMS_ENCRYPTED_FILE';
+	// const file = bucket.file(filePath);
+	// const buffers = await file.download();
+	// const buffer = buffers[ 0 ];
+
+	const buffer = new Buffer('[ENCRYPTED_SOURCE_BUFFER]');
+	const formattedName = kmsClient.cryptoKeyPath('[PROJECT_ID]', '[LOCATION]', '[KEYRING_ID]', '[KEY_ID]');
+	const [ asyncDecryptResult ] = await kmsClient.decrypt({name: formattedName, ciphertext: buffer.toString('base64') });
+	if (asyncDecryptResult != null) {
+		console.log(`Decrypted: ${asyncDecryptResult.plaintext}`);
+	}
+
+	kmsClient.decrypt({ name: formattedName, ciphertext: buffer.toString('base64') }, (err, [ callbackDecryptResult ]) => {
+		if (callbackDecryptResult != null) {
+			console.log(`Decrypted: ${callbackDecryptResult.plaintext}`);
+		}
+	});
+
+	kmsClient.decrypt({ name: formattedName, ciphertext: buffer.toString('base64') }, (err, [ callbackWithOptionsDecryptResult ]) => {
+		if (callbackWithOptionsDecryptResult != null) {
+			console.log(`Decrypted: ${callbackWithOptionsDecryptResult.plaintext}`);
+		}
+	});
+}
diff --git a/types/google-cloud__kms/index.d.ts b/types/google-cloud__kms/index.d.ts
new file mode 100644
index 0000000000..7f14a731bd
--- /dev/null
+++ b/types/google-cloud__kms/index.d.ts
@@ -0,0 +1,275 @@
+// Type definitions for @google-cloud/kms 0.2
+// Project: https://github.com/googleapis/nodejs-kms
+// Definitions by: Ben Talbot <https://github.com/ben-tbotlabs>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+/// <reference types="node" />
+
+import * as google_protobuf_timestamp_pb from "google-protobuf/google/protobuf/timestamp_pb";
+
+declare module '@google-cloud/kms' {
+	namespace v1 {
+		enum CryptoKeyVersionAlgorithm {
+			// Not specified.
+			CRYPTO_KEY_VERSION_ALGORITHM_UNSPECIFIED = 0,
+
+			// Creates symmetric encryption keys.
+			GOOGLE_SYMMETRIC_ENCRYPTION = 1,
+
+			// RSASSA-PSS 2048 bit key with a SHA256 digest.
+			RSA_SIGN_PSS_2048_SHA256 = 2,
+
+			// RSASSA-PSS 3072 bit key with a SHA256 digest.
+			RSA_SIGN_PSS_3072_SHA256 = 3,
+
+			// RSASSA-PSS 4096 bit key with a SHA256 digest.
+			RSA_SIGN_PSS_4096_SHA256 = 4,
+
+			// RSASSA-PKCS1-v1_5 with a 2048 bit key and a SHA256 digest.
+			RSA_SIGN_PKCS1_2048_SHA256 = 5,
+
+			// RSASSA-PKCS1-v1_5 with a 3072 bit key and a SHA256 digest.
+			RSA_SIGN_PKCS1_3072_SHA256 = 6,
+
+			// RSASSA-PKCS1-v1_5 with a 4096 bit key and a SHA256 digest.
+			RSA_SIGN_PKCS1_4096_SHA256 = 7,
+
+			// RSAES-OAEP 2048 bit key with a SHA256 digest.
+			RSA_DECRYPT_OAEP_2048_SHA256 = 8,
+
+			// RSAES-OAEP 3072 bit key with a SHA256 digest.
+			RSA_DECRYPT_OAEP_3072_SHA256 = 9,
+
+			// RSAES-OAEP 4096 bit key with a SHA256 digest.
+			RSA_DECRYPT_OAEP_4096_SHA256 = 10,
+
+			// ECDSA on the NIST P-256 curve with a SHA256 digest.
+			EC_SIGN_P256_SHA256 = 12,
+
+			// ECDSA on the NIST P-384 curve with a SHA384 digest.
+			EC_SIGN_P384_SHA384 = 13,
+		}
+
+		enum CryptoKeyVersionState {
+			// Not specified.
+			CRYPTO_KEY_VERSION_STATE_UNSPECIFIED = 0,
+
+			// This version is still being generated. It may not be used, enabled,
+			// disabled, or destroyed yet. Cloud KMS will automatically mark this
+			// version [ENABLED][google.cloud.kms.v1.CryptoKeyVersion.CryptoKeyVersionState.ENABLED] as soon as the version is ready.
+			PENDING_GENERATION = 5,
+
+			// This version may be used for cryptographic operations.
+			ENABLED = 1,
+
+			// This version may not be used, but the key material is still available,
+			// and the version can be placed back into the [ENABLED][google.cloud.kms.v1.CryptoKeyVersion.CryptoKeyVersionState.ENABLED] state.
+			DISABLED = 2,
+
+			// This version is destroyed, and the key material is no longer stored.
+			// A version may not leave this state once entered.
+			DESTROYED = 3,
+
+			// This version is scheduled for destruction, and will be destroyed soon.
+			// Call
+			// [RestoreCryptoKeyVersion][google.cloud.kms.v1.KeyManagementService.RestoreCryptoKeyVersion]
+			// to put it back into the [DISABLED][google.cloud.kms.v1.CryptoKeyVersion.CryptoKeyVersionState.DISABLED] state.
+			DESTROY_SCHEDULED = 4,
+		}
+
+		enum CryptoKeyVersionView {
+			// Default view for each [CryptoKeyVersion][google.cloud.kms.v1.CryptoKeyVersion]. Does not include
+			// the [attestation][google.cloud.kms.v1.CryptoKeyVersion.attestation] field.
+			CRYPTO_KEY_VERSION_VIEW_UNSPECIFIED = 0,
+
+			// Provides all fields in each [CryptoKeyVersion][google.cloud.kms.v1.CryptoKeyVersion], including the
+			// [attestation][google.cloud.kms.v1.CryptoKeyVersion.attestation].
+			FULL = 1,
+		}
+
+		enum ProtectionLevel {
+			// Not specified.
+			PROTECTION_LEVEL_UNSPECIFIED = 0,
+
+			// Crypto operations are performed in software.
+			SOFTWARE = 1,
+
+			// Crypto operations are performed in a Hardware Security Module.
+			HSM = 2,
+		}
+
+		enum AttestationFormat {
+			ATTESTATION_FORMAT_UNSPECIFIED = 0,
+
+			// Cavium HSM attestation compressed with gzip. Note that this format is
+			// defined by Cavium and subject to change at any time.
+			CAVIUM_V1_COMPRESSED = 3,
+		}
+
+		interface KeyOperationAttestation {
+			format: AttestationFormat;
+		}
+
+		interface CryptoKeyVersion {
+			name: string;
+			state: CryptoKeyVersionState;
+			protectionLevel: ProtectionLevel;
+			algorithm: CryptoKeyVersionAlgorithm;
+			attestation?: KeyOperationAttestation;
+			createTime: google_protobuf_timestamp_pb.Timestamp.AsObject;
+			generateTime: google_protobuf_timestamp_pb.Timestamp.AsObject;
+			destroyTime?: google_protobuf_timestamp_pb.Timestamp.AsObject;
+			destroyEventTime?: google_protobuf_timestamp_pb.Timestamp.AsObject;
+		}
+
+		interface CryptoKeyVersionTemplate {
+			protectionLevel: ProtectionLevel;
+			algorithm: CryptoKeyVersionAlgorithm;
+		}
+
+		enum CryptoKeyPurpose {
+			// Not specified.
+			CRYPTO_KEY_PURPOSE_UNSPECIFIED = 0,
+
+			// [CryptoKeys][google.cloud.kms.v1.CryptoKey] with this purpose may be used with
+			// [Encrypt][google.cloud.kms.v1.KeyManagementService.Encrypt] and
+			// [Decrypt][google.cloud.kms.v1.KeyManagementService.Decrypt].
+			ENCRYPT_DECRYPT = 1,
+
+			// [CryptoKeys][google.cloud.kms.v1.CryptoKey] with this purpose may be used with
+			// [AsymmetricSign][google.cloud.kms.v1.KeyManagementService.AsymmetricSign] and
+			// [GetPublicKey][google.cloud.kms.v1.KeyManagementService.GetPublicKey].
+			ASYMMETRIC_SIGN = 5,
+
+			// [CryptoKeys][google.cloud.kms.v1.CryptoKey] with this purpose may be used with
+			// [AsymmetricDecrypt][google.cloud.kms.v1.KeyManagementService.AsymmetricDecrypt] and
+			// [GetPublicKey][google.cloud.kms.v1.KeyManagementService.GetPublicKey].
+			ASYMMETRIC_DECRYPT = 6,
+		}
+
+		interface CryptoKey {
+			name: string;
+			primary: CryptoKeyVersion;
+			purpose: CryptoKeyPurpose;
+			createTime: google_protobuf_timestamp_pb.Timestamp.AsObject;
+			nextRotationTime?: google_protobuf_timestamp_pb.Timestamp.AsObject;
+			versionTemplate: CryptoKeyVersionTemplate;
+			labels: { [s: string]: string; };
+		}
+
+		interface KeyRing {
+			name: string;
+			createTime: google_protobuf_timestamp_pb.Timestamp.AsObject;
+		}
+
+		namespace KeyManagementServiceClient {
+			interface ConfigurationObject {
+				credentials?: {
+					client_email?: string;
+					private_key?: string
+				};
+				email?: string;
+				keyFilename?: string;
+				port?: number;
+				projectId?: string;
+				promise?: any;
+				servicePath?: string;
+			}
+
+			interface EncryptRequest {
+				name: string;
+				plaintext: string;
+				additionalAuthenticatedData?: string;
+			}
+			interface EncryptResponse {
+				name: string;
+				ciphertext: Buffer;
+			}
+			type EncryptCallback = (err: Error | null, apiResponse: [EncryptResponse, any, any]) => void;
+
+			interface DecryptRequest {
+				name: string;
+				ciphertext: string;
+				additionalAuthenticatedData?: string;
+			}
+			interface DecryptResponse {
+				plaintext: Buffer;
+			}
+			type DecryptCallback = (err: Error | null, apiResponse: [DecryptResponse, any, any]) => void;
+
+			interface ListKeyRingsRequest {
+				parent: string;
+				page_size?: number;
+				page_token?: string;
+			}
+			type ListKeyRingsCallback = (err: Error | null, apiResponse: [KeyRing[], any, any]) => void;
+
+			interface ListCryptoKeysRequest {
+				parent: string;
+				page_size?: number;
+				page_token?: string;
+			}
+			type ListCryptoKeysCallback = (err: Error | null, apiResponse: [CryptoKey[], any, any]) => void;
+		}
+
+		class KeyManagementServiceClient {
+			constructor(options?: KeyManagementServiceClient.ConfigurationObject);
+
+			keyRingPath(project: string, location: string, keyRing: string): string;
+			cryptoKeyPathPath(project: string, location: string, keyRing: string, cryptoKeyPath: string): string;
+			locationPath(project: string, location: string): string;
+			cryptoKeyPath(project: string, location: string, keyRing: string, cryptoKey: string): string;
+			cryptoKeyVersionPath(project: string, location: string, keyRing: string, cryptoKey: string, cryptoKeyVersion: string): string;
+
+			encrypt(request: KeyManagementServiceClient.EncryptRequest, gaxOpts?: GAX.CallOptions): Promise<[KeyManagementServiceClient.EncryptResponse, any, any]>;
+			encrypt(request: KeyManagementServiceClient.EncryptRequest, callback: KeyManagementServiceClient.EncryptCallback): void;
+			encrypt(request: KeyManagementServiceClient.EncryptRequest, gaxOpts: GAX.CallOptions, callback: KeyManagementServiceClient.EncryptCallback): void;
+
+			decrypt(request: KeyManagementServiceClient.DecryptRequest, gaxOpts?: GAX.CallOptions): Promise<[KeyManagementServiceClient.DecryptResponse, any, any]>;
+			decrypt(request: KeyManagementServiceClient.DecryptRequest, callback: KeyManagementServiceClient.DecryptCallback): void;
+			decrypt(request: KeyManagementServiceClient.DecryptRequest, gaxOpts: GAX.CallOptions, callback: KeyManagementServiceClient.DecryptCallback): void;
+
+			listKeyRings(request: KeyManagementServiceClient.ListKeyRingsRequest, gaxOpts?: GAX.CallOptions): Promise<[KeyRing[], any, any]>;
+			listKeyRings(request: KeyManagementServiceClient.ListKeyRingsRequest, callback: KeyManagementServiceClient.ListKeyRingsCallback): void;
+			listKeyRings(request: KeyManagementServiceClient.ListKeyRingsRequest, gaxOpts: GAX.CallOptions, callback: KeyManagementServiceClient.ListKeyRingsCallback): void;
+
+			listCryptoKeys(request: KeyManagementServiceClient.ListCryptoKeysRequest, gaxOpts?: GAX.CallOptions): Promise<[CryptoKey[], any, any]>;
+			listCryptoKeys(request: KeyManagementServiceClient.ListCryptoKeysRequest, callback: KeyManagementServiceClient.ListCryptoKeysCallback): void;
+			listCryptoKeys(request: KeyManagementServiceClient.ListCryptoKeysRequest, gaxOpts: GAX.CallOptions, callback: KeyManagementServiceClient.ListCryptoKeysCallback): void;
+		}
+	}
+
+	class KeyManagementServiceClient extends v1.KeyManagementServiceClient {
+		constructor(options?: v1.KeyManagementServiceClient.ConfigurationObject);
+	}
+
+	namespace GAX {
+		/** https://googleapis.github.io/gax-nodejs/global.html#CallOptions */
+		interface CallOptions {
+			timeout?: number;
+			retry?: RetryOptions;
+			autoPaginate?: boolean;
+			pageToken?: object;
+			isBundling?: boolean;
+			longrunning?: BackoffSettings;
+			promise?: PromiseConstructor; // FIXME Unsure if this is the correct type; remove this comment if it is
+		}
+
+		/** https://googleapis.github.io/gax-nodejs/global.html#RetryOptions */
+		interface RetryOptions {
+			retryCodes: string[];
+			backoffSettings: BackoffSettings;
+		}
+
+		/** https://googleapis.github.io/gax-nodejs/global.html#BackoffSettings */
+		interface BackoffSettings {
+			initialRetryDelayMillis: number;
+			retryDelayMultiplier: number;
+			maxRetryDelayMillis: number;
+			initialRpcTimeoutMillis: number;
+			maxRpcTimeoutMillis: number;
+			totalTimeoutMillis: number;
+		}
+	}
+}
diff --git a/types/google-cloud__kms/tsconfig.json b/types/google-cloud__kms/tsconfig.json
new file mode 100644
index 0000000000..bb1ba097cc
--- /dev/null
+++ b/types/google-cloud__kms/tsconfig.json
@@ -0,0 +1,28 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "paths": {
+            "@google-cloud/kms": [
+                "google-cloud__kms"
+            ]
+        },
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "google-cloud__kms-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/google-cloud__kms/tslint.json b/types/google-cloud__kms/tslint.json
new file mode 100644
index 0000000000..1f75469243
--- /dev/null
+++ b/types/google-cloud__kms/tslint.json
@@ -0,0 +1,7 @@
+{
+	"extends": "dtslint/dt.json",
+	"rules": {
+		"indent": [true, "tabs"],
+		"no-single-declare-module": false
+	}
+}

From 6f7086044fba04f62991fcbf961911f746d15b62 Mon Sep 17 00:00:00 2001
From: Ben Talbot <ben@tbotlabs.com>
Date: Tue, 4 Dec 2018 22:21:22 -0800
Subject: [PATCH 666/836] Remove "no-single-declare-module": false from
 tslint.json

---
 types/google-cloud__kms/tslint.json | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/types/google-cloud__kms/tslint.json b/types/google-cloud__kms/tslint.json
index 1f75469243..ffaae9bd46 100644
--- a/types/google-cloud__kms/tslint.json
+++ b/types/google-cloud__kms/tslint.json
@@ -1,7 +1,6 @@
 {
 	"extends": "dtslint/dt.json",
 	"rules": {
-		"indent": [true, "tabs"],
-		"no-single-declare-module": false
+		"indent": [true, "tabs"]
 	}
 }

From 78de2a5f211671214c2aa94c5f3e2adcac0f25b1 Mon Sep 17 00:00:00 2001
From: Robert Stigsson <robert.stigsson@gmail.com>
Date: Wed, 5 Dec 2018 08:25:02 +0100
Subject: [PATCH 667/836] recharts: moved ifOverflow-types to IfOverflowType.

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

diff --git a/types/recharts/index.d.ts b/types/recharts/index.d.ts
index 7054b18e08..d18a846c56 100644
--- a/types/recharts/index.d.ts
+++ b/types/recharts/index.d.ts
@@ -46,6 +46,7 @@ export type StackOffsetType = 'sign' | 'expand' | 'none' | 'wiggle' | 'silhouett
 export type LineType =
     'basis' | 'basisClosed' | 'basisOpen' | 'linear' | 'linearClosed' | 'natural' |
     'monotoneX' | 'monotoneY' | 'monotone' | 'step' | 'stepBefore' | 'stepAfter' | CurveFactory;
+export type IfOverflowType = 'hidden' | 'visible' | 'discard' | 'extendDomain';
 export type AxisInterval = number | 'preserveStart' | 'preserveEnd' | 'preserveStartEnd';
 
 export type PickedCSSStyleDeclarationKeys =
@@ -635,7 +636,7 @@ export interface ReferenceAreaProps extends Partial<PresentationAttributes> {
     yAxis?: object;
     isFront?: boolean;
     alwaysShow?: boolean;
-    ifOverflow?: 'hidden' | 'visible' | 'discard' | 'extendDomain';
+    ifOverflow?: IfOverflowType;
     x1?: number | string;
     x2?: number | string;
     y1?: number | string;
@@ -659,7 +660,7 @@ export interface ReferenceDotProps extends EventAttributes, Partial<Presentation
     yAxis?: ReferenceDotAxisConfiguration;
     isFront?: boolean;
     alwaysShow?: boolean;
-    ifOverflow?: 'hidden' | 'visible' | 'discard' | 'extendDomain';
+    ifOverflow?: IfOverflowType;
     x?: number | string;
     y?: number | string;
     xAxisId?: string | number;
@@ -680,7 +681,7 @@ export interface ReferenceLineProps extends Partial<PresentationAttributes<numbe
     yAxis?: object;
     isFront?: boolean;
     alwaysShow?: boolean;
-    ifOverflow?: 'hidden' | 'visible' | 'discard' | 'extendDomain';
+    ifOverflow?: IfOverflowType;
     x?: number | string;
     y?: number | string;
     label?: string | number | ContentRenderer<any> | React.ReactElement<any>;

From f047781c2fa912f136447ac7bcdd54140ff8fc0b Mon Sep 17 00:00:00 2001
From: Christian Sporer <IanStorm28@outlook.com>
Date: Wed, 5 Dec 2018 08:27:11 +0100
Subject: [PATCH 668/836] Using real name in the definitions file as per
 "convention" (and it is now anyways visible on my profile)

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

diff --git a/types/list-stream/index.d.ts b/types/list-stream/index.d.ts
index f92eb5f917..2b3fd1da28 100644
--- a/types/list-stream/index.d.ts
+++ b/types/list-stream/index.d.ts
@@ -1,6 +1,6 @@
 // Type definitions for list-stream 1.0
 // Project: https://github.com/rvagg/list-stream
-// Definitions by: IanStorm <https://github.com/IanStorm>
+// Definitions by: Christian Sporer <https://github.com/IanStorm>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.7
 

From 3e46e7059c10dd0d23bbfe8e83e7f635d161d943 Mon Sep 17 00:00:00 2001
From: Christian Sporer <IanStorm28@outlook.com>
Date: Wed, 5 Dec 2018 08:28:48 +0100
Subject: [PATCH 669/836] Explicit mentioning of support for "import-" and
 "require-style" by providing more tests, as per discussion
 (https://github.com/DefinitelyTyped/DefinitelyTyped/pull/30669#discussion_r238432884)

---
 types/list-stream/list-stream-tests.ts   | 56 +-----------------------
 types/list-stream/tests/import-tests.ts  | 54 +++++++++++++++++++++++
 types/list-stream/tests/require-tests.ts | 54 +++++++++++++++++++++++
 3 files changed, 110 insertions(+), 54 deletions(-)
 create mode 100644 types/list-stream/tests/import-tests.ts
 create mode 100644 types/list-stream/tests/require-tests.ts

diff --git a/types/list-stream/list-stream-tests.ts b/types/list-stream/list-stream-tests.ts
index 3648097ad6..89b0d6c236 100644
--- a/types/list-stream/list-stream-tests.ts
+++ b/types/list-stream/list-stream-tests.ts
@@ -1,54 +1,2 @@
-import ListStream from "list-stream";
-
-let chunk: any = "chunk";
-let listStream: ListStream;
-let num = 1;
-
-listStream = ListStream((err: Error, data: any[]) => {
-    if (err) { throw err; }
-    console.log(data.length);
-    for (const date of data) {
-        console.log(date);
-    }
-});
-listStream = ListStream({ objectMode: true }, (err: Error, data: any[]) => {
-    if (err) { throw err; }
-    console.log(data.length);
-    for (const date of data) {
-        console.log(date);
-    }
-});
-listStream = new ListStream((err: Error, data: any[]) => {
-    if (err) { throw err; }
-    console.log(data.length);
-    for (const date of data) {
-        console.log(date);
-    }
-});
-listStream = new ListStream({ objectMode: true }, (err: Error, data: any[]) => {
-    if (err) { throw err; }
-    console.log(data.length);
-    for (const date of data) {
-        console.log(date);
-    }
-});
-listStream = ListStream.obj((err: Error, data: any[]) => {
-    if (err) { throw err; }
-    console.log(data.length);
-    for (const date of data) {
-        console.log(date);
-    }
-});
-
-listStream = ListStream.obj();
-listStream.write({ key: "value" });
-
-listStream.append(chunk);
-
-listStream = listStream.duplicate();
-
-listStream.end();
-
-chunk = listStream.get(num);
-
-num = listStream.length;
+import "./tests/import-tests";
+import "./tests/require-tests";
diff --git a/types/list-stream/tests/import-tests.ts b/types/list-stream/tests/import-tests.ts
new file mode 100644
index 0000000000..3648097ad6
--- /dev/null
+++ b/types/list-stream/tests/import-tests.ts
@@ -0,0 +1,54 @@
+import ListStream from "list-stream";
+
+let chunk: any = "chunk";
+let listStream: ListStream;
+let num = 1;
+
+listStream = ListStream((err: Error, data: any[]) => {
+    if (err) { throw err; }
+    console.log(data.length);
+    for (const date of data) {
+        console.log(date);
+    }
+});
+listStream = ListStream({ objectMode: true }, (err: Error, data: any[]) => {
+    if (err) { throw err; }
+    console.log(data.length);
+    for (const date of data) {
+        console.log(date);
+    }
+});
+listStream = new ListStream((err: Error, data: any[]) => {
+    if (err) { throw err; }
+    console.log(data.length);
+    for (const date of data) {
+        console.log(date);
+    }
+});
+listStream = new ListStream({ objectMode: true }, (err: Error, data: any[]) => {
+    if (err) { throw err; }
+    console.log(data.length);
+    for (const date of data) {
+        console.log(date);
+    }
+});
+listStream = ListStream.obj((err: Error, data: any[]) => {
+    if (err) { throw err; }
+    console.log(data.length);
+    for (const date of data) {
+        console.log(date);
+    }
+});
+
+listStream = ListStream.obj();
+listStream.write({ key: "value" });
+
+listStream.append(chunk);
+
+listStream = listStream.duplicate();
+
+listStream.end();
+
+chunk = listStream.get(num);
+
+num = listStream.length;
diff --git a/types/list-stream/tests/require-tests.ts b/types/list-stream/tests/require-tests.ts
new file mode 100644
index 0000000000..8966e1e5a3
--- /dev/null
+++ b/types/list-stream/tests/require-tests.ts
@@ -0,0 +1,54 @@
+import ListStream = require("list-stream");
+
+let chunk: any = "chunk";
+let listStream: ListStream;
+let num = 1;
+
+listStream = ListStream((err: Error, data: any[]) => {
+    if (err) { throw err; }
+    console.log(data.length);
+    for (const date of data) {
+        console.log(date);
+    }
+});
+listStream = ListStream({ objectMode: true }, (err: Error, data: any[]) => {
+    if (err) { throw err; }
+    console.log(data.length);
+    for (const date of data) {
+        console.log(date);
+    }
+});
+listStream = new ListStream((err: Error, data: any[]) => {
+    if (err) { throw err; }
+    console.log(data.length);
+    for (const date of data) {
+        console.log(date);
+    }
+});
+listStream = new ListStream({ objectMode: true }, (err: Error, data: any[]) => {
+    if (err) { throw err; }
+    console.log(data.length);
+    for (const date of data) {
+        console.log(date);
+    }
+});
+listStream = ListStream.obj((err: Error, data: any[]) => {
+    if (err) { throw err; }
+    console.log(data.length);
+    for (const date of data) {
+        console.log(date);
+    }
+});
+
+listStream = ListStream.obj();
+listStream.write({ key: "value" });
+
+listStream.append(chunk);
+
+listStream = listStream.duplicate();
+
+listStream.end();
+
+chunk = listStream.get(num);
+
+num = listStream.length;

From 0421278faec4e63ee3e4aa6d13fe275091999468 Mon Sep 17 00:00:00 2001
From: Dimitri Benin <dimitri.benin@gmail.com>
Date: Wed, 5 Dec 2018 00:26:45 +0100
Subject: [PATCH 670/836] Add types for rechoir

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

diff --git a/types/rechoir/index.d.ts b/types/rechoir/index.d.ts
new file mode 100644
index 0000000000..2cb3bbb7ab
--- /dev/null
+++ b/types/rechoir/index.d.ts
@@ -0,0 +1,18 @@
+// Type definitions for rechoir 0.6
+// Project: https://github.com/tkellen/node-rechoir
+// Definitions by: BendingBender <https://github.com/BendingBender>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+import { Extensions } from 'interpret';
+
+export function prepare(
+    config: Extensions,
+    filepath: string,
+    requireFrom?: string
+): true | Attempt[];
+
+export interface Attempt {
+    moduleName: string;
+    module: any;
+    error: Error | null;
+}
diff --git a/types/rechoir/rechoir-tests.ts b/types/rechoir/rechoir-tests.ts
new file mode 100644
index 0000000000..de4b18c74f
--- /dev/null
+++ b/types/rechoir/rechoir-tests.ts
@@ -0,0 +1,6 @@
+import { extensions as config } from 'interpret';
+import { prepare } from 'rechoir';
+
+// $ExpectType true | Attempt[]
+prepare(config, './test/fixtures/test.coffee');
+prepare(config, './test/fixtures/test.coffee', './');
diff --git a/types/rechoir/tsconfig.json b/types/rechoir/tsconfig.json
new file mode 100644
index 0000000000..03a006d997
--- /dev/null
+++ b/types/rechoir/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "rechoir-tests.ts"
+    ]
+}
diff --git a/types/rechoir/tslint.json b/types/rechoir/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/rechoir/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From f225c53dc1ac9c8b10cf69fa6ce74c623246c9ab Mon Sep 17 00:00:00 2001
From: Dimitri Benin <dimitri.benin@gmail.com>
Date: Sun, 25 Nov 2018 23:56:28 +0100
Subject: [PATCH 671/836] Add types for sasl-anonymous

---
 types/sasl-anonymous/index.d.ts              | 29 ++++++++++++++++++++
 types/sasl-anonymous/sasl-anonymous-tests.ts | 22 +++++++++++++++
 types/sasl-anonymous/tsconfig.json           | 23 ++++++++++++++++
 types/sasl-anonymous/tslint.json             |  1 +
 4 files changed, 75 insertions(+)
 create mode 100644 types/sasl-anonymous/index.d.ts
 create mode 100644 types/sasl-anonymous/sasl-anonymous-tests.ts
 create mode 100644 types/sasl-anonymous/tsconfig.json
 create mode 100644 types/sasl-anonymous/tslint.json

diff --git a/types/sasl-anonymous/index.d.ts b/types/sasl-anonymous/index.d.ts
new file mode 100644
index 0000000000..b438a411d7
--- /dev/null
+++ b/types/sasl-anonymous/index.d.ts
@@ -0,0 +1,29 @@
+// Type definitions for sasl-anonymous 0.1
+// Project: https://github.com/jaredhanson/js-sasl-anonymous
+// Definitions by: BendingBender <https://github.com/BendingBender>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+import { Mechanism } from 'saslmechanisms';
+
+export = AnonymousMechanism;
+
+declare class AnonymousMechanism implements Mechanism {
+    static Mechanism: typeof AnonymousMechanism;
+    static prototype: {
+        name: 'ANONYMOUS';
+        clientFirst: true;
+    };
+
+    name: 'ANONYMOUS';
+    clientFirst: true;
+
+    response(cred: AnonymousMechanism.Credentials): string;
+
+    challenge(chal: string): void;
+}
+
+declare namespace AnonymousMechanism {
+    interface Credentials {
+        trace?: string;
+    }
+}
diff --git a/types/sasl-anonymous/sasl-anonymous-tests.ts b/types/sasl-anonymous/sasl-anonymous-tests.ts
new file mode 100644
index 0000000000..dd993fa49d
--- /dev/null
+++ b/types/sasl-anonymous/sasl-anonymous-tests.ts
@@ -0,0 +1,22 @@
+import AnonymousMechanism = require('sasl-anonymous');
+import { Mechanism } from 'sasl-anonymous';
+import { Factory } from 'saslmechanisms';
+
+new Factory().use(AnonymousMechanism);
+new Factory().use(Mechanism);
+
+// $ExpectType "ANONYMOUS"
+AnonymousMechanism.prototype.name;
+// $ExpectType true
+AnonymousMechanism.prototype.clientFirst;
+
+const m = new AnonymousMechanism();
+
+// $ExpectType "ANONYMOUS"
+m.name;
+// $ExpectType true
+m.clientFirst;
+// $ExpectType string
+m.response({ trace: 't' });
+// $ExpectType void
+m.challenge('challenge');
diff --git a/types/sasl-anonymous/tsconfig.json b/types/sasl-anonymous/tsconfig.json
new file mode 100644
index 0000000000..5a9ebd2f35
--- /dev/null
+++ b/types/sasl-anonymous/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "sasl-anonymous-tests.ts"
+    ]
+}
diff --git a/types/sasl-anonymous/tslint.json b/types/sasl-anonymous/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/sasl-anonymous/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 0eebf91a2d2ac25a45eeeb8e60dbff0c8c8059cd Mon Sep 17 00:00:00 2001
From: Dimitri Benin <dimitri.benin@gmail.com>
Date: Sun, 25 Nov 2018 23:57:42 +0100
Subject: [PATCH 672/836] Add types for sasl-digest-md5

---
 types/sasl-digest-md5/index.d.ts              | 41 +++++++++++++++++++
 .../sasl-digest-md5/sasl-digest-md5-tests.ts  | 30 ++++++++++++++
 types/sasl-digest-md5/tsconfig.json           | 23 +++++++++++
 types/sasl-digest-md5/tslint.json             |  1 +
 4 files changed, 95 insertions(+)
 create mode 100644 types/sasl-digest-md5/index.d.ts
 create mode 100644 types/sasl-digest-md5/sasl-digest-md5-tests.ts
 create mode 100644 types/sasl-digest-md5/tsconfig.json
 create mode 100644 types/sasl-digest-md5/tslint.json

diff --git a/types/sasl-digest-md5/index.d.ts b/types/sasl-digest-md5/index.d.ts
new file mode 100644
index 0000000000..001875f330
--- /dev/null
+++ b/types/sasl-digest-md5/index.d.ts
@@ -0,0 +1,41 @@
+// Type definitions for sasl-digest-md5 0.1
+// Project: https://github.com/jaredhanson/js-sasl-digest-md5
+// Definitions by: BendingBender <https://github.com/BendingBender>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+import { Mechanism } from 'saslmechanisms';
+
+export = DigestMd5Mechanism;
+
+declare class DigestMd5Mechanism implements Mechanism {
+    static Mechanism: typeof DigestMd5Mechanism;
+    static prototype: {
+        name: 'DIGEST-MD5';
+        clientFirst: false;
+    };
+
+    name: 'DIGEST-MD5';
+    clientFirst: false;
+
+    constructor(options?: DigestMd5Mechanism.Options);
+
+    response(cred: DigestMd5Mechanism.Credentials): string;
+
+    challenge(chal: string): this;
+}
+
+declare namespace DigestMd5Mechanism {
+    interface Options {
+        genNonce?: () => number;
+    }
+
+    interface Credentials {
+        serviceType: string;
+        host: string;
+        username: string;
+        password: string;
+        serviceName?: string;
+        realm?: string;
+        authzid?: string;
+    }
+}
diff --git a/types/sasl-digest-md5/sasl-digest-md5-tests.ts b/types/sasl-digest-md5/sasl-digest-md5-tests.ts
new file mode 100644
index 0000000000..f63c4b7359
--- /dev/null
+++ b/types/sasl-digest-md5/sasl-digest-md5-tests.ts
@@ -0,0 +1,30 @@
+import DigestMd5Mechanism = require('sasl-digest-md5');
+import { Mechanism } from 'sasl-digest-md5';
+import { Factory } from 'saslmechanisms';
+
+new Factory().use(DigestMd5Mechanism);
+new Factory().use(Mechanism);
+
+// $ExpectType "DIGEST-MD5"
+DigestMd5Mechanism.prototype.name;
+// $ExpectType false
+DigestMd5Mechanism.prototype.clientFirst;
+
+const m = new DigestMd5Mechanism();
+new DigestMd5Mechanism({
+    genNonce() {
+        return 1;
+    },
+});
+
+// $ExpectType "DIGEST-MD5"
+m.name;
+// $ExpectType false
+m.clientFirst;
+// $ExpectType string
+m.response({ serviceType: 's', host: 'h', username: 'u', password: 'p' });
+m.response({ serviceType: 's', host: 'h', username: 'u', password: 'p', serviceName: 'sn' });
+m.response({ serviceType: 's', host: 'h', username: 'u', password: 'p', realm: 'r' });
+m.response({ serviceType: 's', host: 'h', username: 'u', password: 'p', authzid: 'a' });
+// $ExpectType DigestMd5Mechanism
+m.challenge('challenge');
diff --git a/types/sasl-digest-md5/tsconfig.json b/types/sasl-digest-md5/tsconfig.json
new file mode 100644
index 0000000000..84059391b2
--- /dev/null
+++ b/types/sasl-digest-md5/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "sasl-digest-md5-tests.ts"
+    ]
+}
diff --git a/types/sasl-digest-md5/tslint.json b/types/sasl-digest-md5/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/sasl-digest-md5/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 50db82783af95ccf7ee14596963360a84b790393 Mon Sep 17 00:00:00 2001
From: Christian Sporer <IanStorm28@outlook.com>
Date: Wed, 5 Dec 2018 08:39:16 +0100
Subject: [PATCH 673/836] Fixed "unused file" error while running `npm test`

---
 types/list-stream/list-stream-tests.ts             | 4 ++--
 types/list-stream/{tests => test}/import-tests.ts  | 0
 types/list-stream/{tests => test}/require-tests.ts | 0
 types/list-stream/tsconfig.json                    | 2 ++
 4 files changed, 4 insertions(+), 2 deletions(-)
 rename types/list-stream/{tests => test}/import-tests.ts (100%)
 rename types/list-stream/{tests => test}/require-tests.ts (100%)

diff --git a/types/list-stream/list-stream-tests.ts b/types/list-stream/list-stream-tests.ts
index 89b0d6c236..8b6ae25435 100644
--- a/types/list-stream/list-stream-tests.ts
+++ b/types/list-stream/list-stream-tests.ts
@@ -1,2 +1,2 @@
-import "./tests/import-tests";
-import "./tests/require-tests";
+import "./test/import-tests";
+import "./test/require-tests";
diff --git a/types/list-stream/tests/import-tests.ts b/types/list-stream/test/import-tests.ts
similarity index 100%
rename from types/list-stream/tests/import-tests.ts
rename to types/list-stream/test/import-tests.ts
diff --git a/types/list-stream/tests/require-tests.ts b/types/list-stream/test/require-tests.ts
similarity index 100%
rename from types/list-stream/tests/require-tests.ts
rename to types/list-stream/test/require-tests.ts
diff --git a/types/list-stream/tsconfig.json b/types/list-stream/tsconfig.json
index 060c211379..00fe9a2e23 100644
--- a/types/list-stream/tsconfig.json
+++ b/types/list-stream/tsconfig.json
@@ -18,6 +18,8 @@
         "esModuleInterop": true
     },
     "files": [
+        "test/import-tests.ts",
+        "test/require-tests.ts",
         "index.d.ts",
         "list-stream-tests.ts"
     ]

From 2133ee8e4c24f7c242f77d1680e77073a6e0b771 Mon Sep 17 00:00:00 2001
From: Dimitri Benin <dimitri.benin@gmail.com>
Date: Sun, 25 Nov 2018 23:58:42 +0100
Subject: [PATCH 674/836] Add types for sasl-external

---
 types/sasl-external/index.d.ts             | 29 ++++++++++++++++++++++
 types/sasl-external/sasl-external-tests.ts | 22 ++++++++++++++++
 types/sasl-external/tsconfig.json          | 23 +++++++++++++++++
 types/sasl-external/tslint.json            |  1 +
 4 files changed, 75 insertions(+)
 create mode 100644 types/sasl-external/index.d.ts
 create mode 100644 types/sasl-external/sasl-external-tests.ts
 create mode 100644 types/sasl-external/tsconfig.json
 create mode 100644 types/sasl-external/tslint.json

diff --git a/types/sasl-external/index.d.ts b/types/sasl-external/index.d.ts
new file mode 100644
index 0000000000..06a90ce3a4
--- /dev/null
+++ b/types/sasl-external/index.d.ts
@@ -0,0 +1,29 @@
+// Type definitions for sasl-external 0.1
+// Project: https://github.com/jaredhanson/js-sasl-external
+// Definitions by: BendingBender <https://github.com/BendingBender>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+import { Mechanism } from 'saslmechanisms';
+
+export = ExternalMechanism;
+
+declare class ExternalMechanism implements Mechanism {
+    static Mechanism: typeof ExternalMechanism;
+    static prototype: {
+        name: 'EXTERNAL';
+        clientFirst: true;
+    };
+
+    name: 'EXTERNAL';
+    clientFirst: true;
+
+    response(cred: ExternalMechanism.Credentials): string;
+
+    challenge(chal: string): void;
+}
+
+declare namespace ExternalMechanism {
+    interface Credentials {
+        authzid?: string;
+    }
+}
diff --git a/types/sasl-external/sasl-external-tests.ts b/types/sasl-external/sasl-external-tests.ts
new file mode 100644
index 0000000000..919721aec5
--- /dev/null
+++ b/types/sasl-external/sasl-external-tests.ts
@@ -0,0 +1,22 @@
+import ExternalMechanism = require('sasl-external');
+import { Mechanism } from 'sasl-external';
+import { Factory } from 'saslmechanisms';
+
+new Factory().use(ExternalMechanism);
+new Factory().use(Mechanism);
+
+// $ExpectType "EXTERNAL"
+ExternalMechanism.prototype.name;
+// $ExpectType true
+ExternalMechanism.prototype.clientFirst;
+
+const m = new ExternalMechanism();
+
+// $ExpectType "EXTERNAL"
+m.name;
+// $ExpectType true
+m.clientFirst;
+// $ExpectType string
+m.response({ authzid: 'a' });
+// $ExpectType void
+m.challenge('challenge');
diff --git a/types/sasl-external/tsconfig.json b/types/sasl-external/tsconfig.json
new file mode 100644
index 0000000000..b319008559
--- /dev/null
+++ b/types/sasl-external/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "sasl-external-tests.ts"
+    ]
+}
diff --git a/types/sasl-external/tslint.json b/types/sasl-external/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/sasl-external/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 0b80d92a10d2e643ec871e8ba80a0ab18ebd2a8e Mon Sep 17 00:00:00 2001
From: Dimitri Benin <dimitri.benin@gmail.com>
Date: Sun, 25 Nov 2018 23:59:27 +0100
Subject: [PATCH 675/836] Add types for sasl-plain

---
 types/sasl-plain/index.d.ts          | 31 ++++++++++++++++++++++++++++
 types/sasl-plain/sasl-plain-tests.ts | 23 +++++++++++++++++++++
 types/sasl-plain/tsconfig.json       | 23 +++++++++++++++++++++
 types/sasl-plain/tslint.json         |  1 +
 4 files changed, 78 insertions(+)
 create mode 100644 types/sasl-plain/index.d.ts
 create mode 100644 types/sasl-plain/sasl-plain-tests.ts
 create mode 100644 types/sasl-plain/tsconfig.json
 create mode 100644 types/sasl-plain/tslint.json

diff --git a/types/sasl-plain/index.d.ts b/types/sasl-plain/index.d.ts
new file mode 100644
index 0000000000..a1c5f61467
--- /dev/null
+++ b/types/sasl-plain/index.d.ts
@@ -0,0 +1,31 @@
+// Type definitions for sasl-plain 0.1
+// Project: https://github.com/jaredhanson/js-sasl-plain
+// Definitions by: BendingBender <https://github.com/BendingBender>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+import { Mechanism } from 'saslmechanisms';
+
+export = PlainMechanism;
+
+declare class PlainMechanism implements Mechanism {
+    static Mechanism: typeof PlainMechanism;
+    static prototype: {
+        name: 'PLAIN';
+        clientFirst: true;
+    };
+
+    name: 'PLAIN';
+    clientFirst: true;
+
+    response(cred: PlainMechanism.Credentials): string;
+
+    challenge(chal: string): this;
+}
+
+declare namespace PlainMechanism {
+    interface Credentials {
+        authzid?: string;
+        username: string;
+        password: string;
+    }
+}
diff --git a/types/sasl-plain/sasl-plain-tests.ts b/types/sasl-plain/sasl-plain-tests.ts
new file mode 100644
index 0000000000..144d21451f
--- /dev/null
+++ b/types/sasl-plain/sasl-plain-tests.ts
@@ -0,0 +1,23 @@
+import PlainMechanism = require('sasl-plain');
+import { Mechanism } from 'sasl-plain';
+import { Factory } from 'saslmechanisms';
+
+new Factory().use(PlainMechanism);
+new Factory().use(Mechanism);
+
+// $ExpectType "PLAIN"
+PlainMechanism.prototype.name;
+// $ExpectType true
+PlainMechanism.prototype.clientFirst;
+
+const m = new PlainMechanism();
+
+// $ExpectType "PLAIN"
+m.name;
+// $ExpectType true
+m.clientFirst;
+// $ExpectType string
+m.response({ username: 'u', password: 'pw' });
+m.response({ username: 'u', password: 'pw', authzid: 'a' });
+// $ExpectType PlainMechanism
+m.challenge('challenge');
diff --git a/types/sasl-plain/tsconfig.json b/types/sasl-plain/tsconfig.json
new file mode 100644
index 0000000000..3e33152c74
--- /dev/null
+++ b/types/sasl-plain/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "sasl-plain-tests.ts"
+    ]
+}
diff --git a/types/sasl-plain/tslint.json b/types/sasl-plain/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/sasl-plain/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 2e722d3138e0103158de95c755376085e01a030f Mon Sep 17 00:00:00 2001
From: Dimitri Benin <dimitri.benin@gmail.com>
Date: Mon, 26 Nov 2018 00:01:17 +0100
Subject: [PATCH 676/836] Add types for sasl-scram-sha-1

---
 types/sasl-scram-sha-1/index.d.ts             | 41 +++++++++++++++++++
 .../sasl-scram-sha-1-tests.ts                 | 33 +++++++++++++++
 types/sasl-scram-sha-1/tsconfig.json          | 23 +++++++++++
 types/sasl-scram-sha-1/tslint.json            |  1 +
 4 files changed, 98 insertions(+)
 create mode 100644 types/sasl-scram-sha-1/index.d.ts
 create mode 100644 types/sasl-scram-sha-1/sasl-scram-sha-1-tests.ts
 create mode 100644 types/sasl-scram-sha-1/tsconfig.json
 create mode 100644 types/sasl-scram-sha-1/tslint.json

diff --git a/types/sasl-scram-sha-1/index.d.ts b/types/sasl-scram-sha-1/index.d.ts
new file mode 100644
index 0000000000..d332b6126a
--- /dev/null
+++ b/types/sasl-scram-sha-1/index.d.ts
@@ -0,0 +1,41 @@
+// Type definitions for sasl-scram-sha-1 1.2
+// Project: https://github.com/legastero/js-sasl-scram-sha-1
+// Definitions by: BendingBender <https://github.com/BendingBender>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+import { Mechanism } from 'saslmechanisms';
+
+export = ScramSha1Mechanism;
+
+declare class ScramSha1Mechanism implements Mechanism {
+    static Mechanism: typeof ScramSha1Mechanism;
+    static prototype: {
+        name: 'SCRAM-SHA-1';
+        clientFirst: true;
+    };
+
+    name: 'SCRAM-SHA-1';
+    clientFirst: true;
+
+    constructor(options?: ScramSha1Mechanism.Options);
+
+    response(cred: ScramSha1Mechanism.Credentials): string;
+
+    challenge(chal: string): this;
+}
+
+declare namespace ScramSha1Mechanism {
+    interface Options {
+        genNonce?: () => number;
+    }
+
+    interface Credentials {
+        authzid?: string;
+        username?: string;
+        password?: string;
+        salt?: string;
+        saltedPassword?: string;
+        clientKey?: string;
+        serverKey?: string;
+    }
+}
diff --git a/types/sasl-scram-sha-1/sasl-scram-sha-1-tests.ts b/types/sasl-scram-sha-1/sasl-scram-sha-1-tests.ts
new file mode 100644
index 0000000000..85eb648193
--- /dev/null
+++ b/types/sasl-scram-sha-1/sasl-scram-sha-1-tests.ts
@@ -0,0 +1,33 @@
+import ScramSha1Mechanism = require('sasl-scram-sha-1');
+import { Mechanism } from 'sasl-scram-sha-1';
+import { Factory } from 'saslmechanisms';
+
+new Factory().use(ScramSha1Mechanism);
+new Factory().use(Mechanism);
+
+// $ExpectType "SCRAM-SHA-1"
+ScramSha1Mechanism.prototype.name;
+// $ExpectType true
+ScramSha1Mechanism.prototype.clientFirst;
+
+const m = new ScramSha1Mechanism();
+new ScramSha1Mechanism({
+    genNonce() {
+        return 1;
+    },
+});
+
+// $ExpectType "SCRAM-SHA-1"
+m.name;
+// $ExpectType true
+m.clientFirst;
+// $ExpectType string
+m.response({ authzid: 'a' });
+m.response({ username: 'u' });
+m.response({ password: 'pw' });
+m.response({ salt: 's' });
+m.response({ saltedPassword: 'sp' });
+m.response({ clientKey: 'ck' });
+m.response({ serverKey: 'sk' });
+// $ExpectType ScramSha1Mechanism
+m.challenge('challenge');
diff --git a/types/sasl-scram-sha-1/tsconfig.json b/types/sasl-scram-sha-1/tsconfig.json
new file mode 100644
index 0000000000..80181379ea
--- /dev/null
+++ b/types/sasl-scram-sha-1/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "sasl-scram-sha-1-tests.ts"
+    ]
+}
diff --git a/types/sasl-scram-sha-1/tslint.json b/types/sasl-scram-sha-1/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/sasl-scram-sha-1/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 345782feb2525373689bc8de68ea52777ac8533c Mon Sep 17 00:00:00 2001
From: Dimitri Benin <dimitri.benin@gmail.com>
Date: Wed, 21 Nov 2018 01:09:59 +0100
Subject: [PATCH 677/836] Add types for @xmpp/xml

---
 types/xmpp__xml/index.d.ts          | 66 +++++++++++++++++++++++++++++
 types/xmpp__xml/tsconfig.json       | 30 +++++++++++++
 types/xmpp__xml/tslint.json         |  1 +
 types/xmpp__xml/xmpp__xml-tests.ts  | 46 ++++++++++++++++++++
 types/xmpp__xml/xmpp__xml-tests.tsx | 26 ++++++++++++
 5 files changed, 169 insertions(+)
 create mode 100644 types/xmpp__xml/index.d.ts
 create mode 100644 types/xmpp__xml/tsconfig.json
 create mode 100644 types/xmpp__xml/tslint.json
 create mode 100644 types/xmpp__xml/xmpp__xml-tests.ts
 create mode 100644 types/xmpp__xml/xmpp__xml-tests.tsx

diff --git a/types/xmpp__xml/index.d.ts b/types/xmpp__xml/index.d.ts
new file mode 100644
index 0000000000..b69eacee0f
--- /dev/null
+++ b/types/xmpp__xml/index.d.ts
@@ -0,0 +1,66 @@
+// Type definitions for @xmpp/xml 0.6
+// Project: https://github.com/xmppjs/xmpp.js/tree/master/packages/xml
+// Definitions by: BendingBender <https://github.com/BendingBender>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+/// <reference types="node" />
+
+export = xml;
+
+import * as ltx from 'ltx';
+import * as escape from 'ltx/lib/escape';
+import { EventEmitter } from 'events';
+
+declare function xml(
+    name: string,
+    attrs?: string | { [key: string]: any },
+    ...children: xml.ElementChild[]
+): xml.Element;
+
+declare namespace xml {
+    function x(
+        name: string,
+        attrs?: string | { [key: string]: any },
+        ...children: ElementChild[]
+    ): Element;
+
+    const escapeXML: typeof escape.escapeXML;
+    const unescapeXML: typeof escape.unescapeXML;
+    const escapeXMLText: typeof escape.escapeXMLText;
+    const unescapeXMLText: typeof escape.unescapeXMLText;
+
+    class Element extends ltx.Element {
+        attrs: { [key: string]: any };
+        append(nodes: ElementChild): Element;
+        prepend(nodes: ElementChild): Element;
+    }
+    type ElementChild = Element | Element[] | string | number | boolean;
+
+    class Parser extends EventEmitter {
+        readonly XMLError: typeof XMLError;
+        readonly parser: ltx.Parser;
+        root: Element | null;
+        cursor: Element | null;
+
+        onStartElement(name: string, attrs?: string | { [attrName: string]: any }): void;
+        onEndElement(name: string): void;
+        onText(str: string): void;
+        write(data: Buffer): void;
+        end(data: Buffer): void;
+    }
+}
+
+declare class XMLError extends Error {
+    readonly name: 'XMLError';
+}
+
+declare global {
+    namespace JSX {
+        interface IntrinsicElements {
+            [elemName: string]: any;
+        }
+
+        type Element = xml.Element;
+    }
+}
diff --git a/types/xmpp__xml/tsconfig.json b/types/xmpp__xml/tsconfig.json
new file mode 100644
index 0000000000..3fbf44dc71
--- /dev/null
+++ b/types/xmpp__xml/tsconfig.json
@@ -0,0 +1,30 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "paths": {
+            "@xmpp/xml": [
+                "xmpp__xml"
+            ]
+        },
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "jsx": "preserve"
+    },
+    "files": [
+        "index.d.ts",
+        "xmpp__xml-tests.ts",
+        "xmpp__xml-tests.tsx"
+    ]
+}
diff --git a/types/xmpp__xml/tslint.json b/types/xmpp__xml/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/xmpp__xml/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/xmpp__xml/xmpp__xml-tests.ts b/types/xmpp__xml/xmpp__xml-tests.ts
new file mode 100644
index 0000000000..84820feaaa
--- /dev/null
+++ b/types/xmpp__xml/xmpp__xml-tests.ts
@@ -0,0 +1,46 @@
+import xml = require('@xmpp/xml');
+
+xml.escapeXML('');
+xml.unescapeXML('');
+xml.escapeXMLText('');
+xml.unescapeXMLText('');
+
+const parser = new xml.Parser();
+parser.onStartElement('el');
+parser.onEndElement('el');
+parser.onText('text');
+parser.write((null as any) as Buffer);
+parser.end((null as any) as Buffer);
+
+const recipient = 'user@example.com';
+const days = ['Monday', 'Tuesday'];
+const message = xml(
+    'message',
+    { to: recipient },
+    xml('body', {}, 1 + 2),
+    xml('days', days.map(day => xml('day', {}, day)))
+);
+xml.x(
+    'message',
+    { to: recipient },
+    xml('body', {}, 1 + 2),
+    xml('days', days.map(day => xml('day', {}, day)))
+);
+
+message.attrs;
+message.getChild('body')!.text();
+message.getChild('body')!.toString();
+message.getChild('days')!.getChildren('day');
+message.getChildText('body');
+
+message.attrs.type = 'chat';
+Object.assign(message.attrs, { type: 'chat' });
+message.getChild('body')!.text('Hello world');
+message.append(xml('foo'));
+message.append('bar');
+message.append(days.map(day => xml('day', {}, day)));
+message.prepend(xml('foo'));
+message.prepend('bar');
+message.prepend(days.map(day => xml('day', {}, day)));
+const body = message.getChild('body');
+message.remove(body!);
diff --git a/types/xmpp__xml/xmpp__xml-tests.tsx b/types/xmpp__xml/xmpp__xml-tests.tsx
new file mode 100644
index 0000000000..010cc43f2a
--- /dev/null
+++ b/types/xmpp__xml/xmpp__xml-tests.tsx
@@ -0,0 +1,26 @@
+/** @jsx xml */
+
+import xml = require('@xmpp/xml');
+
+const recipient = 'user@example.com';
+const days = ['Monday', 'Tuesday'];
+const message = (
+    <message to={recipient}>
+        <body>{1 + 2}</body>
+        <days>
+            {days.map(day => (
+                <day>${day}</day>
+            ))}
+        </days>
+    </message>
+);
+
+// write
+message.append(
+    <myevent xmlns="xmpp:example.org">
+        <json xmlns="urn:xmpp:json:0">{JSON.stringify(days)}</json>
+    </myevent>
+);
+
+// read
+JSON.parse(message.getChild('myevent', 'xmpp:example.org')!.getChildText('json', 'urn:xmpp:json:0')!);

From 138fc3747c5eca96c27fae8ded65640d83979fa7 Mon Sep 17 00:00:00 2001
From: Dimitri Benin <dimitri.benin@gmail.com>
Date: Sun, 2 Dec 2018 22:36:19 +0100
Subject: [PATCH 678/836] Add types for web-resource-inliner

---
 types/web-resource-inliner/index.d.ts         | 129 ++++++++++++++++++
 types/web-resource-inliner/tsconfig.json      |  23 ++++
 types/web-resource-inliner/tslint.json        |   1 +
 .../web-resource-inliner-tests.ts             |  49 +++++++
 4 files changed, 202 insertions(+)
 create mode 100644 types/web-resource-inliner/index.d.ts
 create mode 100644 types/web-resource-inliner/tsconfig.json
 create mode 100644 types/web-resource-inliner/tslint.json
 create mode 100644 types/web-resource-inliner/web-resource-inliner-tests.ts

diff --git a/types/web-resource-inliner/index.d.ts b/types/web-resource-inliner/index.d.ts
new file mode 100644
index 0000000000..009f3a5dda
--- /dev/null
+++ b/types/web-resource-inliner/index.d.ts
@@ -0,0 +1,129 @@
+// Type definitions for web-resource-inliner 4.2
+// Project: https://github.com/jrit/web-resource-inliner#readme
+// Definitions by: BendingBender <https://github.com/BendingBender>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+import { CoreOptions, RequiredUriUrl } from 'request';
+
+export function html(options: Options, callback: Callback): string;
+export function css(options: Options, callback: Callback): string;
+
+export type Callback = (error: any, result: any) => void;
+
+export interface Options {
+    /**
+     * This is the HTML or CSS content to be inlined, you should provide HTML to the html() method and CSS to the css() method or you will get errors or garbage output.
+     */
+    fileContent: string;
+    /**
+     * Sets the attribute that is used to include/exclude specific resources based on the default behavior for the resource type.
+     *
+     * For example, if scripts is set to false, an individual script can be inlined by adding the attribute to the script tag like <script src="myscript.js" data-inline></script>.
+     * On the other hand, if images are set to be inlined by default,
+     * a specific image can be excluded by adding -ignore to the end of the inlineAttribute like <img src="myimg.png" data-inline-ignore />.
+     *
+     * In CSS, a comment is required at the end of the line to perform the same thing, such as \/*data-inline*\/ or \/*data-inline-ignore*\/.
+     *
+     * @default "data-inline"
+     */
+    inlineAttribute?: string;
+    /**
+     * When true, inline images unless they have an exclusion attribute (see inlineAttribute option).
+     *
+     * When false, exclude images unless they have an inclusion attribute (see inlineAttribute option).
+     *
+     * When a number, inline images only when the base64 content size is less than the number of KBs.
+     *
+     * For example, the default is to only inline images less than 8KB.
+     *
+     * @default 8
+     */
+    images?: boolean | number;
+    /**
+     * When true, inline SVG <use> unless they have an exclusion attribute (see inlineAttribute option).
+     *
+     * When false, exclude SVG <use> unless they have an inclusion attribute (see inlineAttribute option).
+     *
+     * When a number, inline SVG <use> only when the content size is less than the number of KBs.
+     *
+     * For example, the default is to only inline SVGs less than 8KB.
+     *
+     * @default 8
+     */
+    svgs?: boolean | number;
+    /**
+     * When true, inline scripts unless they have an exclusion attribute (see inlineAttribute option).
+     *
+     * When false, exclude scripts unless they have an inclusion attribute (see inlineAttribute option).
+     *
+     * When a number, inline scripts only when the base64 content size is less than the number of KBs.
+     *
+     * @default true
+     */
+    scripts?: boolean | number;
+    /**
+     * When true, inline stylesheet links unless they have an exclusion attribute (see inlineAttribute option).
+     *
+     * When false, exclude stylesheet links unless they have an inclusion attribute (see inlineAttribute option).
+     *
+     * When a number, inline stylesheet links only when the base64 content size is less than the number of KBs.
+     *
+     * @default true
+     */
+    links?: boolean | number;
+    /**
+     * Describes the path relationship between where web-resource-inliner is running and what the relative paths in fileContent or href/src urls refer to.
+     *
+     * For example, the tests cases in this package are in test/cases/ so their relative paths start by referring to that folder,
+     * but the root of this project and where npm test runs from is 2 folders up, so relativeTo is set to test/cases/ in test/spec.js.
+     * Likewise, with href="content.css" and a relativeTo of http://github.com/ the resource retrieved would be http://github.com/content.css.
+     *
+     * @default ""
+     */
+    relativeTo?: string;
+    /**
+     * Describes the path relationship between CSS content and the context it will be loaded in.
+     *
+     * For example, when a CSS file contains url(some-file.png) and the file is moved from a location in a folder like /css to /
+     * then the path to the image needs to be changed to url(css/some-file.png).
+     * In this case, rebaseRelativeTo would be css. You probably don't want to set this when you are using html().
+     *
+     * @default ""
+     */
+    rebaseRelativeTo?: string;
+    /**
+     * When strict is true, a missing resource will cause the inliner to halt and return an error in the callback.
+     *
+     * The default behavior is to log a warning to the console and continue inlining with the available resources, which is more similar to how a web page behaves.
+     *
+     * @default false
+     */
+    strict?: boolean;
+    /**
+     * Allows to adjust issued requests.
+     *
+     * E.g., add authentication tokens to requested URLs.
+     *
+     * The function is called with the request options object as its parameter.
+     *
+     * It can modify this object or return a new one.
+     *
+     * See the [list of available options](https://www.npmjs.com/package/request#request-options-callback).
+     */
+    requestTransform?: (
+        requestOptions: RequiredUriUrl & CoreOptions
+    ) => RequiredUriUrl & CoreOptions;
+    /**
+     * Allows to make changes to scripts before they are inlined, such as minifying.
+     *
+     * Callback is standard node error first, second argument is transformed value.
+     */
+    scriptTransform?: (content: string, done: Callback) => any;
+    /**
+     * Allows to make changes to links before they are inlined, such as CSS pre-and-post-processors.
+     *
+     * Callback is standard node error first, second argument is transformed value.
+     */
+    linkTransform?: (content: string, done: Callback) => any;
+}
diff --git a/types/web-resource-inliner/tsconfig.json b/types/web-resource-inliner/tsconfig.json
new file mode 100644
index 0000000000..cdfd6e6a41
--- /dev/null
+++ b/types/web-resource-inliner/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "web-resource-inliner-tests.ts"
+    ]
+}
diff --git a/types/web-resource-inliner/tslint.json b/types/web-resource-inliner/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/web-resource-inliner/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/web-resource-inliner/web-resource-inliner-tests.ts b/types/web-resource-inliner/web-resource-inliner-tests.ts
new file mode 100644
index 0000000000..a0410e151f
--- /dev/null
+++ b/types/web-resource-inliner/web-resource-inliner-tests.ts
@@ -0,0 +1,49 @@
+import { html, css } from 'web-resource-inliner';
+
+const fileContent = '<p>some content</p>';
+const cb = (error: any, result: any) => null;
+
+html({ fileContent }, cb);
+html({ fileContent, inlineAttribute: 'foo' }, cb);
+html({ fileContent, images: true }, cb);
+html({ fileContent, images: 8 }, cb);
+html({ fileContent, svgs: true }, cb);
+html({ fileContent, svgs: 8 }, cb);
+html({ fileContent, scripts: true }, cb);
+html({ fileContent, scripts: 8 }, cb);
+html({ fileContent, links: true }, cb);
+html({ fileContent, links: 8 }, cb);
+html({ fileContent, relativeTo: 'http://foo.bar' }, cb);
+html({ fileContent, rebaseRelativeTo: 'css' }, cb);
+html({ fileContent, strict: true }, cb);
+html(
+    {
+        fileContent,
+        requestTransform(options) {
+            // $ExpectType (UriOptions & CoreOptions) | (UrlOptions & CoreOptions)
+            options;
+            return options;
+        },
+    },
+    cb
+);
+html(
+    {
+        fileContent,
+        scriptTransform(content, done) {
+            done(null, content);
+        },
+    },
+    cb
+);
+html(
+    {
+        fileContent,
+        linkTransform(content, done) {
+            done(null, content);
+        },
+    },
+    cb
+);
+
+css({ fileContent }, cb);

From 321271c1c3e0337fe42005e8e0425ad69664f77c Mon Sep 17 00:00:00 2001
From: Daniel Rose <daniel.rose@inform-software.com>
Date: Wed, 5 Dec 2018 09:21:57 +0100
Subject: [PATCH 679/836] Use standard dtslint settings.

---
 types/fleximap/index.d.ts  | 2 +-
 types/fleximap/tslint.json | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/types/fleximap/index.d.ts b/types/fleximap/index.d.ts
index 9bce180c66..8481134ffe 100644
--- a/types/fleximap/index.d.ts
+++ b/types/fleximap/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for fleximap 0.9.10
+// Type definitions for fleximap 0.9
 // Project: https://github.com/SocketCluster/fleximap
 // Definitions by: Daniel Rose <https://github.com/DanielRose>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/fleximap/tslint.json b/types/fleximap/tslint.json
index 65c83fb1e3..f93cf8562a 100644
--- a/types/fleximap/tslint.json
+++ b/types/fleximap/tslint.json
@@ -1,6 +1,3 @@
 {
-    "extends": "dtslint/dt.json",
-    "rules": {
-        "dt-header": false
-    }
+    "extends": "dtslint/dt.json"
 }

From e7b92554e7ca0731739069c8c02e43bfb2279ddd Mon Sep 17 00:00:00 2001
From: Junyoung Choi <fluke8259@gmail.com>
Date: Wed, 5 Dec 2018 17:27:19 +0900
Subject: [PATCH 680/836] Add me to contributors :smile:

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

diff --git a/types/unist/index.d.ts b/types/unist/index.d.ts
index a7f6cc639d..2d7d37e17f 100644
--- a/types/unist/index.d.ts
+++ b/types/unist/index.d.ts
@@ -4,6 +4,7 @@
 //                 Jun Lu <https://github.com/lujun2>
 //                 Hernan Rajchert <https://github.com/hrajchert>
 //                 Titus Wormer <https://github.com/wooorm>
+//                 Junyoung Choi <https://github.com/rokt33r>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 3.0
 

From f3ba892a8346f8d5b2c69206d7eb195dbdc216da Mon Sep 17 00:00:00 2001
From: Junyoung Choi <fluke8259@gmail.com>
Date: Wed, 5 Dec 2018 18:06:30 +0900
Subject: [PATCH 681/836] Add unist-util-is

---
 types/unist-util-is/index.d.ts             | 36 ++++++++++++++++++++++
 types/unist-util-is/tsconfig.json          | 23 ++++++++++++++
 types/unist-util-is/tslint.json            |  1 +
 types/unist-util-is/unist-util-is-tests.ts | 34 ++++++++++++++++++++
 4 files changed, 94 insertions(+)
 create mode 100644 types/unist-util-is/index.d.ts
 create mode 100644 types/unist-util-is/tsconfig.json
 create mode 100644 types/unist-util-is/tslint.json
 create mode 100644 types/unist-util-is/unist-util-is-tests.ts

diff --git a/types/unist-util-is/index.d.ts b/types/unist-util-is/index.d.ts
new file mode 100644
index 0000000000..831b06f0e4
--- /dev/null
+++ b/types/unist-util-is/index.d.ts
@@ -0,0 +1,36 @@
+// Type definitions for unist-util-is 2.1
+// Project: https://github.com/syntax-tree/unist-util-is#readme
+// Definitions by: Junyoung Choi <https://github.com/rokt33r>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 3.0
+
+/// <reference types='node' />
+
+import * as Unist from 'unist';
+
+declare namespace unistUtilIs {
+    /**
+     * @param node Node to test
+     * @param index Position of node in parent
+     * @param parent Parent of node
+     */
+    type TestFunction<C = {}> = (this: C, node: unknown, index: number, parent: Unist.Parent) => boolean | void;
+    type Test<C = {}> = TestFunction<C> | Partial<Unist.Node> | string | null;
+}
+
+/**
+ * Unist utility to check if a node passes a test.
+ *
+ * @param test When not given, checks if `node` is a `Node`.
+ * When `string`, works like passing `function (node) {return node.type === test}`.
+ * When `array`, checks any one of the subtests pass.
+ * When `object`, checks that all keys in test are in node, and that they have (strictly) equal values
+ * @param node Node to check. `false` is returned
+ * @param index Position of `node` in `parent`
+ * @param parent Parent of `node`
+ * @param context Context object to invoke `test` with
+ * @returns Whether test passed and `node` is a `Node` (object with `type` set to non-empty `string`).
+ */
+declare function unistUtilIs<C = {}>(test: unistUtilIs.Test<C> | Array<unistUtilIs.Test<C>>, node: unknown, index?: number, parent?: Unist.Parent, context?: any): boolean;
+
+export = unistUtilIs;
diff --git a/types/unist-util-is/tsconfig.json b/types/unist-util-is/tsconfig.json
new file mode 100644
index 0000000000..dbe499fef0
--- /dev/null
+++ b/types/unist-util-is/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "unist-util-is-tests.ts"
+    ]
+}
diff --git a/types/unist-util-is/tslint.json b/types/unist-util-is/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/unist-util-is/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/unist-util-is/unist-util-is-tests.ts b/types/unist-util-is/unist-util-is-tests.ts
new file mode 100644
index 0000000000..430d58746d
--- /dev/null
+++ b/types/unist-util-is/unist-util-is-tests.ts
@@ -0,0 +1,34 @@
+import is = require('unist-util-is');
+
+const node = {type: 'strong'};
+const parent = {type: 'paragraph', children: [node]};
+
+function test(node: unknown, n: number) {
+  return n === 5;
+}
+
+is(null, {children: []});
+is(null, node);
+is('strong', node);
+is('emphasis', node);
+
+is(node, node);
+is({type: 'paragraph'}, parent);
+is({type: 'strong'}, parent);
+
+is(test, node);
+is(test, node, 4, parent);
+is(test, node, 5, parent);
+
+interface TestContext {
+  some: string;
+}
+function testWithContext(this: TestContext, node: unknown) {}
+is<TestContext>(testWithContext, node);
+
+const wrongTestFunc: is.TestFunction = (node: unknown, n: string) => {}; // $ExpectError
+
+interface OtherTestContext {
+  some: number;
+}
+is<OtherTestContext>(testWithContext, node); // $ExpectError

From 8a416301e43da9cdb89db2b7c1d17ac8c6389f24 Mon Sep 17 00:00:00 2001
From: Junyoung Choi <fluke8259@gmail.com>
Date: Wed, 5 Dec 2018 18:17:45 +0900
Subject: [PATCH 682/836] Make index and parent optional

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

diff --git a/types/unist-util-is/index.d.ts b/types/unist-util-is/index.d.ts
index 831b06f0e4..ae92217c6e 100644
--- a/types/unist-util-is/index.d.ts
+++ b/types/unist-util-is/index.d.ts
@@ -14,7 +14,7 @@ declare namespace unistUtilIs {
      * @param index Position of node in parent
      * @param parent Parent of node
      */
-    type TestFunction<C = {}> = (this: C, node: unknown, index: number, parent: Unist.Parent) => boolean | void;
+    type TestFunction<C = {}> = (this: C, node: unknown, index?: number, parent?: Unist.Parent) => boolean | void;
     type Test<C = {}> = TestFunction<C> | Partial<Unist.Node> | string | null;
 }
 
diff --git a/types/unist-util-is/unist-util-is-tests.ts b/types/unist-util-is/unist-util-is-tests.ts
index 430d58746d..4d355c90ec 100644
--- a/types/unist-util-is/unist-util-is-tests.ts
+++ b/types/unist-util-is/unist-util-is-tests.ts
@@ -3,7 +3,7 @@ import is = require('unist-util-is');
 const node = {type: 'strong'};
 const parent = {type: 'paragraph', children: [node]};
 
-function test(node: unknown, n: number) {
+function test(node: unknown, n?: number) {
   return n === 5;
 }
 

From b3ae835f65271d63ca326e287b419b6a2d08d234 Mon Sep 17 00:00:00 2001
From: arichter83 <ar@5mm.de>
Date: Wed, 5 Dec 2018 10:44:07 +0100
Subject: [PATCH 683/836] Extended test case

---
 types/simpl-schema/index.d.ts            | 13 ++++-
 types/simpl-schema/simpl-schema-tests.ts | 73 +++++++-----------------
 2 files changed, 31 insertions(+), 55 deletions(-)

diff --git a/types/simpl-schema/index.d.ts b/types/simpl-schema/index.d.ts
index 32dd8d7b66..d5527b0697 100644
--- a/types/simpl-schema/index.d.ts
+++ b/types/simpl-schema/index.d.ts
@@ -50,11 +50,20 @@ interface CleanOption {
     getAutoValues?: boolean;
     isModifier?: boolean;
     extendAutoValueContext?: boolean;
+    removeNullsFromArrays?: boolean;
+}
+
+interface SimpleSchemaOptions {
+  check?: boolean;
+  clean?: CleanOption;
+  defaultLabel?: string;
+  humanizeAutoLabels?: boolean;
+  requiredByDefault?: boolean;
+  tracker?: any;
 }
 
-// ???
 interface SimpleSchemaStatic {
-  new(schema: {[key: string]: SchemaDefinition} | any[]): SimpleSchema;
+  new(schema: {[key: string]: SchemaDefinition} | any[], options?: SimpleSchemaOptions): SimpleSchema;
   namedContext(name?: string): SimpleSchemaValidationContextStatic;
   addValidator(validator: () => boolean): any;
   pick(...fields: string[]): SimpleSchemaStatic;
diff --git a/types/simpl-schema/simpl-schema-tests.ts b/types/simpl-schema/simpl-schema-tests.ts
index 3c40f0c4bb..49c166070d 100644
--- a/types/simpl-schema/simpl-schema-tests.ts
+++ b/types/simpl-schema/simpl-schema-tests.ts
@@ -34,63 +34,30 @@ StringSchema.validate({
     regExpString: "id"
 });
 
-    /*
-    ,
-    title: {
-      type: String,
-      label: "Argument",
-      custom: function () {
-        var text = this.value;
-        text = text.replace(/https?:\/\/(www\.)?([-a-zA-Z0-9@:%._\+~#=]{2,256}\.[a-z]{2,6})\b([-a-zA-Z0-9@:%_\+.~#?&//=]*)/gi, '$2');
-
-        if(text.length > MAX_ARGUMENT_LENGTH) return { type: SimpleSchema.ErrorTypes.MAX_STRING, max: MAX_ARGUMENT_LENGTH }
-        else if(text.length < MIN_ARGUMENT_LENGTH) return { type: SimpleSchema.ErrorTypes.MIN_STRING, min: MIN_ARGUMENT_LENGTH }
-      }
+const StringSchemaWithOptions = new SimpleSchema({
+    basicString: {
+        type: String
     },
-    questionId: {
-      type: String,
-      regEx: SimpleSchema.RegEx.Id
-    },
-    side: {
-      type: String,
-      allowedValues: ['pro', 'con']
+    limitedString: {
+        type: String,
+        allowedValues: ['pro', 'con']
     },
     userId: {
-      type: String,
-      regEx: SimpleSchema.RegEx.Id
+        type: String,
+        regEx: SimpleSchema.RegEx.Id
     },
     createdAt: {
-      type: Date,
-      autoValue: () => new Date(),
+        type: Date,
+        autoValue: () => new Date(),
     },
-    clapCount: {
-      type: SimpleSchema.Integer,
-      defaultValue: 0
-    },
-    highlight: {
-      type: Array,
-      optional: true
-    },
-    'highlight.$': {
-      type: Object
-    },
-    'highlight.$.start': SimpleSchema.Integer,
-    'highlight.$.end': SimpleSchema.Integer,
-    'highlight.$.text': {
-      type: String,
-      trim: false
+},
+{
+    clean: {
+        filter: true,
+        autoConvert: true,
+        removeEmptyStrings: true,
+        trimStrings: true,
+        getAutoValues: true,
+        removeNullsFromArrays: true,
     }
-    */
-    /*
-    ,
-    {
-        clean: {
-            filter: true,
-            autoConvert: true,
-            removeEmptyStrings: true,
-            trimStrings: true,
-            getAutoValues: true,
-            removeNullsFromArrays: true,
-        }
-    }
-    */
+});

From 334c888710c049fcef0a362b3993e24fb3cffd36 Mon Sep 17 00:00:00 2001
From: Jonas Kugelmann <jk@secomba.com>
Date: Wed, 5 Dec 2018 11:09:31 +0100
Subject: [PATCH 684/836] Made StepProps augmentable according to docs

---
 types/react-albus/index.d.ts            | 13 ++++++++++++-
 types/react-albus/react-albus-tests.tsx |  8 ++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/types/react-albus/index.d.ts b/types/react-albus/index.d.ts
index be546011d4..371a50cca7 100644
--- a/types/react-albus/index.d.ts
+++ b/types/react-albus/index.d.ts
@@ -47,8 +47,19 @@ export interface StepsProps {
 
 export const Steps: React.ComponentType<StepsProps>;
 
-export type StepProps = { id: string } & (
+export type StepProps = WizardStepObject & (
     | { render?: (wizard: WizardContext) => React.ReactNode }
     | { children: (wizard: WizardContext) => React.ReactNode });
 
+/**
+ * In addition to id, any additional props added to <Step> will be available on each step object.
+ * This can be used to add names, descriptions, or other metadata to each step.
+ * To use this feature generally you need to augment the WizardStepObject
+ * @example
+ * declare module "react-albus" {
+ *   interface WizardStepObject {
+ *     propName: string;
+ *   }
+ * }
+ */
 export const Step: React.ComponentType<StepProps>;
diff --git a/types/react-albus/react-albus-tests.tsx b/types/react-albus/react-albus-tests.tsx
index 2f31733b1d..f03e57cc2e 100644
--- a/types/react-albus/react-albus-tests.tsx
+++ b/types/react-albus/react-albus-tests.tsx
@@ -1,6 +1,12 @@
 import * as React from "react";
 import { Wizard, Step, Steps, withWizard } from "react-albus";
 
+declare module "react-albus" {
+    interface WizardStepObject {
+        quote?: string;
+    }
+}
+
 const Example = () => (
     <Wizard
         basename="path"
@@ -19,6 +25,7 @@ const Example = () => (
             <Steps>
                 <Step
                     id="merlin"
+                    quote="Camelot isn't built on magic, but on people, on their faith"
                     render={() => (
                         <div>
                             <h1>Merlin</h1>
@@ -28,6 +35,7 @@ const Example = () => (
                 />
                 <Step
                     id="gandalf"
+                    quote="A wizard is never late, nor is he early. He arrives precisely when he means to."
                     render={stepWiz => (
                         <div>
                             <h1>Gandalf</h1>

From 250e3e9de236d4c4d74a8c3ce5f08aff00b13f60 Mon Sep 17 00:00:00 2001
From: arichter83 <ar@5mm.de>
Date: Wed, 5 Dec 2018 12:31:05 +0100
Subject: [PATCH 685/836] Further test cases, short hand support

---
 types/simpl-schema/index.d.ts            | 15 ++++++++++++++-
 types/simpl-schema/simpl-schema-tests.ts | 13 +++++++++++++
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/types/simpl-schema/index.d.ts b/types/simpl-schema/index.d.ts
index d5527b0697..1317b50d45 100644
--- a/types/simpl-schema/index.d.ts
+++ b/types/simpl-schema/index.d.ts
@@ -4,6 +4,8 @@
 //                 Qkramer <https://github.com/Qkramer>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
+declare module 'simpl-schema' {
+
 export class ValidationContext {
     constructor(ss: any);
     addValidationErrors(errors: any): void;
@@ -63,7 +65,16 @@ interface SimpleSchemaOptions {
 }
 
 interface SimpleSchemaStatic {
-  new(schema: {[key: string]: SchemaDefinition} | any[], options?: SimpleSchemaOptions): SimpleSchema;
+  new(
+    schema: {
+      [key: string]: SchemaDefinition
+        | BooleanConstructor | StringConstructor | NumberConstructor | DateConstructor
+        | ArrayConstructor
+        | string | RegExp
+        | SimpleSchema
+    } | any[],
+    options?: SimpleSchemaOptions
+  ): SimpleSchema;
   namedContext(name?: string): SimpleSchemaValidationContextStatic;
   addValidator(validator: () => boolean): any;
   pick(...fields: string[]): SimpleSchemaStatic;
@@ -202,3 +213,5 @@ export interface MongoObject {
 }
 
 export default SimpleSchema;
+
+}
diff --git a/types/simpl-schema/simpl-schema-tests.ts b/types/simpl-schema/simpl-schema-tests.ts
index 49c166070d..50181c373f 100644
--- a/types/simpl-schema/simpl-schema-tests.ts
+++ b/types/simpl-schema/simpl-schema-tests.ts
@@ -42,6 +42,9 @@ const StringSchemaWithOptions = new SimpleSchema({
         type: String,
         allowedValues: ['pro', 'con']
     },
+    subschema: {
+        type: StringSchema
+    },
     userId: {
         type: String,
         regEx: SimpleSchema.RegEx.Id
@@ -61,3 +64,13 @@ const StringSchemaWithOptions = new SimpleSchema({
         removeNullsFromArrays: true,
     }
 });
+
+new SimpleSchema({
+    shortBoolean: Boolean,
+    shortString: String,
+    shortNumber: Number,
+    shortInteger: SimpleSchema.Integer,
+    shortDate: Date,
+    shortArray: Array,
+    subSchema: StringSchemaWithOptions
+});

From 84f45b6af38fa445a3fcf6099121e7e253fb69c2 Mon Sep 17 00:00:00 2001
From: pawkrol <pawel.krol@futurum.tech>
Date: Wed, 5 Dec 2018 12:59:45 +0100
Subject: [PATCH 686/836] Fix tests

---
 types/mathjs/index.d.ts      |  7 ++++++-
 types/mathjs/mathjs-tests.ts | 18 ++++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/types/mathjs/index.d.ts b/types/mathjs/index.d.ts
index 7917ce417e..e335421701 100644
--- a/types/mathjs/index.d.ts
+++ b/types/mathjs/index.d.ts
@@ -2578,7 +2578,8 @@ declare namespace math {
          * @param object An object with functions to be imported.
          * @param options An object with import options.
          */
-        import(object: object | Array<object>, options: ImportOptions);
+        import(object: ImportObject | ImportObject[], options: ImportOptions): void;
+        // TypeScript Version: 2.4
 
         /**
          * It may not exists - this is _only_ for import functionality.
@@ -4561,4 +4562,8 @@ declare namespace math {
         silent?: boolean;
         wrap?: boolean;
     }
+
+    interface ImportObject {
+        [key: string]: any;
+    }
 }
diff --git a/types/mathjs/mathjs-tests.ts b/types/mathjs/mathjs-tests.ts
index babfa3ff37..c5eadb82a5 100644
--- a/types/mathjs/mathjs-tests.ts
+++ b/types/mathjs/mathjs-tests.ts
@@ -392,3 +392,21 @@ JSON serialization/deserialization
 	const parsed = JSON.parse(stringified, math.json.reviver);
 	parsed.bigNumber === math.bignumber('1.5'); // true
 }
+
+/*
+Extend functionality with import
+ */
+{
+    const testFun = function() {
+        return 5;
+    };
+
+    math.import({
+        testFun,
+        value: 10
+    }, {});
+
+    math.testFun();
+
+    const a = math.value * 2;
+}

From 237b96f0783ee45dc9d82d3b121e1f01e59c7aab Mon Sep 17 00:00:00 2001
From: arichter83 <ar@5mm.de>
Date: Wed, 5 Dec 2018 13:11:30 +0100
Subject: [PATCH 687/836] Fixes validate(..., {keys: []}) with keys selection

---
 types/simpl-schema/index.d.ts            | 17 ++---------------
 types/simpl-schema/simpl-schema-tests.ts |  2 +-
 2 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/types/simpl-schema/index.d.ts b/types/simpl-schema/index.d.ts
index 1317b50d45..b3445ed2d3 100644
--- a/types/simpl-schema/index.d.ts
+++ b/types/simpl-schema/index.d.ts
@@ -5,7 +5,6 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 declare module 'simpl-schema' {
-
 export class ValidationContext {
     constructor(ss: any);
     addValidationErrors(errors: any): void;
@@ -133,6 +132,7 @@ interface ValidationOption {
     clean?: boolean;
     filter?: boolean;
     upsertextendedCustomContext?: boolean;
+    keys?: string[];
 }
 
 interface SimpleSchemaValidationContextStaticKeys {
@@ -188,24 +188,12 @@ export const SimpleSchema: SimpleSchemaStatic;
 export const SimpleSchemaValidationContext: SimpleSchemaValidationContextStatic;
 export const MongoObject: MongoObjectStatic;
 
-export interface SimpleSchema {
+export interface SimpleSchema extends SimpleSchemaStatic {
     debug: boolean;
     validate(obj: any, options?: ValidationOption): void;
     addValidator(validator: () => boolean): any;
     extendOptions(options: {[key: string]: any}): void;
     messages(messages: any): void;
-    RegEx: {
-      Email: RegExp;
-      Domain: RegExp;
-      WeakDomain: RegExp;
-      IP: RegExp;
-      IPv4: RegExp;
-      IPv6: RegExp;
-      Url: RegExp;
-      Id: RegExp;
-      ZipCode: RegExp;
-      Phone: RegExp;
-    };
 }
 
 export interface MongoObject {
@@ -213,5 +201,4 @@ export interface MongoObject {
 }
 
 export default SimpleSchema;
-
 }
diff --git a/types/simpl-schema/simpl-schema-tests.ts b/types/simpl-schema/simpl-schema-tests.ts
index 50181c373f..6373107aa3 100644
--- a/types/simpl-schema/simpl-schema-tests.ts
+++ b/types/simpl-schema/simpl-schema-tests.ts
@@ -32,7 +32,7 @@ StringSchema.validate({
     basicString: "Test",
     limitedString: "pro",
     regExpString: "id"
-});
+}, {keys: ['basicString']});
 
 const StringSchemaWithOptions = new SimpleSchema({
     basicString: {

From b725a1d28c75f0d59a76f4abe6da95e695a55977 Mon Sep 17 00:00:00 2001
From: Lukas Schmidt <lukas.schmidt@hypoport.de>
Date: Wed, 5 Dec 2018 13:37:16 +0100
Subject: [PATCH 688/836] iframe-resizer: declare namespace

---
 types/iframe-resizer/iframe-resizer-tests.ts |   8 +-
 types/iframe-resizer/index.d.ts              | 580 ++++++++++---------
 2 files changed, 314 insertions(+), 274 deletions(-)

diff --git a/types/iframe-resizer/iframe-resizer-tests.ts b/types/iframe-resizer/iframe-resizer-tests.ts
index 1efe701f9a..2f459c16a7 100644
--- a/types/iframe-resizer/iframe-resizer-tests.ts
+++ b/types/iframe-resizer/iframe-resizer-tests.ts
@@ -1,9 +1,9 @@
-import iframeResizer, { IFrameComponent, IFrameOptions } from "iframe-resizer";
+import iframeResizer = require("iframe-resizer");
 
 function testOne(): void {
   const iframe: HTMLIFrameElement = document.createElement('iframe');
-  const options: IFrameOptions = {log: true};
-  const components: IFrameComponent[] = iframeResizer(options, iframe);
+  const options: iframeResizer.IFrameOptions = {log: true};
+  const components: iframeResizer.IFrameComponent[] = iframeResizer(options, iframe);
   if (components) {
     components.forEach(component => console.log(component.iFrameResizer));
   } else {
@@ -13,7 +13,7 @@ function testOne(): void {
 
 function testTwo(): void {
   const iframe: HTMLIFrameElement = document.createElement('iframe');
-  const components: IFrameComponent[] = iframeResizer({
+  const components: iframeResizer.IFrameComponent[] = iframeResizer({
     initCallback: () => {
       console.log('Init');
     },
diff --git a/types/iframe-resizer/index.d.ts b/types/iframe-resizer/index.d.ts
index 920c80b3a7..5f3cb19c7d 100644
--- a/types/iframe-resizer/index.d.ts
+++ b/types/iframe-resizer/index.d.ts
@@ -3,275 +3,315 @@
 // Definitions by: Armin Baljic <https://github.com/arminbaljic>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-// tslint:disable-next-line:interface-name
-export interface IFrameObject {
-  close(): void;
-  moveToAnchor(anchor: string): void;
-  resize(): void;
-  sendMessage(message: any, targetOrigin?: string): void;
+declare namespace iframeResizer {
+  // tslint:disable-next-line:interface-name
+  interface IFrameObject {
+    close(): void;
+
+    moveToAnchor(anchor: string): void;
+
+    resize(): void;
+
+    sendMessage(
+      message: any,
+      targetOrigin?: string
+    ): void;
+  }
+
+  // tslint:disable-next-line:interface-name
+  interface IFrameComponent extends HTMLIFrameElement {
+    iFrameResizer: IFrameObject;
+  }
+
+  // tslint:disable-next-line:interface-name
+  interface IFrameOptions {
+    /**
+     * When enabled changes to the Window size or the DOM will cause the iFrame to resize to the new content size.
+     * Disable if using size method with custom dimensions.
+     */
+    autoResize?: boolean;
+    /**
+     * Override the body background style in the iFrame.
+     */
+    bodyBackground?: string;
+    /**
+     * Override the default body margin style in the iFrame. A string can be any valid value for the
+     * CSS margin attribute, for example '8px 3em'. A number value is converted into px.
+     */
+    bodyMargin?: number | string;
+    /**
+     * Override the default body padding style in the iFrame. A string can be any valid value for the
+     * CSS margin attribute, for example '8px 3em'. A number value is converted into px.
+     */
+    bodyPadding?: number | string;
+    /**
+     * When set to true, only allow incoming messages from the domain listed in the src property of the iFrame tag.
+     * If your iFrame navigates between different domains, ports or protocols; then you will need to
+     * provide an array of URLs or disable this option.
+     */
+    checkOrigin?: boolean | string[];
+    /**
+     * When enabled in page linking inside the iFrame and from the iFrame to the parent page will be enabled.
+     */
+    inPageLinks?: boolean;
+    /**
+     * Height calculation method.
+     */
+    heightCalculationMethod?: HeightCalculationMethod;
+    /**
+     * Set iFrame Id
+     */
+    id?: string;
+    /**
+     * In browsers that don't support mutationObserver, such as IE10, the library falls back to using
+     * setInterval, to check for changes to the page size.
+     */
+    interval?: number;
+    /**
+     * Setting the log option to true will make the scripts in both the host page and the iFrame output
+     * everything they do to the JavaScript console so you can see the communication between the two scripts.
+     */
+    log?: boolean;
+    /**
+     * Set maximum height of iFrame.
+     */
+    maxHeight?: number;
+    /**
+     * Set maximum width of iFrame.
+     */
+    maxWidth?: number;
+    /**
+     * Set minimum height of iFrame.
+     */
+    minHeight?: number;
+    /**
+     * Set minimum width of iFrame.
+     */
+    minWidth?: number;
+    /**
+     * Listen for resize events from the parent page, or the iFrame. Select the 'child' value if the iFrame
+     * can be resized independently of the browser window. Selecting this value can cause issues with some
+     * height calculation methods on mobile devices.
+     */
+    resizeFrom?: 'parent' | 'child';
+    /**
+     * Enable scroll bars in iFrame.
+     */
+    scrolling?: boolean | 'auto';
+    /**
+     * Resize iFrame to content height.
+     */
+    sizeHeight?: boolean;
+    /**
+     * Resize iFrame to content width.
+     */
+    sizeWidth?: boolean;
+    /**
+     * Set the number of pixels the iFrame content size has to change by, before triggering a resize of the iFrame.
+     */
+    tolerance?: number;
+    /**
+     * Width calculation method.
+     */
+    widthCalculationMethod?: WidthCalculationMethod;
+
+    /**
+     * Called when iFrame is closed via parentIFrame.close() or iframe.iframeResizer.close() methods.
+     */
+    closedCallback?(iframeId: string): void;
+
+    /**
+     * Initial setup callback function.
+     */
+    initCallback?(iframe: IFrameComponent): void;
+
+    /**
+     * Receive message posted from iFrame with the parentIFrame.sendMessage() method.
+     */
+    messageCallback?(data: IFrameMessageData): void;
+
+    /**
+     * Function called after iFrame resized. Passes in messageData object containing the iFrame, height, width
+     * and the type of event that triggered the iFrame to resize.
+     */
+    resizedCallback?(data: IFrameResizedData): void;
+
+    /**
+     * Called before the page is repositioned after a request from the iFrame, due to either an in page link,
+     * or a direct request from either parentIFrame.scrollTo() or parentIFrame.scrollToOffset().
+     * If this callback function returns false, it will stop the library from repositioning the page, so that
+     * you can implement your own animated page scrolling instead.
+     */
+    scrollCallback?(data: IFrameScrollData): boolean;
+  }
+
+  // tslint:disable-next-line:interface-name
+  interface IFramePageOptions {
+    /**
+     * This option allows you to restrict the domain of the parent page,
+     * to prevent other sites mimicking your parent page.
+     */
+    targetOrigin?: string;
+
+    /**
+     * Receive message posted from the parent page with the iframe.iFrameResizer.sendMessage() method.
+     */
+    messageCallback?(message: any): void;
+
+    /**
+     * This function is called once iFrame-Resizer has been initialized after receiving a call from the parent page.
+     */
+    readyCallback?(): void;
+
+    /**
+     * These option can be used to override the option set in the parent page
+     */
+    heightCalculationMethod?: HeightCalculationMethod | (() => number);
+    /**
+     * These option can be used to override the option set in the parent page
+     */
+    widthCalculationMethod?: WidthCalculationMethod | (() => number);
+  }
+
+  type HeightCalculationMethod = 'bodyOffset' | 'bodyScroll' | 'documentElementOffset' | 'documentElementScroll' |
+    'max' | 'min' | 'grow' | 'lowestElement' | 'taggedElement';
+
+  type WidthCalculationMethod = 'bodyOffset' | 'bodyScroll' | 'documentElementOffset' | 'documentElementScroll' |
+    'max' | 'min' | 'scroll' | 'rightMostElement' | 'taggedElement';
+
+  // tslint:disable-next-line:interface-name
+  interface IFramePage {
+    /**
+     * Turn autoResizing of the iFrame on and off. Returns bool of current state.
+     */
+    autoResize(resize?: boolean): boolean;
+
+    /**
+     * Remove the iFrame from the parent page.
+     */
+    close(): void;
+
+    /**
+     * Returns the ID of the iFrame that the page is contained in.
+     */
+    getId(): string;
+
+    /**
+     * Ask the containing page for its positioning coordinates.
+     *
+     * Your callback function will be recalled when the parent page is scrolled or resized.
+     *
+     * Pass false to disable the callback.
+     */
+    getPageInfo(callback: ((data: PageInfo) => void) | false): void;
+
+    /**
+     * Scroll the parent page to the coordinates x and y
+     */
+    scrollTo(
+      x: number,
+      y: number
+    ): void;
+
+    /**
+     * Scroll the parent page to the coordinates x and y relative to the position of the iFrame.
+     */
+    scrollToOffset(
+      x: number,
+      y: number
+    ): void;
+
+    /**
+     * Send data to the containing page, message can be any data type that can be serialized into JSON. The `targetOrigin`
+     * option is used to restrict where the message is sent to; to stop an attacker mimicking your parent page.
+     * See the MDN documentation on postMessage for more details.
+     */
+    sendMessage(
+      message: any,
+      targetOrigin?: string
+    ): void;
+
+    /**
+     * Change the method use to workout the height of the iFrame.
+     */
+    setHeightCalculationMethod(method: HeightCalculationMethod): void;
+
+    /**
+     * Change the method use to workout the width of the iFrame.
+     */
+    setWidthCalculationMethod(method: WidthCalculationMethod): void;
+
+    /**
+     * Set default target origin.
+     */
+    setTargetOrigin(targetOrigin: string): void;
+
+    /**
+     * Manually force iFrame to resize. To use passed arguments you need first to disable the `autoResize` option to
+     * prevent auto resizing and enable the `sizeWidth` option if you wish to set the width.
+     */
+    size(
+      customHeight?: string,
+      customWidth?: string
+    ): void;
+  }
+
+  interface PageInfo {
+    /**
+     * The height of the iframe in pixels
+     */
+    iframeHeight: number;
+    /**
+     * The width of the iframe in pixels
+     */
+    iframeWidth: number;
+    /**
+     * The height of the viewport in pixels
+     */
+    clientHeight: number;
+    /**
+     * The width of the viewport in pixels
+     */
+    clientWidth: number;
+    /**
+     * The number of pixels between the left edge of the containing page and the left edge of the iframe
+     */
+    offsetLeft: number;
+    /**
+     * The number of pixels between the top edge of the containing page and the top edge of the iframe
+     */
+    offsetTop: number;
+    /**
+     * The number of pixels between the left edge of the iframe and the left edge of the iframe viewport
+     */
+    scrollLeft: number;
+    /**
+     * The number of pixels between the top edge of the iframe and the top edge of the iframe viewport
+     */
+    scrollTop: number;
+  }
+
+  // tslint:disable-next-line:interface-name
+  interface IFrameResizedData {
+    iframe: IFrameComponent;
+    height: number;
+    width: number;
+    type: string;
+  }
+
+  // tslint:disable-next-line:interface-name
+  interface IFrameMessageData {
+    iframe: IFrameComponent;
+    message: any;
+  }
+
+  // tslint:disable-next-line:interface-name
+  interface IFrameScrollData {
+    x: number;
+    y: number;
+  }
 }
 
-// tslint:disable-next-line:interface-name
-export interface IFrameComponent extends HTMLIFrameElement {
-  iFrameResizer: IFrameObject;
-}
-
-// tslint:disable-next-line:interface-name
-export interface IFrameOptions {
-  /**
-   * When enabled changes to the Window size or the DOM will cause the iFrame to resize to the new content size.
-   * Disable if using size method with custom dimensions.
-   */
-  autoResize?: boolean;
-  /**
-   * Override the body background style in the iFrame.
-   */
-  bodyBackground?: string;
-  /**
-   * Override the default body margin style in the iFrame. A string can be any valid value for the
-   * CSS margin attribute, for example '8px 3em'. A number value is converted into px.
-   */
-  bodyMargin?: number | string;
-  /**
-   * Override the default body padding style in the iFrame. A string can be any valid value for the
-   * CSS margin attribute, for example '8px 3em'. A number value is converted into px.
-   */
-  bodyPadding?: number | string;
-  /**
-   * When set to true, only allow incoming messages from the domain listed in the src property of the iFrame tag.
-   * If your iFrame navigates between different domains, ports or protocols; then you will need to
-   * provide an array of URLs or disable this option.
-   */
-  checkOrigin?: boolean | string[];
-  /**
-   * When enabled in page linking inside the iFrame and from the iFrame to the parent page will be enabled.
-   */
-  inPageLinks?: boolean;
-  /**
-   * Height calculation method.
-   */
-  heightCalculationMethod?: HeightCalculationMethod;
-  /**
-   * Set iFrame Id
-   */
-  id?: string;
-  /**
-   * In browsers that don't support mutationObserver, such as IE10, the library falls back to using
-   * setInterval, to check for changes to the page size.
-   */
-  interval?: number;
-  /**
-   * Setting the log option to true will make the scripts in both the host page and the iFrame output
-   * everything they do to the JavaScript console so you can see the communication between the two scripts.
-   */
-  log?: boolean;
-  /**
-   * Set maximum height of iFrame.
-   */
-  maxHeight?: number;
-  /**
-   * Set maximum width of iFrame.
-   */
-  maxWidth?: number;
-  /**
-   * Set minimum height of iFrame.
-   */
-  minHeight?: number;
-  /**
-   * Set minimum width of iFrame.
-   */
-  minWidth?: number;
-  /**
-   * Listen for resize events from the parent page, or the iFrame. Select the 'child' value if the iFrame
-   * can be resized independently of the browser window. Selecting this value can cause issues with some
-   * height calculation methods on mobile devices.
-   */
-  resizeFrom?: 'parent' | 'child';
-  /**
-   * Enable scroll bars in iFrame.
-   */
-  scrolling?: boolean | 'auto';
-  /**
-   * Resize iFrame to content height.
-   */
-  sizeHeight?: boolean;
-  /**
-   * Resize iFrame to content width.
-   */
-  sizeWidth?: boolean;
-  /**
-   * Set the number of pixels the iFrame content size has to change by, before triggering a resize of the iFrame.
-   */
-  tolerance?: number;
-  /**
-   * Width calculation method.
-   */
-  widthCalculationMethod?: WidthCalculationMethod;
-  /**
-   * Called when iFrame is closed via parentIFrame.close() or iframe.iframeResizer.close() methods.
-   */
-  closedCallback?(iframeId: string): void;
-  /**
-   * Initial setup callback function.
-   */
-  initCallback?(iframe: IFrameComponent): void;
-  /**
-   * Receive message posted from iFrame with the parentIFrame.sendMessage() method.
-   */
-  messageCallback?(data: IFrameMessageData): void;
-  /**
-   * Function called after iFrame resized. Passes in messageData object containing the iFrame, height, width
-   * and the type of event that triggered the iFrame to resize.
-   */
-  resizedCallback?(data: IFrameResizedData): void;
-  /**
-   * Called before the page is repositioned after a request from the iFrame, due to either an in page link,
-   * or a direct request from either parentIFrame.scrollTo() or parentIFrame.scrollToOffset().
-   * If this callback function returns false, it will stop the library from repositioning the page, so that
-   * you can implement your own animated page scrolling instead.
-   */
-  scrollCallback?(data: IFrameScrollData): boolean;
-}
-
-// tslint:disable-next-line:interface-name
-export interface IFramePageOptions {
-  /**
-   * This option allows you to restrict the domain of the parent page,
-   * to prevent other sites mimicking your parent page.
-   */
-  targetOrigin?: string;
-  /**
-   * Receive message posted from the parent page with the iframe.iFrameResizer.sendMessage() method.
-   */
-  messageCallback?(message: any): void;
-  /**
-   * This function is called once iFrame-Resizer has been initialized after receiving a call from the parent page.
-   */
-  readyCallback?(): void;
-  /**
-   * These option can be used to override the option set in the parent page
-   */
-  heightCalculationMethod?: HeightCalculationMethod | (() => number);
-  /**
-   * These option can be used to override the option set in the parent page
-   */
-  widthCalculationMethod?: WidthCalculationMethod | (() => number);
-}
-
-export type HeightCalculationMethod = 'bodyOffset' | 'bodyScroll' | 'documentElementOffset' | 'documentElementScroll' |
-  'max' | 'min' | 'grow' | 'lowestElement' | 'taggedElement';
-
-  export type WidthCalculationMethod = 'bodyOffset' | 'bodyScroll' | 'documentElementOffset' | 'documentElementScroll' |
-  'max' | 'min' | 'scroll' | 'rightMostElement' | 'taggedElement';
-
-// tslint:disable-next-line:interface-name
-export interface IFramePage {
-  /**
-   * Turn autoResizing of the iFrame on and off. Returns bool of current state.
-   */
-  autoResize(resize?: boolean): boolean;
-  /**
-   * Remove the iFrame from the parent page.
-   */
-  close(): void;
-  /**
-   * Returns the ID of the iFrame that the page is contained in.
-   */
-  getId(): string;
-  /**
-   * Ask the containing page for its positioning coordinates.
-   *
-   * Your callback function will be recalled when the parent page is scrolled or resized.
-   *
-   * Pass false to disable the callback.
-   */
-  getPageInfo(callback: ((data: PageInfo) => void) | false): void;
-  /**
-   * Scroll the parent page to the coordinates x and y
-   */
-  scrollTo(x: number, y: number): void;
-  /**
-   * Scroll the parent page to the coordinates x and y relative to the position of the iFrame.
-   */
-  scrollToOffset(x: number, y: number): void;
-  /**
-   * Send data to the containing page, message can be any data type that can be serialized into JSON. The `targetOrigin`
-   * option is used to restrict where the message is sent to; to stop an attacker mimicking your parent page.
-   * See the MDN documentation on postMessage for more details.
-   */
-  sendMessage(message: any, targetOrigin?: string): void;
-  /**
-   * Change the method use to workout the height of the iFrame.
-   */
-  setHeightCalculationMethod(method: HeightCalculationMethod): void;
-  /**
-   * Change the method use to workout the width of the iFrame.
-   */
-  setWidthCalculationMethod(method: WidthCalculationMethod): void;
-  /**
-   * Set default target origin.
-   */
-  setTargetOrigin(targetOrigin: string): void;
-  /**
-   * Manually force iFrame to resize. To use passed arguments you need first to disable the `autoResize` option to
-   * prevent auto resizing and enable the `sizeWidth` option if you wish to set the width.
-   */
-  size(customHeight?: string, customWidth?: string): void;
-}
-
-export interface PageInfo {
-  /**
-   * The height of the iframe in pixels
-   */
-  iframeHeight: number;
-  /**
-   * The width of the iframe in pixels
-   */
-  iframeWidth: number;
-  /**
-   * The height of the viewport in pixels
-   */
-  clientHeight: number;
-  /**
-   * The width of the viewport in pixels
-   */
-  clientWidth: number;
-  /**
-   * The number of pixels between the left edge of the containing page and the left edge of the iframe
-   */
-  offsetLeft: number;
-  /**
-   * The number of pixels between the top edge of the containing page and the top edge of the iframe
-   */
-  offsetTop: number;
-  /**
-   * The number of pixels between the left edge of the iframe and the left edge of the iframe viewport
-   */
-  scrollLeft: number;
-  /**
-   * The number of pixels between the top edge of the iframe and the top edge of the iframe viewport
-   */
-  scrollTop: number;
-}
-
-// tslint:disable-next-line:interface-name
-export interface IFrameResizedData {
-  iframe: IFrameComponent;
-  height: number;
-  width: number;
-  type: string;
-}
-
-// tslint:disable-next-line:interface-name
-export interface IFrameMessageData {
-  iframe: IFrameComponent;
-  message: any;
-}
-
-// tslint:disable-next-line:interface-name
-export interface IFrameScrollData {
-  x: number;
-  y: number;
-}
-
-export default function iframeResizer(options: IFrameOptions, target: string | HTMLElement): IFrameComponent[];
+declare function iframeResizer(options: iframeResizer.IFrameOptions, target: string | HTMLElement): iframeResizer.IFrameComponent[];
+export = iframeResizer;
+export as namespace iframeResizer;

From 2837928c08099a1a520fd27bb26ab0bb6bdee711 Mon Sep 17 00:00:00 2001
From: arichter83 <ar@5mm.de>
Date: Wed, 5 Dec 2018 13:59:13 +0100
Subject: [PATCH 689/836] Worked on ValidationContext

---
 types/simpl-schema/index.d.ts | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/types/simpl-schema/index.d.ts b/types/simpl-schema/index.d.ts
index b3445ed2d3..54d0a5665d 100644
--- a/types/simpl-schema/index.d.ts
+++ b/types/simpl-schema/index.d.ts
@@ -4,18 +4,13 @@
 //                 Qkramer <https://github.com/Qkramer>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module 'simpl-schema' {
-export class ValidationContext {
-    constructor(ss: any);
+export interface ValidationContext extends SimpleSchemaValidationContextStatic {
+    // constructor(ss: any);
     addValidationErrors(errors: any): void;
     clean(...args: any[]): any;
     getErrorForKey(key: any, ...args: any[]): any;
-    isValid(): any;
-    keyErrorMessage(key: any, ...args: any[]): any;
-    keyIsInvalid(key: any, ...args: any[]): any;
     reset(): void;
     setValidationErrors(errors: any): void;
-    validate(obj: any, ...args: any[]): any;
     validationErrors(): any;
 }
 
@@ -88,7 +83,7 @@ interface SimpleSchemaStatic {
   messages(messages: any): any;
   messageForError(type: any, key: any, def: any, value: any): string;
   allowsKey(key: any): string;
-  newContext(): SimpleSchemaValidationContextStatic;
+  newContext(): ValidationContext;
   objectKeys(keyPrefix: any): any[];
   validate(obj: any, options?: ValidationOption): void;
   validator(options: ValidationOption): () => boolean;
@@ -201,4 +196,3 @@ export interface MongoObject {
 }
 
 export default SimpleSchema;
-}

From d595e11e17d9fef0f90b531be473942a544c42d6 Mon Sep 17 00:00:00 2001
From: Hanna <hanna@Hannas-Work-Mac.local>
Date: Wed, 5 Dec 2018 14:07:26 +0100
Subject: [PATCH 690/836] Fix incorrect method name

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

diff --git a/types/slate/index.d.ts b/types/slate/index.d.ts
index a8ed67d541..8c20d89cdd 100644
--- a/types/slate/index.d.ts
+++ b/types/slate/index.d.ts
@@ -319,7 +319,7 @@ export class Text extends Immutable.Record({}) {
     addMark(index: number, length: number, mark: Mark): Text;
     addMarks(index: number, lenght: number, marks: Immutable.Set<Mark>): Text;
     getLeaves(decorations?: Range[]): Immutable.List<Leaf>;
-    getActiveMarksBetweenOffset(
+    getActiveMarksBetweenOffsets(
         startOffset: number,
         endOffset: number
     ): Immutable.Set<Mark>;

From b73032965927680102116ccb597ea89f80836372 Mon Sep 17 00:00:00 2001
From: Hanna <hanna@Hannas-Work-Mac.local>
Date: Wed, 5 Dec 2018 14:10:22 +0100
Subject: [PATCH 691/836] Fix my name

Might as well while Im here
---
 types/slate/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/slate/index.d.ts b/types/slate/index.d.ts
index 8c20d89cdd..9494aef1c0 100644
--- a/types/slate/index.d.ts
+++ b/types/slate/index.d.ts
@@ -7,7 +7,7 @@
 //                 Kalley Powell <https://github.com/kalley>
 //                 Francesco Agnoletto <https://github.com/Kornil>
 //                 Irwan Fario Subastian <https://github.com/isubasti>
-//                 Sebastian Greaves <https://github.com/sgreav>
+//                 Hanna Greaves <https://github.com/sgreav>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 import * as Immutable from "immutable";

From d5106d2476ef23245b736d3cee33886dd1af43db Mon Sep 17 00:00:00 2001
From: Silas Rech <silas@panascais.net>
Date: Wed, 5 Dec 2018 15:31:15 +0100
Subject: [PATCH 692/836] =?UTF-8?q?[sass]=20add=20missing=20=E2=80=98forma?=
 =?UTF-8?q?tted=E2=80=99=20property?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://github.com/sass/dart-sass/blob/f914c390676b97fc8de86a24072e0112095dd4ce/lib/src/node.dart#L384
---
 types/sass/index.d.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/types/sass/index.d.ts b/types/sass/index.d.ts
index 0131836143..bd416d9718 100644
--- a/types/sass/index.d.ts
+++ b/types/sass/index.d.ts
@@ -136,6 +136,11 @@ export interface SassException extends Error {
      */
     message: string;
 
+    /**
+     * The formatted error.
+     */
+    formatted: string;
+
     /**
      * The line number of error.
      */

From b4cc8ebfabdeea13b386a57e34e641867fd99dd9 Mon Sep 17 00:00:00 2001
From: Dimitri Benin <dimitri.benin@gmail.com>
Date: Wed, 5 Dec 2018 15:25:22 +0100
Subject: [PATCH 693/836] Fix toobusy-js types, add docs

---
 types/toobusy-js/index.d.ts          | 55 ++++++++++++++++++++++++++--
 types/toobusy-js/toobusy-js-tests.ts | 18 ++++++---
 2 files changed, 64 insertions(+), 9 deletions(-)

diff --git a/types/toobusy-js/index.d.ts b/types/toobusy-js/index.d.ts
index 2d7f2688a7..2e6aca6c4b 100644
--- a/types/toobusy-js/index.d.ts
+++ b/types/toobusy-js/index.d.ts
@@ -1,19 +1,66 @@
 // Type definitions for toobusy-js 0.5
 // Project: https://github.com/STRML/node-toobusy
 // Definitions by: Arne Schubert <https://github.com/atd-schubert>
+//                 BendingBender <https://github.com/BendingBender>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 export = toobusy_js;
 
+/**
+ * Main export function.
+ * @return True if node process is too busy.
+ */
 declare function toobusy_js(): boolean;
 
 declare namespace toobusy_js {
-    function interval(newInterval: number): number;
+    /**
+     * Sets or gets the current check interval.
+     * If you want more sensitive checking, set a faster (lower) interval. A lower maxLag can also create a more
+     * sensitive check.
+     * @param  [newInterval] New interval to set. If not provided, will return the existing interval.
+     * @return               New or existing interval.
+     */
+    function interval(newInterval?: number): number;
+    /**
+     * Returns last lag reading from last check interval.
+     * @return Lag in ms.
+     */
     function lag(): number;
-    function maxLag(newLag: number): number;
-    function smoothingFactor(newFactor: number): number;
+    /**
+     * Set or get the current max latency threshold. Default is 70ms.
+     *
+     * Note that if event loop lag goes over this threshold, the process is not always 'too busy' - the farther
+     * it goes over the threshold, the more likely the process will be considered too busy.
+     *
+     * The percentage is equal to the percent over the max lag threshold. So 1.25x over the maxLag will indicate
+     * too busy 25% of the time. 2x over the maxLag threshold will indicate too busy 100% of the time.
+     * @param  [newLag] New maxLag (highwater) threshold.
+     * @return          New or existing maxLag (highwater) threshold.
+     */
+    function maxLag(newLag?: number): number;
+    /**
+     * Set or get the smoothing factor. Default is 0.3333....
+     *
+     * The smoothing factor per the standard exponential smoothing formula "αtn + (1-α)tn-1"
+     * See: https://en.wikipedia.org/wiki/Exponential_smoothing
+     *
+     * @param  [newFactor] New smoothing factor.
+     * @return             New or existing smoothing factor.
+     */
+    function smoothingFactor(newFactor?: number): number;
+    /**
+     * Shuts down toobusy.
+     *
+     * Not necessary to call this manually, only do this if you know what you're doing. `unref()` is called
+     * on toobusy's check interval, so it will never keep the server open.
+     */
     function shutdown(): void;
+    /**
+     * Registers an event listener for lag events,
+     * optionally specify a minimum value threshold for events being emitted
+     * @param fn                 Function of form onLag(value: number) => void
+     * @param [threshold=maxLag] Optional minimum lag value for events to be emitted
+     */
     function onLag(fn: (lag: number) => void, threshold?: number): void;
-
     function started(): boolean;
 }
diff --git a/types/toobusy-js/toobusy-js-tests.ts b/types/toobusy-js/toobusy-js-tests.ts
index 121b84ddb4..2678dcc777 100644
--- a/types/toobusy-js/toobusy-js-tests.ts
+++ b/types/toobusy-js/toobusy-js-tests.ts
@@ -1,4 +1,4 @@
-import toobusy = require("toobusy-js");
+import toobusy = require('toobusy-js');
 
 let numberValue = 1;
 let booleanValue = true;
@@ -7,11 +7,19 @@ booleanValue = toobusy();
 booleanValue = toobusy.started();
 
 numberValue = toobusy.interval(numberValue);
+numberValue = toobusy.interval();
 numberValue = toobusy.lag();
 numberValue = toobusy.maxLag(numberValue);
+numberValue = toobusy.maxLag();
 numberValue = toobusy.smoothingFactor(numberValue);
-
-toobusy.onLag((duration: number) => {});
-toobusy.onLag((duration: number) => {}, numberValue);
-
+numberValue = toobusy.smoothingFactor();
 toobusy.shutdown();
+
+toobusy.onLag(duration => {
+    // $ExpectType number
+    duration;
+});
+toobusy.onLag(duration => {
+    // $ExpectType number
+    duration;
+}, numberValue);

From 3f3542a24e52d34680e07a0fd988e42111f99367 Mon Sep 17 00:00:00 2001
From: Daniel Dyla <daniel.dyla@dynatrace.com>
Date: Wed, 5 Dec 2018 10:07:08 -0500
Subject: [PATCH 694/836] Add SessionEntityClient service calls

---
 types/dialogflow/index.d.ts | 54 ++++++++++++++++++++++++++++++++-----
 1 file changed, 47 insertions(+), 7 deletions(-)

diff --git a/types/dialogflow/index.d.ts b/types/dialogflow/index.d.ts
index c421c47f68..8329021bb8 100644
--- a/types/dialogflow/index.d.ts
+++ b/types/dialogflow/index.d.ts
@@ -23,12 +23,7 @@ export namespace v2 {
         searchAgents(
             request: SearchAgentRequest,
             options?: gax.CallOptions,
-            cb?: (
-                err: Error,
-                agents: Agent[],
-                arg3: any,
-                response: any
-            ) => void
+            cb?: (err: Error, agents: Agent[], arg3: any, response: any) => void
         ): Promise<Agent[]>;
         searchAgentsStream(
             request: SearchAgentRequest,
@@ -213,7 +208,28 @@ export namespace v2 {
         getProjectId(): Promise<string>;
         getProjectId(callback?: (error: Error, id: string) => string): void;
 
-        // TODO: add Session Entity Types service methods
+        // TODO: add streaming calls
+
+        listSessionEntityTypes(
+            request: ListSessionEntityTypesRequest,
+            options?: gax.CallOptions
+        ): Promise<[SessionEntityType[]]>;
+        getSessionEntityType(
+            request: GetSessionEntityTypeRequest,
+            options?: gax.CallOptions
+        ): Promise<[SessionEntityType]>;
+        createSessionEntityType(
+            request: CreateSessionEntityTypeRequest,
+            options?: gax.CallOptions
+        ): Promise<[SessionEntityType]>;
+        updateSessionEntityType(
+            request: UpdateSessionEntityTypeRequest,
+            options?: gax.CallOptions
+        ): Promise<[SessionEntityType]>;
+        deleteSessionEntityType(
+            request: DeleteSessionEntityTypeRequest,
+            options?: gax.CallOptions
+        ): Promise<void>;
     }
 
     class SessionsClient {
@@ -504,6 +520,30 @@ export interface DeleteEntityTypeRequest {
     name: string;
 }
 
+export interface ListSessionEntityTypesRequest {
+    parent: string;
+    pageSize?: number;
+}
+
+export interface GetSessionEntityTypeRequest {
+    name: string;
+}
+
+export interface CreateSessionEntityTypeRequest {
+    parent: string;
+    sessionEntityType: SessionEntityType;
+}
+
+export interface UpdateSessionEntityTypeRequest {
+    sessionEntityType: SessionEntityType;
+    /** @link https://github.com/google/protobuf/blob/master/src/google/protobuf/field_mask.proto */
+    updateMask: any;
+}
+
+export interface DeleteSessionEntityTypeRequest {
+    name: string;
+}
+
 export interface ListIntentsRequest {
     parent: string;
     languageCode?: string;

From 2ef5b8cb2dea6a9baa53d62f10ce10a4d84dc3ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karl=20J=2E=20Over=C3=A5?= <k@rl.run>
Date: Wed, 5 Dec 2018 16:36:34 +0100
Subject: [PATCH 695/836] Update eureka-js-client to 4.4 typing

---
 .../eureka-js-client-tests.ts                 | 24 +++++++++++++++++++
 types/eureka-js-client/index.d.ts             | 11 ++++++---
 2 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/types/eureka-js-client/eureka-js-client-tests.ts b/types/eureka-js-client/eureka-js-client-tests.ts
index 109dab0278..b4b5c5f54e 100644
--- a/types/eureka-js-client/eureka-js-client-tests.ts
+++ b/types/eureka-js-client/eureka-js-client-tests.ts
@@ -19,3 +19,27 @@ const client = new Eureka({
     port: 32768,
   }
 });
+
+// example configuration against newer Eureka (https://www.npmjs.com/package/eureka-js-client#400-bad-request-errors-from-eureka-server)
+const newerClient = new Eureka({
+  // application instance information
+  instance: {
+    app: 'jqservice',
+    hostName: 'localhost',
+    ipAddr: '127.0.0.1',
+    port: {
+      $: 443,
+      '@enabled': true
+    },
+    vipAddress: 'jq.test.something.com',
+    dataCenterInfo: {
+      '@class': 'com.netflix.appinfo.InstanceInfo$DefaultDataCenterInfo',
+      name: 'MyOwn',
+    },
+  },
+  eureka: {
+    // eureka server host / port
+    host: '192.168.99.100',
+    port: 32768,
+  }
+});
diff --git a/types/eureka-js-client/index.d.ts b/types/eureka-js-client/index.d.ts
index bfd9f10666..693e1b8ec8 100644
--- a/types/eureka-js-client/index.d.ts
+++ b/types/eureka-js-client/index.d.ts
@@ -1,6 +1,6 @@
-// Type definitions for eureka-js-client 4.3
+// Type definitions for eureka-js-client 4.4
 // Project: https://github.com/jquatier/eureka-js-client
-// Definitions by: Ilko Hoffmann <https://github.com/Schnillz>
+// Definitions by: Ilko Hoffmann <https://github.com/Schnillz>, Karl O. <https://github.com/karl-run>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 export class Eureka {
@@ -26,7 +26,7 @@ export namespace EurekaClient {
         ipAddr: string;
         vipAddress: string;
         dataCenterInfo: DataCenterInfo;
-        port?: number;
+        port?: number | LegacyPortWrapper;
         instanceId?: string;
         appGroupName?: string;
         sid?: string;
@@ -61,6 +61,10 @@ export namespace EurekaClient {
         useLocalMetadata?: boolean;
         preferIpAddress?: boolean;
     }
+    interface LegacyPortWrapper {
+        '$': number;
+        '@enabled': boolean;
+    }
     interface PortWrapper {
         enabled: boolean;
         port: number;
@@ -71,5 +75,6 @@ export namespace EurekaClient {
     }
     interface DataCenterInfo {
         name: DataCenterName;
+        '@class'?: string;
     }
 }

From 0e0d9592b38a2a7ae549b61435e233bc5fb87312 Mon Sep 17 00:00:00 2001
From: Dmitry Guketlev <yavanosta@yandex-team.ru>
Date: Wed, 5 Dec 2018 17:34:04 +0300
Subject: [PATCH 696/836] Typings for punycode package

---
 types/punycode/index.d.ts        | 16 ++++++++++++++++
 types/punycode/punycode-tests.ts | 11 +++++++++++
 types/punycode/tsconfig.json     | 23 +++++++++++++++++++++++
 types/punycode/tslint.json       |  1 +
 4 files changed, 51 insertions(+)
 create mode 100644 types/punycode/index.d.ts
 create mode 100644 types/punycode/punycode-tests.ts
 create mode 100644 types/punycode/tsconfig.json
 create mode 100644 types/punycode/tslint.json

diff --git a/types/punycode/index.d.ts b/types/punycode/index.d.ts
new file mode 100644
index 0000000000..a3048a5e28
--- /dev/null
+++ b/types/punycode/index.d.ts
@@ -0,0 +1,16 @@
+// Type definitions for punycode 2.1
+// Project: https://mths.be/punycode
+// Definitions by: Dmitry Guketlev <https://github.com/yavanosta>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export function decode(input: string): string;
+export function encode(input: string): string;
+export function toUnicode(input: string): string;
+export function toASCII(input: string): string;
+
+export namespace ucs2 {
+    function decode(string: string): number[];
+    function encode(array: ReadonlyArray<number>): string;
+}
+
+export const version: string;
diff --git a/types/punycode/punycode-tests.ts b/types/punycode/punycode-tests.ts
new file mode 100644
index 0000000000..4de954fbc7
--- /dev/null
+++ b/types/punycode/punycode-tests.ts
@@ -0,0 +1,11 @@
+import punycode = require('punycode');
+
+const result1: string = punycode.decode('x');
+const result2: string = punycode.encode('x');
+const result3: string = punycode.toASCII('x');
+const result4: string = punycode.toUnicode('x');
+
+const ucs2result1: number[] = punycode.ucs2.decode('x');
+const ucs2result2: string = punycode.ucs2.encode([1, 2, 3]);
+
+const version: string = punycode.version;
diff --git a/types/punycode/tsconfig.json b/types/punycode/tsconfig.json
new file mode 100644
index 0000000000..0474c0a874
--- /dev/null
+++ b/types/punycode/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "punycode-tests.ts"
+    ]
+}
diff --git a/types/punycode/tslint.json b/types/punycode/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/punycode/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From fa7edccac867cee4a397160e164e1bfae2f3b90f Mon Sep 17 00:00:00 2001
From: Ari Lotter <arilotter@gmail.com>
Date: Wed, 5 Dec 2018 11:36:51 -0500
Subject: [PATCH 697/836] [three] Euler.onChange returns the Euler instance.

As per https://github.com/mrdoob/three.js/blob/1675680a7763a16010bf1254a8576e5c1b149b55/src/math/Euler.js#L339-L345
---
 types/three/three-core.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/three/three-core.d.ts b/types/three/three-core.d.ts
index 955eb45faf..003c6a70f6 100755
--- a/types/three/three-core.d.ts
+++ b/types/three/three-core.d.ts
@@ -3562,7 +3562,7 @@ export class Euler {
     fromArray(xyzo: any[]): Euler;
     toArray(array?: number[], offset?: number): number[];
     toVector3(optionalResult?: Vector3): Vector3;
-    onChange(callback: Function): void;
+    onChange(callback: Function): this;
 
     static RotationOrders: string[];
     static DefaultOrder: string;

From 8b75a98c101dc69ca2ccfbe8c195c25e9f300e9c Mon Sep 17 00:00:00 2001
From: Dimitri Benin <dimitri.benin@gmail.com>
Date: Wed, 5 Dec 2018 19:08:30 +0100
Subject: [PATCH 698/836] Update types for common-tags to v1.8

---
 types/common-tags/common-tags-tests.ts | 333 +++++++++++++++----------
 types/common-tags/index.d.ts           | 271 +++++++++++++++-----
 types/common-tags/tslint.json          |  78 +-----
 3 files changed, 417 insertions(+), 265 deletions(-)

diff --git a/types/common-tags/common-tags-tests.ts b/types/common-tags/common-tags-tests.ts
index e504624943..37a1fba789 100644
--- a/types/common-tags/common-tags-tests.ts
+++ b/types/common-tags/common-tags-tests.ts
@@ -1,167 +1,242 @@
-import * as commonTags from 'common-tags';
+import {
+    html,
+    safeHtml,
+    oneLine,
+    oneLineTrim,
+    stripIndent,
+    stripIndents,
+    inlineLists,
+    oneLineInlineLists,
+    commaLists,
+    commaListsOr,
+    commaListsAnd,
+    oneLineCommaLists,
+    oneLineCommaListsOr,
+    oneLineCommaListsAnd,
+    id,
+    TemplateTag,
+    trimResultTransformer,
+    stripIndentTransformer,
+    replaceResultTransformer,
+    replaceSubstitutionTransformer,
+    inlineArrayTransformer,
+    splitStringTransformer,
+    createTag,
+    TemplateTransformer,
+    replaceStringTransformer,
+} from 'common-tags';
 
-/* Test Built-in Tags */
-
-commonTags.commaLists `
-  I like ${['apples', 'bananas', 'watermelons']}
-  They're good!
+const userMessages = ['hi', 'what are you up to?', '<script>alert("something evil")</script>'];
+html`
+    <div class="chat-list">
+        <ul>
+            ${userMessages.map(message => safeHtml`<li>${message}</li>`)}
+        </ul>
+    </div>
 `;
 
-commonTags.commaListsAnd`
-  I like ${['apples', 'bananas', 'watermelons']}
-  They're good!
-`;
-
-commonTags.commaListsOr`
-  I like ${['apples', 'bananas', 'watermelons']}
-  They're good!
-`;
-
-let fruits = ['apple', 'orange', 'watermelon'];
-
-commonTags.html`
-  <div class="list">
-    <ul>
-      ${fruits.map(fruit => `<li>${fruit}</li>`)}
-      ${'<li>kiwi</li>\n<li>guava</li>'}
-    </ul>
-  </div>
-`;
-
-commonTags.codeBlock`
-  <div class="list">
-    <ul>
-      ${fruits.map(fruit => `<li>${fruit}</li>`)}
-      ${'<li>kiwi</li>\n<li>guava</li>'}
-    </ul>
-  </div>
-`;
-
-commonTags.source`
-  <div class="list">
-    <ul>
-      ${fruits.map(fruit => `<li>${fruit}</li>`)}
-      ${'<li>kiwi</li>\n<li>guava</li>'}
-    </ul>
-  </div>
-`;
-
-let userMessages = ['hi', 'what are you up to?', '<script>alert("something evil")</script>']
-commonTags.html`
-  <div class="chat-list">
-    <ul>
-      ${userMessages.map(message => commonTags.safeHtml`<li>${message}</li>`)}
-    </ul>
-  </div>
-`
-
-commonTags.oneLine`
+oneLine`
   foo
   bar
   baz
 `;
 
-commonTags.oneLineTrim`
+oneLineTrim`
   https://news.com/article
   ?utm_source=designernews.co
 `;
 
-commonTags.oneLineCommaLists`
-  I like ${['apples', 'bananas', 'watermelons']}
-  They're good!
-`;
-
-commonTags.oneLineCommaListsOr`
-  I like ${['apples', 'bananas', 'watermelons']}
-  They're good!
-`;
-
-commonTags.oneLineCommaListsAnd`
-  I like ${['apples', 'bananas', 'watermelons']}
-  They're good!
-`;
-
-commonTags.inlineLists`
-  I like ${['apples', 'bananas', 'watermelons']}
-  They're good!
-`;
-
-commonTags.oneLineInlineLists`
-  I like ${['apples', 'bananas', 'watermelons']}
-  They're good!
-`;
-
-let verb = 'notice';
-
-commonTags.stripIndent`
+const verb = 'notice';
+stripIndent`
   This is a multi-line string.
   You'll ${verb} that it is indented.
   We don't want to output this indentation.
     But we do want to keep this line indented.
 `;
 
-commonTags.stripIndents`
+stripIndents`
   This is a multi-line string.
   You'll ${verb} that it is indented.
   We don't want to output this indentation.
     We don't want to keep this line indented either.
 `;
 
-/* Test Tag Constructor */
+inlineLists`
+  I like ${['apples', 'bananas', 'watermelons']}
+  They're good!
+`;
 
-new commonTags.TemplateTag();
+oneLineInlineLists`
+  I like ${['apples', 'bananas', 'watermelons']}
+  They're good!
+`;
 
-const substitutionReplacer = (oldValue : string, newValue : string) => ({
-    onSubstitution(substitution : string, resultSoFar : string) {
+commaLists`
+  I like ${['apples', 'bananas', 'watermelons']}
+  They're good!
+`;
+
+commaListsOr`
+  I like ${['apples', 'bananas', 'watermelons']}
+  They're good!
+`;
+
+commaListsAnd`
+  I like ${['apples', 'bananas', 'watermelons']}
+  They're good!
+`;
+
+oneLineCommaLists`
+  I like ${['apples', 'bananas', 'watermelons']}
+  They're good!
+`;
+
+oneLineCommaListsOr`
+  I like ${['apples', 'bananas', 'watermelons']}
+  They're good!
+`;
+
+oneLineCommaListsAnd`
+  I like ${['apples', 'bananas', 'watermelons']}
+  They're good!
+`;
+
+id`hello ${'world'}`;
+
+oneLine(String.raw)`
+  foo
+  bar\nbaz
+`;
+
+stripIndent('  foo\n    bar');
+
+const doNothing = createTag();
+doNothing`foo bar`;
+
+const substitutionReplacer = (oldValue: string, newValue: string): TemplateTransformer => ({
+    onSubstitution(substitution, resultSoFar) {
         if (substitution === oldValue) {
             return newValue;
         }
         return substitution;
-    }
+    },
 });
 
-new commonTags.TemplateTag(substitutionReplacer('fizz', 'buzz'));
+const replaceFizzWithBuzz = createTag(substitutionReplacer('fizz', 'buzz'));
+replaceFizzWithBuzz`foo bar ${'fizz'}`;
 
-new commonTags.TemplateTag(
-    substitutionReplacer('fizz', 'buzz'),
-    substitutionReplacer('foo', 'bar')
+createTag();
+createTag(substitutionReplacer('fizz', 'buzz'));
+createTag(substitutionReplacer('fizz', 'buzz'), substitutionReplacer('foo', 'bar'));
+createTag([substitutionReplacer('fizz', 'buzz'), substitutionReplacer('foo', 'bar')]);
+new TemplateTag();
+new TemplateTag(substitutionReplacer('fizz', 'buzz'));
+new TemplateTag(substitutionReplacer('fizz', 'buzz'), substitutionReplacer('foo', 'bar'));
+new TemplateTag([substitutionReplacer('fizz', 'buzz'), substitutionReplacer('foo', 'bar')]);
+
+const tt: TemplateTransformer<{ foo: string }> = {
+    getInitialContext() {
+        return { foo: 'bar' };
+    },
+    onString(str, context) {
+        // $ExpectType string
+        str;
+        // $ExpectType { foo: string; }
+        context;
+        return '';
+    },
+    onSubstitution(substitution, resultSoFar, context) {
+        // $ExpectType string
+        substitution;
+        // $ExpectType string
+        resultSoFar;
+        // $ExpectType { foo: string; }
+        context;
+        return '';
+    },
+    onEndResult(endResult, context) {
+        // $ExpectType string
+        endResult;
+        // $ExpectType { foo: string; }
+        context;
+        return '';
+    },
+};
+
+createTag({});
+createTag(tt);
+createTag({
+    onString: str => `${str}!`,
+});
+createTag({
+    onSubstitution: substitution => `${substitution}!`,
+});
+createTag({
+    onEndResult: endResult => `${endResult}!`,
+});
+new TemplateTag({});
+new TemplateTag(tt);
+new TemplateTag({
+    onString: str => `${str}!`,
+});
+new TemplateTag({
+    onSubstitution: substitution => `${substitution}!`,
+});
+new TemplateTag({
+    onEndResult: endResult => `${endResult}!`,
+});
+
+createTag(trimResultTransformer());
+createTag(trimResultTransformer(''));
+createTag(trimResultTransformer('start'));
+createTag(trimResultTransformer('end'));
+createTag(trimResultTransformer('left'));
+createTag(trimResultTransformer('right'));
+
+createTag(stripIndentTransformer());
+createTag(stripIndentTransformer('initial'));
+createTag(stripIndentTransformer('all'));
+
+createTag(replaceResultTransformer('foo', 'bar'));
+createTag(replaceResultTransformer(/baz/g, 'bar'));
+createTag(
+    replaceResultTransformer(/baz/g, (substring, ...matches) => {
+        // $ExpectType string
+        substring;
+        // $ExpectType any[]
+        matches;
+        return '';
+    })
 );
 
-new commonTags.TemplateTag([
-    substitutionReplacer('fizz', 'buzz'),
-    substitutionReplacer('foo', 'bar')
-]);
+createTag(replaceSubstitutionTransformer('foo', 'bar'));
+createTag(replaceSubstitutionTransformer(/baz/g, 'bar'));
+createTag(
+    replaceSubstitutionTransformer(/baz/g, (substring, ...matches) => {
+        // $ExpectType string
+        substring;
+        // $ExpectType any[]
+        matches;
+        return '';
+    })
+);
 
-new commonTags.TemplateTag({});
+createTag(replaceStringTransformer('foo', 'bar'));
+createTag(replaceStringTransformer(/baz/g, 'bar'));
+createTag(
+    replaceStringTransformer(/baz/g, (substring, ...matches) => {
+        // $ExpectType string
+        substring;
+        // $ExpectType any[]
+        matches;
+        return '';
+    })
+);
 
-new commonTags.TemplateTag({
-    onEndResult: endResult => `${endResult}!`
-});
+createTag(inlineArrayTransformer());
+createTag(inlineArrayTransformer({}));
+createTag(inlineArrayTransformer({ separator: 'foo' }));
+createTag(inlineArrayTransformer({ conjunction: 'bar' }));
+createTag(inlineArrayTransformer({ serial: true }));
 
-new commonTags.TemplateTag({
-    onSubstitution: substitution => `${substitution}!`,
-    onEndResult: endResult => `${endResult}!`
-});
-
-/* Tests Built-in Transformers */
-
-new commonTags.TemplateTag(commonTags.trimResultTransformer());
-new commonTags.TemplateTag(commonTags.trimResultTransformer('left'));
-new commonTags.TemplateTag(commonTags.trimResultTransformer('right'));
-
-new commonTags.TemplateTag(commonTags.stripIndentTransformer());
-new commonTags.TemplateTag(commonTags.stripIndentTransformer('initial'));
-new commonTags.TemplateTag(commonTags.stripIndentTransformer('all'));
-
-new commonTags.TemplateTag(commonTags.replaceResultTransformer('foo', 'bar'));
-new commonTags.TemplateTag(commonTags.replaceSubstitutionTransformer(/baz/g, 'bar'));
-
-new commonTags.TemplateTag(commonTags.replaceSubstitutionTransformer('foo', 'bar'));
-new commonTags.TemplateTag(commonTags.replaceSubstitutionTransformer(/baz/g, 'bar'));
-
-new commonTags.TemplateTag(commonTags.inlineArrayTransformer());
-new commonTags.TemplateTag(commonTags.inlineArrayTransformer({}));
-new commonTags.TemplateTag(commonTags.inlineArrayTransformer({separator: 'foo'}));
-new commonTags.TemplateTag(commonTags.inlineArrayTransformer({conjunction: 'bar'}));
-
-new commonTags.TemplateTag(commonTags.splitStringTransformer('foo'));
+createTag(splitStringTransformer('foo'));
diff --git a/types/common-tags/index.d.ts b/types/common-tags/index.d.ts
index 65f0b61673..3a12c91109 100644
--- a/types/common-tags/index.d.ts
+++ b/types/common-tags/index.d.ts
@@ -1,67 +1,220 @@
-// Type definitions for common-tags v1.4.0
+// Type definitions for common-tags 1.8
 // Project: https://github.com/declandewet/common-tags
 // Definitions by: Viktor Zozuliak <https://github.com/zuzusik>
 //                 Paul Wang <https://github.com/tzupengwang>
+//                 BendingBender <https://github.com/BendingBender>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
-declare module 'common-tags' {
-    type TemplateTag = (literals: TemplateStringsArray, ...placeholders: any[]) => string;
+export as namespace commonTags;
 
-    type TemplateTransformer = {
-        onSubstitution?: (substitution: string, resultSoFar: string) => string;
-        onEndResult?: (endResult : string) => string;
-    }
+export type JSTag = (literals: TemplateStringsArray, ...placeholders: any[]) => string;
 
-    /* Built-in Tags */
-    export var commaLists: TemplateTag;
-
-    export var commaListsAnd: TemplateTag;
-
-    export var commaListsOr: TemplateTag;
-
-    export var html: TemplateTag;
-
-    export var codeBlock: TemplateTag;
-
-    export var source: TemplateTag;
-
-    export var safeHtml: TemplateTag;
-
-    export var oneLine: TemplateTag;
-
-    export var oneLineTrim: TemplateTag;
-
-    export var oneLineCommaLists: TemplateTag;
-
-    export var oneLineCommaListsOr: TemplateTag;
-
-    export var oneLineCommaListsAnd: TemplateTag;
-
-    export var inlineLists: TemplateTag;
-
-    export var oneLineInlineLists: TemplateTag;
-
-    export var stripIndent: TemplateTag;
-
-    export var stripIndents: TemplateTag;
-
-    /* New Tag Constructor */
-    export var TemplateTag: {
-        new(): TemplateTag;
-        new(...transformers: TemplateTransformer[]): TemplateTag;
-        new(transformers: TemplateTransformer[]): TemplateTag;
-    };
-
-    /* Built-in Transformers */
-    export var trimResultTransformer: (side?: 'left'|'right') => TemplateTransformer;
-
-    export var stripIndentTransformer: (type?: 'initial'|'all') => TemplateTransformer;
-
-    export var replaceResultTransformer: (replaceWhat: string|RegExp, replaceWith: string) => TemplateTransformer;
-
-    export var replaceSubstitutionTransformer: (replaceWhat: string|RegExp, replaceWith: string) => TemplateTransformer;
-
-    export var inlineArrayTransformer: (opts?: {separator?: string, conjunction?: string}) => TemplateTransformer;
-
-    export var splitStringTransformer: (splitBy: string) => TemplateTransformer;
+export interface TemplateTag {
+    (str: string): string;
+    (tag: JSTag): TemplateTag;
+    (literals: TemplateStringsArray, ...placeholders: any[]): string;
 }
+
+/**
+ * You'll often find that you might want to include an array in a template.
+ * Typically, doing something like `${array.join(', ')}` would work - but what if you're printing a list of items
+ * in an HTML template and want to maintain the indentation? You'd have to count the spaces manually and include
+ * them in the `.join()` call - which is a bit ugly for my taste.
+ * This tag properly indents arrays, as well as newline characters in string substitutions,
+ * by converting them to an array split by newline and re-using the same array inclusion logic.
+ */
+export const html: TemplateTag;
+
+/**
+ * alias for `html`
+ */
+export const codeBlock: TemplateTag;
+
+/**
+ * alias for `html`
+ */
+export const source: TemplateTag;
+
+/**
+ * A tag very similar to `html` but it does safe HTML escaping for strings coming from substitutions.
+ * When combined with regular `html` tag, you can do basic HTML templating that is safe from
+ * XSS (Cross-Site Scripting) attacks.
+ */
+export const safeHtml: TemplateTag;
+
+/**
+ * Allows you to keep your single-line strings under 80 characters without resorting to crazy string concatenation.
+ */
+export const oneLine: TemplateTag;
+
+/**
+ * Allows you to keep your single-line strings under 80 characters while trimming the new lines.
+ */
+export const oneLineTrim: TemplateTag;
+
+/**
+ * If you want to strip the initial indentation from the beginning of each line in a multiline string.
+ * Important note: this tag will not indent multiline strings coming from the substitutions.
+ * If you want that behavior, use the `html` tag (aliases: `source`, `codeBlock`).
+ */
+export const stripIndent: TemplateTag;
+
+/**
+ * If you want to strip *all* of the indentation from the beginning of each line in a multiline string.
+ */
+export const stripIndents: TemplateTag;
+
+/**
+ * Allows you to inline an array substitution as a list.
+ */
+export const inlineLists: TemplateTag;
+
+/**
+ * Allows you to inline an array substitution as a list, rendered out on a single line.
+ */
+export const oneLineInlineLists: TemplateTag;
+
+/**
+ * Allows you to inline an array substitution as a comma-separated list.
+ */
+export const commaLists: TemplateTag;
+
+/**
+ * Allows you to inline an array substitution as a comma-separated list, the last of which is preceded by the word "or".
+ */
+export const commaListsOr: TemplateTag;
+
+/**
+ * Allows you to inline an array substitution as a comma-separated list, the last of which is preceded by the word "and".
+ */
+export const commaListsAnd: TemplateTag;
+
+/**
+ * Allows you to inline an array substitution as a comma-separated list, and is rendered out on to a single line.
+ */
+export const oneLineCommaLists: TemplateTag;
+
+/**
+ * Allows you to inline an array substitution as a comma-separated list, the last of which is preceded by the word "or", and is rendered out on to a single line.
+ */
+export const oneLineCommaListsOr: TemplateTag;
+
+/**
+ * Allows you to inline an array substitution as a comma-separated list, the last of which is preceded by the word "and", and is rendered out on to a single line.
+ */
+export const oneLineCommaListsAnd: TemplateTag;
+
+/**
+ * A no-op tag that might come in useful in some scenarios, e.g. mocking.
+ */
+export const id: TemplateTag;
+
+export interface TemplateTransformer<TCtx = { [key: string]: any }> {
+    /**
+     * Called before everything else.
+     * The result of this hook will be passed to other hooks as `context`.
+     * If omitted, `context` will be an empty object.
+     */
+    getInitialContext?: () => TCtx;
+    /**
+     * Called when the tag encounters a string.
+     * (a string is whatever's not inside "${}" in your template literal)
+     * `str` is the value of the current string
+     */
+    onString?: (str: string, context: TCtx) => string;
+    /**
+     * Called when the tag encounters a substitution.
+     * (a substitution is whatever's inside "${}" in your template literal)
+     * `substitution` is the value of the current substitution
+     * `resultSoFar` is the end result up to the point of this substitution
+     */
+    onSubstitution?: (substitution: string, resultSoFar: string, context: TCtx) => string;
+    /**
+     * Called when all substitutions have been parsed
+     * `endResult` is the final value.
+     */
+    onEndResult?: (endResult: string, context: TCtx) => string;
+}
+
+export type PluginFunction = (oldValue: string, newValue: string) => TemplateTransformer<any>;
+
+/**
+ * New Tag factory
+ */
+export function createTag(transformers?: Array<TemplateTransformer<any>>): TemplateTag;
+export function createTag(...transformers: Array<TemplateTransformer<any>>): TemplateTag;
+export function createTag(...pluginFunctions: PluginFunction[]): TemplateTag;
+
+export const TemplateTag: {
+    /**
+     * New Tag Constructor
+     * @deprecated
+     */
+    new (transformers?: Array<TemplateTransformer<any>>): TemplateTag;
+    new (...transformers: Array<TemplateTransformer<any>>): TemplateTag;
+    new (...pluginFunctions: PluginFunction[]): TemplateTag;
+};
+
+/**
+ * TemplateTag transformer that trims whitespace on the end result of a tagged template
+ * @param  [side=''] The side of the string to trim. Can be 'start' or 'end' (alternatively 'left' or 'right')
+ * @return a TemplateTag transformer
+ */
+export function trimResultTransformer(
+    side?: 'start' | 'end' | 'left' | 'right' | ''
+): TemplateTransformer;
+
+/**
+ * strips indentation from a template literal
+ * @param  [type='initial'] whether to remove all indentation or just leading indentation. can be 'all' or 'initial'
+ * @return a TemplateTag transformer
+ */
+export function stripIndentTransformer(type?: 'initial' | 'all'): TemplateTransformer;
+
+/**
+ * Replaces a value or pattern in the end result with a new value.
+ * @param  replaceWhat the value or pattern that should be replaced
+ * @param  replaceWith the replacement value
+ * @return a TemplateTag transformer
+ */
+export function replaceResultTransformer(
+    replaceWhat: string | RegExp,
+    replaceWith: string | ((substring: string, ...args: any[]) => string)
+): TemplateTransformer;
+
+/**
+ * Replaces the result of all substitutions (results of calling ${ ... }) with a new value.
+ * Same as for `replaceResultTransformer`, replaceWhat can be a string or regular expression and replaceWith is the new value.
+ */
+export function replaceSubstitutionTransformer(
+    replaceWhat: string | RegExp,
+    replaceWith: string | ((substring: string, ...args: any[]) => string)
+): TemplateTransformer;
+
+/**
+ * Replaces the result of all strings (what's not in ${ ... }) with a new value.
+ * Same as for `replaceResultTransformer`, replaceWhat can be a string or regular expression and replaceWith is the new value.
+ */
+export function replaceStringTransformer(
+    replaceWhat: string | RegExp,
+    replaceWith: string | ((substring: string, ...args: any[]) => string)
+): TemplateTransformer;
+
+/**
+ * Converts an array substitution to a string containing a list
+ * @param  [opts.separator=''] what to separate each item with (always followed by a space)
+ * @param  [opts.conjunction=''] replace the last separator with this value
+ * @param  [opts.serial=false] should the separator be included before the conjunction? As in the case of serial/oxford commas
+ * @return a TemplateTag transformer
+ */
+export function inlineArrayTransformer(opts?: {
+    separator?: string;
+    conjunction?: string;
+    serial?: boolean;
+}): TemplateTransformer;
+
+/**
+ * Splits a string substitution into an array by the provided splitBy substring, only if the string contains the splitBy substring.
+ */
+export function splitStringTransformer(splitBy: string): TemplateTransformer;
diff --git a/types/common-tags/tslint.json b/types/common-tags/tslint.json
index a41bf5d19a..f93cf8562a 100644
--- a/types/common-tags/tslint.json
+++ b/types/common-tags/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 56218fdbce266c90154f8f9934e25305cc1563b2 Mon Sep 17 00:00:00 2001
From: Gordon <gburgett@watermark.org>
Date: Wed, 5 Dec 2018 12:58:37 -0600
Subject: [PATCH 699/836] Define connectCurrentRefinements

---
 types/react-instantsearch-core/index.d.ts     | 44 ++++++++++++++++++-
 .../react-instantsearch-core-tests.tsx        | 19 +++++++-
 2 files changed, 61 insertions(+), 2 deletions(-)

diff --git a/types/react-instantsearch-core/index.d.ts b/types/react-instantsearch-core/index.d.ts
index e76be4ee08..71305a2406 100644
--- a/types/react-instantsearch-core/index.d.ts
+++ b/types/react-instantsearch-core/index.d.ts
@@ -128,7 +128,49 @@ export class Configure extends React.Component<any, any> {}
 export function connectAutoComplete(Composed: React.ComponentType<any>): React.ComponentClass<any>;
 export function connectBreadcrumb(Composed: React.ComponentType<any>): React.ComponentClass<any>;
 export function connectConfigure(Composed: React.ComponentType<any>): React.ComponentClass<any>;
-export function connectCurrentRefinements(Composed: React.ComponentType<any>): React.ComponentClass<any>;
+
+export interface Refinement {
+  label: string;
+  attribute: string;
+  currentRefinement: string | object;
+  items?: Array<{ label: string, value: RefinementValue }>;
+  index: string;
+  id: string;
+  value: RefinementValue;
+}
+
+type RefinementValue = (searchState: SearchState) => SearchState;
+
+export interface CurrentRefinementsExposed {
+  /**
+   * Function to modify the items being displayed, e.g. for filtering or sorting them.
+   * Takes an items as parameter and expects it back in return.
+   */
+  transformItems?: (...args: any[]) => any;
+  /** Pass true to also clear the search query */
+  clearsQuery?: boolean;
+}
+
+export interface CurrentRefinementsProvided {
+  /** a function to remove a single filter */
+  refine: (refinement: RefinementValue | RefinementValue[]) => void;
+  /**
+   * all the filters, the value is to pass to the refine function for removing all currentrefinements,
+   * label is for the display. When existing several refinements for the same atribute name, then you
+   * get a nested items object that contains a label and a value function to use to remove a single filter.
+   * attribute and currentRefinement are metadata containing row values.
+   */
+  items: Refinement[];
+  /** the search query */
+  query: string;
+}
+
+export function connectCurrentRefinements(
+  stateless: React.StatelessComponent<CurrentRefinementsProvided>,
+): React.ComponentClass<CurrentRefinementsExposed>;
+export function connectCurrentRefinements<TProps extends Partial<CurrentRefinementsProvided>>(
+  Composed: React.ComponentType<TProps>,
+): ConnectedComponentClass<TProps, CurrentRefinementsProvided, CurrentRefinementsExposed>;
 
 export interface NESW {
   northEast: { lat: number, lng: number };
diff --git a/types/react-instantsearch-core/react-instantsearch-core-tests.tsx b/types/react-instantsearch-core/react-instantsearch-core-tests.tsx
index 62bf99e3d4..d18e5a78e6 100644
--- a/types/react-instantsearch-core/react-instantsearch-core-tests.tsx
+++ b/types/react-instantsearch-core/react-instantsearch-core-tests.tsx
@@ -7,7 +7,9 @@ import {
   connectStateResults,
   SearchBoxProvided,
   connectSearchBox,
-  connectRefinementList
+  connectRefinementList,
+  CurrentRefinementsProvided,
+  connectCurrentRefinements
 } from 'react-instantsearch-core';
 
 () => {
@@ -153,3 +155,18 @@ import {
   // reading and manipulating the current query of the search.
   const ConnectedSearchBox = connectSearchBox(MySearchBox);
 };
+
+() => {
+  const MyCurrentRefinements = ({refine, items, query}: CurrentRefinementsProvided) =>
+    <>
+      {items.map((refinement) => (
+        <div key={refinement.id} onClick={() => refine(refinement.value) }>
+          <label>{refinement.label}</label>
+        </div>
+      ))}
+    </>;
+
+  const ConnectedCurrentRefinements = connectCurrentRefinements(MyCurrentRefinements);
+
+  <ConnectedCurrentRefinements clearsQuery={true} transformItems={(item) => item} />;
+};

From 30e6b2c00df6d694dab9d7f0315caf41b0eb1dbd Mon Sep 17 00:00:00 2001
From: Gordon <gburgett@watermark.org>
Date: Wed, 5 Dec 2018 13:02:29 -0600
Subject: [PATCH 700/836] Improve _highlightResult on Hit

---
 types/react-instantsearch-core/index.d.ts                 | 8 +++++++-
 .../react-instantsearch-core-tests.tsx                    | 6 ++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/types/react-instantsearch-core/index.d.ts b/types/react-instantsearch-core/index.d.ts
index 71305a2406..af86139fde 100644
--- a/types/react-instantsearch-core/index.d.ts
+++ b/types/react-instantsearch-core/index.d.ts
@@ -497,12 +497,18 @@ export interface SearchResults<TDoc = BasicDoc> {
  */
 export type Hit<TDoc = BasicDoc> = TDoc & {
   objectID: string;
+  /**
+   * Contains the searchable attributes within the document and shows which part of the
+   * attribute was matched by the search terms.  Note that if the index has defined
+   * any searchable attributes, this object will only contain those keys and others
+   * will not exist.
+   */
   '_highlightResult': HighlightResult<TDoc>;
 };
 
 export type HighlightResult<TDoc> =
   TDoc extends { [k: string]: any } ?
-    { [K in keyof TDoc]: HighlightResultField<TDoc[K]> } :
+    { [K in keyof TDoc]?: HighlightResultField<TDoc[K]> } :
     never;
 
 type HighlightResultField<TField> =
diff --git a/types/react-instantsearch-core/react-instantsearch-core-tests.tsx b/types/react-instantsearch-core/react-instantsearch-core-tests.tsx
index d18e5a78e6..1ced5dee69 100644
--- a/types/react-instantsearch-core/react-instantsearch-core-tests.tsx
+++ b/types/react-instantsearch-core/react-instantsearch-core-tests.tsx
@@ -102,9 +102,7 @@ import {
       <h1>{additionalProp}</h1>
       {searchResults.hits.map((h) => {
         // $ExpectType string
-        const compound = h._highlightResult.field3.compound.value;
-        // $ExpectType never
-        const field2 = h._highlightResult.field2;
+        const compound = h._highlightResult.field3!.compound!.value;
         return <span>{compound}</span>;
       })}
     </div>;
@@ -121,7 +119,7 @@ import {
       <h1>{additionalProp}</h1>
       {searchResults.hits.map((h) => {
         // $ExpectType string[]
-        const words = h._highlightResult.field3.compound.matchedWords;
+        const words = h._highlightResult.field3!.compound!.matchedWords;
         return <span>{h.field2}: {words.join(',')}</span>;
       })}
     </div>;

From 4801f891a4e5ea41cfa8aa246e3a45e9a6fcfff1 Mon Sep 17 00:00:00 2001
From: Gordon <gburgett@watermark.org>
Date: Wed, 5 Dec 2018 13:03:20 -0600
Subject: [PATCH 701/836] Improve events on SearchBox

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

diff --git a/types/react-instantsearch-dom/index.d.ts b/types/react-instantsearch-dom/index.d.ts
index f1dec59118..6ecb03c981 100644
--- a/types/react-instantsearch-dom/index.d.ts
+++ b/types/react-instantsearch-dom/index.d.ts
@@ -118,8 +118,9 @@ export interface SearchBoxProps extends CommonWidgetProps {
   reset?: JSX.Element;
   loadingIndicator?: JSX.Element;
 
-  onSubmit?: (...args: any[]) => any;
-  onReset?: (...args: any[]) => any;
+  onSubmit?: (event: React.SyntheticEvent<HTMLFormElement>) => any;
+  onReset?: (event: React.SyntheticEvent<HTMLFormElement>) => any;
+  onChange?: (event: React.SyntheticEvent<HTMLInputElement>) => any;
 }
 /**
  * The SearchBox component displays a search box that lets the user search for a specific query.
diff --git a/types/react-instantsearch-dom/react-instantsearch-dom-tests.tsx b/types/react-instantsearch-dom/react-instantsearch-dom-tests.tsx
index 6d9b7b55f8..e10d3fde08 100644
--- a/types/react-instantsearch-dom/react-instantsearch-dom-tests.tsx
+++ b/types/react-instantsearch-dom/react-instantsearch-dom-tests.tsx
@@ -216,6 +216,21 @@ import { Hit, connectRefinementList, connectMenu } from 'react-instantsearch-cor
   </InstantSearch>;
 };
 
+(() => {
+  function onSearchBoxChange(event: React.SyntheticEvent<HTMLInputElement>) {
+  }
+
+  function onSearchBoxReset(event: React.SyntheticEvent<HTMLFormElement>) {
+  }
+
+  function onSearchBoxSubmit(event: React.SyntheticEvent<HTMLFormElement>) {
+  }
+
+  <SearchBox
+      onChange={onSearchBoxChange} onReset={onSearchBoxReset} onSubmit={onSearchBoxSubmit}
+      submit={<></>} />;
+});
+
 import { createInstantSearch } from 'react-instantsearch-dom/server';
 // import { createServer } from 'http';
 declare function createServer(handler: (req: any, res: any) => any): any;

From 33ace784b8444eeb85e60cee92fd51a4eb601a74 Mon Sep 17 00:00:00 2001
From: Abhi Aiyer <abhiaiyer91@gmail.com>
Date: Wed, 5 Dec 2018 11:36:54 -0800
Subject: [PATCH 702/836] fix typings for chatter and metadata for finally

---
 types/jsforce/api/chatter.d.ts  | 2 ++
 types/jsforce/api/metadata.d.ts | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/types/jsforce/api/chatter.d.ts b/types/jsforce/api/chatter.d.ts
index 4e0982ca24..5c300a7b4e 100644
--- a/types/jsforce/api/chatter.d.ts
+++ b/types/jsforce/api/chatter.d.ts
@@ -41,6 +41,8 @@ export class Request<T> implements Promise<T> {
     then<TResult1, TResult2>(onfulfilled?: ((value: T) => (PromiseLike<TResult1> | TResult1)) | null | undefined,
                              onrejected?: ((reason: any) => (PromiseLike<TResult2> | TResult2)) | null | undefined): Promise<TResult1 | TResult2>;
 
+    finally(onfinally?: () => void): Promise<T>
+    
     thenCall(callback?: (err: Error, records: T) => void): Query<T>;
 
     readonly [Symbol.toStringTag]: 'Promise';
diff --git a/types/jsforce/api/metadata.d.ts b/types/jsforce/api/metadata.d.ts
index 15f0fe249e..ce7476a731 100644
--- a/types/jsforce/api/metadata.d.ts
+++ b/types/jsforce/api/metadata.d.ts
@@ -124,6 +124,8 @@ export class AsyncResultLocator<T> extends EventEmitter implements Promise<T> {
     then<TResult1, TResult2>(onfulfilled?: ((value: T) => (PromiseLike<TResult1> | TResult1)) | null | undefined,
                              onrejected?: ((reason: any) => (PromiseLike<TResult2> | TResult2)) | null | undefined): Promise<TResult1 | TResult2>;
 
+    finally(onfinally?: () => void): Promise<T>
+    
     readonly [Symbol.toStringTag]: "Promise";
 }
 

From 17211a0628a38a868f68ebc0cb624deed4648734 Mon Sep 17 00:00:00 2001
From: Alex Duka <aduka@alteryx.com>
Date: Wed, 5 Dec 2018 21:38:50 +0200
Subject: [PATCH 703/836] improved Binding field types

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

diff --git a/types/rabbitmq-schema/index.d.ts b/types/rabbitmq-schema/index.d.ts
index 49d20ea14b..3c607115ab 100644
--- a/types/rabbitmq-schema/index.d.ts
+++ b/types/rabbitmq-schema/index.d.ts
@@ -5,7 +5,7 @@
 // TypeScript Version: 2.2
 
 interface Binding {
-    destination: Topology;
+    destination: Exchange | Queue;
     source: Exchange;
     args?: object;
     routingPattern?: string;

From 622559c8f6adfaf6f2c469e3bb856500f196d42d Mon Sep 17 00:00:00 2001
From: Michael Utech <michael.utech@aka-labs.com>
Date: Wed, 5 Dec 2018 17:51:24 +0100
Subject: [PATCH 704/836] add types for caniuse-lite

---
 types/caniuse-lite/caniuse-lite-tests.ts |  48 +++++++
 types/caniuse-lite/index.d.ts            | 159 +++++++++++++++++++++++
 types/caniuse-lite/tsconfig.json         |  23 ++++
 types/caniuse-lite/tslint.json           |   1 +
 4 files changed, 231 insertions(+)
 create mode 100644 types/caniuse-lite/caniuse-lite-tests.ts
 create mode 100644 types/caniuse-lite/index.d.ts
 create mode 100644 types/caniuse-lite/tsconfig.json
 create mode 100644 types/caniuse-lite/tslint.json

diff --git a/types/caniuse-lite/caniuse-lite-tests.ts b/types/caniuse-lite/caniuse-lite-tests.ts
new file mode 100644
index 0000000000..38b09230de
--- /dev/null
+++ b/types/caniuse-lite/caniuse-lite-tests.ts
@@ -0,0 +1,48 @@
+import {
+    agents, features, feature, Agent, Feature, PackedFeature, StatsByAgentID, SupportStatusByVersion, SupportStatus
+} from "caniuse-lite";
+
+const chrome: Agent | undefined = agents.chrome;
+if (chrome !== undefined) {
+    const browser: string = chrome.browser;
+    const prefix: string = chrome.prefix;
+    const prefixExceptions: any = chrome.prefix_exceptions;
+    const usageGlobal: { [version: string]: number | undefined } = chrome.usage_global;
+    const releaseDate: { [version: string]: number | undefined } = chrome.release_date;
+    const versions: Array<string | null> = chrome.versions;
+    consume(browser, prefix, prefixExceptions, usageGlobal, releaseDate, versions);
+}
+
+const unpackedFeatures = Object.keys(features).map((id: string) => {
+    const packed: PackedFeature = features[id];
+    const unpacked: Feature = feature(packed);
+
+    const status: string = unpacked.status;
+    const title: string = unpacked.title;
+    const stats: StatsByAgentID = unpacked.stats;
+    Object.keys(stats).forEach((agentID: string) => {
+        const byVersion: SupportStatusByVersion = stats[agentID];
+        Object.keys(byVersion).forEach(version => {
+            const supportStatus: SupportStatus = byVersion[version];
+            consume(supportStatus);
+        });
+
+        const supportStatusByVersion: SupportStatusByVersion = stats[agentID];
+        const agent: Agent = agents[agentID]!;
+        return {
+            feature: unpacked,
+            agent,
+            versions: Object.keys(supportStatusByVersion).map(version => {
+                return {
+                    version,
+                    releaseDate: agent.release_date[version],
+                    [`feature_${id}`]: supportStatusByVersion[version]
+                };
+            })
+        };
+    });
+});
+
+function consume(...anything: any[]): void {
+    // ...
+}
diff --git a/types/caniuse-lite/index.d.ts b/types/caniuse-lite/index.d.ts
new file mode 100644
index 0000000000..ce4f91a35f
--- /dev/null
+++ b/types/caniuse-lite/index.d.ts
@@ -0,0 +1,159 @@
+// Type definitions for caniuse-lite 1.0
+// Project: https://github.com/ben-eb/caniuse-lite#readme
+// Definitions by: Michael Utech <https://github.com/mutech>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+/**
+ * Information about user agents (browsers, platforms) indexed by their ID.
+ */
+export const agents: AgentsByID;
+
+/**
+ * Features index by their ID. The feature ID is a human readable identifier. The
+ * associated value is a packed version of information about the feature that
+ * can be unpacked using the function `feature(packed)`
+ */
+export const features: { [featureID: string]: PackedFeature; };
+
+/**
+ * @param packedFeature a packed feature obtained from `features[key]` for some valid key.
+ * @return the unpacked information as `Feature`.
+ */
+export function feature(packedFeature: PackedFeature): Feature;
+
+/**
+ * @param packedRegion a packed version of regional usage data by agent OD.
+ * @return the unpacked usage data indexed by agent ID and then version.
+ */
+export function region(packedRegion: PackedRegion): { [agentID: string]: UsageByVersion };
+
+/**
+ * Agents indexed by their ID. .
+ */
+export type AgentsByID = Readonly<{ [id: string]: Readonly<Agent> | undefined }>;
+
+/**
+ * Feature support status by version indexed by agent ID.
+ */
+export type StatsByAgentID = Readonly<{ [agentID: string]: SupportStatusByVersion }>;
+
+/**
+ * Feature support status indexed by an agent's versions.
+ */
+export type SupportStatusByVersion = Readonly<{ [version: string]: SupportStatus }>;
+
+/**
+ * Usage (percentage/market share) indexed by an agent's versions.
+ */
+export type UsageByVersion = Readonly<{ [version: string]: number | undefined }>;
+
+/**
+ * The standardization status of a feature:
+ * * ls - WHATWG living standard
+ * * rec - W3C recommendation
+ * * pr - W3C proposed recommendation
+ * * cr - W3C candidate recommendation
+ * * wd - W3C working draft
+ * * other - Non-W3C, but reputable
+ * * unoff - Unofficial
+ */
+export type FeatureStatus = "ls" | "rec" | "pr" | "cr" | "wd" | "other" | "unoff" | string;
+
+/**
+ * Encoded support status:
+ * * `n` - not supported
+ * * `p` - not supported, polyfill available
+ * * `u` - unknown
+ * * `a x` - partially supported, vendor prefix
+ * * `a` - partially supported
+ * * `y x` - fully supported, vendor prefix
+ * * `y` - fully supported
+ *
+ * The support status can additionally have one or more footnote references as `#<n>`, f.e.
+ * `a x #1 #3`.
+ */
+export type SupportStatus = 'n' | 'p' | 'u' | "a x" | 'a' | "y x" | 'y' | string;
+
+/**
+ * Provides information about the Agent.
+ */
+export interface Agent {
+    /**
+     * Global agent usage by version
+     */
+    usage_global: UsageByVersion;
+
+    /**
+     * The agents vendor prefix
+     */
+    prefix: string;
+
+    /**
+     * Version matrix. See [caniuse](https://caniuse.com)
+     */
+    versions: [ // Tuple of 70 version slots:
+        string|null, string|null, string|null, string|null, string|null,
+        string|null, string|null, string|null, string|null, string|null,
+        string|null, string|null, string|null, string|null, string|null,
+        string|null, string|null, string|null, string|null, string|null,
+        string|null, string|null, string|null, string|null, string|null,
+        string|null, string|null, string|null, string|null, string|null,
+        string|null, string|null, string|null, string|null, string|null,
+        string|null, string|null, string|null, string|null, string|null,
+        string|null, string|null, string|null, string|null, string|null,
+        string|null, string|null, string|null, string|null, string|null,
+        string|null, string|null, string|null, string|null, string|null,
+        string|null, string|null, string|null, string|null, string|null,
+        string|null, string|null, string|null, string|null, string|null,
+        string|null, string|null, string|null, string|null, string|null ];
+
+    /**
+     * The agent's name
+     */
+    browser: string;
+
+    /**
+     * Release dates as seconds since epoch by version.
+     */
+    release_date: { [version: string]: number | undefined };
+
+    /**
+     * Exceptions to vendor prefix use.
+     */
+    prefix_exceptions?: { [version: string]: string | undefined };
+}
+
+/**
+ * Specifies a feature and its support status in all known agent versions.
+ */
+export interface Feature {
+    /**
+     * Specification status of the feature.
+     */
+    status: FeatureStatus;
+
+    /**
+     * Descriptive title of the feature.
+     */
+    title: string;
+
+    /**
+     * Agent support matrix for this feature.
+     */
+    stats: StatsByAgentID;
+}
+
+/**
+ * A space optimized version of Feature that can be unpacked using `feature(PackedFeature)`.
+ */
+export interface PackedFeature {
+    [encodedKey: string]: any;
+}
+
+/**
+ * A space optimized version of Region that can be unpacked using `region(PackedFeature)`.
+ */
+export interface PackedRegion {
+    [encodedKey: string]: any;
+}
diff --git a/types/caniuse-lite/tsconfig.json b/types/caniuse-lite/tsconfig.json
new file mode 100644
index 0000000000..adcea4d555
--- /dev/null
+++ b/types/caniuse-lite/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "caniuse-lite-tests.ts"
+    ]
+}
diff --git a/types/caniuse-lite/tslint.json b/types/caniuse-lite/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/caniuse-lite/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From b81e520dc29fb85d68891b348d26556374d3e35c Mon Sep 17 00:00:00 2001
From: Abhi Aiyer <abhiaiyer91@gmail.com>
Date: Wed, 5 Dec 2018 12:11:31 -0800
Subject: [PATCH 705/836] fix typings for chatter and metadata for finally

---
 types/jsforce/api/chatter.d.ts  | 4 ++--
 types/jsforce/api/metadata.d.ts | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/types/jsforce/api/chatter.d.ts b/types/jsforce/api/chatter.d.ts
index 5c300a7b4e..c712187559 100644
--- a/types/jsforce/api/chatter.d.ts
+++ b/types/jsforce/api/chatter.d.ts
@@ -41,8 +41,8 @@ export class Request<T> implements Promise<T> {
     then<TResult1, TResult2>(onfulfilled?: ((value: T) => (PromiseLike<TResult1> | TResult1)) | null | undefined,
                              onrejected?: ((reason: any) => (PromiseLike<TResult2> | TResult2)) | null | undefined): Promise<TResult1 | TResult2>;
 
-    finally(onfinally?: () => void): Promise<T>
-    
+    finally(onfinally?: () => void): Promise<T>;
+
     thenCall(callback?: (err: Error, records: T) => void): Query<T>;
 
     readonly [Symbol.toStringTag]: 'Promise';
diff --git a/types/jsforce/api/metadata.d.ts b/types/jsforce/api/metadata.d.ts
index ce7476a731..c6aec12e7e 100644
--- a/types/jsforce/api/metadata.d.ts
+++ b/types/jsforce/api/metadata.d.ts
@@ -124,8 +124,8 @@ export class AsyncResultLocator<T> extends EventEmitter implements Promise<T> {
     then<TResult1, TResult2>(onfulfilled?: ((value: T) => (PromiseLike<TResult1> | TResult1)) | null | undefined,
                              onrejected?: ((reason: any) => (PromiseLike<TResult2> | TResult2)) | null | undefined): Promise<TResult1 | TResult2>;
 
-    finally(onfinally?: () => void): Promise<T>
-    
+    finally(onfinally?: () => void): Promise<T>;
+
     readonly [Symbol.toStringTag]: "Promise";
 }
 

From 36e268033babcc716200192c72ba839daa43d7f9 Mon Sep 17 00:00:00 2001
From: jeremy <bensimon.jeremy@gmail.com>
Date: Wed, 5 Dec 2018 23:21:11 +0100
Subject: [PATCH 706/836] Add types for json-server

---
 types/json-server/index.d.ts           | 72 ++++++++++++++++++++++++++
 types/json-server/json-server-tests.ts | 41 +++++++++++++++
 types/json-server/tsconfig.json        | 16 ++++++
 types/json-server/tslint.json          |  1 +
 4 files changed, 130 insertions(+)
 create mode 100644 types/json-server/index.d.ts
 create mode 100644 types/json-server/json-server-tests.ts
 create mode 100644 types/json-server/tsconfig.json
 create mode 100644 types/json-server/tslint.json

diff --git a/types/json-server/index.d.ts b/types/json-server/index.d.ts
new file mode 100644
index 0000000000..c52a4b220e
--- /dev/null
+++ b/types/json-server/index.d.ts
@@ -0,0 +1,72 @@
+// Type definitions for json-server 0.14
+// Project: https://github.com/typicode/json-server
+// Definitions by: Jeremy Bensimon <https://github.com/jeremyben>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+import { NextHandleFunction } from 'connect';
+import { Application, RequestHandler, Router } from 'express';
+
+/**
+ * Returns an Express server.
+ */
+export function create(): Application;
+
+/**
+ * Returns middlewares used by JSON Server.
+ */
+export function defaults(options?: MiddlewaresOptions): RequestHandler[];
+
+/**
+ * Returns JSON Server router.
+ * @param source Either a path to a json file (e.g. `'db.json'`) or an object in memory
+ * @param options Set foreign key suffix (default: `'Id'`)
+ */
+export function router(source: string | object, options?: { foreignKeySuffix: string }): Router;
+
+/**
+ * Add custom rewrite rules.
+ */
+export function rewriter(rules: { [rule: string]: string }): Router;
+
+/**
+ * Returns body-parser middleware used by JSON Server router.
+ *
+ * @returns
+ * ```
+ * [bodyParser.json({ limit: '10mb', extended: false }), bodyParser.urlencoded({ extended: false })]
+ * ```
+ */
+export const bodyParser: [NextHandleFunction, NextHandleFunction];
+
+export interface MiddlewaresOptions {
+    /**
+     * Path to static files
+     * @default "public" (if folder exists)
+     */
+    static?: string;
+
+    /**
+     * Enable logger middleware
+     * @default true
+     */
+    logger?: boolean;
+
+    /**
+     * Enable body-parser middleware
+     * @default true
+     */
+    bodyParser?: boolean;
+
+    /**
+     * Disable CORS
+     * @default false
+     */
+    noCors?: boolean;
+
+    /**
+     * Accept only GET requests
+     * @default false
+     */
+    readOnly?: boolean;
+}
diff --git a/types/json-server/json-server-tests.ts b/types/json-server/json-server-tests.ts
new file mode 100644
index 0000000000..d68484b1ff
--- /dev/null
+++ b/types/json-server/json-server-tests.ts
@@ -0,0 +1,41 @@
+import * as jsonServer from 'json-server';
+
+const server = jsonServer.create();
+
+const inMemoryDbRouter = jsonServer.router({ todos: [] as any[], users: [] as any[] });
+
+const router = jsonServer.router('db.json', { foreignKeySuffix: '_id' });
+
+const middlewaresOptions: jsonServer.MiddlewaresOptions = {
+    bodyParser: true,
+    logger: false,
+    noCors: true,
+    readOnly: true,
+    static: 'assets',
+};
+
+const middlewares = jsonServer.defaults(middlewaresOptions);
+
+const rewriter = jsonServer.rewriter({
+    '/api/*': '/$1',
+    '/blog/:resource/:id/show': '/:resource/:id',
+});
+
+server.use(jsonServer.bodyParser);
+
+server.use((req, res, next) => {
+    if (req.method === 'POST') {
+        req.body.createdAt = Date.now();
+    }
+    next();
+});
+
+server.use(rewriter);
+
+server.use(middlewares);
+
+server.use(router);
+
+server.listen(3000, () => {
+    console.log('JSON Server is running');
+});
diff --git a/types/json-server/tsconfig.json b/types/json-server/tsconfig.json
new file mode 100644
index 0000000000..e923ac1d7a
--- /dev/null
+++ b/types/json-server/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": ["es6"],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": ["../"],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": ["index.d.ts", "json-server-tests.ts"]
+}
diff --git a/types/json-server/tslint.json b/types/json-server/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/json-server/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From b95a55fbe079cbd34adf870f68b4780a9373bde5 Mon Sep 17 00:00:00 2001
From: Minjie Shen <minjie@canva.com>
Date: Thu, 6 Dec 2018 09:36:54 +1100
Subject: [PATCH 707/836] Update style according to linter

---
 types/netease-captcha/index.d.ts              | 29 ++++++++++---------
 .../netease-captcha/netease-captcha-tests.ts  |  9 +++---
 types/netease-captcha/tsconfig.json           |  5 ++--
 3 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/types/netease-captcha/index.d.ts b/types/netease-captcha/index.d.ts
index 7a199b6d85..fbdfb03e7d 100644
--- a/types/netease-captcha/index.d.ts
+++ b/types/netease-captcha/index.d.ts
@@ -1,41 +1,40 @@
-// Type definitions for netease-captcha x.x
+// Type definitions for netease-captcha 2.1
 // Project: https://cstaticdun.126.net/load.min.js
 // Definitions by: Minjie Shen <https://github.com/norubidium>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-
-declare interface Window {
+interface Window {
     initNECaptcha?: NeteaseCaptcha.InitFunction;
 }
 
 declare namespace NeteaseCaptcha {
-    declare type InitFunction = (config: Config, onLoad?: onLoad, onError?: onError) => void;
+    type InitFunction = (config: Config, onLoad?: onLoad, onError?: onError) => void;
 
-    declare type Config = {
+    interface Config {
         /**
          * Verification code id
          */
-        captchaId: string,
+        captchaId: string;
 
         /**
          * Selector string or HTMLElement to render widget into
          */
-        element: string | HTMLElement,
+        element: string | HTMLElement;
 
         /**
          * Defaults to 'float' on desktop, and 'popup' on mobile
          */
-        mode?: 'float' | 'embed' | 'popup',
+        mode?: 'float' | 'embed' | 'popup';
 
         /**
          * Defaults to page protocol
          */
-        protocol?: 'http' | 'https',
+        protocol?: 'http' | 'https';
 
         /**
          * Defaults to 'auto'
          */
-        width?: number | string,
+        width?: number | string;
 
         /**
          * Defaults to 'zh-CN'
@@ -45,9 +44,9 @@ declare namespace NeteaseCaptcha {
         onReady?(instance: Instance): void;
 
         onVerify?(error: any, data: Data): void;
-    };
+    }
 
-    type Instance = {
+    interface Instance {
         /**
          * Refresh the instance to get new verification information
          */
@@ -62,9 +61,11 @@ declare namespace NeteaseCaptcha {
          * Available when the mode is set to 'popup' - opens the popup to accept verification
          */
         popUp?(): void;
-    };
+    }
 
-    type Data = { validate: string };
+    interface Data {
+        validate: string;
+    }
 
     type onLoad = (instance: Instance) => void;
 
diff --git a/types/netease-captcha/netease-captcha-tests.ts b/types/netease-captcha/netease-captcha-tests.ts
index 05ed51c2bb..c174affdf0 100644
--- a/types/netease-captcha/netease-captcha-tests.ts
+++ b/types/netease-captcha/netease-captcha-tests.ts
@@ -1,4 +1,4 @@
-const config : NeteaseCaptcha.Config = {
+const config: NeteaseCaptcha.Config = {
         captchaId: 'FAKE ID',
         element: '#captcha',
         mode: 'popup',
@@ -10,12 +10,11 @@ const config : NeteaseCaptcha.Config = {
         }
     };
 
-const onLoad : NeteaseCaptcha.onLoad = (instance : NeteaseCaptcha.Instance) => void {
+const onLoad: NeteaseCaptcha.onLoad = (instance: NeteaseCaptcha.Instance) => {
     instance.refresh();
     instance.destroy();
-}
+};
 
-function init(initNECaptcha : NeteaseCaptcha.InitFunction) => void {
+function init(initNECaptcha: NeteaseCaptcha.InitFunction): void {
     initNECaptcha(config, onLoad);
 }
-
diff --git a/types/netease-captcha/tsconfig.json b/types/netease-captcha/tsconfig.json
index 67a7f5dd64..11afad945f 100644
--- a/types/netease-captcha/tsconfig.json
+++ b/types/netease-captcha/tsconfig.json
@@ -1,12 +1,11 @@
 {
     "compilerOptions": {
         "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
+        "lib": ["es6", "dom"],
         "noImplicitAny": true,
         "noImplicitThis": true,
         "strictNullChecks": true,
+        "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [
             "../"

From 8b5e6afb2fee6cb6ae8b31845d18e4ff85bc49ba Mon Sep 17 00:00:00 2001
From: Alan Plum <me@pluma.io>
Date: Wed, 5 Dec 2018 23:39:57 +0100
Subject: [PATCH 708/836] Unbreak the build

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

diff --git a/types/json_ml/index.d.ts b/types/json_ml/index.d.ts
index e2eb2c7af4..7cab812880 100644
--- a/types/json_ml/index.d.ts
+++ b/types/json_ml/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/59naga/json-ml
 // Definitions by: Alan Plum <https://github.com/pluma>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 3.0
 
 /// <reference types="cheerio" />
 

From 5d5e47bc5aa15e8f499bd35b033ec297dabda48b Mon Sep 17 00:00:00 2001
From: Minjie Shen <minjie@canva.com>
Date: Thu, 6 Dec 2018 10:59:44 +1100
Subject: [PATCH 709/836] Add test for window attribute

---
 types/netease-captcha/netease-captcha-tests.ts | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/types/netease-captcha/netease-captcha-tests.ts b/types/netease-captcha/netease-captcha-tests.ts
index c174affdf0..ee73302cc1 100644
--- a/types/netease-captcha/netease-captcha-tests.ts
+++ b/types/netease-captcha/netease-captcha-tests.ts
@@ -13,8 +13,11 @@ const config: NeteaseCaptcha.Config = {
 const onLoad: NeteaseCaptcha.onLoad = (instance: NeteaseCaptcha.Instance) => {
     instance.refresh();
     instance.destroy();
+    if (instance.popUp) {
+        instance.popUp();
+    }
 };
 
-function init(initNECaptcha: NeteaseCaptcha.InitFunction): void {
-    initNECaptcha(config, onLoad);
+if (window.initNECaptcha) {
+    window.initNECaptcha(config, onLoad);
 }

From 83a6d98e96ae9f8c173e40592b4f6e3cf2d071f1 Mon Sep 17 00:00:00 2001
From: Mark Lee <electronjs@lazymalevolence.com>
Date: Wed, 5 Dec 2018 18:51:54 -0800
Subject: [PATCH 710/836] Update types for Electron Packager to 13.0

---
 .../electron-packager-tests.ts                | 37 ++++++-----------
 types/electron-packager/index.d.ts            | 41 +++++++++----------
 2 files changed, 33 insertions(+), 45 deletions(-)

diff --git a/types/electron-packager/electron-packager-tests.ts b/types/electron-packager/electron-packager-tests.ts
index 06cadf97f0..6b10ea4bf3 100644
--- a/types/electron-packager/electron-packager-tests.ts
+++ b/types/electron-packager/electron-packager-tests.ts
@@ -13,25 +13,6 @@ function ignoreFunction(path: string) {
 	return true;
 }
 
-// this is the obsolete API and will be removed in a future version
-
-packager({
-	dir: ".",
-	name: "myapplication",
-	platform: "win32",
-	arch: "all",
-	electronVersion: "0.34.0",
-	win32metadata: {
-		CompanyName: "Acme CO",
-		FileDescription: "My application",
-		OriginalFilename: "myapp.exe",
-		ProductName: "Application",
-		InternalName: "roadrunner",
-		"requested-execution-level": "highestAvailable",
-		"application-manifest": "manifest.xml"
-	}
-}, callback);
-
 function onCompleted(appPaths: string | string[]) {
 }
 
@@ -102,7 +83,7 @@ packager({
 	afterExtract: [
 		completeFunction
 	],
-	afterPrune:  [
+	afterPrune: [
 		completeFunction
 	],
 	appCopyright: "Copyright",
@@ -122,7 +103,6 @@ packager({
 	ignore: /ab+c/,
 	out: "out",
 	overwrite: true,
-	packageManager: false,
 	prune: true,
 	quiet: true,
 	tmpdir: "/tmp",
@@ -157,7 +137,6 @@ packager({
 		new RegExp('abc')
 	],
 	overwrite: false,
-	packageManager: "npm",
 	platform: "darwin",
 	prune: false,
 	quiet: false,
@@ -184,7 +163,14 @@ packager({
 		strictSSL: false
 	},
 	ignore: ignoreFunction,
-	packageManager: "cnpm",
+	platform: "linux"
+}).then(onCompleted).catch(onError);
+
+packager({
+	dir: ".",
+	arch: "mips64el",
+	electronVersion: "1.8.8",
+	prebuiltAsar: "prebuilt.asar",
 	platform: "linux"
 }).then(onCompleted).catch(onError);
 
@@ -200,11 +186,14 @@ packager({
 		quiet: true,
 		strictSSL: false
 	},
-	packageManager: "yarn",
 	platform: "mas",
 	extendInfo: {
 		foo: "bar"
 	},
+	osxNotarize: {
+		appleId: "My ID",
+		appleIdPassword: "Bad Password"
+	},
 	osxSign: {
 		identity: "myidentity",
 		entitlements: "path/to/my.entitlements",
diff --git a/types/electron-packager/index.d.ts b/types/electron-packager/index.d.ts
index 0e438ebc6e..04e62a28b5 100644
--- a/types/electron-packager/index.d.ts
+++ b/types/electron-packager/index.d.ts
@@ -1,9 +1,10 @@
-// Type definitions for electron-packager 12.0
+// Type definitions for electron-packager 13.0
 // Project: https://github.com/electron-userland/electron-packager
 // Definitions by: Maxime LUCE <https://github.com/SomaticIT>
 //                 Juan Jimenez-Anca <https://github.com/cortopy>
 //                 John Kleinschmidt <https://github.com/jkleinsc>
 //                 Brendan Forster <https://github.com/shiftkey>
+//                 Mark Lee <https://github.com/malept>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="node" />
@@ -23,20 +24,6 @@ export = electronPackager;
  */
 declare function electronPackager(opts: electronPackager.Options): Promise<string|string[]>;
 
-/**
- * This will:
- * - Find or download the correct release of Electron
- * - Use that version of electron to create a app in <out>/<appname>-<platform>-<arch>
- *
- * You should be able to launch the app on the platform you built for. If not, check your settings and try again.
- *
- * @param opts - Options to configure packaging.
- * @param callback - Callback which is called when packaging is done or an error occured.
- *
- * @deprecated since version 12.0
- */
-declare function electronPackager(opts: electronPackager.Options, callback: electronPackager.finalCallback): void;
-
 declare namespace electronPackager {
     /**
      * Callback which is called when electron-packager is done.
@@ -48,8 +35,7 @@ declare namespace electronPackager {
 
     type ignoreFunction = (path: string) => boolean;
     type onCompleteFn = (buildPath: string, electronVersion: string, platform: string, arch: string, callbackFn: () => void) => void;
-    type arch = "ia32" | "x64" | "armv7l" | "arm64" |"all";
-    type packageManager = "npm" | "cnpm" | "yarn" | false;
+    type arch = "ia32" | "x64" | "armv7l" | "arm64" | "mips64el" | "all";
     type platform = "linux" | "win32" | "darwin" | "mas" | "all";
 
     interface AsarOptions {
@@ -65,6 +51,11 @@ declare namespace electronPackager {
         strictSSL?: boolean;
     }
 
+    interface ElectronNotarizeOptions {
+        appleId: string;
+        appleIdPassword: string;
+    }
+
     interface ElectronOsXSignOptions {
         identity?: string;
         entitlements?: string;
@@ -116,6 +107,10 @@ declare namespace electronPackager {
          * Whether to package the application's source code into an archive, using Electron's archive format
          */
         asar?: boolean | AsarOptions;
+        /**
+         * The path to a prebuilt ASAR file.
+         */
+        prebuiltAsar?: string;
         /**
          * The build version of the application. Defaults to the value of appVersion.
          * Maps to the FileVersion metadata property on Windows, and CFBundleVersion on OS X.
@@ -160,10 +155,6 @@ declare namespace electronPackager {
          * Whether to replace an already existing output directory for a given platform (true) or skip recreating it (false).
          */
         overwrite?: boolean;
-        /**
-         * The package manager used to prune devDependencies modules from the outputted Electron app
-         */
-        packageManager?: packageManager;
         /**
          * The target platform(s) to build for. Not required if the all option is set.
          */
@@ -202,6 +193,14 @@ declare namespace electronPackager {
          * The bundle identifier to use in the application helper's plist.
          */
         helperBundleId?: string;
+        /**
+         * Forces support for Mojave (macOS 10.14) dark mode in the packaged app.
+         */
+        darwinDarkModeSupport?: boolean;
+        /**
+         * If present, notarizes OS X target apps when the host platform is OS X and XCode is installed.
+         */
+        osxNotarize?: ElectronNotarizeOptions;
         /**
          * If present, signs OS X target apps when the host platform is OS X and XCode is installed.
          */

From fa958ebb69b88685129d6f7fc8f081ed6f3485ab Mon Sep 17 00:00:00 2001
From: danford <dford@staff.compass.edu.au>
Date: Thu, 6 Dec 2018 15:50:48 +1100
Subject: [PATCH 711/836] remove stray semicolon

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

diff --git a/types/react-css-collapse/index.d.ts b/types/react-css-collapse/index.d.ts
index aa17200367..0fb568beef 100644
--- a/types/react-css-collapse/index.d.ts
+++ b/types/react-css-collapse/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for react-css-collapse 3.6.0
-// Project: https://github.com/SparebankenVest/react-css-collapse;
+// Project: https://github.com/SparebankenVest/react-css-collapse
 // Definitions by: Daniel Ford <https://github.com/dford07>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8

From 4facac46480208ba90e13d2c5f27beca147e5107 Mon Sep 17 00:00:00 2001
From: danford <dford@staff.compass.edu.au>
Date: Thu, 6 Dec 2018 15:51:13 +1100
Subject: [PATCH 712/836] Re-enforce nullchecks

---
 types/react-css-collapse/tsconfig.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/react-css-collapse/tsconfig.json b/types/react-css-collapse/tsconfig.json
index 4af49b9769..efb2921718 100644
--- a/types/react-css-collapse/tsconfig.json
+++ b/types/react-css-collapse/tsconfig.json
@@ -7,7 +7,7 @@
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
-        "strictNullChecks": false,
+        "strictNullChecks": true,
         "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [

From f75ae9b0aede62bef173d5fa6de0ed94fbbd8fa4 Mon Sep 17 00:00:00 2001
From: danford <dford@staff.compass.edu.au>
Date: Thu, 6 Dec 2018 15:51:45 +1100
Subject: [PATCH 713/836] Only disable necessary lint rule

---
 types/react-css-collapse/tslint.json | 75 +---------------------------
 1 file changed, 1 insertion(+), 74 deletions(-)

diff --git a/types/react-css-collapse/tslint.json b/types/react-css-collapse/tslint.json
index a41bf5d19a..9ce242b768 100644
--- a/types/react-css-collapse/tslint.json
+++ b/types/react-css-collapse/tslint.json
@@ -1,79 +1,6 @@
 {
     "extends": "dtslint/dt.json",
     "rules": {
-        "adjacent-overload-signatures": false,
-        "array-type": false,
-        "arrow-return-shorthand": false,
-        "ban-types": false,
-        "callable-types": false,
-        "comment-format": false,
-        "dt-header": false,
-        "eofline": false,
-        "export-just-namespace": false,
-        "import-spacing": false,
-        "interface-name": false,
-        "interface-over-type-literal": false,
-        "jsdoc-format": false,
-        "max-line-length": false,
-        "member-access": false,
-        "new-parens": false,
-        "no-any-union": false,
-        "no-boolean-literal-compare": false,
-        "no-conditional-assignment": false,
-        "no-consecutive-blank-lines": false,
-        "no-construct": false,
-        "no-declare-current-package": false,
-        "no-duplicate-imports": false,
-        "no-duplicate-variable": false,
-        "no-empty-interface": false,
-        "no-for-in-array": false,
-        "no-inferrable-types": false,
-        "no-internal-module": false,
-        "no-irregular-whitespace": false,
-        "no-mergeable-namespace": false,
-        "no-misused-new": false,
-        "no-namespace": false,
-        "no-object-literal-type-assertion": false,
-        "no-padding": false,
-        "no-redundant-jsdoc": false,
-        "no-redundant-jsdoc-2": false,
-        "no-redundant-undefined": false,
-        "no-reference-import": false,
-        "no-relative-import-in-test": false,
-        "no-self-import": false,
-        "no-single-declare-module": false,
-        "no-string-throw": false,
-        "no-unnecessary-callback-wrapper": false,
-        "no-unnecessary-class": false,
-        "no-unnecessary-generics": false,
-        "no-unnecessary-qualifier": false,
-        "no-unnecessary-type-assertion": false,
-        "no-useless-files": false,
-        "no-var-keyword": false,
-        "no-var-requires": false,
-        "no-void-expression": false,
-        "no-trailing-whitespace": false,
-        "object-literal-key-quotes": false,
-        "object-literal-shorthand": false,
-        "one-line": false,
-        "one-variable-per-declaration": false,
-        "only-arrow-functions": false,
-        "prefer-conditional-expression": false,
-        "prefer-const": false,
-        "prefer-declare-function": false,
-        "prefer-for-of": false,
-        "prefer-method-signature": false,
-        "prefer-template": false,
-        "radix": false,
-        "semicolon": false,
-        "space-before-function-paren": false,
-        "space-within-parens": false,
-        "strict-export-declare-modifiers": false,
-        "trim-file": false,
-        "triple-equals": false,
-        "typedef-whitespace": false,
-        "unified-signatures": false,
-        "void-return": false,
-        "whitespace": false
+        "no-duplicate-imports": false     
     }
 }

From 3f45d4caeb3ac5da6c74f4065c810da141df8b45 Mon Sep 17 00:00:00 2001
From: danford <dford@staff.compass.edu.au>
Date: Thu, 6 Dec 2018 16:24:18 +1100
Subject: [PATCH 714/836] lint adjustments

---
 types/react-css-collapse/index.d.ts  | 4 ++--
 types/react-css-collapse/tslint.json | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/types/react-css-collapse/index.d.ts b/types/react-css-collapse/index.d.ts
index 0fb568beef..e454d5946b 100644
--- a/types/react-css-collapse/index.d.ts
+++ b/types/react-css-collapse/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for react-css-collapse 3.6.0
+// Type definitions for react-css-collapse 3.6
 // Project: https://github.com/SparebankenVest/react-css-collapse
 // Definitions by: Daniel Ford <https://github.com/dford07>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -12,7 +12,7 @@ declare module 'react-css-collapse' {
     transition?: string | null;
   }
   class Collapse extends React.Component<Props> {
-    public render(): React.ReactElement<Props>;
+    render(): React.ReactElement<Props>;
   }
   export default Collapse;
 }
diff --git a/types/react-css-collapse/tslint.json b/types/react-css-collapse/tslint.json
index 9ce242b768..9e934cc4fe 100644
--- a/types/react-css-collapse/tslint.json
+++ b/types/react-css-collapse/tslint.json
@@ -1,6 +1,8 @@
 {
     "extends": "dtslint/dt.json",
     "rules": {
-        "no-duplicate-imports": false     
+        "no-single-declare-module": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false
     }
 }

From 951ef11442daac4b5873e84bcfac1b262e75299d Mon Sep 17 00:00:00 2001
From: Leko <leko.noor@gmail.com>
Date: Thu, 6 Dec 2018 16:29:51 +0900
Subject: [PATCH 715/836] Add type definitions for ghauth 3.2

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

diff --git a/types/ghauth/ghauth-tests.ts b/types/ghauth/ghauth-tests.ts
new file mode 100644
index 0000000000..7757cf24dd
--- /dev/null
+++ b/types/ghauth/ghauth-tests.ts
@@ -0,0 +1,27 @@
+import ghauth, { AuthOptions, TokenData } from "ghauth";
+
+// Full
+const authOptions1: AuthOptions = {
+    configName: "awesome",
+    noSave: true,
+    authUrl: "https://api.github.com/authorizations",
+    promptName: "GitHub",
+    scopes: ["user"],
+    note: "This token is for my awesome app",
+    userAgent: "My Awesome App",
+};
+
+ghauth(authOptions1, (err: Error, authData: TokenData) => {
+    authData.user;
+    authData.token;
+});
+
+// Required
+const authOptions2: AuthOptions = {
+    configName: "awesome",
+};
+
+ghauth(authOptions2, (err: Error, authData: TokenData) => {
+    authData.user;
+    authData.token;
+});
diff --git a/types/ghauth/index.d.ts b/types/ghauth/index.d.ts
new file mode 100644
index 0000000000..e21afdf3fa
--- /dev/null
+++ b/types/ghauth/index.d.ts
@@ -0,0 +1,45 @@
+// Type definitions for ghauth 3.2
+// Project: https://github.com/rvagg/ghauth
+// Definitions by: Leko <https://github.com/Leko>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export interface AuthOptions {
+    configName: string;
+
+    /**
+     * @default false
+     */
+    noSave?: boolean;
+
+    /**
+     * @default "https://api.github.com/authorizations"
+     */
+    authUrl?: string;
+
+    /**
+     * @default "GitHub"
+     */
+    promptName?: string;
+
+    /**
+     * @default []
+     */
+    scopes?: ReadonlyArray<string>;
+
+    /**
+     * @default "Node.js command-line app with ghauth"
+     */
+    note?: string;
+
+    /**
+     * @default "Magic Node.js application that does magic things with ghauth"
+     */
+    userAgent?: string;
+}
+
+export interface TokenData {
+    user: string;
+    token: string;
+}
+
+export default function ghauth(authOptions: AuthOptions, callback: (err: Error, tokenData: TokenData) => void): void;
diff --git a/types/ghauth/tsconfig.json b/types/ghauth/tsconfig.json
new file mode 100644
index 0000000000..0b946b4ae8
--- /dev/null
+++ b/types/ghauth/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "ghauth-tests.ts"
+    ]
+}
diff --git a/types/ghauth/tslint.json b/types/ghauth/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/ghauth/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 0df59a63921c700104afd1b1baeb0c07e3707aa3 Mon Sep 17 00:00:00 2001
From: pawkrol <pawel.krol@futurum.tech>
Date: Thu, 6 Dec 2018 09:11:42 +0100
Subject: [PATCH 716/836] Change semantics for import

---
 types/mathjs/index.d.ts      | 16 ++++++++++------
 types/mathjs/mathjs-tests.ts | 15 ++++++++++++---
 2 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/types/mathjs/index.d.ts b/types/mathjs/index.d.ts
index e335421701..a8ec6114eb 100644
--- a/types/mathjs/index.d.ts
+++ b/types/mathjs/index.d.ts
@@ -2575,16 +2575,20 @@ declare namespace math {
 
         /**
          * Import functions from an object or a module
+         * To avoid errors when using one of the imported functions extend module like this:
+         *
+         * @example
+         * // imported_math_functions.ts
+         * declare module 'mathjs' {
+         *      interface MathJsStatic {
+         *          hello(a: number): number;
+         *      }
+         * }
+         *
          * @param object An object with functions to be imported.
          * @param options An object with import options.
          */
         import(object: ImportObject | ImportObject[], options: ImportOptions): void;
-        // TypeScript Version: 2.4
-
-        /**
-         * It may not exists - this is _only_ for import functionality.
-         */
-        [key: string]: any;
     }
 
     interface Matrix {
diff --git a/types/mathjs/mathjs-tests.ts b/types/mathjs/mathjs-tests.ts
index c5eadb82a5..0d21be817e 100644
--- a/types/mathjs/mathjs-tests.ts
+++ b/types/mathjs/mathjs-tests.ts
@@ -1,3 +1,6 @@
+// Import needed for mathjs.import functionality (declaring/extending module)
+import * as math from 'mathjs';
+
 /*
 Basic usage examples
 */
@@ -396,10 +399,16 @@ JSON serialization/deserialization
 /*
 Extend functionality with import
  */
+
+declare module 'mathjs' {
+    interface MathJsStatic {
+        testFun(): number;
+        value: number;
+    }
+}
+
 {
-    const testFun = function() {
-        return 5;
-    };
+    const testFun = () => 5;
 
     math.import({
         testFun,

From 3458e059eb3bc46ae19f6486e2899bbb93edbdf0 Mon Sep 17 00:00:00 2001
From: Jonas Kugelmann <jk@secomba.com>
Date: Thu, 6 Dec 2018 09:18:05 +0100
Subject: [PATCH 717/836] Adjusted naming of WizardStepObject to StepObject

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

diff --git a/types/react-albus/index.d.ts b/types/react-albus/index.d.ts
index 371a50cca7..ccc0ac8582 100644
--- a/types/react-albus/index.d.ts
+++ b/types/react-albus/index.d.ts
@@ -9,13 +9,13 @@
 import * as React from "react";
 import { History } from "history";
 
-export interface WizardStepObject {
+export interface StepObject {
     id: string;
 }
 
 export interface WizardContext {
-    step: WizardStepObject;
-    steps: WizardStepObject[];
+    step: StepObject;
+    steps: StepObject[];
     history: History;
     next: () => void;
     previous: () => void;
@@ -42,22 +42,22 @@ export interface WizardProps {
 export const Wizard: React.ComponentType<WizardProps>;
 
 export interface StepsProps {
-    step?: WizardStepObject;
+    step?: StepObject;
 }
 
 export const Steps: React.ComponentType<StepsProps>;
 
-export type StepProps = WizardStepObject & (
+export type StepProps = StepObject & (
     | { render?: (wizard: WizardContext) => React.ReactNode }
     | { children: (wizard: WizardContext) => React.ReactNode });
 
 /**
  * In addition to id, any additional props added to <Step> will be available on each step object.
  * This can be used to add names, descriptions, or other metadata to each step.
- * To use this feature generally you need to augment the WizardStepObject
+ * To use this feature globally in your project you need to augment the StepObject
  * @example
  * declare module "react-albus" {
- *   interface WizardStepObject {
+ *   interface StepObject {
  *     propName: string;
  *   }
  * }
diff --git a/types/react-albus/react-albus-tests.tsx b/types/react-albus/react-albus-tests.tsx
index f03e57cc2e..57fe8147d1 100644
--- a/types/react-albus/react-albus-tests.tsx
+++ b/types/react-albus/react-albus-tests.tsx
@@ -2,7 +2,7 @@ import * as React from "react";
 import { Wizard, Step, Steps, withWizard } from "react-albus";
 
 declare module "react-albus" {
-    interface WizardStepObject {
+    interface StepObject {
         quote?: string;
     }
 }

From 5536ed5c7108a7a5baac3e283fcc636c45529183 Mon Sep 17 00:00:00 2001
From: Dimitri Benin <dimitri.benin@gmail.com>
Date: Wed, 5 Dec 2018 01:49:38 +0100
Subject: [PATCH 718/836] Add types for liftoff

---
 types/fined/index.d.ts         |   2 +-
 types/liftoff/index.d.ts       | 203 +++++++++++++++++++++++++++++++++
 types/liftoff/liftoff-tests.ts | 182 +++++++++++++++++++++++++++++
 types/liftoff/tsconfig.json    |  23 ++++
 types/liftoff/tslint.json      |   1 +
 5 files changed, 410 insertions(+), 1 deletion(-)
 create mode 100644 types/liftoff/index.d.ts
 create mode 100644 types/liftoff/liftoff-tests.ts
 create mode 100644 types/liftoff/tsconfig.json
 create mode 100644 types/liftoff/tslint.json

diff --git a/types/fined/index.d.ts b/types/fined/index.d.ts
index e19bad318a..107a40760c 100644
--- a/types/fined/index.d.ts
+++ b/types/fined/index.d.ts
@@ -11,7 +11,7 @@ declare namespace fined {
     interface PathSpec {
         path?: string;
         name?: string;
-        extensions?: string | string[] | { [extension: string]: string };
+        extensions?: string | string[] | { [extension: string]: string | null };
         cwd?: string;
         findUp?: boolean;
     }
diff --git a/types/liftoff/index.d.ts b/types/liftoff/index.d.ts
new file mode 100644
index 0000000000..91316ead82
--- /dev/null
+++ b/types/liftoff/index.d.ts
@@ -0,0 +1,203 @@
+// Type definitions for liftoff 2.5
+// Project: https://github.com/js-cli/js-liftoff#readme
+// Definitions by: BendingBender <https://github.com/BendingBender>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+import { Extensions, Extension, ExtensionDescriptor } from 'interpret';
+import { PathSpec } from 'fined';
+import { EventEmitter } from 'events';
+
+export = Liftoff;
+
+declare class Liftoff extends EventEmitter {
+    /**
+     * Create an instance of Liftoff to invoke your application.
+     */
+    constructor(options?: Liftoff.Options);
+
+    /**
+     * Launches your application with provided options, builds an environment,
+     * and invokes your callback, passing the calculated environment as the first argument.
+     */
+    launch(
+        opts: Liftoff.LaunchOptions,
+        callback: (this: this, env: Liftoff.LiftoffEnv) => void
+    ): void;
+
+    addListener(
+        event: 'require',
+        listener: (name: string, module: ExtensionDescriptor) => void
+    ): this;
+    addListener(event: 'requireFail', listener: (name: string, err: any) => void): this;
+    addListener(event: 'respawn', listener: (flags: string[], child: NodeJS.Process) => void): this;
+    on(event: 'require', listener: (name: string, module: ExtensionDescriptor) => void): this;
+    on(event: 'requireFail', listener: (name: string, err: any) => void): this;
+    on(event: 'respawn', listener: (flags: string[], child: NodeJS.Process) => void): this;
+    once(event: 'require', listener: (name: string, module: ExtensionDescriptor) => void): this;
+    once(event: 'requireFail', listener: (name: string, err: any) => void): this;
+    once(event: 'respawn', listener: (flags: string[], child: NodeJS.Process) => void): this;
+    prependListener(
+        event: 'require',
+        listener: (name: string, module: ExtensionDescriptor) => void
+    ): this;
+    prependListener(event: 'requireFail', listener: (name: string, err: any) => void): this;
+    prependListener(
+        event: 'respawn',
+        listener: (flags: string[], child: NodeJS.Process) => void
+    ): this;
+    prependOnceListener(
+        event: 'require',
+        listener: (name: string, module: ExtensionDescriptor) => void
+    ): this;
+    prependOnceListener(event: 'requireFail', listener: (name: string, err: any) => void): this;
+    prependOnceListener(
+        event: 'respawn',
+        listener: (flags: string[], child: NodeJS.Process) => void
+    ): this;
+    removeListener(
+        event: 'require',
+        listener: (name: string, module: ExtensionDescriptor) => void
+    ): this;
+    removeListener(event: 'requireFail', listener: (name: string, err: any) => void): this;
+    removeListener(
+        event: 'respawn',
+        listener: (flags: string[], child: NodeJS.Process) => void
+    ): this;
+    off(event: 'require', listener: (name: string, module: ExtensionDescriptor) => void): this;
+    off(event: 'requireFail', listener: (name: string, err: any) => void): this;
+    off(event: 'respawn', listener: (flags: string[], child: NodeJS.Process) => void): this;
+    removeAllListeners(event?: 'require' | 'requireFail' | 'respawn'): this;
+    listeners(event: 'require' | 'requireFail' | 'respawn'): Function[]; // tslint:disable-line:ban-types
+    rawListeners(event: 'require' | 'requireFail' | 'respawn'): Function[]; // tslint:disable-line:ban-types
+    emit(event: 'require', name: string, module: ExtensionDescriptor): boolean;
+    emit(event: 'requireFail', name: string, err: any): boolean;
+    emit(event: 'respawn', flags: string[], child: NodeJS.Process): boolean;
+    eventNames(): Array<'require' | 'requireFail' | 'respawn'>;
+    listenerCount(type: 'require' | 'requireFail' | 'respawn'): number;
+}
+
+declare namespace Liftoff {
+    interface Options {
+        /**
+         * Sugar for setting processTitle, moduleName, configName automatically.
+         * @default null
+         */
+        name?: string;
+        /**
+         * Sets which module your application expects to find locally when being run.
+         * @default null
+         */
+        moduleName?: string;
+        /**
+         * Sets the name of the configuration file Liftoff will attempt to find. Case-insensitive.
+         * @default null
+         */
+        configName?: string;
+        /**
+         * Set extensions to include when searching for a configuration file.
+         * If an external module is needed to load a given extension (e.g. .coffee),
+         * the module name should be specified as the value for the key.
+         * @default {".js":null,".json":null}
+         */
+        extensions?: Extensions;
+        /**
+         * Any flag specified here will be applied to node, not your program.
+         * Useful for supporting invocations like myapp --harmony command,
+         * where --harmony should be passed to node, not your program.
+         * This functionality is implemented using flagged-respawn.
+         * To support all v8flags, see `v8flags`.
+         * @default null
+         */
+        v8flags?: string[] | ((cb: (err: any, flags: string[]) => void) => void);
+        /**
+         * Sets what the process title will be.
+         * @default null
+         */
+        processTitle?: string;
+        /**
+         * A method to handle bash/zsh/whatever completions.
+         * @default null
+         */
+        completions?: (completion: string) => any;
+        /**
+         * An object of configuration files to find. Each property is keyed by the
+         * default basename of the file being found, and the value is an object
+         * of path arguments keyed by unique names.
+         * @default null
+         */
+        configFiles?: {
+            [extension: string]: { [locationName: string]: string | PathSpec };
+        };
+    }
+
+    interface LaunchOptions {
+        /**
+         * Change the current working directory for this launch. Relative paths are calculated against `process.cwd()`.
+         * @default process.cwd()
+         */
+        cwd?: string;
+
+        /**
+         * Don't search for a config, use the one provided.
+         * **Note**: Liftoff will assume the current working directory is the directory containing the config file
+         * unless an alternate location is explicitly specified using `cwd`.
+         * @default null
+         */
+        configPath?: string;
+
+        /**
+         * A string or array of modules to attempt requiring from the local
+         * working directory before invoking the launch callback.
+         * @default null
+         */
+        require?: string | any[];
+
+        /**
+         * Allows you to force node or V8 flags during the launch.
+         * This is useful if you need to make sure certain flags will always be enabled
+         * or if you need to enable flags that don't show up in `opts.v8flags`
+         * (as these flags aren't validated against opts.v8flags).
+         * @default null
+         */
+        forcedFlags?: string | string[] | ((env: LiftoffEnv) => string | string[]);
+
+        completion?: string;
+    }
+
+    interface LiftoffEnv {
+        /**
+         * the current working directory
+         */
+        cwd: string;
+        /**
+         * an array of modules that liftoff tried to pre-load
+         */
+        require: string[];
+        /**
+         * the config files searched for
+         */
+        configNameSearch: string[];
+        /**
+         * the full path to your configuration file (if found)
+         */
+        configPath: string | undefined;
+        /**
+         * the base directory of your configuration file (if found)
+         */
+        configBase: string | undefined;
+        /**
+         * the full path to the local module your project relies on (if found)
+         */
+        modulePath: string | undefined;
+        /**
+         * the contents of the local module's package.json (if found)
+         */
+        modulePackage: { [key: string]: any } | undefined;
+        /**
+         * an object of filepaths for each found config file (filepath values will be null if not found)
+         */
+        configFiles: { [extensions: string]: { [path: string]: string | null } } | undefined;
+    }
+}
diff --git a/types/liftoff/liftoff-tests.ts b/types/liftoff/liftoff-tests.ts
new file mode 100644
index 0000000000..bfc960eb62
--- /dev/null
+++ b/types/liftoff/liftoff-tests.ts
@@ -0,0 +1,182 @@
+import Liftoff = require('liftoff');
+import v8flags = require('v8flags');
+
+new Liftoff({
+    name: 'hacker',
+    processTitle: 'hacker',
+    moduleName: 'hacker',
+    configName: 'hackerfile',
+    extensions: {
+        '.js': null,
+        '.json': null,
+        '.coffee': 'coffee-script/register',
+    },
+    v8flags: ['--harmony'],
+});
+new Liftoff({
+    name: 'hacker',
+    processTitle: 'hacker',
+    moduleName: 'hacker',
+    configName: 'hackerfile',
+    extensions: {
+        '.js': null,
+        '.json': null,
+        '.coffee': 'coffee-script/register',
+    },
+    v8flags,
+});
+new Liftoff({ name: 'hacker' });
+new Liftoff({
+    name: 'myapp',
+    extensions: {
+        '.js': null,
+        '.json': null,
+        '.coffee': 'coffee-script/register',
+    },
+});
+new Liftoff({
+    name: 'myapp',
+    configName: '.myapp',
+    extensions: {
+        rc: null,
+    },
+});
+new Liftoff({
+    name: 'myapp',
+    extensions: require('interpret').jsVariants,
+});
+new Liftoff({
+    v8flags: ['--trace-deprecation'],
+});
+new Liftoff({
+    v8flags(cb) {
+        cb(null, ['--trace-deprecation']);
+    },
+});
+new Liftoff({
+    name: 'hacker',
+    configFiles: {
+        '.hacker': {
+            cwd: '.',
+        },
+    },
+});
+new Liftoff({
+    name: 'hacker',
+    configFiles: {
+        '.hacker': {
+            home: {
+                path: '~',
+                extensions: {
+                    rc: null,
+                },
+            },
+        },
+    },
+});
+new Liftoff({
+    name: 'hacker',
+    configFiles: {
+        '.hacker': {
+            up: {
+                path: '.',
+                findUp: true,
+            },
+        },
+    },
+});
+new Liftoff({
+    name: 'hacker',
+    configFiles: {
+        hacker: {
+            override: {
+                path: '.',
+                name: '.override',
+            },
+        },
+    },
+});
+new Liftoff({
+    name: 'hacker',
+    configFiles: {
+        '.hacker': {
+            home: {
+                path: '.',
+                cwd: '~',
+            },
+        },
+    },
+});
+
+new Liftoff().launch(
+    {
+        cwd: '',
+        configPath: '',
+        require: '',
+        completion: '',
+    },
+    env => {
+        // $ExpectType LiftoffEnv
+        env;
+
+        // $ExpectType string
+        env.cwd;
+        // $ExpectType string[]
+        env.require;
+        // $ExpectType string[]
+        env.configNameSearch;
+        // $ExpectType string | undefined
+        env.configPath;
+        // $ExpectType string | undefined
+        env.configBase;
+        // $ExpectType string | undefined
+        env.modulePath;
+        // $ExpectType { [key: string]: any; } | undefined
+        env.modulePackage;
+        // $ExpectType { [extensions: string]: { [path: string]: string | null; }; } | undefined
+        env.configFiles;
+    }
+);
+new Liftoff().launch({ cwd: '' }, () => {});
+new Liftoff().launch({ configPath: '' }, () => {});
+new Liftoff().launch({ require: '' }, () => {});
+new Liftoff().launch({ forcedFlags: ['--trace-deprecation'] }, () => {});
+new Liftoff().launch({ forcedFlags: '--trace-deprecation' }, () => {});
+new Liftoff().launch(
+    {
+        forcedFlags: env => {
+            // $ExpectType LiftoffEnv
+            env;
+            return ['--trace-deprecation'];
+        },
+    },
+    () => {}
+);
+new Liftoff().launch(
+    {
+        forcedFlags: env => {
+            return '--trace-deprecation';
+        },
+    },
+    () => {}
+);
+new Liftoff().launch({ completion: '' }, () => {});
+
+new Liftoff().on('require', (name, module) => {
+    // $ExpectType string
+    name;
+    // $ExpectType ExtensionDescriptor
+    module;
+});
+new Liftoff().on('requireFail', (name, err) => {
+    // $ExpectType string
+    name;
+    // $ExpectType any
+    err;
+});
+new Liftoff().on('respawn', (flags, child) => {
+    // $ExpectType string[]
+    flags;
+    // $ExpectType Process
+    child;
+});
diff --git a/types/liftoff/tsconfig.json b/types/liftoff/tsconfig.json
new file mode 100644
index 0000000000..771c8ce2ed
--- /dev/null
+++ b/types/liftoff/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "liftoff-tests.ts"
+    ]
+}
diff --git a/types/liftoff/tslint.json b/types/liftoff/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/liftoff/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 75d166174fbe3f62941034bd5288a450e150a65a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Linus=20Unneb=C3=A4ck?= <linus@folkdatorn.se>
Date: Thu, 6 Dec 2018 12:01:30 +0000
Subject: [PATCH 719/836] [assert] Fix passing RegEx to .throws

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

diff --git a/types/assert/assert-tests.ts b/types/assert/assert-tests.ts
index 22248c18bd..3f795f0552 100644
--- a/types/assert/assert-tests.ts
+++ b/types/assert/assert-tests.ts
@@ -5,6 +5,7 @@ assert(true, "it's working");
 assert.ok(true, "inner functions work as well");
 
 assert.throws(() => {});
+assert.throws(() => {}, /Regex test/);
 assert.throws(() => {}, () => {}, "works wonderfully");
 
 assert['fail'](true, true, "works like a charm");
diff --git a/types/assert/index.d.ts b/types/assert/index.d.ts
index d79805f5af..f04158bbd3 100644
--- a/types/assert/index.d.ts
+++ b/types/assert/index.d.ts
@@ -1,6 +1,7 @@
 // Type definitions for commonjs-assert 1.4
 // Project: https://github.com/browserify/commonjs-assert
 // Definitions by: Nico Gallinal <https://github.com/nicoabie>
+//                 Linus Unnebäck <https://github.com/LinusU>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 declare function assert(value: any, message?: string): void;
@@ -23,10 +24,10 @@ declare namespace assert {
     function notStrictEqual(actual: any, expected: any, message?: string): void;
 
     function throws(block: () => void, message?: string): void;
-    function throws(block: () => void, error: () => void | ((err: any) => boolean) | RegExp, message?: string): void;
+    function throws(block: () => void, error: (() => void) | ((err: any) => boolean) | RegExp, message?: string): void;
 
     function doesNotThrow(block: () => void, message?: string): void;
-    function doesNotThrow(block: () => void, error: () => void | ((err: any) => boolean) | RegExp, message?: string): void;
+    function doesNotThrow(block: () => void, error: (() => void) | ((err: any) => boolean) | RegExp, message?: string): void;
 
     function ifError(value: any): void;
 

From c05467793ee17920d4122e30bc5d6a2bdf8900ae Mon Sep 17 00:00:00 2001
From: Wu Haotian <whtsky@gmail.com>
Date: Thu, 6 Dec 2018 21:11:20 +0800
Subject: [PATCH 720/836] Add type definitation for debounce-promise

---
 .../debounce-promise-tests.ts                 | 25 ++++++++++++++++++
 types/debounce-promise/index.d.ts             | 26 +++++++++++++++++++
 types/debounce-promise/tsconfig.json          | 16 ++++++++++++
 types/debounce-promise/tslint.json            |  1 +
 4 files changed, 68 insertions(+)
 create mode 100644 types/debounce-promise/debounce-promise-tests.ts
 create mode 100644 types/debounce-promise/index.d.ts
 create mode 100644 types/debounce-promise/tsconfig.json
 create mode 100644 types/debounce-promise/tslint.json

diff --git a/types/debounce-promise/debounce-promise-tests.ts b/types/debounce-promise/debounce-promise-tests.ts
new file mode 100644
index 0000000000..75b53dc764
--- /dev/null
+++ b/types/debounce-promise/debounce-promise-tests.ts
@@ -0,0 +1,25 @@
+import debounce = require("debounce-promise");
+import { DebounceOptions } from "debounce-promise";
+
+const options: DebounceOptions = {};
+const optionsA: DebounceOptions = { leading: true };
+const f = async () => 2;
+const f2 = (a: string) => 2;
+debounce(f, 100);
+debounce(f, 0, options);
+debounce(f, 100, optionsA);
+debounce(f, 10, { accumulate: true });
+const foo = debounce(async () => f2, 10, {
+    leading: true,
+    accumulate: true
+});
+foo().then(f => f("2"));
+const bar = debounce(async () => [1, 2, 3], 100);
+bar().then(ar => ar.concat());
+
+// Converts the return value from the producer function to a promise
+const two = debounce((a: string, b: number, c: { d: boolean }) => [4], 10, {
+    leading: true,
+    accumulate: true
+});
+two("1", 2, { d: false }).then(ar => ar.pop(), () => 2);
diff --git a/types/debounce-promise/index.d.ts b/types/debounce-promise/index.d.ts
new file mode 100644
index 0000000000..2356d30060
--- /dev/null
+++ b/types/debounce-promise/index.d.ts
@@ -0,0 +1,26 @@
+// Type definitions for debounce-promise 3.1
+// Project: https://github.com/bjoerge/debounce-promise
+// Definitions by: Wu Haotian <https://github.com/whtsky>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 3.0
+
+declare namespace debounce {
+    interface DebounceOptions {
+        leading?: boolean;
+        accumulate?: boolean;
+    }
+}
+
+type ArgumentsType<T> = T extends (...args: infer A) => any ? A : never;
+
+declare function debounce<T extends (...args: any[]) => any>(
+    func: T,
+    wait?: number,
+    options?: debounce.DebounceOptions
+): (
+    ...args: ArgumentsType<T>
+) => ReturnType<T> extends Promise<any>
+    ? ReturnType<T>
+    : Promise<ReturnType<T>>;
+
+export = debounce;
diff --git a/types/debounce-promise/tsconfig.json b/types/debounce-promise/tsconfig.json
new file mode 100644
index 0000000000..7e41251117
--- /dev/null
+++ b/types/debounce-promise/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": ["es6"],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": ["../"],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": ["index.d.ts", "debounce-promise-tests.ts"]
+}
diff --git a/types/debounce-promise/tslint.json b/types/debounce-promise/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/debounce-promise/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 6adc4768d8b6afddc14c4f47c80bdbf314a82a36 Mon Sep 17 00:00:00 2001
From: arichter83 <ar@5mm.de>
Date: Thu, 6 Dec 2018 14:50:37 +0100
Subject: [PATCH 721/836] Fixed SimpleSchema.custom validation Function with
 correct context

---
 types/simpl-schema/index.d.ts            | 38 +++++++++++++++++++++++-
 types/simpl-schema/simpl-schema-tests.ts | 15 +++++-----
 2 files changed, 45 insertions(+), 8 deletions(-)

diff --git a/types/simpl-schema/index.d.ts b/types/simpl-schema/index.d.ts
index 54d0a5665d..30b33f0b94 100644
--- a/types/simpl-schema/index.d.ts
+++ b/types/simpl-schema/index.d.ts
@@ -15,7 +15,33 @@ export interface ValidationContext extends SimpleSchemaValidationContextStatic {
 }
 
 interface CustomValidationContext {
+    /** The name of the schema key (e.g., "addresses.0.street") */
+    key: string;
+
+    /** The generic name of the schema key (e.g., "addresses.$.street") */
+    genericKey: string;
+
+    /** The schema definition object. */
+    definition: SchemaDefinition;
+
+    /** Does the object being validated have this key set? */
+    isSet: boolean;
+
+    /** Value to validate */
     value: any;
+
+    /** The Mongo operator for which we're doing validation. Might be null. */
+    operator: any;
+    validationContext: ValidationContext;
+
+    /** Use this method to get information about other fields. Pass a field name (non-generic schema key) as the only argument. The return object will have isSet, value, and operator properties for that field. */
+    field(): any;
+
+    /** Use this method to get information about other fields that have the same parent object. Works the same way as field(). This is helpful when you use sub-schemas or when you're dealing with arrays of objects. */
+    siblingField(): any;
+
+    /** Call this to add validation errors for any key. In general, you should use this to add errors for other keys. To add an error for the current key, return the error type string. If you do use this to add an error for the current key, return false from your custom validation function. */
+    addValidationErrors(errors: SimpleSchemaValidationError): any;
 }
 
 interface SchemaDefinition {
@@ -31,7 +57,11 @@ interface SchemaDefinition {
     exclusiveMax?: boolean;
     exclusiveMin?: boolean;
     regEx?: RegExp | RegExp[];
-    custom?: () => any;
+
+    /** For custom validation function. If you use an arrow function the context
+        for "this" will not be available.
+        Use "custom: function() { return something(this.value); }" instead." */
+    custom?: (this: CustomValidationContext) => undefined | string | SimpleSchemaValidationError;
     blackbox?: boolean;
     autoValue?: () => any;
     defaultValue?: any;
@@ -58,6 +88,11 @@ interface SimpleSchemaOptions {
   tracker?: any;
 }
 
+interface SimpleSchemaValidationError {
+  type: string;
+  [key: string]: number | string;
+}
+
 interface SimpleSchemaStatic {
   new(
     schema: {
@@ -185,6 +220,7 @@ export const MongoObject: MongoObjectStatic;
 
 export interface SimpleSchema extends SimpleSchemaStatic {
     debug: boolean;
+    /** Validate a data object. Options: {keys: []} to limit */
     validate(obj: any, options?: ValidationOption): void;
     addValidator(validator: () => boolean): any;
     extendOptions(options: {[key: string]: any}): void;
diff --git a/types/simpl-schema/simpl-schema-tests.ts b/types/simpl-schema/simpl-schema-tests.ts
index 6373107aa3..55be71ec6e 100644
--- a/types/simpl-schema/simpl-schema-tests.ts
+++ b/types/simpl-schema/simpl-schema-tests.ts
@@ -14,18 +14,19 @@ const StringSchema = new SimpleSchema({
     },
     createdAt: {
         type: Date,
-        autoValue: () => new Date(),
+        autoValue: () => new Date()
     },
     title: {
         type: String,
-        label: "Argument",
-        /* TODO, this does not work: "The containing arrow function captures the global value of 'this' which implicitly has type 'any'."
-        custom: () => {
+        label: "Title",
+        /* Can't use arrow function here, else the context won't be available */
+        custom: function() {
           const text = this.value;
-          if (text.length > 10) return { type: SimpleSchema.ErrorTypes.MAX_STRING, max: 10 };
+
+          if (text.length > 100) return { type: SimpleSchema.ErrorTypes.MAX_STRING, max: 100 };
+          else if (text.length <10) return SimpleSchema.ErrorTypes.MIN_STRING
         }
-        */
-    },
+    }
 });
 
 StringSchema.validate({

From 34bd9bc71df60692e286c4a216549ae7c29290ac Mon Sep 17 00:00:00 2001
From: arichter83 <ar@5mm.de>
Date: Thu, 6 Dec 2018 15:00:46 +0100
Subject: [PATCH 722/836] Fix doc format

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

diff --git a/types/simpl-schema/index.d.ts b/types/simpl-schema/index.d.ts
index 30b33f0b94..8ac1a04cc7 100644
--- a/types/simpl-schema/index.d.ts
+++ b/types/simpl-schema/index.d.ts
@@ -34,13 +34,20 @@ interface CustomValidationContext {
     operator: any;
     validationContext: ValidationContext;
 
-    /** Use this method to get information about other fields. Pass a field name (non-generic schema key) as the only argument. The return object will have isSet, value, and operator properties for that field. */
+    /** Use this method to get information about other fields. Pass a field name
+        (non-generic schema key) as the only argument. The return object will
+        have isSet, value, and operator properties for that field. */
     field(): any;
 
-    /** Use this method to get information about other fields that have the same parent object. Works the same way as field(). This is helpful when you use sub-schemas or when you're dealing with arrays of objects. */
+    /** Use this method to get information about other fields that have the same
+        parent object. Works the same way as field(). This is helpful when you use
+        sub-schemas or when you're dealing with arrays of objects. */
     siblingField(): any;
 
-    /** Call this to add validation errors for any key. In general, you should use this to add errors for other keys. To add an error for the current key, return the error type string. If you do use this to add an error for the current key, return false from your custom validation function. */
+    /** Call this to add validation errors for any key. In general, you should use
+        this to add errors for other keys. To add an error for the current key,
+        return the error type string. If you do use this to add an error for the
+        current key, return false from your custom validation function. */
     addValidationErrors(errors: SimpleSchemaValidationError): any;
 }
 
@@ -59,8 +66,8 @@ interface SchemaDefinition {
     regEx?: RegExp | RegExp[];
 
     /** For custom validation function. If you use an arrow function the context
-        for "this" will not be available.
-        Use "custom: function() { return something(this.value); }" instead." */
+        for "this" will not be available. Use "custom: function() { return
+        something(this.value); }" instead. */
     custom?: (this: CustomValidationContext) => undefined | string | SimpleSchemaValidationError;
     blackbox?: boolean;
     autoValue?: () => any;

From 4c382097c7414d6d9d11ec32dcf9d8dcd8d7debf Mon Sep 17 00:00:00 2001
From: arichter83 <ar@5mm.de>
Date: Thu, 6 Dec 2018 15:15:50 +0100
Subject: [PATCH 723/836] Again fixing linting need to disable
 object-literal-shorthand for SimpleSchema.custom

---
 types/simpl-schema/index.d.ts            | 36 ++++++++++++++----------
 types/simpl-schema/simpl-schema-tests.ts |  2 +-
 types/simpl-schema/tslint.json           |  7 ++++-
 3 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/types/simpl-schema/index.d.ts b/types/simpl-schema/index.d.ts
index 8ac1a04cc7..afd841e0c9 100644
--- a/types/simpl-schema/index.d.ts
+++ b/types/simpl-schema/index.d.ts
@@ -34,20 +34,25 @@ interface CustomValidationContext {
     operator: any;
     validationContext: ValidationContext;
 
-    /** Use this method to get information about other fields. Pass a field name
-        (non-generic schema key) as the only argument. The return object will
-        have isSet, value, and operator properties for that field. */
+    /**
+     * Use this method to get information about other fields. Pass a field name
+     * (non-generic schema key) as the only argument. The return object will
+     * have isSet, value, and operator properties for that field.
+     */
     field(): any;
-
-    /** Use this method to get information about other fields that have the same
-        parent object. Works the same way as field(). This is helpful when you use
-        sub-schemas or when you're dealing with arrays of objects. */
+    /**
+     * Use this method to get information about other fields that have the same
+     * parent object. Works the same way as field(). This is helpful when you use
+     * sub-schemas or when you're dealing with arrays of objects.
+     */
     siblingField(): any;
 
-    /** Call this to add validation errors for any key. In general, you should use
-        this to add errors for other keys. To add an error for the current key,
-        return the error type string. If you do use this to add an error for the
-        current key, return false from your custom validation function. */
+    /**
+     * Call this to add validation errors for any key. In general, you should use
+     * this to add errors for other keys. To add an error for the current key,
+     * return the error type string. If you do use this to add an error for the
+     * current key, return false from your custom validation function.
+     */
     addValidationErrors(errors: SimpleSchemaValidationError): any;
 }
 
@@ -64,10 +69,11 @@ interface SchemaDefinition {
     exclusiveMax?: boolean;
     exclusiveMin?: boolean;
     regEx?: RegExp | RegExp[];
-
-    /** For custom validation function. If you use an arrow function the context
-        for "this" will not be available. Use "custom: function() { return
-        something(this.value); }" instead. */
+    /**
+     * For custom validation function. If you use an arrow function the context
+     * for "this" will not be available. Use "custom: function() { return
+     * something(this.value); }" instead.
+     */
     custom?: (this: CustomValidationContext) => undefined | string | SimpleSchemaValidationError;
     blackbox?: boolean;
     autoValue?: () => any;
diff --git a/types/simpl-schema/simpl-schema-tests.ts b/types/simpl-schema/simpl-schema-tests.ts
index 55be71ec6e..a3555c4428 100644
--- a/types/simpl-schema/simpl-schema-tests.ts
+++ b/types/simpl-schema/simpl-schema-tests.ts
@@ -24,7 +24,7 @@ const StringSchema = new SimpleSchema({
           const text = this.value;
 
           if (text.length > 100) return { type: SimpleSchema.ErrorTypes.MAX_STRING, max: 100 };
-          else if (text.length <10) return SimpleSchema.ErrorTypes.MIN_STRING
+          else if (text.length < 10) return SimpleSchema.ErrorTypes.MIN_STRING;
         }
     }
 });
diff --git a/types/simpl-schema/tslint.json b/types/simpl-schema/tslint.json
index 3db14f85ea..3043773b06 100644
--- a/types/simpl-schema/tslint.json
+++ b/types/simpl-schema/tslint.json
@@ -1 +1,6 @@
-{ "extends": "dtslint/dt.json" }
+{
+  "extends": "dtslint/dt.json",
+  "rules": {
+    "object-literal-shorthand": false
+  }
+}

From 5f098b2d6ad61c2712e5dc8b87bf0487654cacc6 Mon Sep 17 00:00:00 2001
From: Shaun Burdick <shaun.burdick@swimlane.com>
Date: Thu, 6 Dec 2018 10:33:05 -0500
Subject: [PATCH 724/836] [@types/amqp-connection-manager] Added missing
 `ChannelWrapper.removeSetup()`

---
 types/amqp-connection-manager/index.d.ts | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/types/amqp-connection-manager/index.d.ts b/types/amqp-connection-manager/index.d.ts
index ab69aadeb1..e2907b67ee 100644
--- a/types/amqp-connection-manager/index.d.ts
+++ b/types/amqp-connection-manager/index.d.ts
@@ -136,7 +136,16 @@ export interface ChannelWrapper extends EventEmitter {
 	 * Setup functions should, ideally, not throw errors, but if they do then the ChannelWrapper will emit an 'error' event.
 	 * @param func
 	 */
-	addSetup(func: SetupFunc): Promise<void>;
+    addSetup(func: SetupFunc): Promise<void>;
+
+    /**
+     * Remove a setup function added with `addSetup`.  If there is currently a
+     * connection, `teardown(channel, [cb])` will be run immediately, and the
+     * returned Promise will not resolve until it completes.
+     * @param func
+     * @param [tearDown]
+     */
+    removeSetup(func: SetupFunc, tearDown?: SetupFunc): Promise<void>;
 
 	/**
 	 * @see amqplib

From e5ca27ce79a05eb554ac478f97d034cceb43324d Mon Sep 17 00:00:00 2001
From: Bradley Hill <brad.hill@jostens.com>
Date: Thu, 6 Dec 2018 09:46:39 -0600
Subject: [PATCH 725/836] Fabric - Cross origin is a string everywhere. Type as
 such so don't have to downcast as any.

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

diff --git a/types/fabric/fabric-impl.d.ts b/types/fabric/fabric-impl.d.ts
index 39b3e45757..60ec11648f 100644
--- a/types/fabric/fabric-impl.d.ts
+++ b/types/fabric/fabric-impl.d.ts
@@ -4529,7 +4529,7 @@ interface IUtilMisc {
 	 * @param [context] Context to invoke callback in
 	 * @param [crossOrigin] crossOrigin value to set image element to
 	 */
-	loadImage(url: string, callback: (image: HTMLImageElement) => void, context?: any, crossOrigin?: boolean): void;
+	loadImage(url: string, callback: (image: HTMLImageElement) => void, context?: any, crossOrigin?: string): void;
 
 	/**
 	 * Creates corresponding fabric instances from their object representations

From 07c66081db673014a3617144e4e8036dc0249d28 Mon Sep 17 00:00:00 2001
From: Daniel Kesselberg <mail@danielkesselberg.de>
Date: Thu, 6 Dec 2018 16:00:23 +0100
Subject: [PATCH 726/836] Add orFail method

---
 types/mongoose/index.d.ts        | 24 ++++++++++++++++++++++++
 types/mongoose/mongoose-tests.ts |  1 +
 2 files changed, 25 insertions(+)

diff --git a/types/mongoose/index.d.ts b/types/mongoose/index.d.ts
index f08b8e0b5c..ad515a1806 100644
--- a/types/mongoose/index.d.ts
+++ b/types/mongoose/index.d.ts
@@ -2021,6 +2021,30 @@ declare module "mongoose" {
      */
     or(array: any[]): this;
 
+    /**
+     * Make this query throw an error if no documents match the given `filter`.
+     * This is handy for integrating with async/await, because `orFail()` saves you
+     * an extra `if` statement to check if no document was found.
+     *
+     * ####Example:
+     *
+     *     // Throws if no doc returned
+     *     await Model.findOne({ foo: 'bar' }).orFail();
+     *
+     *     // Throws if no document was updated
+     *     await Model.updateOne({ foo: 'bar' }, { name: 'test' }).orFail();
+     *
+     *     // Throws "No docs found!" error if no docs match `{ foo: 'bar' }`
+     *     await Model.find({ foo: 'bar' }).orFail(new Error('No docs found!'));
+     *
+     *     // Throws "Not found" error if no document was found
+     *     await Model.findOneAndUpdate({ foo: 'bar' }, { name: 'test' }).
+     *       orFail(() => Error('Not found'));
+     *
+     * @param err optional error to throw if no docs match `filter`
+     */
+    orFail(err?: Error | (() => Error)): this;
+
     /** Specifies a $polygon condition */
     polygon(...coordinatePairs: number[][]): this;
     polygon(path: string, ...coordinatePairs: number[][]): this;
diff --git a/types/mongoose/mongoose-tests.ts b/types/mongoose/mongoose-tests.ts
index a660ce728f..f4fec31101 100644
--- a/types/mongoose/mongoose-tests.ts
+++ b/types/mongoose/mongoose-tests.ts
@@ -1080,6 +1080,7 @@ query.find().where('age').in([20, 21]);
 query.find().in('age', [20, 21]);
 query.nor([{ color: 'green' }, { status: 'ok' }]).nor([]);
 query.or([{ color: 'red' }, { status: 'emergency' }]).or([]);
+query.find({ color: 'blue' }).orFail();
 query.where('loc').within().polygon([10,20], [13, 25], [7,15]);
 query.polygon('loc', [10,20], [13, 25], [7,15]);
 query.findOne().populate('owner').exec(function (err, kitten) {

From c95a21430b2dd21b55e3146b9940565f0fd7ef38 Mon Sep 17 00:00:00 2001
From: Ben James <benhjames@sky.com>
Date: Thu, 6 Dec 2018 17:48:58 +0000
Subject: [PATCH 727/836] Add types for @atlaskit/tree

---
 types/atlaskit__tree/atlaskit__tree-tests.tsx |  42 +++++
 types/atlaskit__tree/index.d.ts               | 153 ++++++++++++++++++
 types/atlaskit__tree/tsconfig.json            |  20 +++
 types/atlaskit__tree/tslint.json              |   1 +
 4 files changed, 216 insertions(+)
 create mode 100644 types/atlaskit__tree/atlaskit__tree-tests.tsx
 create mode 100644 types/atlaskit__tree/index.d.ts
 create mode 100644 types/atlaskit__tree/tsconfig.json
 create mode 100644 types/atlaskit__tree/tslint.json

diff --git a/types/atlaskit__tree/atlaskit__tree-tests.tsx b/types/atlaskit__tree/atlaskit__tree-tests.tsx
new file mode 100644
index 0000000000..b99647a7c6
--- /dev/null
+++ b/types/atlaskit__tree/atlaskit__tree-tests.tsx
@@ -0,0 +1,42 @@
+import Tree from "@atlaskit/tree";
+
+import * as React from "react";
+import { render } from "react-dom";
+
+declare const container: Element;
+
+render(
+    <Tree
+        tree={{
+            rootId: 1,
+            items: {
+                1: {
+                    id: 1,
+                    children: []
+                },
+                "string-id": {
+                    id: "string-id",
+                    children: [1, "another"],
+                    hasChildren: true,
+                    isExpanded: false,
+                    isChildrenLoading: false,
+                    data: {
+                        myVar: "this can be anything"
+                    }
+                }
+            }
+        }}
+        renderItem={() => <div />}
+        onExpand={() => {}}
+        onCollapse={() => {}}
+        onDragStart={() => {}}
+        onDragEnd={() => {}}
+        offsetPerLevel={20}
+        isDragEnabled
+        isNestingEnabled
+    />,
+    container
+);
+
+// Check that default props work too.
+render(<Tree renderItem={() => <div />} />, container);
diff --git a/types/atlaskit__tree/index.d.ts b/types/atlaskit__tree/index.d.ts
new file mode 100644
index 0000000000..4d6a952b76
--- /dev/null
+++ b/types/atlaskit__tree/index.d.ts
@@ -0,0 +1,153 @@
+// Type definitions for @atlaskit/tree 4.1
+// Project: https://bitbucket.org/atlassian/atlaskit-mk-2/
+// Definitions by: Ben James <https://github.com/benhjames>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 3.0
+
+import { Component, ReactNode } from "react";
+
+import {
+    DraggingStyle,
+    DraggableProvidedDragHandleProps,
+    DraggableStateSnapshot,
+    NotDraggingStyle
+} from "react-beautiful-dnd";
+
+export type ItemId = any;
+
+export type Path = number[];
+
+export interface TreeData {
+    rootId: ItemId;
+    items: { [key: string]: TreeItem; [key: number]: TreeItem };
+}
+
+export type TreeItemData = any;
+
+export interface TreeItem {
+    id: ItemId;
+    children: ItemId[];
+    hasChildren?: boolean;
+    isExpanded?: boolean;
+    isChildrenLoading?: boolean;
+    data?: TreeItemData;
+}
+
+export interface TreeSourcePosition {
+    parentId: ItemId;
+    index: number;
+}
+
+export interface TreeDestinationPosition {
+    parentId: ItemId;
+    index?: number;
+}
+
+type Omit<T, K extends keyof T> = Pick<T, Exclude<keyof T, K>>;
+
+interface TreeDraggingStyle extends Omit<DraggingStyle, "transition"> {
+    paddingLeft: number;
+    transition: "none" | string;
+}
+
+type TreeDraggableStyle = NotDraggingStyle | TreeDraggingStyle;
+
+interface TreeDraggableProps {
+    // Props that can be spread onto the element directly
+    // inline style
+    style?: TreeDraggableStyle;
+    // used for shared global styles
+    "data-react-beautiful-dnd-draggable": string;
+}
+
+interface TreeDraggableProvided {
+    draggableProps: TreeDraggableProps;
+    // will be null if the draggable is disabled
+    dragHandleProps?: DraggableProvidedDragHandleProps;
+    // The following props will be removed once we move to react 16
+    innerRef: (element?: HTMLElement) => void;
+}
+
+export interface RenderItemParams {
+    item: TreeItem;
+    depth: number;
+    onExpand: (itemId: ItemId) => void;
+    onCollapse: (itemId: ItemId) => void;
+    provided: TreeDraggableProvided;
+    snapshot: DraggableStateSnapshot;
+}
+
+interface TreeItemMutation {
+    id?: ItemId;
+    children?: ItemId[];
+    hasChildren?: boolean;
+    isExpanded?: boolean;
+    isChildrenLoading?: boolean;
+    data?: TreeItemData;
+}
+
+export function mutateTree(
+    tree: TreeData,
+    itemId: ItemId,
+    mutation: TreeItemMutation
+): TreeData;
+
+export function moveItemOnTree(
+    tree: TreeData,
+    from: TreeSourcePosition,
+    to: TreeDestinationPosition
+): TreeData;
+
+interface TreeProps {
+    /** The tree data structure. */
+    tree: TreeData;
+    /** Function that will be called when a parent item needs to be expanded. */
+    onExpand: (itemId: ItemId, path: Path) => void;
+    /** Function that will be called when a parent item needs to be collapsed. */
+    onCollapse: (itemId: ItemId, path: Path) => void;
+    /** Function that will be called when the user starts dragging. */
+    onDragStart: (itemId: ItemId) => void;
+    /** Function that will be called when the user finishes dragging. */
+    onDragEnd: (
+        sourcePosition: TreeSourcePosition,
+        destinationPosition: TreeDestinationPosition | undefined
+    ) => void;
+    /** Function that will be called to render a single item. */
+    renderItem: (itemProps: RenderItemParams) => ReactNode;
+    /** Number of pixel is used to scaffold the tree by the consumer. */
+    offsetPerLevel: number;
+    /** Boolean to turn on drag&drop re-ordering on the tree */
+    isDragEnabled: boolean;
+    /** Boolean to turn on hovering while dragging */
+    isNestingEnabled: boolean;
+}
+
+interface FlattenedItem {
+    item: TreeItem;
+    path: Path;
+}
+
+type FlattenedTree = FlattenedItem[];
+
+interface TreeState {
+    /** The flattened tree data structure transformed from props.tree */
+    flattenedTree: FlattenedTree;
+    // Id of the currently dragged item
+    draggedItemId: ItemId;
+}
+
+declare class Tree extends Component<TreeProps, TreeState> {
+    static defaultProps: {
+        tree: { children: [] };
+        onExpand: () => void;
+        onCollapse: () => void;
+        onDragStart: () => void;
+        onDragEnd: () => void;
+        renderItem: () => void;
+        offsetPerLevel: 35;
+        isDragEnabled: false;
+        isNestingEnabled: false;
+    };
+}
+
+export default Tree;
diff --git a/types/atlaskit__tree/tsconfig.json b/types/atlaskit__tree/tsconfig.json
new file mode 100644
index 0000000000..b6d581fa0d
--- /dev/null
+++ b/types/atlaskit__tree/tsconfig.json
@@ -0,0 +1,20 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": ["es6", "dom"],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": ["../"],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "jsx": "react",
+        "paths": {
+            "@atlaskit/tree": ["atlaskit__tree"]
+        }
+    },
+    "files": ["index.d.ts", "atlaskit__tree-tests.tsx"]
+}
diff --git a/types/atlaskit__tree/tslint.json b/types/atlaskit__tree/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/atlaskit__tree/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 0710a3b0f6f506c78ae5056403952f7a06798096 Mon Sep 17 00:00:00 2001
From: Dimitri Benin <dimitri.benin@gmail.com>
Date: Thu, 6 Dec 2018 19:07:31 +0100
Subject: [PATCH 728/836] Add types for empty-dir

---
 types/empty-dir/empty-dir-tests.ts | 25 +++++++++++++++++++++++++
 types/empty-dir/index.d.ts         | 22 ++++++++++++++++++++++
 types/empty-dir/tsconfig.json      | 23 +++++++++++++++++++++++
 types/empty-dir/tslint.json        |  1 +
 4 files changed, 71 insertions(+)
 create mode 100644 types/empty-dir/empty-dir-tests.ts
 create mode 100644 types/empty-dir/index.d.ts
 create mode 100644 types/empty-dir/tsconfig.json
 create mode 100644 types/empty-dir/tslint.json

diff --git a/types/empty-dir/empty-dir-tests.ts b/types/empty-dir/empty-dir-tests.ts
new file mode 100644
index 0000000000..63700ae87b
--- /dev/null
+++ b/types/empty-dir/empty-dir-tests.ts
@@ -0,0 +1,25 @@
+import emptyDir = require('empty-dir');
+
+emptyDir('./', (err, isEmpty) => {
+    // $ExpectType ErrnoException
+    err;
+    // $ExpectType boolean
+    isEmpty;
+});
+
+// $ExpectType boolean
+emptyDir.sync('./test/empty');
+
+function filter(filepath: string) {
+    return !/(Thumbs\.db|\.DS_Store)$/i.test(filepath);
+}
+
+emptyDir('./', filter, (err, isEmpty) => {
+    // $ExpectType ErrnoException
+    err;
+    // $ExpectType boolean
+    isEmpty;
+});
+
+// $ExpectType boolean
+emptyDir.sync('./test/empty', filter);
diff --git a/types/empty-dir/index.d.ts b/types/empty-dir/index.d.ts
new file mode 100644
index 0000000000..0f623a991d
--- /dev/null
+++ b/types/empty-dir/index.d.ts
@@ -0,0 +1,22 @@
+// Type definitions for empty-dir 1.0
+// Project: https://github.com/js-cli/js-empty-dir
+// Definitions by: BendingBender <https://github.com/BendingBender>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+export = emptyDir;
+
+declare function emptyDir(
+    dir: string,
+    cb: (err: NodeJS.ErrnoException, isEmpty: boolean) => void
+): void;
+declare function emptyDir(
+    dir: string,
+    filter: (path: string) => boolean,
+    cb: (err: NodeJS.ErrnoException, isEmpty: boolean) => void
+): void;
+
+declare namespace emptyDir {
+    function sync(dir: string, filter?: (path: string) => boolean): boolean;
+}
diff --git a/types/empty-dir/tsconfig.json b/types/empty-dir/tsconfig.json
new file mode 100644
index 0000000000..cb73470ad8
--- /dev/null
+++ b/types/empty-dir/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "empty-dir-tests.ts"
+    ]
+}
diff --git a/types/empty-dir/tslint.json b/types/empty-dir/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/empty-dir/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From b19ba7a9a3b4f548bc350956847a5b6644c7ce8b Mon Sep 17 00:00:00 2001
From: Dimitri Benin <dimitri.benin@gmail.com>
Date: Thu, 6 Dec 2018 19:27:28 +0100
Subject: [PATCH 729/836] Add types for tildify

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

diff --git a/types/tildify/index.d.ts b/types/tildify/index.d.ts
new file mode 100644
index 0000000000..a0dd100bf9
--- /dev/null
+++ b/types/tildify/index.d.ts
@@ -0,0 +1,8 @@
+// Type definitions for tildify 1.2
+// Project: https://github.com/sindresorhus/tildify#readme
+// Definitions by: BendingBender <https://github.com/BendingBender>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export = tildify;
+
+declare function tildify(str: string): string;
diff --git a/types/tildify/tildify-tests.ts b/types/tildify/tildify-tests.ts
new file mode 100644
index 0000000000..109f5f6c6e
--- /dev/null
+++ b/types/tildify/tildify-tests.ts
@@ -0,0 +1,4 @@
+import tildify = require('tildify');
+
+// $ExpectType string
+tildify('/Users/sindresorhus/dev');
diff --git a/types/tildify/tsconfig.json b/types/tildify/tsconfig.json
new file mode 100644
index 0000000000..4375409ba0
--- /dev/null
+++ b/types/tildify/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "tildify-tests.ts"
+    ]
+}
diff --git a/types/tildify/tslint.json b/types/tildify/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/tildify/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 11ec8b0e410c1e83c2b6011a7aa30dddbc154c26 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <293473+sandersn@users.noreply.github.com>
Date: Thu, 6 Dec 2018 10:41:09 -0800
Subject: [PATCH 730/836] Add shelljs/make

The make utility script:
1. Adds an object named target to the global namespace.
2. Dumps the contents of shelljs into the global namespace.
---
 types/shelljs/make.d.ts     | 41 +++++++++++++++++++++++++++++++++++++
 types/shelljs/tsconfig.json |  3 ++-
 2 files changed, 43 insertions(+), 1 deletion(-)
 create mode 100644 types/shelljs/make.d.ts

diff --git a/types/shelljs/make.d.ts b/types/shelljs/make.d.ts
new file mode 100644
index 0000000000..2ebded5a99
--- /dev/null
+++ b/types/shelljs/make.d.ts
@@ -0,0 +1,41 @@
+import * as shelljs from './'
+declare global {
+    type Target = {
+        (...args: any[]): void,
+        result?: any,
+        done?: boolean
+    };
+    export const target: {
+        all?: Target;
+        [s: string]: Target;
+    };
+    export const cd: typeof shelljs.cd;
+    export const pwd: typeof shelljs.pwd;
+    export const ls: typeof shelljs.ls;
+    export const find: typeof shelljs.find;
+    export const cp: typeof shelljs.cp;
+    export const rm: typeof shelljs.rm;
+    export const mv: typeof shelljs.mv;
+    export const mkdir: typeof shelljs.mkdir;
+    export const cat: typeof shelljs.cat;
+    export const sed: typeof shelljs.sed;
+    export const grep: typeof shelljs.grep;
+    export const echo: typeof shelljs.echo;
+    export const pushd: typeof shelljs.pushd;
+    export const popd: typeof shelljs.popd;
+    export const dirs: typeof shelljs.dirs;
+    export const ln: typeof shelljs.ln;
+    export const exit: typeof shelljs.exit;
+    export const env: typeof shelljs.env;
+    export const exec: typeof shelljs.exec;
+    export const chmod: typeof shelljs.chmod;
+    export const tempdir: typeof shelljs.tempdir;
+    export const error: typeof shelljs.error;
+    export const touch: typeof shelljs.touch;
+    export const head: typeof shelljs.head;
+    export const sort: typeof shelljs.sort;
+    export const tail: typeof shelljs.tail;
+    export const uniq: typeof shelljs.uniq;
+    export const set: typeof shelljs.set;
+    export const config: typeof shelljs.config;
+}
diff --git a/types/shelljs/tsconfig.json b/types/shelljs/tsconfig.json
index 7343a42a7e..51937bc2c0 100644
--- a/types/shelljs/tsconfig.json
+++ b/types/shelljs/tsconfig.json
@@ -18,6 +18,7 @@
     },
     "files": [
         "index.d.ts",
+        "make.d.ts",
         "shelljs-tests.ts"
     ]
-}
\ No newline at end of file
+}

From 6b035ca04e5a9cc16c5b846f7f3ea10bde4d1911 Mon Sep 17 00:00:00 2001
From: Paul Sherman <paul.sherman.88@gmail.com>
Date: Thu, 6 Dec 2018 12:48:16 -0600
Subject: [PATCH 731/836] [react] Deduplicate HTMLElements in global.d.ts

---
 types/react/global.d.ts | 49 ++++-------------------------------------
 1 file changed, 4 insertions(+), 45 deletions(-)

diff --git a/types/react/global.d.ts b/types/react/global.d.ts
index 0c7a24070a..2ea2b7ca91 100644
--- a/types/react/global.d.ts
+++ b/types/react/global.d.ts
@@ -34,6 +34,7 @@ interface HTMLBodyElement extends HTMLElement { }
 interface HTMLBRElement extends HTMLElement { }
 interface HTMLButtonElement extends HTMLElement { }
 interface HTMLCanvasElement extends HTMLElement { }
+interface HTMLDataListElement extends HTMLElement { }
 interface HTMLDialogElement extends HTMLElement { }
 interface HTMLDivElement extends HTMLElement { }
 interface HTMLDListElement extends HTMLElement { }
@@ -43,8 +44,6 @@ interface HTMLFormElement extends HTMLElement { }
 interface HTMLHeadingElement extends HTMLElement { }
 interface HTMLHeadElement extends HTMLElement { }
 interface HTMLHRElement extends HTMLElement { }
-interface HTMLTableColElement extends HTMLElement { }
-interface HTMLDataListElement extends HTMLElement { }
 interface HTMLHtmlElement extends HTMLElement { }
 interface HTMLIFrameElement extends HTMLElement { }
 interface HTMLImageElement extends HTMLElement { }
@@ -71,53 +70,13 @@ interface HTMLSourceElement extends HTMLElement { }
 interface HTMLSpanElement extends HTMLElement { }
 interface HTMLStyleElement extends HTMLElement { }
 interface HTMLTableElement extends HTMLElement { }
-interface HTMLTableSectionElement extends HTMLElement { }
-interface HTMLTableDataCellElement extends HTMLElement { }
-interface HTMLTextAreaElement extends HTMLElement { }
-interface HTMLTableSectionElement extends HTMLElement { }
-interface HTMLTableHeaderCellElement extends HTMLElement { }
-interface HTMLTableSectionElement extends HTMLElement { }
-interface HTMLTitleElement extends HTMLElement { }
-interface HTMLTableRowElement extends HTMLElement { }
-interface HTMLTrackElement extends HTMLElement { }
-interface HTMLUListElement extends HTMLElement { }
-interface HTMLVideoElement extends HTMLElement { }
 interface HTMLTableColElement extends HTMLElement { }
-interface HTMLDataListElement extends HTMLElement { }
-interface HTMLHtmlElement extends HTMLElement { }
-interface HTMLIFrameElement extends HTMLElement { }
-interface HTMLImageElement extends HTMLElement { }
-interface HTMLInputElement extends HTMLElement { }
-interface HTMLModElement extends HTMLElement { }
-interface HTMLLabelElement extends HTMLElement { }
-interface HTMLLegendElement extends HTMLElement { }
-interface HTMLLIElement extends HTMLElement { }
-interface HTMLLinkElement extends HTMLElement { }
-interface HTMLMapElement extends HTMLElement { }
-interface HTMLMetaElement extends HTMLElement { }
-interface HTMLObjectElement extends HTMLElement { }
-interface HTMLOListElement extends HTMLElement { }
-interface HTMLOptGroupElement extends HTMLElement { }
-interface HTMLOptionElement extends HTMLElement { }
-interface HTMLParagraphElement extends HTMLElement { }
-interface HTMLParamElement extends HTMLElement { }
-interface HTMLPreElement extends HTMLElement { }
-interface HTMLProgressElement extends HTMLElement { }
-interface HTMLQuoteElement extends HTMLElement { }
-interface HTMLScriptElement extends HTMLElement { }
-interface HTMLSelectElement extends HTMLElement { }
-interface HTMLSourceElement extends HTMLElement { }
-interface HTMLSpanElement extends HTMLElement { }
-interface HTMLStyleElement extends HTMLElement { }
-interface HTMLTableElement extends HTMLElement { }
-interface HTMLTableSectionElement extends HTMLElement { }
 interface HTMLTableDataCellElement extends HTMLElement { }
-interface HTMLTextAreaElement extends HTMLElement { }
-interface HTMLTableSectionElement extends HTMLElement { }
 interface HTMLTableHeaderCellElement extends HTMLElement { }
-interface HTMLTableSectionElement extends HTMLElement { }
-interface HTMLTitleElement extends HTMLElement { }
 interface HTMLTableRowElement extends HTMLElement { }
+interface HTMLTableSectionElement extends HTMLElement { }
+interface HTMLTextAreaElement extends HTMLElement { }
+interface HTMLTitleElement extends HTMLElement { }
 interface HTMLTrackElement extends HTMLElement { }
 interface HTMLUListElement extends HTMLElement { }
 interface HTMLVideoElement extends HTMLElement { }

From c9ed1594d67e7a632b308e1a483a7c667fe4c844 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <293473+sandersn@users.noreply.github.com>
Date: Thu, 6 Dec 2018 10:50:51 -0800
Subject: [PATCH 732/836] Fix some lint

---
 types/shelljs/make.d.ts | 66 ++++++++++++++++++++---------------------
 1 file changed, 33 insertions(+), 33 deletions(-)

diff --git a/types/shelljs/make.d.ts b/types/shelljs/make.d.ts
index 2ebded5a99..0db5320b72 100644
--- a/types/shelljs/make.d.ts
+++ b/types/shelljs/make.d.ts
@@ -1,41 +1,41 @@
-import * as shelljs from './'
+import * as shelljs from './';
 declare global {
-    type Target = {
+    interface Target {
         (...args: any[]): void,
         result?: any,
         done?: boolean
-    };
-    export const target: {
+    }
+    const target: {
         all?: Target;
         [s: string]: Target;
     };
-    export const cd: typeof shelljs.cd;
-    export const pwd: typeof shelljs.pwd;
-    export const ls: typeof shelljs.ls;
-    export const find: typeof shelljs.find;
-    export const cp: typeof shelljs.cp;
-    export const rm: typeof shelljs.rm;
-    export const mv: typeof shelljs.mv;
-    export const mkdir: typeof shelljs.mkdir;
-    export const cat: typeof shelljs.cat;
-    export const sed: typeof shelljs.sed;
-    export const grep: typeof shelljs.grep;
-    export const echo: typeof shelljs.echo;
-    export const pushd: typeof shelljs.pushd;
-    export const popd: typeof shelljs.popd;
-    export const dirs: typeof shelljs.dirs;
-    export const ln: typeof shelljs.ln;
-    export const exit: typeof shelljs.exit;
-    export const env: typeof shelljs.env;
-    export const exec: typeof shelljs.exec;
-    export const chmod: typeof shelljs.chmod;
-    export const tempdir: typeof shelljs.tempdir;
-    export const error: typeof shelljs.error;
-    export const touch: typeof shelljs.touch;
-    export const head: typeof shelljs.head;
-    export const sort: typeof shelljs.sort;
-    export const tail: typeof shelljs.tail;
-    export const uniq: typeof shelljs.uniq;
-    export const set: typeof shelljs.set;
-    export const config: typeof shelljs.config;
+    const cd: typeof shelljs.cd;
+    const pwd: typeof shelljs.pwd;
+    const ls: typeof shelljs.ls;
+    const find: typeof shelljs.find;
+    const cp: typeof shelljs.cp;
+    const rm: typeof shelljs.rm;
+    const mv: typeof shelljs.mv;
+    const mkdir: typeof shelljs.mkdir;
+    const cat: typeof shelljs.cat;
+    const sed: typeof shelljs.sed;
+    const grep: typeof shelljs.grep;
+    const echo: typeof shelljs.echo;
+    const pushd: typeof shelljs.pushd;
+    const popd: typeof shelljs.popd;
+    const dirs: typeof shelljs.dirs;
+    const ln: typeof shelljs.ln;
+    const exit: typeof shelljs.exit;
+    const env: typeof shelljs.env;
+    const exec: typeof shelljs.exec;
+    const chmod: typeof shelljs.chmod;
+    const tempdir: typeof shelljs.tempdir;
+    const error: typeof shelljs.error;
+    const touch: typeof shelljs.touch;
+    const head: typeof shelljs.head;
+    const sort: typeof shelljs.sort;
+    const tail: typeof shelljs.tail;
+    const uniq: typeof shelljs.uniq;
+    const set: typeof shelljs.set;
+    const config: typeof shelljs.config;
 }

From 52aee928af894837bf24f71bb2621a710f6e804a Mon Sep 17 00:00:00 2001
From: Chris Wilcox <crwilcox@google.com>
Date: Thu, 6 Dec 2018 11:09:51 -0800
Subject: [PATCH 733/836] Remove google-cloud__storage as it is now Typescript.

---
 notNeededPackages.json                        |   6 +
 .../google-cloud__storage-tests.ts            | 592 ------------------
 types/google-cloud__storage/index.d.ts        | 469 --------------
 types/google-cloud__storage/tsconfig.json     |  28 -
 types/google-cloud__storage/tslint.json       |   8 -
 5 files changed, 6 insertions(+), 1097 deletions(-)
 delete mode 100644 types/google-cloud__storage/google-cloud__storage-tests.ts
 delete mode 100644 types/google-cloud__storage/index.d.ts
 delete mode 100644 types/google-cloud__storage/tsconfig.json
 delete mode 100644 types/google-cloud__storage/tslint.json

diff --git a/notNeededPackages.json b/notNeededPackages.json
index 53ff6a7124..c64738aa8d 100644
--- a/notNeededPackages.json
+++ b/notNeededPackages.json
@@ -642,6 +642,12 @@
             "sourceRepoURL": "https://github.com/jdalrymple/node-gitlab",
             "asOfVersion": "2.0.0"
         },
+        {
+            "libraryName": "Google Cloud Storage",
+            "typingsPackageName": "google-cloud__storage",
+            "sourceRepoURL": "https://github.com/googleapis/nodejs-storage",
+            "asOfVersion": "2.3.0"
+        },
         {
             "libraryName": "graphene-pk11",
             "typingsPackageName": "graphene-pk11",
diff --git a/types/google-cloud__storage/google-cloud__storage-tests.ts b/types/google-cloud__storage/google-cloud__storage-tests.ts
deleted file mode 100644
index 1db3e73284..0000000000
--- a/types/google-cloud__storage/google-cloud__storage-tests.ts
+++ /dev/null
@@ -1,592 +0,0 @@
-// import file system i/o api
-import * as fs from "fs";
-
-// import Google Cloud Storage
-import {
-    Acl,
-    Bucket,
-    Channel,
-    File,
-    ApiResponse,
-    BucketConfig,
-    BucketFileOptions,
-    BucketGetOptions,
-    BucketMetadata,
-    BucketPrivacyOptions,
-    BucketQuery,
-    ChannelConfig,
-    DownloadOptions,
-    FileMetadata,
-    FilePrivateOptions,
-    ReadStreamOptions,
-    ResumableUploadOptions,
-    SignedPolicy,
-    SignedPolicyOptions,
-    SignedUrlConfig,
-    WriteStreamOptions,
-    UploadOptions
-} from "@google-cloud/storage";
-import Storage = require("@google-cloud/storage");
-
-/**
- * Test the storage service.
- */
-export class TestStorage {
-    // constants
-    static BUCKET_CONFIG: BucketConfig = {
-        multiRegional: true
-    };
-
-    // import Storage class
-    static gcs = new Storage();
-
-    constructor() {
-        // nothing to do
-    }
-
-    /** Returns the bucket. */
-    bucket(name: string): Bucket {
-        return TestStorage.gcs.bucket(name);
-    }
-
-    /** Create a new bucket. */
-    createBucket(name: string, config?: BucketConfig): Promise<[Bucket, ApiResponse]> {
-        // overwrite default values with custom config
-        config = Object.assign(TestStorage.BUCKET_CONFIG, config);
-
-        return TestStorage.gcs.createBucket(name, config);
-    }
-
-    /**
-     * Query for buckets.
-     */
-    getBuckets(query?: BucketQuery): Promise<[Bucket[]]> {
-        return TestStorage.gcs.getBuckets(query);
-    }
-}
-
-/** The bucket API wrapper. */
-export class TestBucket {
-    // the bucket in the cloud
-    bucket: Bucket;
-
-    /** Create a bucket. */
-    create(config?: BucketConfig): Promise<[Bucket, ApiResponse]> {
-        return this.bucket.create(config);
-    }
-
-    /** Create a channel that will be notified when objects in this bucket changes. */
-    createChannel(id: string, config: ChannelConfig): Promise<[Channel, ApiResponse]> {
-        return this.bucket.createChannel(id, config);
-    }
-
-    /** Delete the bucket. */
-    delete(): Promise<[ApiResponse]> {
-        return this.bucket.delete();
-    }
-
-    /** Iterate over the bucket's files, calling file.delete() on each. */
-    deleteFiles(query?: BucketQuery): Promise<void> {
-        return this.bucket.deleteFiles(query);
-    }
-
-    /** Check if the bucket exists. */
-    exists(): Promise<[boolean]> {
-        return this.bucket.exists();
-    }
-
-    /** Create a File object. */
-    file(name: string, options?: BucketFileOptions): File {
-        return this.bucket.file(name);
-    }
-
-    /** Get a bucket if it exists. */
-    get(options?: BucketGetOptions): Promise<[Bucket, ApiResponse]> {
-        return this.bucket.get(options);
-    }
-
-    /** Get File objects for the files currently in the bucket */
-    getFiles(query?: BucketQuery): Promise<[File[]]> {
-        return this.bucket.getFiles(query);
-    }
-
-    /** Get File objects for the files currently in the bucket as a readable object stream. */
-    getFilesStream(query?: BucketQuery): fs.ReadStream {
-        return this.bucket.getFilesStream(query);
-    }
-
-    /** Get the bucket's metadata. */
-    getMetadata(): Promise<[BucketMetadata, ApiResponse]> {
-        return this.bucket.getMetadata();
-    }
-
-    /** Make the bucket listing private. */
-    makePrivate(options?: BucketPrivacyOptions): Promise<[File[]]> {
-        return this.bucket.makePrivate(options);
-    }
-
-    /** Make the bucket publicly readable. */
-    makePublic(options?: BucketPrivacyOptions): Promise<[File[]]> {
-        return this.bucket.makePublic(options);
-    }
-
-    /** Set the bucket's metadata. */
-    setMetadata(metadata?: BucketMetadata): Promise<[ApiResponse]> {
-        return this.bucket.setMetadata(metadata);
-    }
-
-    /** Upload a file. */
-    upload(localPath: string, options?: UploadOptions): Promise<[File]> {
-        return this.bucket.upload(localPath, options);
-    }
-}
-
-/** The file API wrapper. */
-export class TestFile {
-    // the file in the cloud
-    file: File;
-
-    /**
-     * Copy this file to another file.
-     * By default, this will copy the file to the same bucket, but you can choose to copy it to another
-     * Bucket by providing a Bucket or File object or a URL starting with "gs:// ".
-     */
-    copy(destination: string | Bucket | File): Promise<[File, ApiResponse]> {
-        return this.file.copy(destination);
-    }
-
-    /** Create a unique resumable upload session URI. This is the first step when performing a resumable upload. */
-    createResumableUpload(options?: ResumableUploadOptions): Promise<[string]> {
-        return this.file.createResumableUpload(options);
-    }
-
-    /**
-     * Create a readable stream to read the contents of the remote file.
-     * It can be piped to a writable stream or listened to for 'data' events to read a file's contents.
-     */
-    createReadStream(options?: ReadStreamOptions): fs.ReadStream {
-        return this.file.createReadStream(options);
-    }
-
-    /** Create a writable stream to overwrite the contents of the file in your bucket. */
-    createWriteStream(options?: WriteStreamOptions): fs.WriteStream {
-        return this.file.createWriteStream(options);
-    }
-
-    /** Delete the file. */
-    delete(): Promise<[ApiResponse]> {
-        return this.file.delete();
-    }
-
-    /** Convenience method to download a file into memory or to a local destination. */
-    download(options?: DownloadOptions): Promise<[Buffer]> {
-        return this.file.download(options);
-    }
-
-    /** Check if the file exists. */
-    exists(): Promise<[boolean]> {
-        return this.file.exists();
-    }
-
-    /** Get a file object and its metadata if it exists. */
-    get(): Promise<[File, ApiResponse]> {
-        return this.file.get();
-    }
-
-    /** Get the file's metadata. */
-    getMetadata(): Promise<[FileMetadata, ApiResponse]> {
-        return this.file.getMetadata();
-    }
-
-    /** Get a signed policy document to allow a user to upload data with a POST request */
-    getSignedPolicy(options?: SignedPolicyOptions): Promise<[SignedPolicy]> {
-        return this.file.getSignedPolicy(options);
-    }
-
-    /** Get a signed URL to allow limited time access to the file */
-    getSignedUrl(config: SignedUrlConfig): Promise<[string]> {
-        return this.file.getSignedUrl(config);
-    }
-
-    /** Make a file private to the project and remove all other permissions. */
-    makePrivate(options?: FilePrivateOptions): Promise<[ApiResponse]> {
-        return this.file.makePrivate(options);
-    }
-
-    /** Set a file to be publicly readable and maintain all previous permissions. */
-    makePublic(): Promise<[ApiResponse]> {
-        return this.file.makePublic();
-    }
-
-    /**
-     * Move this file to another location.
-     * By default, this will move the file to the same bucket, but you can choose to move it to
-     * another Bucket by providing a Bucket or File object or a URL beginning with "gs:// ".
-     */
-    move(destination: string | Bucket | File): Promise<[File, ApiResponse]> {
-        return this.file.move(destination);
-    }
-
-    /** Write arbitrary data to a file. */
-    save(data: string, options?: WriteStreamOptions): Promise<void> {
-        return this.file.save(data);
-    }
-
-    /** The Storage API allows you to use a custom key for server-side encryption. */
-    setEncryptionKey(encryptionKey: string | Buffer): File {
-        return this.file.setEncryptionKey(encryptionKey);
-    }
-
-    /**
-     * Merge the given metadata with the current remote file's metadata.
-     * This will set metadata if it was previously unset or update previously set metadata.
-     * To unset previously set metadata, set its value to null.
-     */
-    setMetadata(metadata: FileMetadata): Promise<[ApiResponse]> {
-        return this.file.setMetadata(metadata);
-    }
-}
-
-const testStorage = new TestStorage().bucket("examplebucketname");
-
-testStorage.iam.getPolicy();
-
-testStorage.iam.setPolicy({
-        bindings: [
-            {
-                role: "roles/storage.admin",
-                members: ['serviceAccount:myotherproject@appspot.gserviceaccount.com']
-            }
-        ]
-    });
-
-testStorage.iam.testPermissions('storage.buckets.delete');
-
-testStorage.iam.testPermissions(['storage.buckets.delete', 'storage.buckets.get']);
-
-// Example from https://cloud.google.com/storage/docs/creating-buckets#storage-create-bucket-code_samples
-{
-    // Creates a client
-    const storage = new Storage();
-
-    const bucketName = 'Name of a bucket, e.g. my-bucket';
-
-    // Creates a new bucket
-    storage
-    .createBucket(bucketName, {
-        location: 'ASIA',
-        storageClass: 'COLDLINE',
-    })
-    .then(() => {
-        console.log(`Bucket ${bucketName} created.`);
-    })
-    .catch(err => {
-        console.error('ERROR:', err);
-    });
-}
-
-// Example from https://cloud.google.com/storage/docs/listing-buckets#storage-list-buckets-nodejs
-{
-    // Creates a client
-    const storage = new Storage();
-
-    // Lists all buckets in the current project
-    storage
-    .getBuckets()
-    .then(results => {
-        const buckets = results[0];
-
-        console.log('Buckets:');
-        buckets.forEach(bucket => {
-        console.log(bucket.name);
-        });
-    })
-    .catch(err => {
-        console.error('ERROR:', err);
-    });
-}
-
-// Example from https://cloud.google.com/storage/docs/moving-buckets#storage-create-bucket-nodejs
-{
-    // Creates a client
-    const storage = new Storage();
-
-    const bucketName = 'Name of a bucket, e.g. my-bucket';
-
-    // Creates a new bucket
-    storage
-    .createBucket(bucketName, {
-        location: 'ASIA',
-        storageClass: 'COLDLINE',
-    })
-    .then(() => {
-        console.log(`Bucket ${bucketName} created.`);
-    })
-    .catch(err => {
-        console.error('ERROR:', err);
-    });
-}
-
-// Example from https://cloud.google.com/storage/docs/deleting-buckets
-{
-    // Creates a client
-    const storage = new Storage();
-
-    const bucketName = 'Name of a bucket, e.g. my-bucket';
-
-    // Deletes the bucket
-    storage
-    .bucket(bucketName)
-    .delete()
-    .then(() => {
-        console.log(`Bucket ${bucketName} deleted.`);
-    })
-    .catch(err => {
-        console.error('ERROR:', err);
-    });
-}
-
-// Example from https://cloud.google.com/storage/docs/uploading-objects
-{
-    // Creates a client
-    const storage = new Storage();
-
-    const bucketName = 'Name of a bucket, e.g. my-bucket';
-    const filename = 'Local file to upload, e.g. ./local/path/to/file.txt';
-
-    // Uploads a local file to the bucket
-    storage
-    .bucket(bucketName)
-    .upload(filename, {
-        // Support for HTTP requests made with `Accept-Encoding: gzip`
-        gzip: true,
-        metadata: {
-        // Enable long-lived HTTP caching headers
-        // Use only if the contents of the file will never change
-        // (If the contents will change, use cacheControl: 'no-cache')
-        cacheControl: 'public, max-age=31536000',
-        },
-    })
-    .then(() => {
-        console.log(`${filename} uploaded to ${bucketName}.`);
-    })
-    .catch(err => {
-        console.error('ERROR:', err);
-    });
-}
-
-// Example from https://cloud.google.com/storage/docs/listing-objects
-{
-    // Creates a client
-    const storage = new Storage();
-
-    const bucketName = 'Name of a bucket, e.g. my-bucket';
-
-    // Lists files in the bucket
-    storage
-    .bucket(bucketName)
-    .getFiles()
-    .then(results => {
-        const files = results[0];
-
-        console.log('Files:');
-        files.forEach(file => {
-        console.log(file.name);
-        });
-    })
-    .catch(err => {
-        console.error('ERROR:', err);
-    });
-}
-
-// Example from https://cloud.google.com/storage/docs/listing-objects
-{
-    // Creates a client
-    const storage = new Storage();
-
-    const bucketName = 'Name of a bucket, e.g. my-bucket';
-    const prefix = 'Prefix by which to filter, e.g. public/';
-    const delimiter = 'Delimiter to use, e.g. /';
-
-    /**
-     * This can be used to list all blobs in a "folder", e.g. "public/".
-     *
-     * The delimiter argument can be used to restrict the results to only the
-     * "files" in the given "folder". Without the delimiter, the entire tree under
-     * the prefix is returned. For example, given these blobs:
-     *
-     *   /a/1.txt
-     *   /a/b/2.txt
-     *
-     * If you just specify prefix = '/a', you'll get back:
-     *
-     *   /a/1.txt
-     *   /a/b/2.txt
-     *
-     * However, if you specify prefix='/a' and delimiter='/', you'll get back:
-     *
-     *   /a/1.txt
-     */
-    const options = {
-        prefix,
-        delimiter
-    };
-
-    // Lists files in the bucket, filtered by a prefix
-    storage
-        .bucket(bucketName)
-        .getFiles(options)
-        .then(results => {
-            const files = results[0];
-
-            console.log('Files:');
-            files.forEach(file => {
-            console.log(file.name);
-            });
-        })
-        .catch(err => {
-            console.error('ERROR:', err);
-        });
-}
-
-// Example from https://cloud.google.com/storage/docs/downloading-objects#storage-download-object-nodejs
-{
-    // Creates a client
-    const storage = new Storage();
-
-    const bucketName = 'Name of a bucket, e.g. my-bucket';
-    const srcFilename = 'Remote file to download, e.g. file.txt';
-    const destFilename = 'Local destination for file, e.g. ./local/path/to/file.txt';
-
-    const options = {
-        // The path to which the file should be downloaded, e.g. "./file.txt"
-        destination: destFilename,
-    };
-
-    // Downloads the file
-    storage
-    .bucket(bucketName)
-    .file(srcFilename)
-    .download(options)
-    .then(() => {
-        console.log(
-        `gs://${bucketName}/${srcFilename} downloaded to ${destFilename}.`
-        );
-    })
-    .catch(err => {
-        console.error('ERROR:', err);
-    });
-}
-
-// Example from https://cloud.google.com/storage/docs/renaming-copying-moving-objects
-{
-    // Creates a client
-    const storage = new Storage();
-
-    const bucketName = 'Name of a bucket, e.g. my-bucket';
-    const srcFilename = 'File to move, e.g. file.txt';
-    const destFilename = 'Destination for file, e.g. moved.txt';
-
-    // Moves the file within the bucket
-    storage
-        .bucket(bucketName)
-        .file(srcFilename)
-        .move(destFilename)
-        .then(() => {
-            console.log(
-            `gs://${bucketName}/${srcFilename} moved to gs://${bucketName}/${destFilename}.`
-            );
-        })
-        .catch(err => {
-            console.error('ERROR:', err);
-        });
-}
-
-// Example from https://cloud.google.com/storage/docs/renaming-copying-moving-objects
-{
-    // Creates a client
-    const storage = new Storage();
-
-    const srcBucketName = 'Name of the source bucket, e.g. my-bucket';
-    const srcFilename = 'Name of the source file, e.g. file.txt';
-    const destBucketName = 'Name of the destination bucket, e.g. my-other-bucket';
-    const destFilename = 'Destination name of file, e.g. file.txt';
-
-    // Copies the file to the other bucket
-    storage
-        .bucket(srcBucketName)
-        .file(srcFilename)
-        .copy(storage.bucket(destBucketName).file(destFilename))
-        .then(() => {
-            console.log(
-            `gs://${srcBucketName}/${srcFilename} copied to gs://${destBucketName}/${destFilename}.`
-            );
-        })
-        .catch(err => {
-            console.error('ERROR:', err);
-        });
-}
-
-// Example from https://cloud.google.com/storage/docs/viewing-editing-metadata
-{
-    // Creates a client
-    const storage = new Storage();
-
-    const bucketName = 'Name of a bucket, e.g. my-bucket';
-    const filename = 'File to access, e.g. file.txt';
-
-    // Gets the metadata for the file
-    storage
-        .bucket(bucketName)
-        .file(filename)
-        .getMetadata()
-        .then(results => {
-            const metadata = results[0];
-
-            console.log(`File: ${metadata.name}`);
-            console.log(`Bucket: ${metadata.bucket}`);
-            console.log(`Storage class: ${metadata.storageClass}`);
-            console.log(`Self link: ${metadata.selfLink}`);
-            console.log(`ID: ${metadata.id}`);
-            console.log(`Size: ${metadata.size}`);
-            console.log(`Updated: ${metadata.updated}`);
-            console.log(`Generation: ${metadata.generation}`);
-            console.log(`Metageneration: ${metadata.metageneration}`);
-            console.log(`Etag: ${metadata.etag}`);
-            console.log(`Owner: ${metadata.owner}`);
-            console.log(`Component count: ${metadata.component_count}`);
-            console.log(`Crc32c: ${metadata.crc32c}`);
-            console.log(`md5Hash: ${metadata.md5Hash}`);
-            console.log(`Cache-control: ${metadata.cacheControl}`);
-            console.log(`Content-type: ${metadata.contentType}`);
-            console.log(`Content-disposition: ${metadata.contentDisposition}`);
-            console.log(`Content-encoding: ${metadata.contentEncoding}`);
-            console.log(`Content-language: ${metadata.contentLanguage}`);
-            console.log(`Metadata: ${metadata.metadata}`);
-            console.log(`Media link: ${metadata.mediaLink}`);
-        })
-        .catch(err => {
-            console.error('ERROR:', err);
-        });
-}
-
-// Example from https://cloud.google.com/storage/docs/deleting-objects
-{
-    // Creates a client
-    const storage = new Storage();
-
-    const bucketName = 'Name of a bucket, e.g. my-bucket';
-    const filename = 'File to delete, e.g. file.txt';
-
-    // Deletes the file from the bucket
-    storage
-        .bucket(bucketName)
-        .file(filename)
-        .delete()
-        .then(() => {
-            console.log(`gs://${bucketName}/${filename} deleted.`);
-        })
-        .catch(err => {
-            console.error('ERROR:', err);
-        });
-}
diff --git a/types/google-cloud__storage/index.d.ts b/types/google-cloud__storage/index.d.ts
deleted file mode 100644
index 2053abcc62..0000000000
--- a/types/google-cloud__storage/index.d.ts
+++ /dev/null
@@ -1,469 +0,0 @@
-// Type definitions for @google-cloud/storage 1.7
-// Project: https://github.com/googleapis/nodejs-storage
-// Definitions by: Brian Love <https://github.com/blove>
-//                 Nathan Brooker Perry <https://github.com/nbperry>
-//                 Matt Welke <https://github.com/welkie>
-//                 Futa Ogawa <https://github.com/ogawa0071>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
-
-/// <reference types="node" />
-
-import { ReadStream, WriteStream } from "fs";
-import { CoreOptions } from "request";
-
-type PromiseLibrary<T> = () => PromiseLike<T>;
-
-declare namespace Storage {
-    /**
-     * A bucket in the cloud.
-     */
-    class Bucket {
-        constructor(storage: Storage, name: string);
-        acl: Acl;
-        combine(sources: string[] | File[], destination: string | File): Promise<[File, ApiResponse]>;
-        create(config?: BucketConfig): Promise<[Bucket, ApiResponse]>;
-        createChannel(id: string, config: ChannelConfig): Promise<[Channel, ApiResponse]>;
-        delete(): Promise<[ApiResponse]>;
-        deleteFiles(query?: BucketQuery): Promise<void>;
-        exists(): Promise<[boolean]>;
-        file(name: string, options?: BucketFileOptions): File;
-        get(options?: BucketGetOptions): Promise<[Bucket, ApiResponse]>;
-        getFiles(query?: BucketQuery): Promise<[File[]]>;
-        getFilesStream(query?: BucketQuery): ReadStream;
-        getMetadata(): Promise<[BucketMetadata, ApiResponse]>;
-        id: string;
-        iam: Iam;
-        makePrivate(options?: BucketPrivacyOptions): Promise<[File[]]>;
-        makePublic(options?: BucketPrivacyOptions): Promise<[File[]]>;
-        metadata: BucketMetadata;
-        name: string;
-        setMetadata(metadata?: BucketMetadata): Promise<[ApiResponse]>;
-        upload(localPath: string, options?: UploadOptions): Promise<[File]>;
-    }
-
-    /**
-     * Bucket configuration.
-     */
-    interface BucketConfig {
-        coldline?: boolean;
-        dra?: boolean;
-        location?: string;
-        multiRegional?: boolean;
-        nearline?: boolean;
-        regional?: boolean;
-        versioning?: {
-            enabled?: boolean
-        };
-        // Note: This is not documented, but it is used in examples (https://cloud.google.com/nodejs/docs/reference/storage/1.7.x/Storage)
-        storageClass?: 'COLDLINE' | 'DURABLE_REDUCED_AVAILABILITY' | 'MULTI_REGIONAL' | 'NEARLINE' | 'REGIONAL';
-    }
-
-    /**
-     * Options for getting a file.
-     */
-    interface BucketFileOptions {
-        generation?: string | number;
-    }
-
-    /**
-     * Options for getting a bucket.
-     */
-    interface BucketGetOptions {
-        autoCreate?: boolean;
-    }
-
-    /**
-     * Bucket metadata.
-     */
-    interface BucketMetadata {
-        etag?: string;
-        id?: string;
-        kind?: string;
-        location?: string;
-        metageneration?: string;
-        name?: string;
-        projectNumber?: string;
-        selfLink?: string;
-        storageClass?: string;
-        timeCreated?: string;
-        updated?: string;
-    }
-
-    /**
-     * The options for making the bucket private.
-     */
-    interface BucketPrivacyOptions {
-        includeFiles?: boolean;
-        force?: boolean;
-    }
-
-    /**
-     * Query a bucket.
-     */
-    interface BucketQuery {
-        autoPaginate?: boolean;
-        delimiter?: string;
-        directory?: string;
-        prefix?: string;
-        maxApiCalls?: number;
-        maxResults?: number;
-        pageToken?: string;
-        userProject?: string;
-        versions?: boolean;
-    }
-
-    /**
-     * Options for specifying the content length range.
-     */
-    interface ContentLengthRange {
-        max?: number;
-        min?: number;
-    }
-
-    /**
-     * A file in the cloud.
-     */
-    class File {
-        constructor(bucket: Bucket, name: string, options?: BucketFileOptions);
-        acl: Acl;
-        copy(destination: string | Bucket | File): Promise<[File, ApiResponse]>;
-        createReadStream(options?: ReadStreamOptions): ReadStream;
-        createResumableUpload(options?: ResumableUploadOptions): Promise<[string]>;
-        createWriteStream(options?: WriteStreamOptions): WriteStream;
-        delete(): Promise<[ApiResponse]>;
-        download(options?: DownloadOptions): Promise<[Buffer]>;
-        exists(): Promise<[boolean]>;
-        get(): Promise<[File, ApiResponse]>;
-        getMetadata(): Promise<[FileMetadata, ApiResponse]>;
-        getSignedPolicy(options?: SignedPolicyOptions): Promise<[SignedPolicy]>;
-        getSignedUrl(config: SignedUrlConfig): Promise<[string]>;
-        makePrivate(options?: FilePrivateOptions): Promise<[ApiResponse]>;
-        makePublic(): Promise<[ApiResponse]>;
-        move(destination: string | Bucket | File): Promise<[File, ApiResponse]>;
-        name: string;
-        save(data: string | Buffer, options?: WriteStreamOptions): Promise<void>;
-        setEncryptionKey(encryptionKey: string | Buffer): File;
-        setMetadata(metadata: FileMetadata): Promise<[ApiResponse]>;
-        metadata?: FileMetadata;
-    }
-
-    /**
-     * Access controls on the object, containing one or more objectAccessControls Resources.
-     */
-    interface AclFileMetadata {
-        bucket?: string;
-        domain?: string;
-        email?: string;
-        entity?: string;
-        entityId?: string;
-        etag?: string;
-        generation?: number;
-        id?: string;
-        kind?: string;
-        object?: string;
-        projectTeam?: ProjectTeam;
-        role?: string;
-        selfLink?: string;
-    }
-
-    /**
-     * The project team associated with the entity, if any.
-     */
-    interface ProjectTeam {
-        projectNumber?: string;
-        team?: string;
-    }
-
-    /**
-     * Metadata of customer-supplied encryption key, if the object is encrypted by such a key.
-     */
-    interface CustomerEncryption {
-        encryptionAlgorithm?: string;
-        keySha256?: string;
-    }
-
-    /**
-     * User-defined metadata.
-     */
-    interface CustomFileMetadata {
-        [key: string]: string;
-    }
-
-    /**
-     * The owner of the object. This will always be the uploader of the object.
-     */
-    interface Owner {
-        entity?: string;
-        entityId?: string;
-    }
-
-    /**
-     * File metadata.
-     */
-    interface FileMetadata {
-        acl?: AclFileMetadata[];
-        bucket?: string;
-        cacheControl?: string;
-        componentCount?: number;
-        // Note: this property is accessed in one of the examples
-        component_count?: number;
-        contentDisposition?: string;
-        contentEncoding?: string;
-        contentLanguage?: string;
-        contentType?: string;
-        crc32c?: string;
-        customerEncryption?: CustomerEncryption;
-        etag?: string;
-        generation?: number;
-        id?: string;
-        kind?: string;
-        kmsKeyName?: string;
-        md5Hash?: string;
-        mediaLink?: string;
-        metadata?: CustomFileMetadata;
-        metageneration?: number;
-        name?: string;
-        owner?: Owner;
-        selfLink?: string;
-        size?: null | number;
-        storageClass?: string;
-        timeCreated?: string;
-        timeDeleted?: string;
-        timeStorageClassUpdated?: string;
-        updated?: string;
-    }
-
-    /**
-     * Options when setting the file as private.
-     */
-    interface FilePrivateOptions {
-        strict?: boolean;
-    }
-
-    /**
-     * A signed policy allowing a user to upload a file with a POST.
-     */
-    interface SignedPolicy {
-        base64?: string;
-        signature?: string;
-        string?: string;
-    }
-
-    /**
-     * Options when obtaining the signed policy.
-     */
-    interface SignedPolicyOptions {
-        acl?: string;
-        contentLengthRange?: ContentLengthRange;
-        equals?: string[] | [string[]];
-        expires?: number | string;
-        max?: number;
-        min?: number;
-        startsWith?: string[] | [string[]];
-        successRedirect?: string;
-        successStatus?: string;
-    }
-
-    /**
-     * Options when obtaining a temporary signed URL for a file.
-     */
-    interface SignedUrlConfig {
-        action: string;
-        cname?: string;
-        contentMd5?: string;
-        contentType?: string;
-        expires: any;
-        extensionHeaders?: { [key: string]: string };
-        promptSaveAs?: string;
-        responseDisposition?: string;
-        responseType?: string;
-    }
-
-    /**
-     * Options when obtaining a resumable upload URI.
-     */
-    interface ResumableUploadOptions {
-        metadata?: FileMetadata;
-        origin?: string;
-        predefinedAcl?: string;
-        private?: boolean;
-        public?: boolean;
-    }
-
-    /**
-     * Access control list for storage buckets and files.
-     */
-    interface Acl extends AclActions {
-        default: AclEntity;
-        owners: AclEntity;
-        readers: AclEntity;
-        writers: AclEntity;
-    }
-
-    /**
-     * Actions that can be performed on all ACL entities, including the root Acl.
-     */
-    interface AclActions {
-        add(options: AclOptions): Promise<[Acl, ApiResponse]>;
-        delete(options: AclOptions): Promise<[Acl, ApiResponse]>;
-        get(options: AclOptions): Promise<[Acl, ApiResponse]>;
-        update(options: AclOptions): Promise<[Acl, ApiResponse]>;
-    }
-
-    /**
-     * An object of convenience methods to add or delete reader ACL permissions for a given entity.
-     */
-    interface AclEntity extends AclActions {
-        addAllAuthenticatedUsers(): Promise<[Acl, ApiResponse]>;
-        addAllUsers(): Promise<[Acl, ApiResponse]>;
-        addDomain(entity: string): Promise<[Acl, ApiResponse]>;
-        addGroup(entity: string): Promise<[Acl, ApiResponse]>;
-        addProject(entity: string): Promise<[Acl, ApiResponse]>;
-        addUser(entity: string): Promise<[Acl, ApiResponse]>;
-        deleteAllAuthenticatedUsers(): Promise<[Acl, ApiResponse]>;
-        deleteAllUsers(): Promise<[Acl, ApiResponse]>;
-        deleteDomain(entity: string): Promise<[Acl, ApiResponse]>;
-        deleteGroup(entity: string): Promise<[Acl, ApiResponse]>;
-        deleteProject(entity: string): Promise<[Acl, ApiResponse]>;
-        deleteUser(entity: string): Promise<[Acl, ApiResponse]>;
-    }
-
-    /**
-     * ACL options.
-     */
-    interface AclOptions {
-        entity?: string;
-        role?: string;
-        generation?: number;
-    }
-
-    /**
-     * The response object.
-     */
-    interface ApiResponse {
-        etag?: string;
-        id?: string;
-        kind?: string;
-        location?: string;
-        metageneration?: string;
-        name?: string;
-        projectNumber?: string;
-        selfLink?: string;
-        storageClass?: string;
-        timeCreated?: string;
-        updated?: string;
-    }
-
-    interface Credentials {
-        client_email?: string;
-        private_key?: string;
-    }
-
-    interface ConfigurationObject {
-        autoRetry?: boolean;
-        credentials?: Credentials;
-        email?: string;
-        keyFilename?: string;
-        maxRetries?: number;
-        projectId?: string;
-        promise?: PromiseLibrary<any>;
-    }
-
-    /**
-     * The options when downloading a file.
-     */
-    interface DownloadOptions extends ReadStreamOptions {
-        destination?: string;
-    }
-
-    /**
-     * Options when reading a file stream.
-     */
-    interface ReadStreamOptions {
-        end?: number;
-        start?: number;
-        validation?: string | boolean;
-    }
-
-    /**
-     * Options when uploading file to bucket.
-     */
-    interface UploadOptions extends WriteStreamOptions {
-        destination?: string | File;
-        encryptionKey?: string;
-        kmsKeyName?: string;
-        requestOptions?: CoreOptions;
-    }
-
-    /**
-     * Options when writing to a file stream.
-     */
-    interface WriteStreamOptions {
-        contentType?: string;
-        gzip?: string | boolean;
-        metadata?: FileMetadata;
-        offset?: string;
-        predefinedAcl?: string;
-        private?: boolean;
-        public?: boolean;
-        resumable?: boolean;
-        uri?: string;
-        userProject?: string;
-        validation?: string | boolean;
-    }
-
-    /**
-     * This class allows you interact with Google Cloud Storage.
-     */
-    class Channel {
-        constructor(storage: Storage, id: string, resourceId: string);
-        stop(): Promise<[ApiResponse]>;
-    }
-
-    /**
-     * Channel configuration.
-     */
-    interface ChannelConfig {
-        address: string;
-    }
-
-    /**
-     * This class allows you to get Identity Access Management information.
-     */
-    class Iam {
-        getPolicy(): Promise<IamPolicy>;
-        setPolicy(policy: IamPolicy): Promise<[IamPolicy, ApiResponse]>;
-        testPermissions(permission: string | string[]): Promise<[{[key: string]: boolean}, ApiResponse]>;
-    }
-
-    /**
-     * IAM policy
-     */
-    interface IamPolicy {
-        bindings: IamBinding[];
-    }
-
-    interface IamBinding {
-        role: string;
-        members: string[];
-    }
-}
-
-/**
- * The Storage class allows you interact with Google Cloud Storage.
- */
-declare class Storage {
-    constructor(config?: Storage.ConfigurationObject);
-    acl: Storage.Acl;
-    bucket(name: string | Storage.Bucket): Storage.Bucket;
-    channel(id: string, resourceId: string): Storage.Channel;
-    createBucket(name: string, metadata?: Storage.BucketConfig): Promise<[Storage.Bucket, Storage.ApiResponse]>;
-    getBuckets(query?: Storage.BucketQuery): Promise<[Storage.Bucket[]]>;
-    getBucketsStream(query?: Storage.BucketQuery): Promise<[ReadStream]>;
-    Channel: (storage: Storage, id: string, resourceId: string) => Storage.Channel;
-    File: (bucket: Storage.Bucket, name: string, opts: Storage.BucketFileOptions) => Storage.File;
-    Bucket: (storage: Storage, name: string) => Storage.Bucket;
-}
-
-export = Storage;
diff --git a/types/google-cloud__storage/tsconfig.json b/types/google-cloud__storage/tsconfig.json
deleted file mode 100644
index fe05cce995..0000000000
--- a/types/google-cloud__storage/tsconfig.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "paths": {
-            "@google-cloud/storage": [
-                "google-cloud__storage"
-            ]
-        },
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "google-cloud__storage-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/google-cloud__storage/tslint.json b/types/google-cloud__storage/tslint.json
deleted file mode 100644
index b3dfb39122..0000000000
--- a/types/google-cloud__storage/tslint.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-	"extends": "dtslint/dt.json",
-	"rules": {
-		// TODOs
-		"no-duplicate-imports": false,
-		"prefer-object-spread": false
-	}
-}

From d00ce6dfdf92472f320222dab32d8a8eb149b402 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <293473+sandersn@users.noreply.github.com>
Date: Thu, 6 Dec 2018 11:39:44 -0800
Subject: [PATCH 734/836] Add semi-colons

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

diff --git a/types/shelljs/make.d.ts b/types/shelljs/make.d.ts
index 0db5320b72..ca4c2b6135 100644
--- a/types/shelljs/make.d.ts
+++ b/types/shelljs/make.d.ts
@@ -1,9 +1,9 @@
 import * as shelljs from './';
 declare global {
     interface Target {
-        (...args: any[]): void,
-        result?: any,
-        done?: boolean
+        (...args: any[]): void;
+        result?: any;
+        done?: boolean;
     }
     const target: {
         all?: Target;

From 225b004f4a13bfde2ce2e847aeda60262a8d9f65 Mon Sep 17 00:00:00 2001
From: Esteban Ibarra <eibarra1992@hotmail.com>
Date: Thu, 6 Dec 2018 15:01:57 -0500
Subject: [PATCH 735/836] Revert "Revert changes of
 react-native-draggable-flatlist"

This reverts commit ca53c065a52c288b7d8d3fb3bde5709c6d496f7c.
---
 .../index.d.ts                                | 59 +++++++++++++++++++
 .../react-native-draggable-flatlist-tests.tsx | 44 ++++++++++++++
 .../tsconfig.json                             | 24 ++++++++
 .../tslint.json                               |  1 +
 4 files changed, 128 insertions(+)
 create mode 100644 types/react-native-draggable-flatlist/index.d.ts
 create mode 100644 types/react-native-draggable-flatlist/react-native-draggable-flatlist-tests.tsx
 create mode 100644 types/react-native-draggable-flatlist/tsconfig.json
 create mode 100644 types/react-native-draggable-flatlist/tslint.json

diff --git a/types/react-native-draggable-flatlist/index.d.ts b/types/react-native-draggable-flatlist/index.d.ts
new file mode 100644
index 0000000000..0b96f0b3cd
--- /dev/null
+++ b/types/react-native-draggable-flatlist/index.d.ts
@@ -0,0 +1,59 @@
+// Type definitions for react-native-draggable-flatlist 1.1
+// Project: https://github.com/computerjazz/react-native-draggable-flatlist#readme
+// Definitions by: Stack Builders <https://github.com/stackbuilders>
+//                 Esteban Ibarra <https://github.com/ibarrae>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
+
+import { VirtualizedListWithoutRenderItemProps } from "react-native";
+import { Component } from "react";
+
+export interface RenderItemInfo<ItemR> {
+  item: ItemR;
+  index: number;
+  move: () => void;
+  moveEnd: () => void;
+  isActive: boolean;
+}
+
+export interface OnMoveEndInfo<ItemM> {
+  data: ReadonlyArray<ItemM> | null;
+  to: number;
+  from: number;
+  row: ItemM;
+}
+
+interface DraggableFlatListProps<Item> extends VirtualizedListWithoutRenderItemProps<Item> {
+  /**
+   * Items to be rendered.
+   */
+  data: ReadonlyArray<Item> | null;
+
+  /**
+   *  Function that returns updated ordering of data
+   */
+  onMoveEnd?: (info: OnMoveEndInfo<Item>) => void;
+
+  /**
+   * Function that is called when row becomes active.
+   */
+  onMoveBegin?: (index: number) => void;
+
+  /**
+   * Sets where scrolling begins.
+   *
+   * Default is 5
+   */
+  scrollPercent?: number;
+
+  /**
+   * Function that calls move when the row should become active (in an onPress, onLongPress, etc). Calls moveEnd when the gesture is complete (in onPressOut).
+   */
+  renderItem: (info: RenderItemInfo<Item>) => React.ReactElement<any> | null;
+}
+
+declare class DraggableFlatList<Item> extends Component<DraggableFlatListProps<Item>> {
+  constructor(props: DraggableFlatListProps<Item>);
+}
+
+export default DraggableFlatList;
diff --git a/types/react-native-draggable-flatlist/react-native-draggable-flatlist-tests.tsx b/types/react-native-draggable-flatlist/react-native-draggable-flatlist-tests.tsx
new file mode 100644
index 0000000000..40d613e4ea
--- /dev/null
+++ b/types/react-native-draggable-flatlist/react-native-draggable-flatlist-tests.tsx
@@ -0,0 +1,44 @@
+import * as React from 'react';
+import { TouchableOpacity, Text } from 'react-native';
+import DraggableFlatList, { RenderItemInfo } from 'react-native-draggable-flatlist';
+
+interface Item {
+  name: string;
+  mail: string;
+}
+
+class Example extends React.Component {
+  state = {
+    data: [
+      { name: 'Esteban', mail: 'foo@foo.com' },
+      { name: 'Xavier', mail: 'foo2@foo.com' },
+    ]
+  };
+
+  renderItem({ item, index, move, moveEnd, isActive }: RenderItemInfo<Item>) {
+    return (
+      <TouchableOpacity
+        onLongPress={move}
+        onPressOut={moveEnd}
+      >
+        <Text>{index}</Text>
+        <Text>{item.name}</Text>
+        <Text>{item.mail}</Text>
+      </TouchableOpacity>
+    );
+  }
+
+  render() {
+    const { data } = this.state;
+    return (
+      <DraggableFlatList
+        data={data}
+        renderItem={this.renderItem}
+        keyExtractor={(_item, index) => `draggable-item-${index}`}
+        scrollPercent={10}
+        onMoveEnd={({ data }) => this.setState({ data })}
+        ListFooterComponent={<Text>{'Hello'}</Text>}
+      />
+    );
+  }
+}
diff --git a/types/react-native-draggable-flatlist/tsconfig.json b/types/react-native-draggable-flatlist/tsconfig.json
new file mode 100644
index 0000000000..b3c009feac
--- /dev/null
+++ b/types/react-native-draggable-flatlist/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "jsx": "react-native"
+    },
+    "files": [
+        "index.d.ts",
+        "react-native-draggable-flatlist-tests.tsx"
+    ]
+}
diff --git a/types/react-native-draggable-flatlist/tslint.json b/types/react-native-draggable-flatlist/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-native-draggable-flatlist/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 57229d3354ac1b10b5b4e1d0799729e82691cfbe Mon Sep 17 00:00:00 2001
From: Dan Vanderkam <danvk@sidewalklabs.com>
Date: Thu, 6 Dec 2018 16:15:32 -0500
Subject: [PATCH 736/836] Add fill-extrusion-vertical-gradient

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

diff --git a/types/mapbox-gl/index.d.ts b/types/mapbox-gl/index.d.ts
index f3389876b9..384cea55b6 100644
--- a/types/mapbox-gl/index.d.ts
+++ b/types/mapbox-gl/index.d.ts
@@ -1319,6 +1319,7 @@ declare namespace mapboxgl {
         'fill-extrusion-height-transition'?: Transition;
         'fill-extrusion-base'?: number | StyleFunction | Expression;
         'fill-extrusion-base-transition'?: Transition;
+        'fill-extrusion-vertical-gradient'?: boolean;
     }
 
     export interface LineLayout {

From 83f02a128bbc3fb2752af6861233fdfc93fb10fb Mon Sep 17 00:00:00 2001
From: Gordon <gburgett@watermark.org>
Date: Thu, 6 Dec 2018 16:07:45 -0600
Subject: [PATCH 737/836] Improve react-instantsearch Refinements

---
 types/react-instantsearch-core/index.d.ts     | 22 +++++---
 .../react-instantsearch-core-tests.tsx        | 53 ++++++++++++++++++-
 .../react-instantsearch-tests.tsx             |  2 +-
 3 files changed, 67 insertions(+), 10 deletions(-)

diff --git a/types/react-instantsearch-core/index.d.ts b/types/react-instantsearch-core/index.d.ts
index af86139fde..bceb91ca85 100644
--- a/types/react-instantsearch-core/index.d.ts
+++ b/types/react-instantsearch-core/index.d.ts
@@ -129,17 +129,20 @@ export function connectAutoComplete(Composed: React.ComponentType<any>): React.C
 export function connectBreadcrumb(Composed: React.ComponentType<any>): React.ComponentClass<any>;
 export function connectConfigure(Composed: React.ComponentType<any>): React.ComponentClass<any>;
 
-export interface Refinement {
+export type Refinement = {
   label: string;
   attribute: string;
-  currentRefinement: string | object;
-  items?: Array<{ label: string, value: RefinementValue }>;
   index: string;
   id: string;
   value: RefinementValue;
-}
+} & ({
+  currentRefinement: string;
+} | {
+  items: Array<{ label: string, value: RefinementValue }>;
+  currentRefinement: string[];
+});
 
-type RefinementValue = (searchState: SearchState) => SearchState;
+export type RefinementValue = (searchState: SearchState) => SearchState;
 
 export interface CurrentRefinementsExposed {
   /**
@@ -305,13 +308,16 @@ export function connectRange(Composed: React.ComponentType<any>): React.Componen
 
 export interface RefinementListProvided {
   /** a function to toggle a refinement */
-  refine: (...args: any[]) => any;
+  refine: (value: string[]) => any;
   /** a function to generate a URL for the corresponding search state */
   createURL: (...args: any[]) => any;
   /** the refinement currently applied */
   currentRefinement: string[];
-  /** the list of items the RefinementList can display. */
-  items: Array<Hit<{ count: number, isRefined: boolean, label: string, value: string }>>;
+  /**
+   * The list of items the RefinementList can display.
+   * If isFromSearch is false, the hit properties like _highlightResult are undefined
+   */
+  items: Array<Hit<{ count: number, isRefined: boolean, label: string, value: string[] }>>;
   /** a function to toggle a search inside items values */
   searchForItems: (...args: any[]) => any;
   /** a boolean that says if the items props contains facet values from the global search or from the search inside items. */
diff --git a/types/react-instantsearch-core/react-instantsearch-core-tests.tsx b/types/react-instantsearch-core/react-instantsearch-core-tests.tsx
index 1ced5dee69..e39a9f53e6 100644
--- a/types/react-instantsearch-core/react-instantsearch-core-tests.tsx
+++ b/types/react-instantsearch-core/react-instantsearch-core-tests.tsx
@@ -9,7 +9,9 @@ import {
   connectSearchBox,
   connectRefinementList,
   CurrentRefinementsProvided,
-  connectCurrentRefinements
+  connectCurrentRefinements,
+  RefinementListProvided,
+  Refinement
 } from 'react-instantsearch-core';
 
 () => {
@@ -168,3 +170,52 @@ import {
 
   <ConnectedCurrentRefinements clearsQuery={true} transformItems={(item) => item} />;
 };
+
+() => {
+  function renderRefinement(
+    label: string,
+    value: Refinement['value'],
+    refine: CurrentRefinementsProvided['refine'],
+  ) {
+    return <button className="badge badge-secondary" onClick={() => refine(value)}>
+        {label}
+      </button>;
+  }
+
+  const MyCurrentRefinements = connectCurrentRefinements(({refine, items, query}: CurrentRefinementsProvided) => {
+    return <>
+        {items.map((refinement) => {
+          let str: string = refinement.currentRefinement; // $ExpectError
+          /*
+           * When existing several refinements for the same atribute name, then you get a
+           * nested items object that contains a label and a value function to use to remove a single filter.
+           * https://community.algolia.com/react-instantsearch/connectors/connectCurrentRefinements.html
+           */
+          if ('items' in refinement) {
+            str = refinement.currentRefinement; // $ExpectError
+            return <>
+              {refinement.items.map((i) => renderRefinement(i.label, i.value, refine))}
+            </>;
+          }
+
+          console.log(refinement.items); // $ExpectError
+          return renderRefinement(refinement.currentRefinement, refinement.value, refine);
+        })}
+      </>;
+  });
+};
+
+() => {
+  const MyRefinementList = ({items, refine}: RefinementListProvided) =>
+    <>
+      {items.map((item) => (
+        <button onClick={() => refine(item.value)}>
+          {item.label}
+        </button>
+      ))}
+    </>;
+  const ConnectedRefinementList = connectRefinementList(MyRefinementList);
+
+  <ConnectedRefinementList attribute={'test'} searchable={true} operator={'and'}
+    showMore={true} limit={8} showMoreLimit={99} />;
+};
diff --git a/types/react-instantsearch/react-instantsearch-tests.tsx b/types/react-instantsearch/react-instantsearch-tests.tsx
index 82672b7a60..9abf91c0ef 100644
--- a/types/react-instantsearch/react-instantsearch-tests.tsx
+++ b/types/react-instantsearch/react-instantsearch-tests.tsx
@@ -348,7 +348,7 @@ import { createInstantSearch } from "react-instantsearch-core";
         : item.label;
 
       return (
-        <li key={item.value}>
+        <li key={item.label}>
           <span onClick={() => props.refine(item.value)}>
             {label} {item.isRefined ? '- selected' : ''}
           </span>

From 8cfbfbf4be20e8dfe1288d1cf5d7879815882e4e Mon Sep 17 00:00:00 2001
From: Alex Deas <alex_deas@outlook.com>
Date: Thu, 6 Dec 2018 22:10:03 +0000
Subject: [PATCH 738/836] Support infinitary functions in cond type type def

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

diff --git a/types/ramda/index.d.ts b/types/ramda/index.d.ts
index 77dcdb05a0..48888c6ee5 100644
--- a/types/ramda/index.d.ts
+++ b/types/ramda/index.d.ts
@@ -776,7 +776,8 @@ declare namespace R {
          * point fn returns the result of applying its arguments to the corresponding transformer. If none of the predicates
          * matches, fn returns undefined.
          */
-        cond<A, B>(fns: ReadonlyArray<[SafePred<A>, (a: A) => B]>): (a: A) => B;
+        cond(fns: ReadonlyArray<[Pred, (...a: any[]) => any]>): (...a: any[]) => any;
+        cond<A, B>(fns: ReadonlyArray<[SafePred<A>, (...a: A[]) => B]>): (...a: A[]) => B;
 
         /**
          * Wraps a constructor function inside a curried function that can be called with the same arguments and returns the same type.
diff --git a/types/ramda/ramda-tests.ts b/types/ramda/ramda-tests.ts
index 61f09c1f40..2bd9a55d2f 100644
--- a/types/ramda/ramda-tests.ts
+++ b/types/ramda/ramda-tests.ts
@@ -1312,13 +1312,15 @@ type Pair = KeyValuePair<string, number>;
     ]);
     f(0); // $ExpectType string
     f(""); // $ExpectError
+    f(1, 2); // $ExpectType string
 
     const g = R.cond([
-        [x => x === 0, () => "a"],
+        [(a, b) => a === b, () => "a"],
         [() => true, () => "b"],
     ]);
     g(0);
     g("");
+    g(1, "");
 };
 
 () => {

From 7a8e5bafe41890916d50d37ea3c34c6890449569 Mon Sep 17 00:00:00 2001
From: Dimitri Benin <dimitri.benin@gmail.com>
Date: Thu, 6 Dec 2018 23:22:53 +0100
Subject: [PATCH 739/836] Add types for command-exists

---
 types/command-exists/command-exists-tests.ts | 14 ++++++++++++
 types/command-exists/index.d.ts              | 16 ++++++++++++++
 types/command-exists/tsconfig.json           | 23 ++++++++++++++++++++
 types/command-exists/tslint.json             |  1 +
 4 files changed, 54 insertions(+)
 create mode 100644 types/command-exists/command-exists-tests.ts
 create mode 100644 types/command-exists/index.d.ts
 create mode 100644 types/command-exists/tsconfig.json
 create mode 100644 types/command-exists/tslint.json

diff --git a/types/command-exists/command-exists-tests.ts b/types/command-exists/command-exists-tests.ts
new file mode 100644
index 0000000000..60efc1e0e5
--- /dev/null
+++ b/types/command-exists/command-exists-tests.ts
@@ -0,0 +1,14 @@
+import commandExists = require('command-exists');
+
+commandExists('ls', (err, commandExists) => {
+    // $ExpectType boolean
+    commandExists;
+});
+
+commandExists('ls').then(command => {
+    // $ExpectType string
+    command;
+});
+
+// $ExpectType boolean
+commandExists.sync('ls');
diff --git a/types/command-exists/index.d.ts b/types/command-exists/index.d.ts
new file mode 100644
index 0000000000..634d2a035e
--- /dev/null
+++ b/types/command-exists/index.d.ts
@@ -0,0 +1,16 @@
+// Type definitions for command-exists 1.2
+// Project: https://github.com/mathisonian/command-exists
+// Definitions by: BendingBender <https://github.com/BendingBender>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export = commandExists;
+
+declare function commandExists(commandName: string): Promise<string>;
+declare function commandExists(
+    commandName: string,
+    cb: (error: null, exists: boolean) => void
+): void;
+
+declare namespace commandExists {
+    function sync(commandName: string): boolean;
+}
diff --git a/types/command-exists/tsconfig.json b/types/command-exists/tsconfig.json
new file mode 100644
index 0000000000..9782cd2715
--- /dev/null
+++ b/types/command-exists/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "command-exists-tests.ts"
+    ]
+}
diff --git a/types/command-exists/tslint.json b/types/command-exists/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/command-exists/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 3027a7b01e9fbf82b7c0fc7cdeaf05a6ff4da7d4 Mon Sep 17 00:00:00 2001
From: Roman Rogowski <rogowski@zeropointdynamics.com>
Date: Thu, 6 Dec 2018 17:48:12 -0500
Subject: [PATCH 740/836] added @types/cryptr

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

diff --git a/types/cryptr/cryptr-tests.ts b/types/cryptr/cryptr-tests.ts
new file mode 100644
index 0000000000..3c655d7288
--- /dev/null
+++ b/types/cryptr/cryptr-tests.ts
@@ -0,0 +1,10 @@
+import Cryptr = require('cryptr');
+
+// $ExpectType Cryptr
+const cryptr = new Cryptr('myTotallySecretKey');
+
+// $ExpectType string
+const encrypted_string = cryptr.encrypt('bacon');
+
+// $ExpectType string
+cryptr.decrypt(encrypted_string);
diff --git a/types/cryptr/index.d.ts b/types/cryptr/index.d.ts
new file mode 100644
index 0000000000..4aec15c419
--- /dev/null
+++ b/types/cryptr/index.d.ts
@@ -0,0 +1,20 @@
+// Type definitions for cryptr 4.0
+// Project: https://github.com/MauriceButler/cryptr
+// Definitions by: Roman Rogowski <https://github.com/rrogowski>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare class Cryptr {
+	/**
+	 * Cryptr provides a mechanism for aes-256-ctr encryption/decryption.
+	 * @param secret key used for encryption/decryption
+	 */
+	constructor(secret: string);
+
+	/** Encrypt a string. */
+	encrypt(value: string): string;
+
+	/** Decrypt a string. */
+	decrypt(value: string): string;
+}
+
+export = Cryptr;
diff --git a/types/cryptr/tsconfig.json b/types/cryptr/tsconfig.json
new file mode 100644
index 0000000000..2727c48e08
--- /dev/null
+++ b/types/cryptr/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "strictFunctionTypes": true
+    },
+    "files": [
+        "index.d.ts",
+        "cryptr-tests.ts"
+    ]
+}
diff --git a/types/cryptr/tslint.json b/types/cryptr/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/cryptr/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 894be3cb10fbcb232d788f57efd2bb0c6f994e8a Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <293473+sandersn@users.noreply.github.com>
Date: Thu, 6 Dec 2018 15:26:02 -0800
Subject: [PATCH 741/836] Update types-publisher dependency

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

diff --git a/package.json b/package.json
index 09fe064d48..caf101cbc6 100644
--- a/package.json
+++ b/package.json
@@ -22,6 +22,6 @@
     },
     "devDependencies": {
         "dtslint": "github:Microsoft/dtslint#production",
-        "types-publisher": "Microsoft/types-publisher#production"
+        "types-publisher": "github:Microsoft/types-publisher#production"
     }
 }

From a92893734238656a2defff936d017a33e39a9b11 Mon Sep 17 00:00:00 2001
From: Kylie Stewart <kylieastewart@gmail.com>
Date: Thu, 6 Dec 2018 17:29:35 -0700
Subject: [PATCH 742/836] Update Spectacle types to reflect latest API, remove
 the 'any's

---
 types/spectacle/index.d.ts          | 377 +++++++++++++++-------
 types/spectacle/package.json        |   6 +
 types/spectacle/spectacle-tests.tsx | 484 +++++++++++++++++++++-------
 3 files changed, 637 insertions(+), 230 deletions(-)
 create mode 100644 types/spectacle/package.json

diff --git a/types/spectacle/index.d.ts b/types/spectacle/index.d.ts
index e00b5dd3c0..285ed6cbe4 100644
--- a/types/spectacle/index.d.ts
+++ b/types/spectacle/index.d.ts
@@ -1,164 +1,321 @@
 // Type definitions for Spectacle 1.2.0
-// Project: https://github.com/FormidableLabs/victory
+// Project: https://github.com/FormidableLabs/spectacle
 // Definitions by: Zachary Maybury <https://github.com/zmaybury>
+//                 Kylie Stewart <https://github.com/kale-stew>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 
 /// <reference types="react"/>
 
 declare module "spectacle" {
-	import * as React from "react";
+    import * as React from "react";
+    import * as CSS from "csstype";
+    /**
+     * Alignment Types for Spectacle
+     */
+    type alignType =
+        | "flex-start flex-start"
+        | "flex-start center"
+        | "flex-start flex-end"
+        | "center flex-start"
+        | "center center"
+        | "center flex-end"
+        | "flex-end flex-start"
+        | "flex-end center"
+        | "flex-end flex-end";
 
-	/**
-	 * Transition Types for Spectacle
-	 */
-	type transitionType = "slide"|"zoom"|"fade"|"spin";
+    /**
+     * Animation Types for Spectacle
+     */
+    type easeType =
+        | "back"
+        | "backIn"
+        | "backOut"
+        | "backInOut"
+        | "bounce"
+        | "bounceIn"
+        | "bounceOut"
+        | "bounceInOut"
+        | "circle"
+        | "circleIn"
+        | "circleOut"
+        | "circleInOut"
+        | "linear"
+        | "linearIn"
+        | "linearOut"
+        | "linearInOut"
+        | "cubic"
+        | "cubicIn"
+        | "cubicOut"
+        | "cubicInOut"
+        | "elastic"
+        | "elasticIn"
+        | "elasticOut"
+        | "elasticInOut"
+        | "exp"
+        | "expIn"
+        | "expOut"
+        | "expInOut"
+        | "poly"
+        | "polyIn"
+        | "polyOut"
+        | "polyInOut"
+        | "quad"
+        | "quadIn"
+        | "quadOut"
+        | "quadInOut"
+        | "sin"
+        | "sinIn"
+        | "sinOut"
+        | "sinInOut";
 
-	/**
-	 * Progress Types for Spectacle
-	 */
-	type progressType = "pacman"|"bar"|"number"|"none";
+    /**
+     * Progress Types for Spectacle
+     */
+    type progressType = "pacman" | "bar" | "number" | "none";
 
-	/**
-	 * Alignment Types for Spectacle
-	 */
-	type alignType =
-		"flex-start flex-start"|"flex-start center"|"flex-start flex-end"|
-		"center flex-start"|"center center"|"center flex-end"|
-		"flex-end flex-start"|"flex-end center"|"flex-end flex-end";
+    /**
+     * S Types for StyledS in Spectacle
+     */
+    type sType = "italic" | "bold" | "line-through" | "underline";
 
-	/**
-	 * Base props for many Spectacle components
-	 */
-	export interface BaseProps {
-		italic?:boolean,
-		bold?:boolean,
-		caps?:boolean,
-		margin?:number|string,
-		padding?:number|string,
-		textColor?:string,
-		textSize?:string,
-		textAlign?:string,
-		textFont?:string,
-		bgColor?:string,
-		bgImage?:string,
-		bgDarken?:number
-	}
+    /**
+     * Target Types for links
+     */
+    type targetType = "_blank" | "_self" | "_parent" | "_top";
 
-	export type Theme = { [key: string ]: string | number }
+    /**
+     * Theme Types for CodePane in Spectacle
+     */
+    type themeType = "dark" | "light" | "external";
 
-	export interface SpectacleProps {
-		theme?: Theme
-	}
+    /**
+     * Transition Types for Spectacle
+     */
+    type transitionType = "slide" | "zoom" | "fade" | "spin";
 
-	export interface DeckProps {
-		transition?:transitionType[],
-		transitionDuration?:number,
-		progress?:progressType,
-		controls?:boolean,
-		theme?: Theme
-	}
+    /**
+     * All available DOM style properties and their types
+     * https://www.npmjs.com/package/csstype
+     */
+    export interface CSSProperties extends CSS.Properties<string | number> {}
 
-	export interface SlideProps extends BaseProps {
-		align?:alignType,
-		transition?:transitionType[],
-		transitionDuration?:number,
-		notes?:string,
-		id?:string
-	}
+    export interface AnimProps {
+        easing: easeType;
+        fromStyle: CSSProperties | CSSProperties[];
+        onAnim?: (forwards?: boolean, animIndex?: number) => void;
+        order?: number;
+        route?: object;
+        style?: CSSProperties;
+        toStyle: CSSProperties | CSSProperties[];
+        transitionDuration: number;
+    }
 
-	export interface MarkdownProps {
-		source?:string,
-		mdastConfig?:{ [key: string ]: string | number }
-	}
+    export interface AppearProps {
+        easing?: easeType;
+        endValue?: object;
+        fid?: string;
+        order?: number;
+        startValue?: object;
+        style?: BaseProps["style"];
+        transitionDuration?: number;
+    }
 
-	export interface CodePaneProps extends BaseProps {
-		lang?:string,
-		source?:string
-	}
+    /**
+     * Base props for many Spectacle components
+     */
+    export interface BaseProps {
+        bgColor?: string;
+        bgDarken?: number;
+        bgImage?: string;
+        bold?: boolean;
+        caps?: boolean;
+        className?: string;
+        italic?: boolean;
+        margin?: number | string;
+        padding?: number | string;
+        style?: CSSProperties;
+        textAlign?: string;
+        textColor?: string;
+        textFont?: string;
+        textSize?: string;
+    }
+    export interface CodePaneProps {
+        className?: BaseProps["className"];
+        contentEditable?: boolean;
+        lang?: string;
+        source?: string;
+        style?: BaseProps["style"];
+        theme?: themeType;
+    }
 
-	export interface HeadingProps extends BaseProps {
-		fit?:boolean,
-		lineHeight?:number
-		size?:number;
-	}
+    export interface ComponentPlaygroundProps {
+        code?: string;
+        previewBackgroundColor?: string;
+        scope?: object;
+        theme?: themeType;
+        transformCode?: (code: string) => string;
+    }
 
-	export interface ImageProps extends BaseProps {
-		display?:string,
-		height?:number,
-		src?:string,
-		width?:number|string
-	}
+    export interface DeckProps {
+        autoplay?: boolean;
+        autoplayDuration?: number;
+        autoplayLoop?: boolean;
+        controls?: boolean;
+        globalStyles?: boolean;
+        history?: any; // Needs a type, see https://github.com/ReactTraining/history
+        progress?: progressType;
+        theme?: Theme;
+        transition?: transitionType[];
+        transitionDuration?: number;
+    }
 
-	export interface LinkProps extends BaseProps {
-		href?:string
-	}
+    export interface FillProps {
+        className?: string;
+        style?: CSSProperties;
+    }
 
-	export interface SProps extends BaseProps {
-		type?:string
-	}
+    export interface FitProps extends FillProps {}
 
-	export interface TextProps extends BaseProps {
-		fit?:boolean,
-		lineHeight?:number
-	}
+    export interface GoToActionProps {
+        margin?: BaseProps["margin"];
+        padding?: BaseProps["padding"];
+        render?: (goToSlide?: (slide: number | string) => void) => void;
+        slide?: number | string;
+        style?: BaseProps["style"];
+    }
 
-	export class Spectacle extends React.Component<SpectacleProps> {}
+    export interface HeadingProps extends BaseProps {
+        fit?: boolean;
+        lineHeight?: number;
+        size?: number;
+    }
 
-	export class Deck extends React.Component<DeckProps> {}
+    export interface ImageProps {
+        alt?: string;
+        className?: BaseProps["className"];
+        display?: string;
+        height?: number | string;
+        margin?: BaseProps["margin"];
+        padding?: BaseProps["padding"];
+        src?: string;
+        width?: number | string;
+    }
 
-	export class Slide extends React.Component<SlideProps> {}
+    export interface LayoutProps {
+        style?: CSSProperties;
+    }
 
-	export class Layout extends React.Component<any> {}
+    export interface LinkProps extends BaseProps {
+        href?: string;
+        target?: targetType;
+    }
 
-	export class Fit extends React.Component<any> {}
+    export interface MarkdownProps {
+        mdastConfig?: { [key: string]: number | string };
+        source?: string;
+    }
 
-	export class Fill extends React.Component<any> {}
+    export interface SlideProps extends BaseProps {
+        align?: alignType;
+        contentStyles?: CSSProperties;
+        controlColor?: string;
+        dispatch?: () => void;
+        hash?: number | string;
+        progressColor?: string;
+        history?: any; // Needs a type, see https://github.com/ReactTraining/history
+        id?: string;
+        lastSlideIndex?: number;
+        notes?: string;
+        onActive?: (slideIndex: string | number) => void;
+        slideIndex?: number;
+        transition?: transitionType[];
+        transitionDuration?: number;
+        transitionIn?: transitionType[];
+        transitionOut?: transitionType[];
+    }
 
-	export class Markdown extends React.Component<MarkdownProps> {}
+    export interface SProps extends BaseProps {
+        type?: sType | sType[];
+    }
 
-	export class Appear extends React.Component<any> {}
+    export interface TextProps extends BaseProps {
+        fit?: boolean;
+        lineHeight?: number;
+    }
 
-	export class BlockQuote extends React.Component<BaseProps> {}
+    export type Theme = { [key: string]: number | string };
 
-	export class Quote extends React.Component<BaseProps> {}
+    export class Anim extends React.Component<AnimProps> {}
 
-	export class Cite extends React.Component<BaseProps> {}
+    export class Appear extends React.Component<AppearProps> {}
 
-	export class CodePane extends React.Component<CodePaneProps> {}
+    export class BlockQuote extends React.Component<BaseProps> {}
 
-	export class Code extends React.Component<BaseProps> {}
+    export class Cite extends React.Component<BaseProps> {}
 
-	export class Heading extends React.Component<HeadingProps> {}
+    export class Code extends React.Component<BaseProps> {}
 
-	export class Image extends React.Component<ImageProps> {}
+    export class CodePane extends React.Component<CodePaneProps> {}
 
-	export class Link extends React.Component<LinkProps> {}
+    export class ComponentPlayground extends React.Component<
+        ComponentPlaygroundProps
+    > {}
 
-	export class List extends React.Component<BaseProps> {}
+    export class Deck extends React.Component<DeckProps> {}
 
-	export class ListItem extends React.Component<BaseProps> {}
+    export class Fill extends React.Component<FillProps> {}
 
-	export class S extends React.Component<SProps> {}
+    export class Fit extends React.Component<FitProps> {}
 
-	export class Table extends React.Component<BaseProps> {}
+    export class GoToAction extends React.Component<GoToActionProps> {}
 
-	export class TableRow extends React.Component<BaseProps> {}
+    export class Heading extends React.Component<HeadingProps> {}
 
-	export class TableHeaderItem extends React.Component<BaseProps> {}
+    export class Image extends React.Component<ImageProps> {}
 
-	export class TableItem extends React.Component<BaseProps> {}
+    export class Layout extends React.Component<LayoutProps> {}
 
-	export class Text extends React.Component<TextProps> {}
+    export class Link extends React.Component<LinkProps> {}
+
+    export class List extends React.Component<BaseProps> {}
+
+    export class ListItem extends React.Component<BaseProps> {}
+
+    export class Markdown extends React.Component<MarkdownProps> {}
+
+    export class Notes extends React.Component<BaseProps> {}
+
+    export class Quote extends React.Component<BaseProps> {}
+
+    export class S extends React.Component<SProps> {}
+
+    export class Slide extends React.Component<SlideProps> {}
+
+    export class SlideSet extends React.Component<BaseProps> {}
+
+    export class Table extends React.Component<BaseProps> {}
+
+    export class TableBody extends React.Component<BaseProps> {}
+
+    export class TableHeader extends React.Component<BaseProps> {}
+
+    export class TableHeaderItem extends React.Component<BaseProps> {}
+
+    export class TableItem extends React.Component<BaseProps> {}
+
+    export class TableRow extends React.Component<BaseProps> {}
+
+    export class Text extends React.Component<TextProps> {}
 }
 
 declare module "spectacle/lib/utils/preloader" {
-	const preloader: (obj: object) => void;
-	export default preloader;
+    const preloader: (obj: object) => void;
+    export default preloader;
 }
 
 declare module "spectacle/lib/themes/default" {
-	import { Theme } from "spectacle";
-	const createTheme: (...args: object[]) => Theme;
-	export default createTheme;
+    import { Theme } from "spectacle";
+    const createTheme: (...args: object[]) => Theme;
+    export default createTheme;
 }
diff --git a/types/spectacle/package.json b/types/spectacle/package.json
new file mode 100644
index 0000000000..9de3dd17fa
--- /dev/null
+++ b/types/spectacle/package.json
@@ -0,0 +1,6 @@
+{
+    "private": true,
+    "dependencies": {
+      "csstype": "^2.2.0"
+    }
+  }
diff --git a/types/spectacle/spectacle-tests.tsx b/types/spectacle/spectacle-tests.tsx
index f0a0b65e5a..04c3403f41 100644
--- a/types/spectacle/spectacle-tests.tsx
+++ b/types/spectacle/spectacle-tests.tsx
@@ -1,133 +1,377 @@
-/**
- * Spectacle Test Examples
- *
- */
-
-import * as React from 'react';
+import * as React from "react";
 import {
-	Appear,
-	BlockQuote,
-	Cite,
-	Deck,
-	Fill,
-	Heading,
-	Layout,
-	Link,
-	ListItem,
-	List,
-	Quote,
-	Slide,
-	Spectacle,
-	Text
+    Anim,
+    Appear,
+    BlockQuote,
+    Cite,
+    CodePane,
+    ComponentPlayground,
+    Deck,
+    Fill,
+    GoToAction,
+    Heading,
+    Image,
+    Layout,
+    Link,
+    List,
+    ListItem,
+    Markdown,
+    Notes,
+    Quote,
+    Slide,
+    SlideSet,
+    Table,
+    TableBody,
+    TableHeader,
+    TableHeaderItem,
+    TableItem,
+    TableRow,
+    Text
 } from "spectacle";
 
 // Import image preloader util
-import preloader from 'spectacle/lib/utils/preloader'
+import preloader from "spectacle/lib/utils/preloader";
 
 // Import theme
-import createTheme from 'spectacle/lib/themes/default'
+import createTheme from "spectacle/lib/themes/default";
 
 const images = {
-  city: 'a-url'
-}
+    city: "a-url",
+    logo: "another-url"
+};
 
-preloader(images)
+preloader(images);
 
-const theme = createTheme({
-  primary: 'white',
-  secondary: '#1F2022',
-  tertiary: '#03A9FC',
-  quartenary: '#CECECE'
-}, {
-  primary: 'Montserrat',
-  secondary: 'Helvetica'
-})
+const theme = createTheme(
+    {
+        primary: "white",
+        secondary: "#1F2022",
+        tertiary: "#03A9FC",
+        quartenary: "#CECECE"
+    },
+    {
+        primary: "Montserrat",
+        secondary: "Helvetica"
+    }
+);
 
 export class SpectacleTest extends React.Component {
-	callback() {
-		alert('Callback: ' + JSON.stringify(arguments));
-	}
-
-	public render() {
-		return (<Spectacle>
-			<Deck transition={["zoom", "slide"]} transitionDuration={500}>
-				<Slide transition={["zoom"]} bgColor="primary">
-					<Heading size={1} fit caps lineHeight={1} textColor="black">
-						Spectacle
-					</Heading>
-					<Heading size={1} fit caps>
-						A ReactJS Presentation Library
-					</Heading>
-					<Heading size={1} fit caps textColor="black">
-						Where You Can Write Your Decks In JSX
-					</Heading>
-					<Link href="https://github.com/FormidableLabs/spectacle">
-						<Text bold caps textColor="tertiary">View on Github</Text>
-					</Link>
-					<Text textSize="1.5em" margin="20px 0px 0px" bold>Hit Your Right Arrow To Begin!</Text>
-				</Slide>
-				<Slide transition={["slide"]} bgColor="black" notes="You can even put notes on your slide. How awesome is that?">
-					<Heading size={2} caps fit textColor="primary" textFont="primary">
-						Wait what?
-					</Heading>
-				</Slide>
-				<Slide transition={["slide"]} bgDarken={0.75}>
-					<Appear fid="1">
-						<Heading size={1} caps fit textColor="primary">
-							Full Width
-						</Heading>
-					</Appear>
-					<Appear fid="2">
-						<Heading size={1} caps fit textColor="tertiary">
-							Adjustable Darkness
-						</Heading>
-					</Appear>
-					<Appear fid="3">
-						<Heading size={1} caps fit textColor="primary">
-							Background Imagery
-						</Heading>
-					</Appear>
-				</Slide>
-				<Slide transition={["zoom", "fade"]} bgColor="primary">
-					<Heading caps fit>Flexible Layouts</Heading>
-					<Layout>
-						<Fill>
-							<Heading size={4} caps textColor="secondary" bgColor="white" margin={10}>
-								Left
-							</Heading>
-						</Fill>
-						<Fill>
-							<Heading size={4} caps textColor="secondary" bgColor="white" margin={10}>
-								Right
-							</Heading>
-						</Fill>
-					</Layout>
-				</Slide>
-				<Slide transition={["slide"]} bgColor="black">
-					<BlockQuote>
-						<Quote>Wonderfully formatted quotes</Quote>
-						<Cite>Ken Wheeler</Cite>
-					</BlockQuote>
-				</Slide>
-				<Slide transition={["slide", "spin"]} bgColor="primary">
-					<Heading caps fit size={1} textColor="tertiary">
-						Smooth
-					</Heading>
-					<Heading caps fit size={1} textColor="secondary">
-						Combinable Transitions
-					</Heading>
-				</Slide>
-				<Slide transition={["fade"]} bgColor="secondary" textColor="primary">
-					<List>
-						<Appear><ListItem>Inline style based theme system</ListItem></Appear>
-						<Appear><ListItem>Autofit text</ListItem></Appear>
-						<Appear><ListItem>Flexbox layout system</ListItem></Appear>
-						<Appear><ListItem>React-Router navigation</ListItem></Appear>
-						<Appear><ListItem>PDF export</ListItem></Appear>
-						<Appear><ListItem>And...</ListItem></Appear>
-					</List>
-				</Slide>
-			</Deck>
-		</Spectacle>);
-	}
+    public render() {
+        return (
+            <Deck
+                transition={["zoom", "slide"]}
+                theme={theme}
+                transitionDuration={500}
+            >
+                <Slide transition={["zoom"]} bgColor="primary">
+                    <Heading size={1} fit caps lineHeight={1} textColor="black">
+                        Spectacle
+                    </Heading>
+                    <Heading size={1} fit caps>
+                        A ReactJS Presentation Library
+                    </Heading>
+                    <Heading size={1} fit caps textColor="black">
+                        Where You Can Write Your Decks In JSX
+                    </Heading>
+                    <Link href="https://github.com/FormidableLabs/spectacle">
+                        <Text bold caps textColor="tertiary">
+                            View on Github
+                        </Text>
+                    </Link>
+                    <Text textSize="1.5em" margin="20px 0px 0px" bold>
+                        Hit Your Right Arrow To Begin!
+                    </Text>
+                </Slide>
+                <Slide
+                    id="wait-what"
+                    transition={["slide"]}
+                    bgColor="black"
+                    notes="You can even put notes on your slide. How awesome is that?"
+                >
+                    <Heading
+                        size={2}
+                        caps
+                        fit
+                        textColor="primary"
+                        textFont="primary"
+                    >
+                        Wait what?
+                    </Heading>
+                </Slide>
+                <Slide
+                    transitionIn={["zoom", "fade"]}
+                    transitionOut={["slide", "fade"]}
+                    bgDarken={0.75}
+                >
+                    <Appear fid="1">
+                        <Heading size={1} caps fit textColor="primary">
+                            Full Width
+                        </Heading>
+                    </Appear>
+                    <Appear fid="2">
+                        <Heading size={1} caps fit textColor="tertiary">
+                            Adjustable Darkness
+                        </Heading>
+                    </Appear>
+                    <Appear fid="3">
+                        <Heading size={1} caps fit textColor="primary">
+                            Background Imagery
+                        </Heading>
+                    </Appear>
+                </Slide>
+                <Slide
+                    transitionIn={["zoom", "fade"]}
+                    transitionOut={["slide", "fade"]}
+                    bgColor="primary"
+                    notes="<ul><li>talk about that</li><li>and that</li></ul>"
+                >
+                    <CodePane
+                        lang="jsx"
+                        source={""}
+                        style={{ margin: "20px auto" }}
+                    />
+                </Slide>
+                <Slide>
+                    <ComponentPlayground theme="dark" />
+                    <Notes>This is a component playground</Notes>
+                </Slide>
+                <Slide transition={["zoom", "fade"]} bgColor="primary">
+                    <Heading caps fit>
+                        Flexible Layouts
+                    </Heading>
+                    <Layout>
+                        <Fill>
+                            <Heading
+                                size={4}
+                                caps
+                                textColor="secondary"
+                                bgColor="white"
+                                margin={10}
+                            >
+                                Left
+                            </Heading>
+                        </Fill>
+                        <Fill>
+                            <Heading
+                                size={4}
+                                caps
+                                textColor="secondary"
+                                bgColor="white"
+                                margin={10}
+                            >
+                                Right
+                            </Heading>
+                        </Fill>
+                    </Layout>
+                </Slide>
+                <Slide
+                    transition={["spin", "zoom"]}
+                    bgColor="tertiary"
+                    controlColor="primary"
+                    progressColor="primary"
+                >
+                    <Heading caps fit size={1} textColor="primary">
+                        Inline Markdown
+                    </Heading>
+                    <Markdown>
+                        {`
+  You can write inline images, [Markdown Links](http://commonmark.org), paragraph text and most other markdown syntax
+  * Lists too!
+  * With ~~strikethrough~~ and _italic_
+  * And let's not forget **bold**
+  * Add some \`inline code\` to your sldes!
+            `}
+                    </Markdown>
+                </Slide>
+                <Slide transition={["slide"]}>
+                    <Anim
+                        onAnim={(forwards, animIndex) => {
+                            /* eslint-disable */
+                            console.log("forwards ", forwards);
+                            console.log("animIndex ", animIndex);
+                            /* eslint-enable */
+                        }}
+                        fromStyle={{
+                            opacity: 0,
+                            transform:
+                                "translate3d(0px, -100px, 0px)  scale(1) rotate(0deg)"
+                        }}
+                        toStyle={[
+                            {
+                                opacity: 1,
+                                transform:
+                                    "translate3d(0px, 0px, 0px)  scale(1) rotate(0deg)"
+                            },
+                            {
+                                opacity: 1,
+                                transform:
+                                    "translate3d(0px, 0px, 0px) scale(1.6) rotate(-15deg)"
+                            },
+                            {
+                                opacity: 1,
+                                transform:
+                                    "translate3d(0px, 0px, 0px)  scale(0.8) rotate(0deg)"
+                            }
+                        ]}
+                        easing={"bounceOut"}
+                        transitionDuration={500}
+                    >
+                        <React.Fragment>
+                            <Heading size={6} caps fit textColor="secondary">
+                                Flexible
+                                <br />
+                                animations
+                            </Heading>
+                        </React.Fragment>
+                    </Anim>
+                </Slide>
+                <Slide>
+                    <Heading size={2} textColor="secondary" margin="0.25em">
+                        Mix it up!
+                    </Heading>
+                    <Heading size={6} textColor="tertiary">
+                        You can even jump to different slides with a standard
+                        button or custom component!
+                    </Heading>
+                    <GoToAction margin="1em" slide={8}>
+                        Jump to Slide 8
+                    </GoToAction>
+                    <GoToAction
+                        render={goToSlide => (
+                            <select
+                                defaultValue=""
+                                style={{
+                                    background: "#000",
+                                    color: "#fff",
+                                    fontSize: "1.1em"
+                                }}
+                                onChange={({ target }) =>
+                                    goToSlide(target.value)
+                                }
+                            >
+                                <option value="" disabled>
+                                    Custom Slide Picker
+                                </option>
+                                <option value="wait-what">
+                                    Wait What!? Slide
+                                </option>
+                                <option value={3}>Slide 3</option>
+                            </select>
+                        )}
+                    />
+                </Slide>
+                <Slide transition={["slide"]} bgColor="black">
+                    <BlockQuote>
+                        <Quote>Wonderfully formatted quotes</Quote>
+                        <Cite>Ken Wheeler</Cite>
+                    </BlockQuote>
+                </Slide>
+                <Slide transition={["slide"]} bgColor="black">
+                    <BlockQuote>
+                        <Quote>Wonderfully formatted quotes</Quote>
+                        <Cite>Ken Wheeler</Cite>
+                    </BlockQuote>
+                </Slide>
+                <SlideSet>
+                    <Slide
+                        transition={["fade"]}
+                        bgColor="secondary"
+                        textColor="primary"
+                    >
+                        <List>
+                            <Appear>
+                                <ListItem>
+                                    Inline style based theme system
+                                </ListItem>
+                            </Appear>
+                            <Appear>
+                                <ListItem>Autofit text</ListItem>
+                            </Appear>
+                            <Appear>
+                                <ListItem>Flexbox layout system</ListItem>
+                            </Appear>
+                            <Appear>
+                                <ListItem>PDF export</ListItem>
+                            </Appear>
+                            <Appear>
+                                <ListItem>And...</ListItem>
+                            </Appear>
+                        </List>
+                    </Slide>
+                    <Slide transition={["slide"]} bgColor="primary">
+                        <Heading size={1} caps fit textColor="tertiary">
+                            You can even share styles with SlideSet
+                        </Heading>
+                    </Slide>
+                </SlideSet>
+                <Slide
+                    transition={["slide"]}
+                    bgColor="primary"
+                    notes="Hard to find cities without any pizza"
+                >
+                    <Heading
+                        size={4}
+                        caps
+                        textColor="secondary"
+                        bgColor="white"
+                        margin={10}
+                    >
+                        Pizza Toppings
+                    </Heading>
+                    <Layout>
+                        <Table>
+                            <TableHeader>
+                                <TableRow>
+                                    <TableHeaderItem />
+                                    <TableHeaderItem>2011</TableHeaderItem>
+                                    <TableHeaderItem>2013</TableHeaderItem>
+                                    <TableHeaderItem>2015</TableHeaderItem>
+                                </TableRow>
+                            </TableHeader>
+                            <TableBody>
+                                <TableRow>
+                                    <TableItem>None</TableItem>
+                                    <TableItem>61.8%</TableItem>
+                                    <TableItem>39.6%</TableItem>
+                                    <TableItem>35.0%</TableItem>
+                                </TableRow>
+                                <TableRow>
+                                    <TableItem>Pineapple</TableItem>
+                                    <TableItem>28.3%</TableItem>
+                                    <TableItem>54.5%</TableItem>
+                                    <TableItem>61.5%</TableItem>
+                                </TableRow>
+                                <TableRow>
+                                    <TableItem>Pepperoni</TableItem>
+                                    <TableItem />
+                                    <TableItem>50.2%</TableItem>
+                                    <TableItem>77.2%</TableItem>
+                                </TableRow>
+                                <TableRow>
+                                    <TableItem>Olives</TableItem>
+                                    <TableItem />
+                                    <TableItem>24.9%</TableItem>
+                                    <TableItem>55.9%</TableItem>
+                                </TableRow>
+                            </TableBody>
+                        </Table>
+                    </Layout>
+                </Slide>
+                <Slide transition={["spin", "slide"]} bgColor="tertiary">
+                    <Heading
+                        size={1}
+                        caps
+                        fit
+                        lineHeight={1.5}
+                        textColor="primary"
+                    >
+                        Made with love in Seattle by
+                    </Heading>
+                    <Link href="http://www.formidable.com">
+                        <Image width="100%" src={images.logo} />
+                    </Link>
+                </Slide>
+            </Deck>
+        );
+    }
 }

From 42a5abdf16075d754a8532601a3ee4539d12536b Mon Sep 17 00:00:00 2001
From: Kylie Stewart <kylieastewart@gmail.com>
Date: Thu, 6 Dec 2018 17:35:02 -0700
Subject: [PATCH 743/836] Bump Spectacle version to latest

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

diff --git a/types/spectacle/index.d.ts b/types/spectacle/index.d.ts
index 285ed6cbe4..621f08f67e 100644
--- a/types/spectacle/index.d.ts
+++ b/types/spectacle/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Spectacle 1.2.0
+// Type definitions for Spectacle 5.2.2
 // Project: https://github.com/FormidableLabs/spectacle
 // Definitions by: Zachary Maybury <https://github.com/zmaybury>
 //                 Kylie Stewart <https://github.com/kale-stew>

From e009d1c3c0747b1147c077e1b1ac6ef4a91f01ea Mon Sep 17 00:00:00 2001
From: Kent Wong <athasach@gmail.com>
Date: Thu, 6 Dec 2018 16:43:14 -0800
Subject: [PATCH 744/836] Typings for cli-box
 (https://github.com/IonicaBizau/node-cli-box).

---
 types/cli-box/cli-box-tests.ts | 47 +++++++++++++++++++++++
 types/cli-box/index.d.ts       | 70 ++++++++++++++++++++++++++++++++++
 types/cli-box/tsconfig.json    | 23 +++++++++++
 types/cli-box/tslint.json      |  1 +
 4 files changed, 141 insertions(+)
 create mode 100644 types/cli-box/cli-box-tests.ts
 create mode 100644 types/cli-box/index.d.ts
 create mode 100644 types/cli-box/tsconfig.json
 create mode 100644 types/cli-box/tslint.json

diff --git a/types/cli-box/cli-box-tests.ts b/types/cli-box/cli-box-tests.ts
new file mode 100644
index 0000000000..a26b436e21
--- /dev/null
+++ b/types/cli-box/cli-box-tests.ts
@@ -0,0 +1,47 @@
+import Box = require('cli-box');
+
+// Create a simple box
+const b1: Box = Box("20x10");
+// console.log(b1.toString());
+
+// Set custom marks
+const b2: Box = new Box({
+    w: 10
+  , h: 10
+  , stringify: false
+  , marks: {
+        nw: "╔"
+      , n:  "══"
+      , ne: "╗"
+      , e:  "║"
+      , se: "╝"
+      , s:  "══"
+      , sw: "╚"
+      , w:  "║"
+      , b: "░░"
+    }
+});
+// console.log(b2.stringify());
+
+// Box with text and use the stringify
+const b3: Box = Box("20x10", "I will be \u001b[31mdis\u001b[0mplayed inside! \n A\u001b[34mnd I'm in a\u001b[0m new line!");
+// console.log(b3);
+
+// Box with aligned text to top-right
+const b4: Box = Box("30x20", {
+    text: "Box content"
+  , stretch: true
+  , autoEOL: true
+  , vAlign: "top"
+  , hAlign: "right"
+});
+// console.log(b4);
+
+// Full screen box
+const b5: Box = Box({fullscreen: true, marks: {}}, "Hello World!");
+// console.log(b5.toString());
+
+const b5s: string = Box({stringify: true, fullscreen: true, marks: {}}, "Hello World!");
+const b5ns: Box = Box({stringify: false, fullscreen: true, marks: {}}, "Hello World!");
+
+const defaults = Box.defaults;
diff --git a/types/cli-box/index.d.ts b/types/cli-box/index.d.ts
new file mode 100644
index 0000000000..c2466853a6
--- /dev/null
+++ b/types/cli-box/index.d.ts
@@ -0,0 +1,70 @@
+// Type definitions for cli-box 6.0
+// Project: https://github.com/IonicaBizau/node-cli-box
+// Definitions by: Kent Wong <https://github.com/athasach>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
+
+/*~ Note that ES6 modules cannot directly export callable functions.
+ *~ This file should be imported using the CommonJS-style:
+ *~   import x = require('someLibrary');
+ *~
+ *~ Refer to the documentation to understand common
+ *~ workarounds for this limitation of ES6 modules.
+ */
+
+/*~ This declaration specifies that the function
+ *~ is the exported object from the file
+ */
+export = Box;
+
+type MarksKeys = 'nw' | 'n' | 'ne' | 'e' | 'se' | 's' | 'sw' | 'w' | 'b';
+type Marks = Record<MarksKeys, string>;
+
+interface Options {
+    w?: number;
+    width?: number;
+    h?: number;
+    height?: number;
+    fullscreen?: boolean;
+    stringify?: boolean;
+    marks?: Partial<Marks>;
+}
+
+interface Text {
+    text?: string;
+    stretch?: boolean;
+    autoEOL?: boolean;
+    hAlign?: 'left' | 'middle' | 'right';
+    vAlign?: 'top' | 'center' | 'bottom';
+}
+
+interface Box {
+    stringify(): string;
+    settings: {
+        width: number;
+        height: number;
+        marks: Marks;
+        lines: Array<{
+            text: string;
+            offset: {
+                y: number;
+            }
+        }>
+    };
+    options: {
+        width: number;
+        height: number;
+        marks: Marks;
+        fullscreen: boolean;
+        stringify: boolean;
+    };
+}
+
+interface BoxConstructor {
+    new(options: Options | string, text?: Text | string): Box;
+    (options: (Exclude<Options, 'stringify'> & { stringify: true }), text?: Text | string): string;
+    (options: Options | string, text?: Text | string): Box;
+    defaults: { marks: Marks };
+}
+
+declare const Box: BoxConstructor;
diff --git a/types/cli-box/tsconfig.json b/types/cli-box/tsconfig.json
new file mode 100644
index 0000000000..d9a3d38876
--- /dev/null
+++ b/types/cli-box/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictFunctionTypes": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "cli-box-tests.ts"
+    ]
+}
diff --git a/types/cli-box/tslint.json b/types/cli-box/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/cli-box/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 2b5740f7d28b9acf379c75e79ae857dae1534e5d Mon Sep 17 00:00:00 2001
From: Matthew Lilley <hello@matthewlilley.com>
Date: Fri, 7 Dec 2018 02:05:09 +0000
Subject: [PATCH 745/836] Make serializeState and deserializeState options,
 optional.

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

diff --git a/types/next-redux-wrapper/index.d.ts b/types/next-redux-wrapper/index.d.ts
index 835a9762ca..84d71b46c1 100644
--- a/types/next-redux-wrapper/index.d.ts
+++ b/types/next-redux-wrapper/index.d.ts
@@ -19,8 +19,8 @@ declare namespace nextReduxWrapper {
     interface Options {
         storeKey?: string;
         debug?: boolean;
-        serializeState: any;
-        deserializeState: any;
+        serializeState?: any;
+        deserializeState?: any;
     }
 
     interface StoreCreatorOptions<TInitialState, TStateProps, TDispatchProps, TOwnProps, TMergedProps> extends Options {

From e8127e09dfdaeaf1f7995f9a5ada2bfdfac936a7 Mon Sep 17 00:00:00 2001
From: Leko <leko.noor@gmail.com>
Date: Fri, 7 Dec 2018 11:35:23 +0900
Subject: [PATCH 746/836] Move types into a namespace

---
 types/ghauth/ghauth-tests.ts |  4 ++-
 types/ghauth/index.d.ts      | 68 +++++++++++++++++++-----------------
 2 files changed, 39 insertions(+), 33 deletions(-)

diff --git a/types/ghauth/ghauth-tests.ts b/types/ghauth/ghauth-tests.ts
index 7757cf24dd..56bc0cd1b0 100644
--- a/types/ghauth/ghauth-tests.ts
+++ b/types/ghauth/ghauth-tests.ts
@@ -1,4 +1,6 @@
-import ghauth, { AuthOptions, TokenData } from "ghauth";
+/// <reference types="node" />
+import ghauth = require("ghauth");
+import { AuthOptions, TokenData } from "ghauth";
 
 // Full
 const authOptions1: AuthOptions = {
diff --git a/types/ghauth/index.d.ts b/types/ghauth/index.d.ts
index e21afdf3fa..3d91ab8ef5 100644
--- a/types/ghauth/index.d.ts
+++ b/types/ghauth/index.d.ts
@@ -3,43 +3,47 @@
 // Definitions by: Leko <https://github.com/Leko>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-export interface AuthOptions {
-    configName: string;
+declare function ghauth(authOptions: ghauth.AuthOptions, callback: (err: Error, tokenData: ghauth.TokenData) => void): void;
 
-    /**
-     * @default false
-     */
-    noSave?: boolean;
+declare namespace ghauth {
+    interface AuthOptions {
+        configName: string;
 
-    /**
-     * @default "https://api.github.com/authorizations"
-     */
-    authUrl?: string;
+        /**
+         * @default false
+         */
+        noSave?: boolean;
 
-    /**
-     * @default "GitHub"
-     */
-    promptName?: string;
+        /**
+         * @default "https://api.github.com/authorizations"
+         */
+        authUrl?: string;
 
-    /**
-     * @default []
-     */
-    scopes?: ReadonlyArray<string>;
+        /**
+         * @default "GitHub"
+         */
+        promptName?: string;
 
-    /**
-     * @default "Node.js command-line app with ghauth"
-     */
-    note?: string;
+        /**
+         * @default []
+         */
+        scopes?: ReadonlyArray<string>;
 
-    /**
-     * @default "Magic Node.js application that does magic things with ghauth"
-     */
-    userAgent?: string;
+        /**
+         * @default "Node.js command-line app with ghauth"
+         */
+        note?: string;
+
+        /**
+         * @default "Magic Node.js application that does magic things with ghauth"
+         */
+        userAgent?: string;
+    }
+
+    interface TokenData {
+        user: string;
+        token: string;
+    }
 }
 
-export interface TokenData {
-    user: string;
-    token: string;
-}
-
-export default function ghauth(authOptions: AuthOptions, callback: (err: Error, tokenData: TokenData) => void): void;
+export = ghauth;

From 0920b0ca86aa58a6513d69ee80e89634a2034369 Mon Sep 17 00:00:00 2001
From: Wu Haotian <whtsky@gmail.com>
Date: Fri, 7 Dec 2018 15:53:43 +0800
Subject: [PATCH 747/836] use Parameters<T>

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

diff --git a/types/debounce-promise/index.d.ts b/types/debounce-promise/index.d.ts
index 2356d30060..905ca7fc50 100644
--- a/types/debounce-promise/index.d.ts
+++ b/types/debounce-promise/index.d.ts
@@ -11,14 +11,12 @@ declare namespace debounce {
     }
 }
 
-type ArgumentsType<T> = T extends (...args: infer A) => any ? A : never;
-
 declare function debounce<T extends (...args: any[]) => any>(
     func: T,
     wait?: number,
     options?: debounce.DebounceOptions
 ): (
-    ...args: ArgumentsType<T>
+    ...args: Parameters<T>
 ) => ReturnType<T> extends Promise<any>
     ? ReturnType<T>
     : Promise<ReturnType<T>>;

From 6ef208779f54941e7bce5900ba37e6f8ca3d15ef Mon Sep 17 00:00:00 2001
From: Meno Abels <meno.abels@adviser.com>
Date: Fri, 7 Dec 2018 09:35:08 +0100
Subject: [PATCH 748/836] add typings for resolve-pkg

---
 types/resolve-pkg/index.d.ts           | 14 ++++++++++++++
 types/resolve-pkg/resolve-pkg-tests.ts |  5 +++++
 types/resolve-pkg/tsconfig.json        | 23 +++++++++++++++++++++++
 types/resolve-pkg/tslint.json          |  1 +
 4 files changed, 43 insertions(+)
 create mode 100644 types/resolve-pkg/index.d.ts
 create mode 100644 types/resolve-pkg/resolve-pkg-tests.ts
 create mode 100644 types/resolve-pkg/tsconfig.json
 create mode 100644 types/resolve-pkg/tslint.json

diff --git a/types/resolve-pkg/index.d.ts b/types/resolve-pkg/index.d.ts
new file mode 100644
index 0000000000..06a706acbe
--- /dev/null
+++ b/types/resolve-pkg/index.d.ts
@@ -0,0 +1,14 @@
+// Type definitions for resolve-pkg 1.0
+// Project: https://github.com/sindresorhus/resolve-pkg
+// Definitions by: Meno Abels <https://github.com/mabels>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.9
+
+interface ResolvePkgOptions {
+  cwd?: boolean;
+}
+
+type ResolveFunction = (moduleId: string, options?: ResolvePkgOptions) => string;
+declare const resolveFunction: ResolveFunction;
+
+export = resolveFunction;
diff --git a/types/resolve-pkg/resolve-pkg-tests.ts b/types/resolve-pkg/resolve-pkg-tests.ts
new file mode 100644
index 0000000000..8794b0cc03
--- /dev/null
+++ b/types/resolve-pkg/resolve-pkg-tests.ts
@@ -0,0 +1,5 @@
+import * as rpkg from 'resolve-pkg';
+
+const test1 = rpkg('hello');
+const test2 = rpkg('hello', {});
+const test3 = rpkg('hello', { cwd: true });
diff --git a/types/resolve-pkg/tsconfig.json b/types/resolve-pkg/tsconfig.json
new file mode 100644
index 0000000000..04c11fa02f
--- /dev/null
+++ b/types/resolve-pkg/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "resolve-pkg-tests.ts"
+    ]
+}
diff --git a/types/resolve-pkg/tslint.json b/types/resolve-pkg/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/resolve-pkg/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From e8cf8f320760d232858101a0be4b2b6f7f1865dc Mon Sep 17 00:00:00 2001
From: Vincent <projects@vinnl.nl>
Date: Fri, 7 Dec 2018 12:12:31 +0100
Subject: [PATCH 749/836] react-syntax-highlighter styles moved to dist/

See
https://github.com/conorhastings/react-syntax-highlighter/blob/master/CHANGELOG.MD#1000
---
 types/react-syntax-highlighter/index.d.ts     | 412 +++++++++---------
 .../react-syntax-highlighter-tests.tsx        |   4 +-
 2 files changed, 208 insertions(+), 208 deletions(-)

diff --git a/types/react-syntax-highlighter/index.d.ts b/types/react-syntax-highlighter/index.d.ts
index c631dea9f7..825608fe92 100644
--- a/types/react-syntax-highlighter/index.d.ts
+++ b/types/react-syntax-highlighter/index.d.ts
@@ -42,626 +42,626 @@ declare module 'react-syntax-highlighter/prism-light' {
     export default class SyntaxHighlighter extends React.Component<SyntaxHighlighterProps> {}
 }
 
-declare module 'react-syntax-highlighter/styles/hljs' {
-    export { default as agate } from 'react-syntax-highlighter/styles/hljs/agate';
-    export { default as androidstudio } from 'react-syntax-highlighter/styles/hljs/androidstudio';
-    export { default as arduinoLight } from 'react-syntax-highlighter/styles/hljs/arduino-light';
-    export { default as arta } from 'react-syntax-highlighter/styles/hljs/arta';
-    export { default as ascetic } from 'react-syntax-highlighter/styles/hljs/ascetic';
-    export { default as atelierCaveDark } from 'react-syntax-highlighter/styles/hljs/atelier-cave-dark';
-    export { default as atelierCaveLight } from 'react-syntax-highlighter/styles/hljs/atelier-cave-light';
-    export { default as atelierDuneDark } from 'react-syntax-highlighter/styles/hljs/atelier-dune-dark';
-    export { default as atelierDuneLight } from 'react-syntax-highlighter/styles/hljs/atelier-dune-light';
-    export { default as atelierEstuaryDark } from 'react-syntax-highlighter/styles/hljs/atelier-estuary-dark';
-    export { default as atelierEstuaryLight } from 'react-syntax-highlighter/styles/hljs/atelier-estuary-light';
-    export { default as atelierForestDark } from 'react-syntax-highlighter/styles/hljs/atelier-forest-dark';
-    export { default as atelierForestLight } from 'react-syntax-highlighter/styles/hljs/atelier-forest-light';
-    export { default as atelierHeathDark } from 'react-syntax-highlighter/styles/hljs/atelier-heath-dark';
-    export { default as atelierHeathLight } from 'react-syntax-highlighter/styles/hljs/atelier-heath-light';
-    export { default as atelierLakesideDark } from 'react-syntax-highlighter/styles/hljs/atelier-lakeside-dark';
-    export { default as atelierLakesideLight } from 'react-syntax-highlighter/styles/hljs/atelier-lakeside-light';
-    export { default as atelierPlateauDark } from 'react-syntax-highlighter/styles/hljs/atelier-plateau-dark';
-    export { default as atelierPlateauLight } from 'react-syntax-highlighter/styles/hljs/atelier-plateau-light';
-    export { default as atelierSavannaDark } from 'react-syntax-highlighter/styles/hljs/atelier-savanna-dark';
-    export { default as atelierSavannaLight } from 'react-syntax-highlighter/styles/hljs/atelier-savanna-light';
-    export { default as atelierSeasideDark } from 'react-syntax-highlighter/styles/hljs/atelier-seaside-dark';
-    export { default as atelierSeasideLight } from 'react-syntax-highlighter/styles/hljs/atelier-seaside-light';
-    export { default as atelierSulphurpoolDark } from 'react-syntax-highlighter/styles/hljs/atelier-sulphurpool-dark';
-    export { default as atelierSulphurpoolLight } from 'react-syntax-highlighter/styles/hljs/atelier-sulphurpool-light';
-    export { default as atomOneDark } from 'react-syntax-highlighter/styles/hljs/atom-one-dark';
-    export { default as atomOneLight } from 'react-syntax-highlighter/styles/hljs/atom-one-light';
-    export { default as brownPaper } from 'react-syntax-highlighter/styles/hljs/brown-paper';
-    export { default as codepenEmbed } from 'react-syntax-highlighter/styles/hljs/codepen-embed';
-    export { default as colorBrewer } from 'react-syntax-highlighter/styles/hljs/color-brewer';
-    export { default as darcula } from 'react-syntax-highlighter/styles/hljs/darcula';
-    export { default as dark } from 'react-syntax-highlighter/styles/hljs/dark';
-    export { default as darkula } from 'react-syntax-highlighter/styles/hljs/darkula';
-    export { default as defaultStyle } from 'react-syntax-highlighter/styles/hljs/default-style';
-    export { default as docco } from 'react-syntax-highlighter/styles/hljs/docco';
-    export { default as dracula } from 'react-syntax-highlighter/styles/hljs/dracula';
-    export { default as far } from 'react-syntax-highlighter/styles/hljs/far';
-    export { default as foundation } from 'react-syntax-highlighter/styles/hljs/foundation';
-    export { default as githubGist } from 'react-syntax-highlighter/styles/hljs/github-gist';
-    export { default as github } from 'react-syntax-highlighter/styles/hljs/github';
-    export { default as googlecode } from 'react-syntax-highlighter/styles/hljs/googlecode';
-    export { default as grayscale } from 'react-syntax-highlighter/styles/hljs/grayscale';
-    export { default as gruvboxDark } from 'react-syntax-highlighter/styles/hljs/gruvbox-dark';
-    export { default as gruvboxLight } from 'react-syntax-highlighter/styles/hljs/gruvbox-light';
-    export { default as hopscotch } from 'react-syntax-highlighter/styles/hljs/hopscotch';
-    export { default as hybrid } from 'react-syntax-highlighter/styles/hljs/hybrid';
-    export { default as idea } from 'react-syntax-highlighter/styles/hljs/idea';
-    export { default as irBlack } from 'react-syntax-highlighter/styles/hljs/ir-black';
-    export { default as kimbieDark } from 'react-syntax-highlighter/styles/hljs/kimbie.dark';
-    export { default as kimbieLight } from 'react-syntax-highlighter/styles/hljs/kimbie.light';
-    export { default as magula } from 'react-syntax-highlighter/styles/hljs/magula';
-    export { default as monoBlue } from 'react-syntax-highlighter/styles/hljs/mono-blue';
-    export { default as monokaiSublime } from 'react-syntax-highlighter/styles/hljs/monokai-sublime';
-    export { default as monokai } from 'react-syntax-highlighter/styles/hljs/monokai';
-    export { default as obsidian } from 'react-syntax-highlighter/styles/hljs/obsidian';
-    export { default as ocean } from 'react-syntax-highlighter/styles/hljs/ocean';
-    export { default as paraisoDark } from 'react-syntax-highlighter/styles/hljs/paraiso-dark';
-    export { default as paraisoLight } from 'react-syntax-highlighter/styles/hljs/paraiso-light';
-    export { default as pojoaque } from 'react-syntax-highlighter/styles/hljs/pojoaque';
-    export { default as purebasic } from 'react-syntax-highlighter/styles/hljs/purebasic';
-    export { default as qtcreatorDark } from 'react-syntax-highlighter/styles/hljs/qtcreator_dark';
-    export { default as qtcreatorLight } from 'react-syntax-highlighter/styles/hljs/qtcreator_light';
-    export { default as railscasts } from 'react-syntax-highlighter/styles/hljs/railscasts';
-    export { default as rainbow } from 'react-syntax-highlighter/styles/hljs/rainbow';
-    export { default as routeros } from 'react-syntax-highlighter/styles/hljs/routeros';
-    export { default as schoolBook } from 'react-syntax-highlighter/styles/hljs/school-book';
-    export { default as solarizedDark } from 'react-syntax-highlighter/styles/hljs/solarized-dark';
-    export { default as solarizedLight } from 'react-syntax-highlighter/styles/hljs/solarized-light';
-    export { default as sunburst } from 'react-syntax-highlighter/styles/hljs/sunburst';
-    export { default as tomorrowNightBlue } from 'react-syntax-highlighter/styles/hljs/tomorrow-night-blue';
-    export { default as tomorrowNightBright } from 'react-syntax-highlighter/styles/hljs/tomorrow-night-bright';
-    export { default as tomorrowNightEighties } from 'react-syntax-highlighter/styles/hljs/tomorrow-night-eighties';
-    export { default as tomorrowNight } from 'react-syntax-highlighter/styles/hljs/tomorrow-night';
-    export { default as tomorrow } from 'react-syntax-highlighter/styles/hljs/tomorrow';
-    export { default as vs } from 'react-syntax-highlighter/styles/hljs/vs';
-    export { default as vs2015 } from 'react-syntax-highlighter/styles/hljs/vs2015';
-    export { default as xcode } from 'react-syntax-highlighter/styles/hljs/xcode';
-    export { default as xt256 } from 'react-syntax-highlighter/styles/hljs/xt256';
-    export { default as zenburn } from 'react-syntax-highlighter/styles/hljs/zenburn';
+declare module 'react-syntax-highlighter/dist/styles/hljs' {
+    export { default as agate } from 'react-syntax-highlighter/dist/styles/hljs/agate';
+    export { default as androidstudio } from 'react-syntax-highlighter/dist/styles/hljs/androidstudio';
+    export { default as arduinoLight } from 'react-syntax-highlighter/dist/styles/hljs/arduino-light';
+    export { default as arta } from 'react-syntax-highlighter/dist/styles/hljs/arta';
+    export { default as ascetic } from 'react-syntax-highlighter/dist/styles/hljs/ascetic';
+    export { default as atelierCaveDark } from 'react-syntax-highlighter/dist/styles/hljs/atelier-cave-dark';
+    export { default as atelierCaveLight } from 'react-syntax-highlighter/dist/styles/hljs/atelier-cave-light';
+    export { default as atelierDuneDark } from 'react-syntax-highlighter/dist/styles/hljs/atelier-dune-dark';
+    export { default as atelierDuneLight } from 'react-syntax-highlighter/dist/styles/hljs/atelier-dune-light';
+    export { default as atelierEstuaryDark } from 'react-syntax-highlighter/dist/styles/hljs/atelier-estuary-dark';
+    export { default as atelierEstuaryLight } from 'react-syntax-highlighter/dist/styles/hljs/atelier-estuary-light';
+    export { default as atelierForestDark } from 'react-syntax-highlighter/dist/styles/hljs/atelier-forest-dark';
+    export { default as atelierForestLight } from 'react-syntax-highlighter/dist/styles/hljs/atelier-forest-light';
+    export { default as atelierHeathDark } from 'react-syntax-highlighter/dist/styles/hljs/atelier-heath-dark';
+    export { default as atelierHeathLight } from 'react-syntax-highlighter/dist/styles/hljs/atelier-heath-light';
+    export { default as atelierLakesideDark } from 'react-syntax-highlighter/dist/styles/hljs/atelier-lakeside-dark';
+    export { default as atelierLakesideLight } from 'react-syntax-highlighter/dist/styles/hljs/atelier-lakeside-light';
+    export { default as atelierPlateauDark } from 'react-syntax-highlighter/dist/styles/hljs/atelier-plateau-dark';
+    export { default as atelierPlateauLight } from 'react-syntax-highlighter/dist/styles/hljs/atelier-plateau-light';
+    export { default as atelierSavannaDark } from 'react-syntax-highlighter/dist/styles/hljs/atelier-savanna-dark';
+    export { default as atelierSavannaLight } from 'react-syntax-highlighter/dist/styles/hljs/atelier-savanna-light';
+    export { default as atelierSeasideDark } from 'react-syntax-highlighter/dist/styles/hljs/atelier-seaside-dark';
+    export { default as atelierSeasideLight } from 'react-syntax-highlighter/dist/styles/hljs/atelier-seaside-light';
+    export { default as atelierSulphurpoolDark } from 'react-syntax-highlighter/dist/styles/hljs/atelier-sulphurpool-dark';
+    export { default as atelierSulphurpoolLight } from 'react-syntax-highlighter/dist/styles/hljs/atelier-sulphurpool-light';
+    export { default as atomOneDark } from 'react-syntax-highlighter/dist/styles/hljs/atom-one-dark';
+    export { default as atomOneLight } from 'react-syntax-highlighter/dist/styles/hljs/atom-one-light';
+    export { default as brownPaper } from 'react-syntax-highlighter/dist/styles/hljs/brown-paper';
+    export { default as codepenEmbed } from 'react-syntax-highlighter/dist/styles/hljs/codepen-embed';
+    export { default as colorBrewer } from 'react-syntax-highlighter/dist/styles/hljs/color-brewer';
+    export { default as darcula } from 'react-syntax-highlighter/dist/styles/hljs/darcula';
+    export { default as dark } from 'react-syntax-highlighter/dist/styles/hljs/dark';
+    export { default as darkula } from 'react-syntax-highlighter/dist/styles/hljs/darkula';
+    export { default as defaultStyle } from 'react-syntax-highlighter/dist/styles/hljs/default-style';
+    export { default as docco } from 'react-syntax-highlighter/dist/styles/hljs/docco';
+    export { default as dracula } from 'react-syntax-highlighter/dist/styles/hljs/dracula';
+    export { default as far } from 'react-syntax-highlighter/dist/styles/hljs/far';
+    export { default as foundation } from 'react-syntax-highlighter/dist/styles/hljs/foundation';
+    export { default as githubGist } from 'react-syntax-highlighter/dist/styles/hljs/github-gist';
+    export { default as github } from 'react-syntax-highlighter/dist/styles/hljs/github';
+    export { default as googlecode } from 'react-syntax-highlighter/dist/styles/hljs/googlecode';
+    export { default as grayscale } from 'react-syntax-highlighter/dist/styles/hljs/grayscale';
+    export { default as gruvboxDark } from 'react-syntax-highlighter/dist/styles/hljs/gruvbox-dark';
+    export { default as gruvboxLight } from 'react-syntax-highlighter/dist/styles/hljs/gruvbox-light';
+    export { default as hopscotch } from 'react-syntax-highlighter/dist/styles/hljs/hopscotch';
+    export { default as hybrid } from 'react-syntax-highlighter/dist/styles/hljs/hybrid';
+    export { default as idea } from 'react-syntax-highlighter/dist/styles/hljs/idea';
+    export { default as irBlack } from 'react-syntax-highlighter/dist/styles/hljs/ir-black';
+    export { default as kimbieDark } from 'react-syntax-highlighter/dist/styles/hljs/kimbie.dark';
+    export { default as kimbieLight } from 'react-syntax-highlighter/dist/styles/hljs/kimbie.light';
+    export { default as magula } from 'react-syntax-highlighter/dist/styles/hljs/magula';
+    export { default as monoBlue } from 'react-syntax-highlighter/dist/styles/hljs/mono-blue';
+    export { default as monokaiSublime } from 'react-syntax-highlighter/dist/styles/hljs/monokai-sublime';
+    export { default as monokai } from 'react-syntax-highlighter/dist/styles/hljs/monokai';
+    export { default as obsidian } from 'react-syntax-highlighter/dist/styles/hljs/obsidian';
+    export { default as ocean } from 'react-syntax-highlighter/dist/styles/hljs/ocean';
+    export { default as paraisoDark } from 'react-syntax-highlighter/dist/styles/hljs/paraiso-dark';
+    export { default as paraisoLight } from 'react-syntax-highlighter/dist/styles/hljs/paraiso-light';
+    export { default as pojoaque } from 'react-syntax-highlighter/dist/styles/hljs/pojoaque';
+    export { default as purebasic } from 'react-syntax-highlighter/dist/styles/hljs/purebasic';
+    export { default as qtcreatorDark } from 'react-syntax-highlighter/dist/styles/hljs/qtcreator_dark';
+    export { default as qtcreatorLight } from 'react-syntax-highlighter/dist/styles/hljs/qtcreator_light';
+    export { default as railscasts } from 'react-syntax-highlighter/dist/styles/hljs/railscasts';
+    export { default as rainbow } from 'react-syntax-highlighter/dist/styles/hljs/rainbow';
+    export { default as routeros } from 'react-syntax-highlighter/dist/styles/hljs/routeros';
+    export { default as schoolBook } from 'react-syntax-highlighter/dist/styles/hljs/school-book';
+    export { default as solarizedDark } from 'react-syntax-highlighter/dist/styles/hljs/solarized-dark';
+    export { default as solarizedLight } from 'react-syntax-highlighter/dist/styles/hljs/solarized-light';
+    export { default as sunburst } from 'react-syntax-highlighter/dist/styles/hljs/sunburst';
+    export { default as tomorrowNightBlue } from 'react-syntax-highlighter/dist/styles/hljs/tomorrow-night-blue';
+    export { default as tomorrowNightBright } from 'react-syntax-highlighter/dist/styles/hljs/tomorrow-night-bright';
+    export { default as tomorrowNightEighties } from 'react-syntax-highlighter/dist/styles/hljs/tomorrow-night-eighties';
+    export { default as tomorrowNight } from 'react-syntax-highlighter/dist/styles/hljs/tomorrow-night';
+    export { default as tomorrow } from 'react-syntax-highlighter/dist/styles/hljs/tomorrow';
+    export { default as vs } from 'react-syntax-highlighter/dist/styles/hljs/vs';
+    export { default as vs2015 } from 'react-syntax-highlighter/dist/styles/hljs/vs2015';
+    export { default as xcode } from 'react-syntax-highlighter/dist/styles/hljs/xcode';
+    export { default as xt256 } from 'react-syntax-highlighter/dist/styles/hljs/xt256';
+    export { default as zenburn } from 'react-syntax-highlighter/dist/styles/hljs/zenburn';
 }
 
-declare module 'react-syntax-highlighter/styles/hljs/agate' {
+declare module 'react-syntax-highlighter/dist/styles/hljs/agate' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/styles/hljs/androidstudio' {
+declare module 'react-syntax-highlighter/dist/styles/hljs/androidstudio' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/styles/hljs/arduino-light' {
+declare module 'react-syntax-highlighter/dist/styles/hljs/arduino-light' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/styles/hljs/arta' {
+declare module 'react-syntax-highlighter/dist/styles/hljs/arta' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/styles/hljs/ascetic' {
+declare module 'react-syntax-highlighter/dist/styles/hljs/ascetic' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/styles/hljs/atelier-cave-dark' {
+declare module 'react-syntax-highlighter/dist/styles/hljs/atelier-cave-dark' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/styles/hljs/atelier-cave-light' {
+declare module 'react-syntax-highlighter/dist/styles/hljs/atelier-cave-light' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/styles/hljs/atelier-dune-dark' {
+declare module 'react-syntax-highlighter/dist/styles/hljs/atelier-dune-dark' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/styles/hljs/atelier-dune-light' {
+declare module 'react-syntax-highlighter/dist/styles/hljs/atelier-dune-light' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/styles/hljs/atelier-estuary-dark' {
+declare module 'react-syntax-highlighter/dist/styles/hljs/atelier-estuary-dark' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/styles/hljs/atelier-estuary-light' {
+declare module 'react-syntax-highlighter/dist/styles/hljs/atelier-estuary-light' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/styles/hljs/atelier-forest-dark' {
+declare module 'react-syntax-highlighter/dist/styles/hljs/atelier-forest-dark' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/styles/hljs/atelier-forest-light' {
+declare module 'react-syntax-highlighter/dist/styles/hljs/atelier-forest-light' {
     const style: any;
     export default style;
 }
 
 
-declare module 'react-syntax-highlighter/styles/hljs/atelier-heath-dark' {
+declare module 'react-syntax-highlighter/dist/styles/hljs/atelier-heath-dark' {
     const style: any;
     export default style;
 }
 
 
-declare module 'react-syntax-highlighter/styles/hljs/atelier-heath-light' {
+declare module 'react-syntax-highlighter/dist/styles/hljs/atelier-heath-light' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/styles/hljs/atelier-lakeside-dark' {
+declare module 'react-syntax-highlighter/dist/styles/hljs/atelier-lakeside-dark' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/styles/hljs/atelier-lakeside-light' {
+declare module 'react-syntax-highlighter/dist/styles/hljs/atelier-lakeside-light' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/styles/hljs/atelier-plateau-dark' {
+declare module 'react-syntax-highlighter/dist/styles/hljs/atelier-plateau-dark' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/styles/hljs/atelier-plateau-light' {
+declare module 'react-syntax-highlighter/dist/styles/hljs/atelier-plateau-light' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/styles/hljs/atelier-savanna-dark' {
+declare module 'react-syntax-highlighter/dist/styles/hljs/atelier-savanna-dark' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/styles/hljs/atelier-savanna-light' {
+declare module 'react-syntax-highlighter/dist/styles/hljs/atelier-savanna-light' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/styles/hljs/atelier-seaside-dark' {
+declare module 'react-syntax-highlighter/dist/styles/hljs/atelier-seaside-dark' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/styles/hljs/atelier-seaside-light' {
+declare module 'react-syntax-highlighter/dist/styles/hljs/atelier-seaside-light' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/styles/hljs/atelier-sulphurpool-dark' {
+declare module 'react-syntax-highlighter/dist/styles/hljs/atelier-sulphurpool-dark' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/styles/hljs/atelier-sulphurpool-light' {
+declare module 'react-syntax-highlighter/dist/styles/hljs/atelier-sulphurpool-light' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/styles/hljs/atom-one-dark' {
+declare module 'react-syntax-highlighter/dist/styles/hljs/atom-one-dark' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/styles/hljs/atom-one-light' {
+declare module 'react-syntax-highlighter/dist/styles/hljs/atom-one-light' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/styles/hljs/brown-paper' {
+declare module 'react-syntax-highlighter/dist/styles/hljs/brown-paper' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/styles/hljs/codepen-embed' {
+declare module 'react-syntax-highlighter/dist/styles/hljs/codepen-embed' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/styles/hljs/color-brewer' {
+declare module 'react-syntax-highlighter/dist/styles/hljs/color-brewer' {
     const style: any;
     export default style;
 }
 
 
-declare module 'react-syntax-highlighter/styles/hljs/darcula' {
+declare module 'react-syntax-highlighter/dist/styles/hljs/darcula' {
     const style: any;
     export default style;
 }
 
 
-declare module 'react-syntax-highlighter/styles/hljs/dark' {
+declare module 'react-syntax-highlighter/dist/styles/hljs/dark' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/styles/hljs/darkula' {
+declare module 'react-syntax-highlighter/dist/styles/hljs/darkula' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/styles/hljs/default-style' {
+declare module 'react-syntax-highlighter/dist/styles/hljs/default-style' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/styles/hljs/docco' {
+declare module 'react-syntax-highlighter/dist/styles/hljs/docco' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/styles/hljs/dracula' {
+declare module 'react-syntax-highlighter/dist/styles/hljs/dracula' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/styles/hljs/far' {
+declare module 'react-syntax-highlighter/dist/styles/hljs/far' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/styles/hljs/foundation' {
+declare module 'react-syntax-highlighter/dist/styles/hljs/foundation' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/styles/hljs/github-gist' {
+declare module 'react-syntax-highlighter/dist/styles/hljs/github-gist' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/styles/hljs/github' {
+declare module 'react-syntax-highlighter/dist/styles/hljs/github' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/styles/hljs/googlecode' {
+declare module 'react-syntax-highlighter/dist/styles/hljs/googlecode' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/styles/hljs/grayscale' {
+declare module 'react-syntax-highlighter/dist/styles/hljs/grayscale' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/styles/hljs/gruvbox-dark' {
+declare module 'react-syntax-highlighter/dist/styles/hljs/gruvbox-dark' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/styles/hljs/gruvbox-light' {
+declare module 'react-syntax-highlighter/dist/styles/hljs/gruvbox-light' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/styles/hljs/hopscotch' {
+declare module 'react-syntax-highlighter/dist/styles/hljs/hopscotch' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/styles/hljs/hybrid' {
+declare module 'react-syntax-highlighter/dist/styles/hljs/hybrid' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/styles/hljs/idea' {
+declare module 'react-syntax-highlighter/dist/styles/hljs/idea' {
     const style: any;
     export default style;
 }
 
 
-declare module 'react-syntax-highlighter/styles/hljs/ir-black' {
+declare module 'react-syntax-highlighter/dist/styles/hljs/ir-black' {
     const style: any;
     export default style;
 }
 
 
-declare module 'react-syntax-highlighter/styles/hljs/kimbie.dark' {
+declare module 'react-syntax-highlighter/dist/styles/hljs/kimbie.dark' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/styles/hljs/kimbie.light' {
+declare module 'react-syntax-highlighter/dist/styles/hljs/kimbie.light' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/styles/hljs/magula' {
+declare module 'react-syntax-highlighter/dist/styles/hljs/magula' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/styles/hljs/mono-blue' {
+declare module 'react-syntax-highlighter/dist/styles/hljs/mono-blue' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/styles/hljs/monokai-sublime' {
+declare module 'react-syntax-highlighter/dist/styles/hljs/monokai-sublime' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/styles/hljs/monokai' {
+declare module 'react-syntax-highlighter/dist/styles/hljs/monokai' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/styles/hljs/obsidian' {
+declare module 'react-syntax-highlighter/dist/styles/hljs/obsidian' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/styles/hljs/ocean' {
+declare module 'react-syntax-highlighter/dist/styles/hljs/ocean' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/styles/hljs/paraiso-dark' {
+declare module 'react-syntax-highlighter/dist/styles/hljs/paraiso-dark' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/styles/hljs/paraiso-light' {
+declare module 'react-syntax-highlighter/dist/styles/hljs/paraiso-light' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/styles/hljs/pojoaque' {
+declare module 'react-syntax-highlighter/dist/styles/hljs/pojoaque' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/styles/hljs/purebasic' {
+declare module 'react-syntax-highlighter/dist/styles/hljs/purebasic' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/styles/hljs/qtcreator_dark' {
+declare module 'react-syntax-highlighter/dist/styles/hljs/qtcreator_dark' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/styles/hljs/qtcreator_light' {
+declare module 'react-syntax-highlighter/dist/styles/hljs/qtcreator_light' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/styles/hljs/railscasts' {
+declare module 'react-syntax-highlighter/dist/styles/hljs/railscasts' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/styles/hljs/rainbow' {
+declare module 'react-syntax-highlighter/dist/styles/hljs/rainbow' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/styles/hljs/routeros' {
+declare module 'react-syntax-highlighter/dist/styles/hljs/routeros' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/styles/hljs/school-book' {
+declare module 'react-syntax-highlighter/dist/styles/hljs/school-book' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/styles/hljs/solarized-dark' {
+declare module 'react-syntax-highlighter/dist/styles/hljs/solarized-dark' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/styles/hljs/solarized-light' {
+declare module 'react-syntax-highlighter/dist/styles/hljs/solarized-light' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/styles/hljs/sunburst' {
+declare module 'react-syntax-highlighter/dist/styles/hljs/sunburst' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/styles/hljs/tomorrow-night-blue' {
+declare module 'react-syntax-highlighter/dist/styles/hljs/tomorrow-night-blue' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/styles/hljs/tomorrow-night-bright' {
+declare module 'react-syntax-highlighter/dist/styles/hljs/tomorrow-night-bright' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/styles/hljs/tomorrow-night-eighties' {
+declare module 'react-syntax-highlighter/dist/styles/hljs/tomorrow-night-eighties' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/styles/hljs/tomorrow-night' {
+declare module 'react-syntax-highlighter/dist/styles/hljs/tomorrow-night' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/styles/hljs/tomorrow' {
+declare module 'react-syntax-highlighter/dist/styles/hljs/tomorrow' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/styles/hljs/vs' {
+declare module 'react-syntax-highlighter/dist/styles/hljs/vs' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/styles/hljs/vs2015' {
+declare module 'react-syntax-highlighter/dist/styles/hljs/vs2015' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/styles/hljs/xcode' {
+declare module 'react-syntax-highlighter/dist/styles/hljs/xcode' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/styles/hljs/xt256' {
+declare module 'react-syntax-highlighter/dist/styles/hljs/xt256' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/styles/hljs/zenburn' {
+declare module 'react-syntax-highlighter/dist/styles/hljs/zenburn' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/styles/prism' {
-    export { default as atomDark } from 'react-syntax-highlighter/styles/prism/atom-dark';
-    export { default as base16AteliersulphurpoolLight } from 'react-syntax-highlighter/styles/prism/base16-ateliersulphurpool.light';
-    export { default as cb } from 'react-syntax-highlighter/styles/prism/cb';
-    export { default as coy } from 'react-syntax-highlighter/styles/prism/coy';
-    export { default as darcula } from 'react-syntax-highlighter/styles/prism/darcula';
-    export { default as dark } from 'react-syntax-highlighter/styles/prism/dark';
-    export { default as duotoneDark } from 'react-syntax-highlighter/styles/prism/duotone-dark';
-    export { default as duotoneEarth } from 'react-syntax-highlighter/styles/prism/duotone-earth';
-    export { default as duotoneForest } from 'react-syntax-highlighter/styles/prism/duotone-forest';
-    export { default as duotoneLight } from 'react-syntax-highlighter/styles/prism/duotone-light';
-    export { default as duotoneSea } from 'react-syntax-highlighter/styles/prism/duotone-sea';
-    export { default as duotoneSpace } from 'react-syntax-highlighter/styles/prism/duotone-space';
-    export { default as funky } from 'react-syntax-highlighter/styles/prism/funky';
-    export { default as ghcolors } from 'react-syntax-highlighter/styles/prism/ghcolors';
-    export { default as hopscotch } from 'react-syntax-highlighter/styles/prism/hopscotch';
-    export { default as okaidia } from 'react-syntax-highlighter/styles/prism/okaidia';
-    export { default as pojoaque } from 'react-syntax-highlighter/styles/prism/pojoaque';
-    export { default as prism } from 'react-syntax-highlighter/styles/prism/prism';
-    export { default as solarizedlight } from 'react-syntax-highlighter/styles/prism/solarizedlight';
-    export { default as tomorrow } from 'react-syntax-highlighter/styles/prism/tomorrow';
-    export { default as twilight } from 'react-syntax-highlighter/styles/prism/twilight';
-    export { default as vs } from 'react-syntax-highlighter/styles/prism/vs';
-    export { default as xonokai } from 'react-syntax-highlighter/styles/prism/xonokai';
+declare module 'react-syntax-highlighter/dist/styles/prism' {
+    export { default as atomDark } from 'react-syntax-highlighter/dist/styles/prism/atom-dark';
+    export { default as base16AteliersulphurpoolLight } from 'react-syntax-highlighter/dist/styles/prism/base16-ateliersulphurpool.light';
+    export { default as cb } from 'react-syntax-highlighter/dist/styles/prism/cb';
+    export { default as coy } from 'react-syntax-highlighter/dist/styles/prism/coy';
+    export { default as darcula } from 'react-syntax-highlighter/dist/styles/prism/darcula';
+    export { default as dark } from 'react-syntax-highlighter/dist/styles/prism/dark';
+    export { default as duotoneDark } from 'react-syntax-highlighter/dist/styles/prism/duotone-dark';
+    export { default as duotoneEarth } from 'react-syntax-highlighter/dist/styles/prism/duotone-earth';
+    export { default as duotoneForest } from 'react-syntax-highlighter/dist/styles/prism/duotone-forest';
+    export { default as duotoneLight } from 'react-syntax-highlighter/dist/styles/prism/duotone-light';
+    export { default as duotoneSea } from 'react-syntax-highlighter/dist/styles/prism/duotone-sea';
+    export { default as duotoneSpace } from 'react-syntax-highlighter/dist/styles/prism/duotone-space';
+    export { default as funky } from 'react-syntax-highlighter/dist/styles/prism/funky';
+    export { default as ghcolors } from 'react-syntax-highlighter/dist/styles/prism/ghcolors';
+    export { default as hopscotch } from 'react-syntax-highlighter/dist/styles/prism/hopscotch';
+    export { default as okaidia } from 'react-syntax-highlighter/dist/styles/prism/okaidia';
+    export { default as pojoaque } from 'react-syntax-highlighter/dist/styles/prism/pojoaque';
+    export { default as prism } from 'react-syntax-highlighter/dist/styles/prism/prism';
+    export { default as solarizedlight } from 'react-syntax-highlighter/dist/styles/prism/solarizedlight';
+    export { default as tomorrow } from 'react-syntax-highlighter/dist/styles/prism/tomorrow';
+    export { default as twilight } from 'react-syntax-highlighter/dist/styles/prism/twilight';
+    export { default as vs } from 'react-syntax-highlighter/dist/styles/prism/vs';
+    export { default as xonokai } from 'react-syntax-highlighter/dist/styles/prism/xonokai';
 }
 
-declare module 'react-syntax-highlighter/styles/prism/atom-dark' {
+declare module 'react-syntax-highlighter/dist/styles/prism/atom-dark' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/styles/prism/base16-ateliersulphurpool.light' {
+declare module 'react-syntax-highlighter/dist/styles/prism/base16-ateliersulphurpool.light' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/styles/prism/cb' {
+declare module 'react-syntax-highlighter/dist/styles/prism/cb' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/styles/prism/coy' {
+declare module 'react-syntax-highlighter/dist/styles/prism/coy' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/styles/prism/darcula' {
+declare module 'react-syntax-highlighter/dist/styles/prism/darcula' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/styles/prism/dark' {
+declare module 'react-syntax-highlighter/dist/styles/prism/dark' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/styles/prism/duotone-dark' {
+declare module 'react-syntax-highlighter/dist/styles/prism/duotone-dark' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/styles/prism/duotone-earth' {
+declare module 'react-syntax-highlighter/dist/styles/prism/duotone-earth' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/styles/prism/duotone-forest' {
+declare module 'react-syntax-highlighter/dist/styles/prism/duotone-forest' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/styles/prism/duotone-light' {
+declare module 'react-syntax-highlighter/dist/styles/prism/duotone-light' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/styles/prism/duotone-sea' {
+declare module 'react-syntax-highlighter/dist/styles/prism/duotone-sea' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/styles/prism/duotone-space' {
+declare module 'react-syntax-highlighter/dist/styles/prism/duotone-space' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/styles/prism/funky' {
+declare module 'react-syntax-highlighter/dist/styles/prism/funky' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/styles/prism/ghcolors' {
+declare module 'react-syntax-highlighter/dist/styles/prism/ghcolors' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/styles/prism/hopscotch' {
+declare module 'react-syntax-highlighter/dist/styles/prism/hopscotch' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/styles/prism/okaidia' {
+declare module 'react-syntax-highlighter/dist/styles/prism/okaidia' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/styles/prism/pojoaque' {
+declare module 'react-syntax-highlighter/dist/styles/prism/pojoaque' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/styles/prism/prism' {
+declare module 'react-syntax-highlighter/dist/styles/prism/prism' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/styles/prism/solarizedlight' {
+declare module 'react-syntax-highlighter/dist/styles/prism/solarizedlight' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/styles/prism/tomorrow' {
+declare module 'react-syntax-highlighter/dist/styles/prism/tomorrow' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/styles/prism/twilight' {
+declare module 'react-syntax-highlighter/dist/styles/prism/twilight' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/styles/prism/vs' {
+declare module 'react-syntax-highlighter/dist/styles/prism/vs' {
     const style: any;
     export default style;
 }
 
-declare module 'react-syntax-highlighter/styles/prism/xonokai' {
+declare module 'react-syntax-highlighter/dist/styles/prism/xonokai' {
     const style: any;
     export default style;
 }
diff --git a/types/react-syntax-highlighter/react-syntax-highlighter-tests.tsx b/types/react-syntax-highlighter/react-syntax-highlighter-tests.tsx
index c516d9f610..36a55aedc1 100644
--- a/types/react-syntax-highlighter/react-syntax-highlighter-tests.tsx
+++ b/types/react-syntax-highlighter/react-syntax-highlighter-tests.tsx
@@ -3,8 +3,8 @@ import SyntaxHighlighter from "react-syntax-highlighter";
 import PrismSyntaxHighlighter from "react-syntax-highlighter/prism";
 import PrismLightHighlighter, { registerLanguage } from "react-syntax-highlighter/prism-light";
 import jsx from 'react-syntax-highlighter/languages/prism/jsx';
-import { docco } from "react-syntax-highlighter/styles/hljs";
-import { atomDark } from "react-syntax-highlighter/styles/prism";
+import { docco } from "react-syntax-highlighter/dist/styles/hljs";
+import { atomDark } from "react-syntax-highlighter/dist/styles/prism";
 
 function hljsHighlighter(): JSX.Element {
     const codeString: string = `class CPP {

From 0f73bf3034f5138fec401e9f629ade0124dc8403 Mon Sep 17 00:00:00 2001
From: Daniel Kesselberg <mail@danielkesselberg.de>
Date: Fri, 7 Dec 2018 12:13:41 +0100
Subject: [PATCH 750/836] Update method documentation

####Example: => Example:
---
 types/mongoose/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/mongoose/index.d.ts b/types/mongoose/index.d.ts
index ad515a1806..83aaa33b2b 100644
--- a/types/mongoose/index.d.ts
+++ b/types/mongoose/index.d.ts
@@ -2026,7 +2026,7 @@ declare module "mongoose" {
      * This is handy for integrating with async/await, because `orFail()` saves you
      * an extra `if` statement to check if no document was found.
      *
-     * ####Example:
+     * Example:
      *
      *     // Throws if no doc returned
      *     await Model.findOne({ foo: 'bar' }).orFail();

From 9a7b2dc7d0e741a3dde3f816805b7acb89bde49f Mon Sep 17 00:00:00 2001
From: webcarrot <admin@webcarrot.pl>
Date: Fri, 7 Dec 2018 12:19:47 +0100
Subject: [PATCH 751/836] [mailgun-js] inline and multiple attachments

1. Allow array of `attachment`s in SendData interface.
2. Add `inline` to SendData interface.
---
 types/mailgun-js/index.d.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/types/mailgun-js/index.d.ts b/types/mailgun-js/index.d.ts
index 0c6ef0eef3..32af61b68c 100644
--- a/types/mailgun-js/index.d.ts
+++ b/types/mailgun-js/index.d.ts
@@ -49,6 +49,8 @@ declare namespace Mailgun {
         contentType?: string;
         getType(): string;
     }
+    
+    type AttachmentData = string | Buffer | NodeJS.ReadWriteStream | Attachment;
 
     interface MailgunExport {
         new (options: ConstructorParams): Mailgun;
@@ -64,7 +66,8 @@ declare namespace Mailgun {
             subject?: string;
             text?: string;
             html?: string;
-            attachment?: string | Buffer | NodeJS.ReadWriteStream | Attachment;
+            attachment?: AttachmentData | AttachmentData[];
+            inline?: AttachmentData | AttachmentData[];
         }
 
         interface BatchData extends SendData {

From a4e765a77684407f0637e66369be02abb58f5437 Mon Sep 17 00:00:00 2001
From: AlexeyTokmakov <alexei619@gmail.com>
Date: Fri, 7 Dec 2018 14:35:30 +0300
Subject: [PATCH 752/836] Update index.d.ts

Add Class "Polyline" , Interface "IPolylineOptions"  and change IGeoObjectFeature, field takes type "object" .
---
 types/yandex-maps/index.d.ts | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/types/yandex-maps/index.d.ts b/types/yandex-maps/index.d.ts
index 94806b9254..1986a5238c 100644
--- a/types/yandex-maps/index.d.ts
+++ b/types/yandex-maps/index.d.ts
@@ -2126,7 +2126,7 @@ declare namespace ymaps {
 	}
 
 	interface IGeoObjectFeature {
-		geometry?: IGeometry | IGeometryJson;
+		geometry?: IGeometry | IGeometryJson | object;
 		properties?: IDataManager | object;
 	}
 
@@ -3036,6 +3036,7 @@ declare namespace ymaps {
 
 		shift(offset: number[]): IShape;
 	}
+        
 	class Monitor {
     	constructor(dataManager: IDataManager | IOptionManager);
    		add(name: string[] | string, changeCallback: (event: (object | IEvent)) => void, context?: any, params?: any): Monitor;
@@ -3044,4 +3045,13 @@ declare namespace ymaps {
     	remove(name: string): Monitor;
     	removeAll(): Monitor;
 	}
+    
+    class Polyline extends GeoObject {
+        constructor(geometry: number[][] | object | ILineStringGeometry, properties: object | IDataManager, options?: IPolylineOptions);
+    }
+
+    interface IPolylineOptions {      
+        cursor?: string;        
+        [index: string]: any;
+    }
 }

From 8b4d0980ef3f4e2e54ee0d4eb0d7e9262edab195 Mon Sep 17 00:00:00 2001
From: webcarrot <admin@webcarrot.pl>
Date: Fri, 7 Dec 2018 12:37:40 +0100
Subject: [PATCH 753/836] [] to ReadonlyArray

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

diff --git a/types/mailgun-js/index.d.ts b/types/mailgun-js/index.d.ts
index 32af61b68c..a9ea40bc93 100644
--- a/types/mailgun-js/index.d.ts
+++ b/types/mailgun-js/index.d.ts
@@ -66,8 +66,8 @@ declare namespace Mailgun {
             subject?: string;
             text?: string;
             html?: string;
-            attachment?: AttachmentData | AttachmentData[];
-            inline?: AttachmentData | AttachmentData[];
+            attachment?: AttachmentData | ReadonlyArray<AttachmentData>;
+            inline?: AttachmentData | ReadonlyArray<AttachmentData>;
         }
 
         interface BatchData extends SendData {

From a7a41699ea7a37bfaf06a323ba3a00f55bbbda86 Mon Sep 17 00:00:00 2001
From: webcarrot <admin@webcarrot.pl>
Date: Fri, 7 Dec 2018 12:44:26 +0100
Subject: [PATCH 754/836] update tests

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

diff --git a/types/mailgun-js/mailgun-js-tests.ts b/types/mailgun-js/mailgun-js-tests.ts
index e06e683248..2dc7629050 100644
--- a/types/mailgun-js/mailgun-js-tests.ts
+++ b/types/mailgun-js/mailgun-js-tests.ts
@@ -25,7 +25,14 @@ const exampleSendData: mailgunFactory.messages.SendData = {
     attachment: new mailgun.Attachment({
         data: "filepath",
         filename: "my_custom_name.png"
-    })
+    }),
+    inline: [
+        new mailgun.Attachment({
+            data: "filepath",
+            filename: "my_custom_name_2.png"
+        }),
+        "my_custom_file_3.png"
+    ]
   };
 
 mailgun.messages().send(exampleSendData, (err, body) => {});

From 00bd8dbd716931469e1a357ada78542b50f2aeec Mon Sep 17 00:00:00 2001
From: webcarrot <admin@webcarrot.pl>
Date: Fri, 7 Dec 2018 12:50:01 +0100
Subject: [PATCH 755/836] add buffer to test

---
 types/mailgun-js/mailgun-js-tests.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/types/mailgun-js/mailgun-js-tests.ts b/types/mailgun-js/mailgun-js-tests.ts
index 2dc7629050..0d830308d1 100644
--- a/types/mailgun-js/mailgun-js-tests.ts
+++ b/types/mailgun-js/mailgun-js-tests.ts
@@ -31,7 +31,8 @@ const exampleSendData: mailgunFactory.messages.SendData = {
             data: "filepath",
             filename: "my_custom_name_2.png"
         }),
-        "my_custom_file_3.png"
+        "my_custom_file_3.png",
+        Buffer.from("plain text")
     ]
   };
 

From 7f3016822d1107d9b565ddc55f279f6431b790fa Mon Sep 17 00:00:00 2001
From: webcarrot <admin@webcarrot.pl>
Date: Fri, 7 Dec 2018 12:50:40 +0100
Subject: [PATCH 756/836] remove spaces

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

diff --git a/types/mailgun-js/index.d.ts b/types/mailgun-js/index.d.ts
index a9ea40bc93..7c6284059e 100644
--- a/types/mailgun-js/index.d.ts
+++ b/types/mailgun-js/index.d.ts
@@ -49,7 +49,7 @@ declare namespace Mailgun {
         contentType?: string;
         getType(): string;
     }
-    
+
     type AttachmentData = string | Buffer | NodeJS.ReadWriteStream | Attachment;
 
     interface MailgunExport {

From c9b217ba146aeaacb33ce9340a6d36446bb0a064 Mon Sep 17 00:00:00 2001
From: Ilia Beliaev <ilia.beliaev@t-systems.com>
Date: Fri, 7 Dec 2018 14:52:26 +0300
Subject: [PATCH 757/836] Added missing options.

---
 types/pretty-ms/index.d.ts         | 6 +++++-
 types/pretty-ms/pretty-ms-tests.ts | 3 +++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/types/pretty-ms/index.d.ts b/types/pretty-ms/index.d.ts
index b1e151cd65..ca9bf663e2 100644
--- a/types/pretty-ms/index.d.ts
+++ b/types/pretty-ms/index.d.ts
@@ -1,7 +1,8 @@
-// Type definitions for pretty-ms 3.2
+// Type definitions for pretty-ms 4.0
 // Project: https://github.com/sindresorhus/pretty-ms#readme
 // Definitions by: BendingBender <https://github.com/BendingBender>
 //                 ocboogie <https://github.com/ocboogie>
+//                 silh <https://github.com/silh>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 export = prettyMs;
@@ -14,6 +15,9 @@ declare namespace prettyMs {
         msDecimalDigits?: number;
         keepDecimalsOnWholeSeconds?: boolean;
         compact?: boolean;
+        unitCount?: number;
         verbose?: boolean;
+        separateMs?: boolean;
+        formatSubMs?: boolean;
     }
 }
diff --git a/types/pretty-ms/pretty-ms-tests.ts b/types/pretty-ms/pretty-ms-tests.ts
index ae5e8120b2..bb5e8a69ec 100644
--- a/types/pretty-ms/pretty-ms-tests.ts
+++ b/types/pretty-ms/pretty-ms-tests.ts
@@ -7,4 +7,7 @@ str = prettyMs(1335669000, {verbose: true});
 str = prettyMs(1335669000, {keepDecimalsOnWholeSeconds: true});
 str = prettyMs(1335669000, {secDecimalDigits: 1});
 str = prettyMs(1335669000, {msDecimalDigits: 2});
+str = prettyMs(1335669000, {unitCount: 2});
+str = prettyMs(1335669000, {separateMs: true});
+str = prettyMs(1335669000, {formatSubMs: true});
 str = prettyMs(new Date(2014, 0, 1, 10, 40).getTime() - new Date(2014, 0, 1, 10, 5).getTime());

From 633d626edbb517d9fd8fd80c2c4a45f2331eec95 Mon Sep 17 00:00:00 2001
From: AlexeyTokmakov <alexei619@gmail.com>
Date: Fri, 7 Dec 2018 15:04:14 +0300
Subject: [PATCH 758/836] Update index.d.ts

---
 types/yandex-maps/index.d.ts | 4112 +++++++++++++++++-----------------
 1 file changed, 2056 insertions(+), 2056 deletions(-)

diff --git a/types/yandex-maps/index.d.ts b/types/yandex-maps/index.d.ts
index 1986a5238c..e7078b4b28 100644
--- a/types/yandex-maps/index.d.ts
+++ b/types/yandex-maps/index.d.ts
@@ -5,3053 +5,3053 @@
 // TypeScript Version: 2.4
 
 declare namespace ymaps {
-	interface IClassConstructor<T> {
-		new (): T;
-	}
+    interface IClassConstructor<T> {
+        new(): T;
+    }
 
-	type ControlSingleKey = "fullscreenControl" | "geolocationControl" | "routeEditor" | "rulerControl" | "searchControl" | "trafficControl" | "typeSelector" | "zoomControl";
-	type ControlSetKey = "smallMapDefaultSet" | "mediumMapDefaultSet" | "largeMapDefaultSet" | "default";
-	type ControlKey = ControlSingleKey | ControlSetKey;
+    type ControlSingleKey = "fullscreenControl" | "geolocationControl" | "routeEditor" | "rulerControl" | "searchControl" | "trafficControl" | "typeSelector" | "zoomControl";
+    type ControlSetKey = "smallMapDefaultSet" | "mediumMapDefaultSet" | "largeMapDefaultSet" | "default";
+    type ControlKey = ControlSingleKey | ControlSetKey;
 
-	type OverlayKey =
-		"default#placemark" | "default#pin" | "default#circle" | "default#rectangle" | "default#polyline" | "default#polygon" |
-		"hotspot#placemark" | "hotspot#circle" | "hotspot#rectangle" | "hotspot#polyline" | "hotspot#polygon" | "html#balloon" | "html#hint" |
-		"html#placemark" | "html#rectangle" |
-		string | IClassConstructor<IOverlay> | ((geometry: IPixelLineStringGeometry,
-												 data: IDataManager | object,
-												 options: object) => Promise<string | IClassConstructor<IOverlay>>);
-	type InteractivityModelKey = "default#opaque" | "default#geoObject" | "default#layer" | "default#transparent" | "default#silent" | string;
+    type OverlayKey =
+        "default#placemark" | "default#pin" | "default#circle" | "default#rectangle" | "default#polyline" | "default#polygon" |
+        "hotspot#placemark" | "hotspot#circle" | "hotspot#rectangle" | "hotspot#polyline" | "hotspot#polygon" | "html#balloon" | "html#hint" |
+        "html#placemark" | "html#rectangle" |
+        string | IClassConstructor<IOverlay> | ((geometry: IPixelLineStringGeometry,
+            data: IDataManager | object,
+            options: object) => Promise<string | IClassConstructor<IOverlay>>);
+    type InteractivityModelKey = "default#opaque" | "default#geoObject" | "default#layer" | "default#transparent" | "default#silent" | string;
 
-	type PresetKey = string; //option.presetStorage
-	//[number, number]
-	//[[number, number], [number, number]]
+    type PresetKey = string; //option.presetStorage
+    //[number, number]
+    //[[number, number], [number, number]]
 
-	namespace behavior {
-		class DblClickZoom implements IBehavior {
-			constructor(options?: IDblClickZoomOptions);
+    namespace behavior {
+        class DblClickZoom implements IBehavior {
+            constructor(options?: IDblClickZoomOptions);
 
-			events: IEventManager;
-			options: IOptionManager;
+            events: IEventManager;
+            options: IOptionManager;
 
-			disable(): void;
+            disable(): void;
 
-			enable(): void;
+            enable(): void;
 
-			isEnabled(): boolean;
+            isEnabled(): boolean;
 
-			getParent(): IControlParent | null;
+            getParent(): IControlParent | null;
 
-			setParent(parent: IControlParent): this;
-		}
+            setParent(parent: IControlParent): this;
+        }
 
-		interface IDblClickZoomOptions extends IMapMarginOptions {
-			centering?: boolean;
-			duration?: number;
-		}
+        interface IDblClickZoomOptions extends IMapMarginOptions {
+            centering?: boolean;
+            duration?: number;
+        }
 
-		class Drag implements IBehavior {
-			constructor(options?: IDragOptions)
+        class Drag implements IBehavior {
+            constructor(options?: IDragOptions)
 
-			events: IEventManager;
-			options: IOptionManager;
+            events: IEventManager;
+            options: IOptionManager;
 
-			disable(): void;
+            disable(): void;
 
-			enable(): void;
+            enable(): void;
 
-			isEnabled(): boolean;
+            isEnabled(): boolean;
 
-			getParent(): null | IControlParent;
+            getParent(): null | IControlParent;
 
-			setParent(parent: IControlParent): this;
-		}
+            setParent(parent: IControlParent): this;
+        }
 
-		interface IDragOptions {
-			actionCursor?: string;
-			cursor?: string;
-			inertia?: boolean;
-			inertiaDuration?: number;
-			tremor?: number;
-		}
+        interface IDragOptions {
+            actionCursor?: string;
+            cursor?: string;
+            inertia?: boolean;
+            inertiaDuration?: number;
+            tremor?: number;
+        }
 
-		class LeftMouseButtonMagnifier implements IBehavior {
-			constructor(options?: ILeftMouseButtonMagnifierOptions)
+        class LeftMouseButtonMagnifier implements IBehavior {
+            constructor(options?: ILeftMouseButtonMagnifierOptions)
 
-			events: IEventManager;
-			options: IOptionManager;
+            events: IEventManager;
+            options: IOptionManager;
 
-			disable(): void;
+            disable(): void;
 
-			enable(): void;
+            enable(): void;
 
-			isEnabled(): boolean;
+            isEnabled(): boolean;
 
-			getParent(): null | IControlParent;
+            getParent(): null | IControlParent;
 
-			setParent(parent: IControlParent): this;
-		}
+            setParent(parent: IControlParent): this;
+        }
 
-		interface ILeftMouseButtonMagnifierOptions {
-			actionCursor?: string;
-			cursor?: string;
-			duration?: number;
-		}
+        interface ILeftMouseButtonMagnifierOptions {
+            actionCursor?: string;
+            cursor?: string;
+            duration?: number;
+        }
 
-		class MultiTouch implements IBehavior {
-			constructor(options?: IMultiTouchOptions)
+        class MultiTouch implements IBehavior {
+            constructor(options?: IMultiTouchOptions)
 
-			events: IEventManager;
-			options: IOptionManager;
+            events: IEventManager;
+            options: IOptionManager;
 
-			disable(): void;
+            disable(): void;
 
-			enable(): void;
+            enable(): void;
 
-			isEnabled(): boolean;
+            isEnabled(): boolean;
 
-			getParent(): null | IControlParent;
+            getParent(): null | IControlParent;
 
-			setParent(parent: IControlParent): this;
-		}
+            setParent(parent: IControlParent): this;
+        }
 
-		interface IMultiTouchOptions {
-			tremor?: number;
-		}
+        interface IMultiTouchOptions {
+            tremor?: number;
+        }
 
-		class RightMouseButtonMagnifier implements IBehavior {
-			constructor(options?: IRightMouseButtonMagnifierOptions)
+        class RightMouseButtonMagnifier implements IBehavior {
+            constructor(options?: IRightMouseButtonMagnifierOptions)
 
-			events: IEventManager;
-			options: IOptionManager;
+            events: IEventManager;
+            options: IOptionManager;
 
-			disable(): void;
+            disable(): void;
 
-			enable(): void;
+            enable(): void;
 
-			isEnabled(): boolean;
+            isEnabled(): boolean;
 
-			getParent(): null | IControlParent;
+            getParent(): null | IControlParent;
 
-			setParent(parent: IControlParent): this;
-		}
+            setParent(parent: IControlParent): this;
+        }
 
-		interface IRightMouseButtonMagnifierOptions {
-			actionCursor?: string;
-			duration?: number;
-		}
+        interface IRightMouseButtonMagnifierOptions {
+            actionCursor?: string;
+            duration?: number;
+        }
 
-		class RouteEditor implements IBehavior {
-			events: IEventManager;
-			options: IOptionManager;
+        class RouteEditor implements IBehavior {
+            events: IEventManager;
+            options: IOptionManager;
 
-			disable(): void;
+            disable(): void;
 
-			enable(): void;
+            enable(): void;
 
-			isEnabled(): boolean;
+            isEnabled(): boolean;
 
-			getParent(): null | IControlParent;
+            getParent(): null | IControlParent;
 
-			setParent(parent: IControlParent): this;
+            setParent(parent: IControlParent): this;
 
-			getRoute(): router.Route;
+            getRoute(): router.Route;
 
-			getState(): string;
+            getState(): string;
 
-			setState(state: string | null): void;
-		}
+            setState(state: string | null): void;
+        }
 
-		class Ruler implements IBehavior {
-			constructor(options?: IRulerOptions)
+        class Ruler implements IBehavior {
+            constructor(options?: IRulerOptions)
 
-			events: IEventManager;
-			options: IOptionManager;
+            events: IEventManager;
+            options: IOptionManager;
 
-			disable(): void;
+            disable(): void;
 
-			enable(): void;
+            enable(): void;
 
-			isEnabled(): boolean;
+            isEnabled(): boolean;
 
-			getParent(): null | IControlParent;
+            getParent(): null | IControlParent;
 
-			setParent(parent: IControlParent): this;
+            setParent(parent: IControlParent): this;
 
-			close(): boolean;
+            close(): boolean;
 
-			getState(): string;
+            getState(): string;
 
-			setState(state: string | null): void;
-		}
+            setState(state: string | null): void;
+        }
 
-		interface IRulerOptions {
-			balloonAutoPan?: boolean;
-		}
+        interface IRulerOptions {
+            balloonAutoPan?: boolean;
+        }
 
-		class ScrollZoom implements IBehavior {
-			constructor(options?: IScrollZoomOptions)
+        class ScrollZoom implements IBehavior {
+            constructor(options?: IScrollZoomOptions)
 
-			events: IEventManager;
-			options: IOptionManager;
+            events: IEventManager;
+            options: IOptionManager;
 
-			disable(): void;
+            disable(): void;
 
-			enable(): void;
+            enable(): void;
 
-			isEnabled(): boolean;
+            isEnabled(): boolean;
 
-			getParent(): null | IControlParent;
+            getParent(): null | IControlParent;
 
-			setParent(parent: IControlParent): this;
-		}
+            setParent(parent: IControlParent): this;
+        }
 
-		interface IScrollZoomOptions {
-			maximumDelta?: number;
-			speed?: number;
-		}
+        interface IScrollZoomOptions {
+            maximumDelta?: number;
+            speed?: number;
+        }
 
-		const storage: util.Storage;
-	}
+        const storage: util.Storage;
+    }
 
-	namespace clusterer {
-		class Balloon implements IBalloonManager<Clusterer> { //tslint:disable-line no-shadowed-variable
-			constructor(clusterer: Clusterer);
+    namespace clusterer {
+        class Balloon implements IBalloonManager<Clusterer> { //tslint:disable-line no-shadowed-variable
+            constructor(clusterer: Clusterer);
 
-			events: IEventManager;
+            events: IEventManager;
 
-			autoPan(): Promise<Clusterer>;
+            autoPan(): Promise<Clusterer>;
 
-			close(force?: boolean): Promise<Clusterer>;
+            close(force?: boolean): Promise<Clusterer>;
 
-			destroy(): void;
+            destroy(): void;
 
-			getData(): object | null;
+            getData(): object | null;
 
-			getOptions(): IOptionManager | null;
+            getOptions(): IOptionManager | null;
 
-			getOverlay(): Promise<IOverlay | null>;
+            getOverlay(): Promise<IOverlay | null>;
 
-			getOverlaySync(): IOverlay | null;
+            getOverlaySync(): IOverlay | null;
 
-			getPosition(): number[] | null;
+            getPosition(): number[] | null;
 
-			isOpen(): boolean;
+            isOpen(): boolean;
 
-			open(position?: number[], data?: object | string | HTMLElement, options?: object): Promise<Clusterer>;
+            open(position?: number[], data?: object | string | HTMLElement, options?: object): Promise<Clusterer>;
 
-			setData(data: object | string | HTMLElement): Promise<Clusterer>;
+            setData(data: object | string | HTMLElement): Promise<Clusterer>;
 
-			setOptions(options: object): Promise<Clusterer>;
+            setOptions(options: object): Promise<Clusterer>;
 
-			setPosition(position: number[]): Promise<Clusterer>;
-		}
+            setPosition(position: number[]): Promise<Clusterer>;
+        }
 
-		class Hint implements IHintManager<Clusterer> {
-			constructor(clusterer: Clusterer);
+        class Hint implements IHintManager<Clusterer> {
+            constructor(clusterer: Clusterer);
 
-			events: IEventManager;
+            events: IEventManager;
 
-			close(force?: boolean): Promise<Clusterer>;
+            close(force?: boolean): Promise<Clusterer>;
 
-			destroy(): void;
+            destroy(): void;
 
-			getData(): object | null;
+            getData(): object | null;
 
-			getOptions(): IOptionManager | null;
+            getOptions(): IOptionManager | null;
 
-			getOverlay(): Promise<IOverlay | null>;
+            getOverlay(): Promise<IOverlay | null>;
 
-			getOverlaySync(): IOverlay | null;
+            getOverlaySync(): IOverlay | null;
 
-			getPosition(): number[] | null;
+            getPosition(): number[] | null;
 
-			isOpen(): boolean;
+            isOpen(): boolean;
 
-			open(position?: number[], data?: object | string | HTMLElement, options?: object): Promise<Clusterer>;
+            open(position?: number[], data?: object | string | HTMLElement, options?: object): Promise<Clusterer>;
 
-			setData(data: object | string | HTMLElement): Promise<Clusterer>;
+            setData(data: object | string | HTMLElement): Promise<Clusterer>;
 
-			setOptions(options: object): Promise<Clusterer>;
+            setOptions(options: object): Promise<Clusterer>;
 
-			setPosition(position: number[]): Promise<Clusterer>;
-		}
-	}
+            setPosition(position: number[]): Promise<Clusterer>;
+        }
+    }
 
-	namespace collection {
-		class Item implements IChildOnMap, ICustomizable, IEventEmitter, IParentOnMap {
-			constructor(options?: object);
+    namespace collection {
+        class Item implements IChildOnMap, ICustomizable, IEventEmitter, IParentOnMap {
+            constructor(options?: object);
 
-			events: IEventManager;
-			options: IOptionManager;
+            events: IEventManager;
+            options: IOptionManager;
 
-			getParent(): null | IControlParent;
+            getParent(): null | IControlParent;
 
-			setParent(parent: IControlParent): this;
+            setParent(parent: IControlParent): this;
 
-			getMap(): Map;
+            getMap(): Map;
 
-			onAddToMap(map: Map): void;
+            onAddToMap(map: Map): void;
 
-			onRemoveFromMap(oldMap: Map): void;
-		}
-	}
+            onRemoveFromMap(oldMap: Map): void;
+        }
+    }
 
-	namespace control {
-		class Button implements ICustomizable, ISelectableControl {
-			constructor(parameters?: IButtonParameters | string);
+    namespace control {
+        class Button implements ICustomizable, ISelectableControl {
+            constructor(parameters?: IButtonParameters | string);
 
-			options: IOptionManager;
-			events: IEventManager;
-			data: data.Manager;
-			state: data.Manager;
+            options: IOptionManager;
+            events: IEventManager;
+            data: data.Manager;
+            state: data.Manager;
 
-			deselect(): void;
+            deselect(): void;
 
-			disable(): void;
+            disable(): void;
 
-			enable(): void;
+            enable(): void;
 
-			isEnabled(): boolean;
+            isEnabled(): boolean;
 
-			isSelected(): boolean;
+            isSelected(): boolean;
 
-			select(): void;
+            select(): void;
 
-			getParent(): null | IControlParent;
+            getParent(): null | IControlParent;
 
-			setParent(parent: IControlParent): this;
-		}
+            setParent(parent: IControlParent): this;
+        }
 
-		interface IBaseButtonParametersOptions {
-			adjustMapMargin?: boolean;
-			float?: "none" | "left" | "right";
-			floatIndex?: number;
-			layout?: IClassConstructor<ISelectableControlLayout> | string;
-			maxWidth?: number[][] | number[] | number;
-			position?: {
-				bottom?: number | string;
-				left?: number | string;
-				right?: number | string;
-				top?: number | string;
-			};
-			visible?: boolean;
-		}
+        interface IBaseButtonParametersOptions {
+            adjustMapMargin?: boolean;
+            float?: "none" | "left" | "right";
+            floatIndex?: number;
+            layout?: IClassConstructor<ISelectableControlLayout> | string;
+            maxWidth?: number[][] | number[] | number;
+            position?: {
+                bottom?: number | string;
+                left?: number | string;
+                right?: number | string;
+                top?: number | string;
+            };
+            visible?: boolean;
+        }
 
-		interface IButtonParameters {
-			data?: {
-				content?: string;
-				image?: string;
-				title?: string;
-			};
-			options?: IBaseButtonParametersOptions & {
-				selectOnClick?: boolean;
-				size?: "auto" | "small" | "medium" | "large";
-			};
-			state?: {
-				enabled?: boolean;
-				selected?: boolean;
-			};
-		}
+        interface IButtonParameters {
+            data?: {
+                content?: string;
+                image?: string;
+                title?: string;
+            };
+            options?: IBaseButtonParametersOptions & {
+                selectOnClick?: boolean;
+                size?: "auto" | "small" | "medium" | "large";
+            };
+            state?: {
+                enabled?: boolean;
+                selected?: boolean;
+            };
+        }
 
-		class FullscreenControl extends Button {
-			constructor(parameters?: IFullscreenControlParameters);
+        class FullscreenControl extends Button {
+            constructor(parameters?: IFullscreenControlParameters);
 
-			enterFullscreen(): void;
+            enterFullscreen(): void;
 
-			exitFullscreen(): void;
-		}
+            exitFullscreen(): void;
+        }
 
-		interface IFullscreenControlParameters {
-			data?: {
-				title?: string;
-			};
-			options?: IBaseButtonParametersOptions & {
-				collapseOnBlur?: boolean;
-				expandOnClick?: boolean;
-				popupFloat?: "left" | "right";
-			};
-			state?: {
-				expanded?: boolean;
-			};
-		}
+        interface IFullscreenControlParameters {
+            data?: {
+                title?: string;
+            };
+            options?: IBaseButtonParametersOptions & {
+                collapseOnBlur?: boolean;
+                expandOnClick?: boolean;
+                popupFloat?: "left" | "right";
+            };
+            state?: {
+                expanded?: boolean;
+            };
+        }
 
-		class GeolocationControl extends Button {
-			constructor(parameters?: IGeolocationControlParameters);
-		}
+        class GeolocationControl extends Button {
+            constructor(parameters?: IGeolocationControlParameters);
+        }
 
-		interface IGeolocationControlParameters extends IButtonParameters {
-			data?: {
-				image?: string;
-				title?: string;
-			};
-			options?: IBaseButtonParametersOptions;
-		}
+        interface IGeolocationControlParameters extends IButtonParameters {
+            data?: {
+                image?: string;
+                title?: string;
+            };
+            options?: IBaseButtonParametersOptions;
+        }
 
-		class ListBox implements ICollection, IControl, ICustomizable {
-			constructor(parameters?: IListBoxParameters);
+        class ListBox implements ICollection, IControl, ICustomizable {
+            constructor(parameters?: IListBoxParameters);
 
-			events: IEventManager;
-			options: IOptionManager;
-			data: data.Manager;
-			state: data.Manager;
+            events: IEventManager;
+            options: IOptionManager;
+            data: data.Manager;
+            state: data.Manager;
 
-			add(object: object): this;
+            add(object: object): this;
 
-			getIterator(): IIterator;
+            getIterator(): IIterator;
 
-			remove(object: object): this;
+            remove(object: object): this;
 
-			getParent(): null | IControlParent;
+            getParent(): null | IControlParent;
 
-			setParent(parent: IControlParent): this;
-		}
+            setParent(parent: IControlParent): this;
+        }
 
-		interface IListBoxParameters extends IButtonParameters {
-			options?: IBaseButtonParametersOptions & {
-				noPlacemark?: boolean;
-			};
-		}
-
-		class ListBoxItem implements ICustomizable, ISelectableControl {
-			constructor(parameters?: IListBoxItemParameters);
-
-			options: IOptionManager;
-			events: IEventManager;
-			data: data.Manager;
-			state: data.Manager;
-
-			deselect(): void;
-
-			disable(): void;
-
-			enable(): void;
-
-			isEnabled(): boolean;
-
-			isSelected(): boolean;
-
-			select(): void;
-
-			getParent(): null | IControlParent;
-
-			setParent(parent: IControlParent): this;
-
-			getMap(): Map;
-		}
-
-		interface IListBoxItemParameters {
-			data?: {
-				content?: string;
-			};
-			options?: {
-				layout?: string | IClassConstructor<ISelectableControlLayout>;
-				selectableLayout?: string | IClassConstructor<ISelectableControlLayout>;
-				selectOnClick?: boolean;
-				separatorLayout?: string | IClassConstructor<ISelectableControlLayout>;
-				type?: "selectable" | "separator";
-				visible?: boolean;
-			};
-			state?: {
-				selected?: boolean;
-			};
-		}
-
-		class Manager {
-			constructor(map: Map, controls?: Array<string | IControl>, options?: IManagerOptions);
-
-			events: event.Manager;
-			options: option.Manager;
-			state: data.Manager;
-
-			add(control: IControl | ControlKey, options?: IManagerControlOptions): this;
-
-			each(callback: (control: IControl) => void, context: object): this;
-
-			get(index: number | string): IControl | null;
-
-			getChildElement(control: IControl): Promise<HTMLElement>;
-
-			getContainer(): HTMLElement;
-
-			getMap(): Map;
-
-			indexOf(childToFind: IControl | string): number;
-
-			remove(control: IControl | string): this;
-		}
-
-		interface IManagerOptions {
-			margin?: number;
-			pane?: IPane;
-			states?: string[];
-		}
+        interface IListBoxParameters extends IButtonParameters {
+            options?: IBaseButtonParametersOptions & {
+                noPlacemark?: boolean;
+            };
+        }
+
+        class ListBoxItem implements ICustomizable, ISelectableControl {
+            constructor(parameters?: IListBoxItemParameters);
+
+            options: IOptionManager;
+            events: IEventManager;
+            data: data.Manager;
+            state: data.Manager;
+
+            deselect(): void;
+
+            disable(): void;
+
+            enable(): void;
+
+            isEnabled(): boolean;
+
+            isSelected(): boolean;
+
+            select(): void;
+
+            getParent(): null | IControlParent;
+
+            setParent(parent: IControlParent): this;
+
+            getMap(): Map;
+        }
+
+        interface IListBoxItemParameters {
+            data?: {
+                content?: string;
+            };
+            options?: {
+                layout?: string | IClassConstructor<ISelectableControlLayout>;
+                selectableLayout?: string | IClassConstructor<ISelectableControlLayout>;
+                selectOnClick?: boolean;
+                separatorLayout?: string | IClassConstructor<ISelectableControlLayout>;
+                type?: "selectable" | "separator";
+                visible?: boolean;
+            };
+            state?: {
+                selected?: boolean;
+            };
+        }
+
+        class Manager {
+            constructor(map: Map, controls?: Array<string | IControl>, options?: IManagerOptions);
+
+            events: event.Manager;
+            options: option.Manager;
+            state: data.Manager;
+
+            add(control: IControl | ControlKey, options?: IManagerControlOptions): this;
+
+            each(callback: (control: IControl) => void, context: object): this;
+
+            get(index: number | string): IControl | null;
+
+            getChildElement(control: IControl): Promise<HTMLElement>;
+
+            getContainer(): HTMLElement;
+
+            getMap(): Map;
+
+            indexOf(childToFind: IControl | string): number;
+
+            remove(control: IControl | string): this;
+        }
+
+        interface IManagerOptions {
+            margin?: number;
+            pane?: IPane;
+            states?: string[];
+        }
 
-		interface IManagerControlOptions {
-			float?: "none" | "left" | "right";
-			floatIndex?: number;
-			position?: {
-				bottom?: number | string;
-				left?: number | string;
-				right?: number | string;
-				top?: number | string;
-			};
-		}
+        interface IManagerControlOptions {
+            float?: "none" | "left" | "right";
+            floatIndex?: number;
+            position?: {
+                bottom?: number | string;
+                left?: number | string;
+                right?: number | string;
+                top?: number | string;
+            };
+        }
 
-		class RouteButton implements IControl, ICustomizable {
-			constructor(parameters?: IRouteButtonParameters);
+        class RouteButton implements IControl, ICustomizable {
+            constructor(parameters?: IRouteButtonParameters);
 
-			events: IEventManager;
-			options: IOptionManager;
-			routePanel: IRoutePanel;
+            events: IEventManager;
+            options: IOptionManager;
+            routePanel: IRoutePanel;
 
-			getParent(): null | IControlParent;
+            getParent(): null | IControlParent;
 
-			setParent(parent: IControlParent): this;
-		}
+            setParent(parent: IControlParent): this;
+        }
 
-		interface IRouteButtonParameters {
-			options?: {
-				adjustMapMargin?: boolean;
-				collapseOnBlur?: boolean;
-				float?: "none" | "left" | "right";
-				floatIndex?: number;
-				popupAnimate?: boolean;
-				popupFloat?: "auto" | "left" | "right";
-				popupWidth?: string;
-				position?: {
-					bottom?: number | string;
-					left?: number | string;
-					right?: number | string;
-					top?: number | string;
-				};
-				size?: "auto" | "small" | "medium" | "large";
-				visible?: boolean;
-			};
-			state?: {
-				expanded?: boolean;
-			};
-		}
-
-		class RouteEditor extends Button {
-			constructor(parameters?: IRouteEditorParameters);
-
-			getRoute(): router.Route;
-		}
-
-		interface IRouteEditorParameters {
-			data?: {
-				image?: string;
-				title?: string;
-			};
-			options?: IBaseButtonParametersOptions;
-			state?: {};
-		}
-
-		class RulerControl extends Button {
-			constructor(parameters?: IRulerControlParameters);
-		}
-
-		interface IRulerControlParameters {
-			data?: {};
-			options?: {
-				adjustMapMargin?: boolean;
-				position?: {
-					bottom?: number | string;
-					left?: number | string;
-					right?: number | string;
-					top?: number | string;
-				};
-				scaleLine?: boolean;
-				visible?: boolean;
-			};
-			state?: {};
-		}
-
-		class SearchControl implements IControl, ICustomizable {
-			constructor(parameters?: ISearchControlParameters);
-
-			events: IEventManager;
-			options: IOptionManager;
-			state: data.Manager;
-
-			getParent(): null | IControlParent;
-
-			setParent(parent: IControlParent): this;
-
-			clear(): void;
-
-			getMap(): Map;
-
-			getRequestString(): string;
-
-			getResponseMetaData(): object;
-
-			getResult(index: number): Promise<object>;
-
-			getResultsArray(): object[];
-
-			getResultsCount(): number;
+        interface IRouteButtonParameters {
+            options?: {
+                adjustMapMargin?: boolean;
+                collapseOnBlur?: boolean;
+                float?: "none" | "left" | "right";
+                floatIndex?: number;
+                popupAnimate?: boolean;
+                popupFloat?: "auto" | "left" | "right";
+                popupWidth?: string;
+                position?: {
+                    bottom?: number | string;
+                    left?: number | string;
+                    right?: number | string;
+                    top?: number | string;
+                };
+                size?: "auto" | "small" | "medium" | "large";
+                visible?: boolean;
+            };
+            state?: {
+                expanded?: boolean;
+            };
+        }
+
+        class RouteEditor extends Button {
+            constructor(parameters?: IRouteEditorParameters);
+
+            getRoute(): router.Route;
+        }
+
+        interface IRouteEditorParameters {
+            data?: {
+                image?: string;
+                title?: string;
+            };
+            options?: IBaseButtonParametersOptions;
+            state?: {};
+        }
+
+        class RulerControl extends Button {
+            constructor(parameters?: IRulerControlParameters);
+        }
+
+        interface IRulerControlParameters {
+            data?: {};
+            options?: {
+                adjustMapMargin?: boolean;
+                position?: {
+                    bottom?: number | string;
+                    left?: number | string;
+                    right?: number | string;
+                    top?: number | string;
+                };
+                scaleLine?: boolean;
+                visible?: boolean;
+            };
+            state?: {};
+        }
+
+        class SearchControl implements IControl, ICustomizable {
+            constructor(parameters?: ISearchControlParameters);
+
+            events: IEventManager;
+            options: IOptionManager;
+            state: data.Manager;
+
+            getParent(): null | IControlParent;
+
+            setParent(parent: IControlParent): this;
+
+            clear(): void;
+
+            getMap(): Map;
+
+            getRequestString(): string;
+
+            getResponseMetaData(): object;
+
+            getResult(index: number): Promise<object>;
+
+            getResultsArray(): object[];
+
+            getResultsCount(): number;
 
-			getSelectedIndex(): number;
+            getSelectedIndex(): number;
 
-			hideResult(): void;
+            hideResult(): void;
 
-			search(request: string): Promise<void>;
+            search(request: string): Promise<void>;
 
-			showResult(index: number): this;
-		}
+            showResult(index: number): this;
+        }
 
-		interface ISearchControlParameters {
-			data?: {};
-			options?: {
-				adjustMapMargin?: boolean;
-				boundedBy?: number[][];
-				fitMaxWidth?: boolean;
-				float?: "none" | "left" | "right";
-				floatIndex?: number;
-				formLayout?: string | IClassConstructor<ILayout>;
-				kind?: "house" | "street" | "metro" | "district" | "locality";
-				layout?: string | IClassConstructor<ISearchControlLayout>;
-				maxWidth?: number[][] | number[] | number;
-				noCentering?: boolean;
-				noPlacemark?: boolean;
-				noPopup?: boolean;
-				noSelect?: boolean;
-				noSuggestPanel?: boolean;
-				placeholderContent?: string;
-				popupItemLayout?: string | IClassConstructor<ILayout>;
-				popupLayout?: string | IClassConstructor<ILayout>;
-				position?: {
-					bottom?: number | string;
-					left?: number | string;
-					right?: number | string;
-					top?: number | string;
-				};
-				provider?: IGeocodeProvider | "yandex#map" | "yandex#search";
-				searchCoordOrder?: "latlong" | "longlat";
-				size?: "auto" | "small" | "medium" | "large";
-				strictBounds?: boolean;
-				suppressYandexSearch?: boolean;
-				useMapBounds?: boolean;
-				zoomMargin?: number;
-				visible?: boolean;
-			};
-			state?: {};
-		}
-	}
+        interface ISearchControlParameters {
+            data?: {};
+            options?: {
+                adjustMapMargin?: boolean;
+                boundedBy?: number[][];
+                fitMaxWidth?: boolean;
+                float?: "none" | "left" | "right";
+                floatIndex?: number;
+                formLayout?: string | IClassConstructor<ILayout>;
+                kind?: "house" | "street" | "metro" | "district" | "locality";
+                layout?: string | IClassConstructor<ISearchControlLayout>;
+                maxWidth?: number[][] | number[] | number;
+                noCentering?: boolean;
+                noPlacemark?: boolean;
+                noPopup?: boolean;
+                noSelect?: boolean;
+                noSuggestPanel?: boolean;
+                placeholderContent?: string;
+                popupItemLayout?: string | IClassConstructor<ILayout>;
+                popupLayout?: string | IClassConstructor<ILayout>;
+                position?: {
+                    bottom?: number | string;
+                    left?: number | string;
+                    right?: number | string;
+                    top?: number | string;
+                };
+                provider?: IGeocodeProvider | "yandex#map" | "yandex#search";
+                searchCoordOrder?: "latlong" | "longlat";
+                size?: "auto" | "small" | "medium" | "large";
+                strictBounds?: boolean;
+                suppressYandexSearch?: boolean;
+                useMapBounds?: boolean;
+                zoomMargin?: number;
+                visible?: boolean;
+            };
+            state?: {};
+        }
+    }
 
-	namespace data {
-		class Manager implements IDataManager, IFreezable {
-			constructor(data?: object);
+    namespace data {
+        class Manager implements IDataManager, IFreezable {
+            constructor(data?: object);
 
-			events: IEventManager;
+            events: IEventManager;
 
-			get(path: string, defaultValue: object): object;
+            get(path: string, defaultValue: object): object;
 
-			getAll(): object;
+            getAll(): object;
 
-			set(path: object | string, value: object): this;
+            set(path: object | string, value: object): this;
 
-			setAll(): this;
+            setAll(): this;
 
-			unset(path: object | string): this;
+            unset(path: object | string): this;
 
-			unsetAll(): this;
+            unsetAll(): this;
 
-			freeze(): IFreezable;
+            freeze(): IFreezable;
 
-			isFrozen(): boolean;
+            isFrozen(): boolean;
 
-			unfreeze(): IFreezable;
+            unfreeze(): IFreezable;
 
-			add(types: string[][] | string[] | string, callback: (event: (object | IEvent)) => void, context?: object, priority?: number): this;
+            add(types: string[][] | string[] | string, callback: (event: (object | IEvent)) => void, context?: object, priority?: number): this;
 
-			getParent(): IEventManager | null;
+            getParent(): IEventManager | null;
 
-			group(): IEventGroup;
+            group(): IEventGroup;
 
-			remove(types: string[][] | string[] | string, callback: (event: (object | IEvent)) => void, context?: object, priority?: number): this;
+            remove(types: string[][] | string[] | string, callback: (event: (object | IEvent)) => void, context?: object, priority?: number): this;
 
-			setParent(parent: IEventManager | null): this;
+            setParent(parent: IEventManager | null): this;
 
-			fire(type: string, eventobject: object | IEvent): this;
-		}
-	}
+            fire(type: string, eventobject: object | IEvent): this;
+        }
+    }
 
-	namespace event {
-		class Manager implements IEventManager {
-			constructor(params?: { context?: object; controllers?: IEventWorkflowController[]; parent?: IEventManager });
+    namespace event {
+        class Manager implements IEventManager {
+            constructor(params?: { context?: object; controllers?: IEventWorkflowController[]; parent?: IEventManager });
 
-			add(types: string[][] | string[] | string, callback: (event: (object | IEvent)) => void, context?: object, priority?: number): this;
+            add(types: string[][] | string[] | string, callback: (event: (object | IEvent)) => void, context?: object, priority?: number): this;
 
-			getParent(): IEventManager | null;
+            getParent(): IEventManager | null;
 
-			group(): IEventGroup;
+            group(): IEventGroup;
 
-			remove(types: string[][] | string[] | string, callback: (event: (object | IEvent)) => void, context?: object, priority?: number): this;
+            remove(types: string[][] | string[] | string, callback: (event: (object | IEvent)) => void, context?: object, priority?: number): this;
 
-			setParent(parent: IEventManager | null): this;
+            setParent(parent: IEventManager | null): this;
 
-			fire(type: string, eventobject: object | IEvent): this;
+            fire(type: string, eventobject: object | IEvent): this;
 
-			createEventobject(type: string, event: object, target: object): Event;
+            createEventobject(type: string, event: object, target: object): Event;
 
-			once(types: string[][] | string[] | string, callback: (event: IEvent) => any, context?: object, priority?: number): this;
-		}
-	}
+            once(types: string[][] | string[] | string, callback: (event: IEvent) => any, context?: object, priority?: number): this;
+        }
+    }
 
-	namespace geometry {
-		namespace base {
-			class LineString implements IBaseLineStringGeometry { //tslint:disable-line no-shadowed-variable
-				static fromEncodedCoordinates(encodedCoordinates: string): geometry.LineString; //tslint:disable-line function-name
+    namespace geometry {
+        namespace base {
+            class LineString implements IBaseLineStringGeometry { //tslint:disable-line no-shadowed-variable
+                static fromEncodedCoordinates(encodedCoordinates: string): geometry.LineString; //tslint:disable-line function-name
 
-				static toEncodedCoordinates(geometry: geometry.LineString): string; //tslint:disable-line function-name
+                static toEncodedCoordinates(geometry: geometry.LineString): string; //tslint:disable-line function-name
 
-				events: IEventManager;
+                events: IEventManager;
 
-				getBounds(): number[][] | null;
+                getBounds(): number[][] | null;
 
-				getType(): string;
+                getType(): string;
 
-				get(index: number): number[];
+                get(index: number): number[];
 
-				getChildGeometry(index: number): IPointGeometryAccess;
+                getChildGeometry(index: number): IPointGeometryAccess;
 
-				getClosest(anchorPosition: number[]): object;
+                getClosest(anchorPosition: number[]): object;
 
-				getCoordinates(): number[][];
+                getCoordinates(): number[][];
 
-				getLength(): number;
+                getLength(): number;
 
-				insert(index: number, coordinates: number[][]): ILineStringGeometryAccess;
+                insert(index: number, coordinates: number[][]): ILineStringGeometryAccess;
 
-				remove(index: number): number[];
+                remove(index: number): number[];
 
-				remove(types: string[][] | string[] | string, callback: (event: (object | IEvent)) => void, context?: object, priority?: number): this;
+                remove(types: string[][] | string[] | string, callback: (event: (object | IEvent)) => void, context?: object, priority?: number): this;
 
-				set(index: number, coordinates: number[]): ILineStringGeometryAccess;
+                set(index: number, coordinates: number[]): ILineStringGeometryAccess;
 
-				setCoordinates(coordinates: number[]): ILineStringGeometryAccess;
+                setCoordinates(coordinates: number[]): ILineStringGeometryAccess;
 
-				splice(index: number, length: number): number[][];
+                splice(index: number, length: number): number[][];
 
-				freeze(): IFreezable;
+                freeze(): IFreezable;
 
-				isFrozen(): boolean;
+                isFrozen(): boolean;
 
-				unfreeze(): IFreezable;
+                unfreeze(): IFreezable;
 
-				add(types: string[][] | string[] | string, callback: (event: (object | IEvent)) => void, context?: object, priority?: number): this;
+                add(types: string[][] | string[] | string, callback: (event: (object | IEvent)) => void, context?: object, priority?: number): this;
 
-				getParent(): object | null;
+                getParent(): object | null;
 
-				group(): IEventGroup;
+                group(): IEventGroup;
 
-				setParent(parent: IEventManager | null): this;
+                setParent(parent: IEventManager | null): this;
 
-				fire(type: string, eventobject: object | IEvent): this;
-			}
+                fire(type: string, eventobject: object | IEvent): this;
+            }
 
-			class Point implements IBasePointGeometry { //tslint:disable-line no-shadowed-variable
-				events: IEventManager;
+            class Point implements IBasePointGeometry { //tslint:disable-line no-shadowed-variable
+                events: IEventManager;
 
-				getBounds(): number[][] | null;
+                getBounds(): number[][] | null;
 
-				getType(): string;
+                getType(): string;
 
-				getCoordinates(): number[] | null;
+                getCoordinates(): number[] | null;
 
-				setCoordinates(coordinates: number[] | null): this;
-			}
-		}
+                setCoordinates(coordinates: number[] | null): this;
+            }
+        }
 
-		class LineString implements ILineStringGeometry {
-			constructor(coordinates?: number[][], options?: {
-				coordRendering?: "shortestPath" | "straightPath";
-				geodesic?: boolean;
-				pixelRendering?: "jumpy" | "static";
-				projection?: IProjection;
-				simplification?: boolean;
-			});
+        class LineString implements ILineStringGeometry {
+            constructor(coordinates?: number[][], options?: {
+                coordRendering?: "shortestPath" | "straightPath";
+                geodesic?: boolean;
+                pixelRendering?: "jumpy" | "static";
+                projection?: IProjection;
+                simplification?: boolean;
+            });
 
-			static fromEncodedCoordinates(encodedCoordinates: string): LineString; //tslint:disable-line function-name
+            static fromEncodedCoordinates(encodedCoordinates: string): LineString; //tslint:disable-line function-name
 
-			static toEncodedCoordinates(geometry: LineString): string; //tslint:disable-line function-name
+            static toEncodedCoordinates(geometry: LineString): string; //tslint:disable-line function-name
 
-			events: IEventManager;
-			options: IOptionManager;
+            events: IEventManager;
+            options: IOptionManager;
 
-			getMap(): Map | null;
+            getMap(): Map | null;
 
-			getPixelGeometry(options?: object): IPixelGeometry;
+            getPixelGeometry(options?: object): IPixelGeometry;
 
-			setMap(map: Map): void;
+            setMap(map: Map): void;
 
-			getBounds(): number[][] | null;
+            getBounds(): number[][] | null;
 
-			getType(): string;
+            getType(): string;
 
-			get(index: number): number[];
+            get(index: number): number[];
 
-			getChildGeometry(index: number): IPointGeometryAccess;
+            getChildGeometry(index: number): IPointGeometryAccess;
 
-			getClosest(anchorPosition: number[]): object;
+            getClosest(anchorPosition: number[]): object;
 
-			getCoordinates(): number[][];
+            getCoordinates(): number[][];
 
-			getLength(): number;
+            getLength(): number;
 
-			insert(index: number, coordinates: number[][]): ILineStringGeometryAccess;
+            insert(index: number, coordinates: number[][]): ILineStringGeometryAccess;
 
-			remove(index: number): number[];
+            remove(index: number): number[];
 
-			remove(types: string[][] | string[] | string, callback: (event: (object | IEvent)) => void, context?: object, priority?: number): this;
+            remove(types: string[][] | string[] | string, callback: (event: (object | IEvent)) => void, context?: object, priority?: number): this;
 
-			set(index: number, coordinates: number[]): ILineStringGeometryAccess;
+            set(index: number, coordinates: number[]): ILineStringGeometryAccess;
 
-			setCoordinates(coordinates: number[]): ILineStringGeometryAccess;
+            setCoordinates(coordinates: number[]): ILineStringGeometryAccess;
 
-			splice(index: number, length: number): number[][];
+            splice(index: number, length: number): number[][];
 
-			freeze(): IFreezable;
+            freeze(): IFreezable;
 
-			isFrozen(): boolean;
+            isFrozen(): boolean;
 
-			unfreeze(): IFreezable;
+            unfreeze(): IFreezable;
 
-			add(types: string[][] | string[] | string, callback: (event: (object | IEvent)) => void, context?: object, priority?: number): this;
+            add(types: string[][] | string[] | string, callback: (event: (object | IEvent)) => void, context?: object, priority?: number): this;
 
-			getParent(): object | null;
+            getParent(): object | null;
 
-			group(): IEventGroup;
+            group(): IEventGroup;
 
-			setParent(parent: IEventManager | null): this;
+            setParent(parent: IEventManager | null): this;
 
-			fire(type: string, eventobject: object | IEvent): this;
-		}
+            fire(type: string, eventobject: object | IEvent): this;
+        }
 
-		class Point implements IPointGeometry {
-			constructor(coordinates?: number[] | null);
+        class Point implements IPointGeometry {
+            constructor(coordinates?: number[] | null);
 
-			options: IOptionManager;
-			events: IEventManager;
+            options: IOptionManager;
+            events: IEventManager;
 
-			getMap(): Map | null;
+            getMap(): Map | null;
 
-			getPixelGeometry(options?: object): IPixelGeometry;
+            getPixelGeometry(options?: object): IPixelGeometry;
 
-			setMap(map: Map): void;
+            setMap(map: Map): void;
 
-			getBounds(): number[][] | null;
+            getBounds(): number[][] | null;
 
-			getType(): string;
+            getType(): string;
 
-			getCoordinates(): number[] | null;
+            getCoordinates(): number[] | null;
 
-			setCoordinates(coordinates: number[] | null): this;
-		}
-	}
+            setCoordinates(coordinates: number[] | null): this;
+        }
+    }
 
-	namespace geoObject {
-		class Balloon implements IBalloonManager<GeoObject> { //tslint:disable-line no-shadowed-variable
-			constructor(geoObject: GeoObject);
+    namespace geoObject {
+        class Balloon implements IBalloonManager<GeoObject> { //tslint:disable-line no-shadowed-variable
+            constructor(geoObject: GeoObject);
 
-			events: IEventManager;
+            events: IEventManager;
 
-			autoPan(): Promise<GeoObject>;
+            autoPan(): Promise<GeoObject>;
 
-			close(force?: boolean): Promise<GeoObject>;
+            close(force?: boolean): Promise<GeoObject>;
 
-			destroy(): void;
+            destroy(): void;
 
-			getData(): object | null;
+            getData(): object | null;
 
-			getOptions(): IOptionManager | null;
+            getOptions(): IOptionManager | null;
 
-			getOverlay(): Promise<IOverlay | null>;
+            getOverlay(): Promise<IOverlay | null>;
 
-			getOverlaySync(): IOverlay | null;
+            getOverlaySync(): IOverlay | null;
 
-			getPosition(): number[] | null;
+            getPosition(): number[] | null;
 
-			isOpen(): boolean;
+            isOpen(): boolean;
 
-			open(position?: number[], data?: object | string | HTMLElement, options?: object): Promise<GeoObject>;
+            open(position?: number[], data?: object | string | HTMLElement, options?: object): Promise<GeoObject>;
 
-			setData(data: object | string | HTMLElement): Promise<GeoObject>;
+            setData(data: object | string | HTMLElement): Promise<GeoObject>;
 
-			setOptions(options: object): Promise<GeoObject>;
+            setOptions(options: object): Promise<GeoObject>;
 
-			setPosition(position: number[]): Promise<GeoObject>;
-		}
+            setPosition(position: number[]): Promise<GeoObject>;
+        }
 
-		class Hint implements IHintManager<GeoObject> {
-			constructor(geoObject: GeoObject);
+        class Hint implements IHintManager<GeoObject> {
+            constructor(geoObject: GeoObject);
 
-			events: IEventManager;
+            events: IEventManager;
 
-			close(force?: boolean): Promise<GeoObject>;
+            close(force?: boolean): Promise<GeoObject>;
 
-			destroy(): void;
+            destroy(): void;
 
-			getData(): object | null;
+            getData(): object | null;
 
-			getOptions(): IOptionManager | null;
+            getOptions(): IOptionManager | null;
 
-			getOverlay(): Promise<IOverlay | null>;
+            getOverlay(): Promise<IOverlay | null>;
 
-			getOverlaySync(): IOverlay | null;
+            getOverlaySync(): IOverlay | null;
 
-			getPosition(): number[] | null;
+            getPosition(): number[] | null;
 
-			isOpen(): boolean;
+            isOpen(): boolean;
 
-			open(position?: number[], data?: object | string | HTMLElement, options?: object): Promise<GeoObject>;
+            open(position?: number[], data?: object | string | HTMLElement, options?: object): Promise<GeoObject>;
 
-			setData(data: object | string | HTMLElement): Promise<GeoObject>;
+            setData(data: object | string | HTMLElement): Promise<GeoObject>;
 
-			setOptions(options: object): Promise<GeoObject>;
+            setOptions(options: object): Promise<GeoObject>;
 
-			setPosition(position: number[]): Promise<GeoObject>;
-		}
+            setPosition(position: number[]): Promise<GeoObject>;
+        }
 
-		class Sequence implements IGeoObject, IGeoObjectSequence {
-			constructor(geoObject: GeoObject);
+        class Sequence implements IGeoObject, IGeoObjectSequence {
+            constructor(geoObject: GeoObject);
 
-			geometry: IGeometry | null;
-			properties: IDataManager;
-			state: IDataManager;
-			events: IEventManager;
-			options: IOptionManager;
+            geometry: IGeometry | null;
+            properties: IDataManager;
+            state: IDataManager;
+            events: IEventManager;
+            options: IOptionManager;
 
-			getOverlay(): Promise<IOverlay | null>;
+            getOverlay(): Promise<IOverlay | null>;
 
-			getOverlaySync(): IOverlay | null;
+            getOverlaySync(): IOverlay | null;
 
-			getParent(): null | IControlParent;
+            getParent(): null | IControlParent;
 
-			setParent(parent: IControlParent): this;
+            setParent(parent: IControlParent): this;
 
-			getMap(): Map;
+            getMap(): Map;
 
-			each(callback: (geoObject: IGeoObject) => void, context?: object): void;
+            each(callback: (geoObject: IGeoObject) => void, context?: object): void;
 
-			get(index: number): IGeoObject;
+            get(index: number): IGeoObject;
 
-			getBounds(): number[][] | null;
+            getBounds(): number[][] | null;
 
-			getIterator(): IIterator;
+            getIterator(): IIterator;
 
-			getLength(): number;
+            getLength(): number;
 
-			getPixelBounds(): number[][] | null;
+            getPixelBounds(): number[][] | null;
 
-			indexOf(geoObject: IGeoObject): number;
-		}
-	}
+            indexOf(geoObject: IGeoObject): number;
+        }
+    }
 
-	namespace layout {
-		namespace templateBased {
-			class Base implements ILayout {
-				constructor(data: object);
+    namespace layout {
+        namespace templateBased {
+            class Base implements ILayout {
+                constructor(data: object);
 
-				events: IEventManager;
+                events: IEventManager;
 
-				destroy(): void;
+                destroy(): void;
 
-				getData(): object;
+                getData(): object;
 
-				getParentElement(): HTMLElement;
+                getParentElement(): HTMLElement;
 
-				getShape(): IShape | null;
+                getShape(): IShape | null;
 
-				isEmpty(): boolean;
+                isEmpty(): boolean;
 
-				setData(data: object): void;
+                setData(data: object): void;
 
-				setParentElement(parent: HTMLElement | null): this;
+                setParentElement(parent: HTMLElement | null): this;
 
-				build(): void;
+                build(): void;
 
-				clear(): void;
+                clear(): void;
 
-				onSublayoutSizeChange(sublayoutInfo: object, nodeSizeByContent: object): void;
+                onSublayoutSizeChange(sublayoutInfo: object, nodeSizeByContent: object): void;
 
-				rebuild(): void;
-			}
-		}
-	}
+                rebuild(): void;
+            }
+        }
+    }
 
-	namespace map {
-		namespace action {
-			class Manager implements IEventEmitter {
-				constructor(map: Map);
+    namespace map {
+        namespace action {
+            class Manager implements IEventEmitter {
+                constructor(map: Map);
 
-				events: IEventManager;
+                events: IEventManager;
 
-				breakTick(): void;
+                breakTick(): void;
 
-				execute(action: IMapAction): void;
+                execute(action: IMapAction): void;
 
-				getCurrentState(): object;
+                getCurrentState(): object;
 
-				getMap(): Map;
+                getMap(): Map;
 
-				setCorrection(userFunction: () => void): void;
+                setCorrection(userFunction: () => void): void;
 
-				stop(): void;
-			}
-		}
+                stop(): void;
+            }
+        }
 
-		namespace behavior { // tslint:disable-line no-shadowed-variable
-			class Manager implements ICustomizable, IEventEmitter, IParentOnMap {
-				constructor(map: Map, behaviors?: string[][] | string[], options?: object);
+        namespace behavior { // tslint:disable-line no-shadowed-variable
+            class Manager implements ICustomizable, IEventEmitter, IParentOnMap {
+                constructor(map: Map, behaviors?: string[][] | string[], options?: object);
 
-				options: IOptionManager;
-				events: IEventManager;
+                options: IOptionManager;
+                events: IEventManager;
 
-				getMap(): Map;
+                getMap(): Map;
 
-				disable(behaviors: string[][] | string[] | string): this;
+                disable(behaviors: string[][] | string[] | string): this;
 
-				enable(behaviors: string[][] | string[] | string): this;
+                enable(behaviors: string[][] | string[] | string): this;
 
-				get(behaviorName: string): IBehavior;
+                get(behaviorName: string): IBehavior;
 
-				isEnabled(behaviorName: string): boolean;
-			}
-		}
+                isEnabled(behaviorName: string): boolean;
+            }
+        }
 
-		namespace layer {
-			class Manager implements ILayer, IMapObjectCollection {
-				constructor(map: Map, options?: {
-					trafficImageZIndex?: number;
-					trafficInfoZIndex?: number;
-					trafficJamZIndex?: number;
-				});
+        namespace layer {
+            class Manager implements ILayer, IMapObjectCollection {
+                constructor(map: Map, options?: {
+                    trafficImageZIndex?: number;
+                    trafficInfoZIndex?: number;
+                    trafficJamZIndex?: number;
+                });
 
-				events: IEventManager;
-				options: IOptionManager;
+                events: IEventManager;
+                options: IOptionManager;
 
-				getParent(): null | IControlParent;
+                getParent(): null | IControlParent;
 
-				setParent(parent: IControlParent): this;
+                setParent(parent: IControlParent): this;
 
-				add(object: object): this;
+                add(object: object): this;
 
-				getIterator(): IIterator;
+                getIterator(): IIterator;
 
-				remove(object: object): this;
+                remove(object: object): this;
 
-				getMap(): Map;
-			}
-		}
+                getMap(): Map;
+            }
+        }
 
-		namespace margin {
-			class Accessor {
-				constructor(screenArea: object);
+        namespace margin {
+            class Accessor {
+                constructor(screenArea: object);
 
-				getArea(): object;
+                getArea(): object;
 
-				remove(): this;
+                remove(): this;
 
-				setArea(screenArea: object): this;
-			}
+                setArea(screenArea: object): this;
+            }
 
-			class Manager {
-				constructor(map: Map);
+            class Manager {
+                constructor(map: Map);
 
-				addArea(screenArea: object): Accessor;
+                addArea(screenArea: object): Accessor;
 
-				destroy(): this;
+                destroy(): this;
 
-				getMargin(): number[];
+                getMargin(): number[];
 
-				getOffset(): number[];
+                getOffset(): number[];
 
-				setDefaultMargin(margin: number[][] | number[] | number): void;
-			}
-		}
+                setDefaultMargin(margin: number[][] | number[] | number): void;
+            }
+        }
 
-		namespace pane {
-			class Manager {
-				constructor(map: Map);
+        namespace pane {
+            class Manager {
+                constructor(map: Map);
 
-				append(key: string, pane: IPane): void;
+                append(key: string, pane: IPane): void;
 
-				destroy(): void;
+                destroy(): void;
 
-				get(key: string): IPane | null;
+                get(key: string): IPane | null;
 
-				getLower(): string;
+                getLower(): string;
 
-				getUpper(): string;
+                getUpper(): string;
 
-				insertBefore(key: string, pane: IPane, referenceKey: string): void;
+                insertBefore(key: string, pane: IPane, referenceKey: string): void;
 
-				remove(pane: IPane): void;
-			}
-		}
+                remove(pane: IPane): void;
+            }
+        }
 
-		class Balloon implements IBalloonManager<Balloon>/*, IBalloonSharingManager*/ { //tslint:disable-line no-shadowed-variable
-			constructor(map: Map);
+        class Balloon implements IBalloonManager<Balloon>/*, IBalloonSharingManager*/ { //tslint:disable-line no-shadowed-variable
+            constructor(map: Map);
 
-			events: IEventManager;
+            events: IEventManager;
 
-			autoPan(): Promise<Balloon>;
+            autoPan(): Promise<Balloon>;
 
-			close(force?: boolean): Promise<Balloon>;
+            close(force?: boolean): Promise<Balloon>;
 
-			destroy(): void;
+            destroy(): void;
 
-			getData(): object | null;
+            getData(): object | null;
 
-			getOptions(): IOptionManager | null;
+            getOptions(): IOptionManager | null;
 
-			getOverlay(): Promise<IOverlay | null>;
+            getOverlay(): Promise<IOverlay | null>;
 
-			getOverlaySync(): IOverlay | null;
+            getOverlaySync(): IOverlay | null;
 
-			getPosition(): number[] | null;
+            getPosition(): number[] | null;
 
-			isOpen(): boolean;
+            isOpen(): boolean;
 
-			open(position?: number[], data?: object | string | HTMLElement, options?: object): Promise<Balloon>;
+            open(position?: number[], data?: object | string | HTMLElement, options?: object): Promise<Balloon>;
 
-			setData(data: object | string | HTMLElement): Promise<Balloon>;
+            setData(data: object | string | HTMLElement): Promise<Balloon>;
 
-			setOptions(options: object): Promise<Balloon>;
+            setOptions(options: object): Promise<Balloon>;
 
-			setPosition(position: number[]): Promise<Balloon>;
-		}
+            setPosition(position: number[]): Promise<Balloon>;
+        }
 
-		class Container implements IDomEventEmitter {
-			constructor(parentElement: string | HTMLElement);
+        class Container implements IDomEventEmitter {
+            constructor(parentElement: string | HTMLElement);
 
-			events: IEventManager;
+            events: IEventManager;
 
-			enterFullscreen(): void;
+            enterFullscreen(): void;
 
-			exitFullscreen(): void;
+            exitFullscreen(): void;
 
-			fitToViewport(preservePixelPosition?: boolean): void;
+            fitToViewport(preservePixelPosition?: boolean): void;
 
-			getElement(): HTMLElement;
+            getElement(): HTMLElement;
 
-			getOffset(): number[];
+            getOffset(): number[];
 
-			getParentElement(): HTMLElement;
+            getParentElement(): HTMLElement;
 
-			getSize(): number[];
+            getSize(): number[];
 
-			isFullscreen(): boolean;
-		}
+            isFullscreen(): boolean;
+        }
 
-		class Converter {
-			constructor(map: Map);
+        class Converter {
+            constructor(map: Map);
 
-			globalToPage(globalPixelPoint: number[]): number[];
+            globalToPage(globalPixelPoint: number[]): number[];
 
-			pageToGlobal(pagePixelPoint: number[]): number[];
-		}
+            pageToGlobal(pagePixelPoint: number[]): number[];
+        }
 
-		class Copyrights {
-			constructor(map: Map);
+        class Copyrights {
+            constructor(map: Map);
 
-			add(customCopyrights: string | HTMLElement | Array<string | HTMLElement>): ICopyrightsAccessor;
+            add(customCopyrights: string | HTMLElement | Array<string | HTMLElement>): ICopyrightsAccessor;
 
-			addProvider(provider: ICopyrightsProvider): this;
+            addProvider(provider: ICopyrightsProvider): this;
 
-			get(point?: number[], zoom?: number): Promise<Array<string | HTMLElement>>;
+            get(point?: number[], zoom?: number): Promise<Array<string | HTMLElement>>;
 
-			getPromoLink(): string;
+            getPromoLink(): string;
 
-			removeProvider(provider: ICopyrightsProvider): this;
-		}
+            removeProvider(provider: ICopyrightsProvider): this;
+        }
 
-		class GeoObjects implements IGeoObjectCollection {
-			constructor(map: Map, options?: object);
+        class GeoObjects implements IGeoObjectCollection {
+            constructor(map: Map, options?: object);
 
-			options: IOptionManager;
-			events: IEventManager;
+            options: IOptionManager;
+            events: IEventManager;
 
-			add(child: IGeoObject, index?: number): this;
+            add(child: IGeoObject, index?: number): this;
 
-			each(callback: (object: IGeoObject) => void, context: object): void;
+            each(callback: (object: IGeoObject) => void, context: object): void;
 
-			get(index: number): IGeoObject;
+            get(index: number): IGeoObject;
 
-			getBounds(): number[][] | null;
+            getBounds(): number[][] | null;
 
-			getIterator(): IIterator;
+            getIterator(): IIterator;
 
-			getLength(): number;
+            getLength(): number;
 
-			getPixelBounds(): number[][] | null;
+            getPixelBounds(): number[][] | null;
 
-			indexOf(object: IGeoObject): number;
+            indexOf(object: IGeoObject): number;
 
-			remove(child: IGeoObject): this;
+            remove(child: IGeoObject): this;
 
-			removeAll(): this;
+            removeAll(): this;
 
-			set(index: number, child: IGeoObject): this;
+            set(index: number, child: IGeoObject): this;
 
-			splice(index: number, length: number): this;
+            splice(index: number, length: number): this;
 
-			getMap(): Map;
-		}
+            getMap(): Map;
+        }
 
-		class Hint implements IHintManager<Hint>/*, IHintSharingManager*/ {
-			constructor(map: Map);
+        class Hint implements IHintManager<Hint>/*, IHintSharingManager*/ {
+            constructor(map: Map);
 
-			events: IEventManager;
+            events: IEventManager;
 
-			close(force?: boolean): Promise<Hint>;
+            close(force?: boolean): Promise<Hint>;
 
-			destroy(): void;
+            destroy(): void;
 
-			getData(): object | null;
+            getData(): object | null;
 
-			getOptions(): IOptionManager | null;
+            getOptions(): IOptionManager | null;
 
-			getOverlay(): Promise<IOverlay | null>;
+            getOverlay(): Promise<IOverlay | null>;
 
-			getOverlaySync(): IOverlay | null;
+            getOverlaySync(): IOverlay | null;
 
-			getPosition(): number[] | null;
+            getPosition(): number[] | null;
 
-			isOpen(): boolean;
+            isOpen(): boolean;
 
-			open(position?: number[], data?: object | string | HTMLElement, options?: object): Promise<Hint>;
+            open(position?: number[], data?: object | string | HTMLElement, options?: object): Promise<Hint>;
 
-			setData(data: object | string | HTMLElement): Promise<Hint>;
+            setData(data: object | string | HTMLElement): Promise<Hint>;
 
-			setOptions(options: object): Promise<Hint>;
+            setOptions(options: object): Promise<Hint>;
 
-			setPosition(position: number[]): Promise<Hint>;
-		}
+            setPosition(position: number[]): Promise<Hint>;
+        }
 
-		class ZoomRange implements IEventEmitter {
-			constructor(map: Map, constraints: number[]);
+        class ZoomRange implements IEventEmitter {
+            constructor(map: Map, constraints: number[]);
 
-			events: IEventManager;
+            events: IEventManager;
 
-			get(coords?: number[]): Promise<number[]>;
+            get(coords?: number[]): Promise<number[]>;
 
-			getCurrent(): number[];
-		}
-	}
+            getCurrent(): number[];
+        }
+    }
 
-	namespace multiRouter {
-		namespace driving {
-			class Path implements IGeoObject {
-				geometry: IGeometry | null;
-				properties: data.Manager;
-				state: IDataManager;
-				model: PathModel;
-				events: IEventManager;
-				options: IOptionManager;
+    namespace multiRouter {
+        namespace driving {
+            class Path implements IGeoObject {
+                geometry: IGeometry | null;
+                properties: data.Manager;
+                state: IDataManager;
+                model: PathModel;
+                events: IEventManager;
+                options: IOptionManager;
 
-				getOverlay(): Promise<IOverlay | null>;
+                getOverlay(): Promise<IOverlay | null>;
 
-				getOverlaySync(): IOverlay | null;
+                getOverlaySync(): IOverlay | null;
 
-				getParent(): object | null;
+                getParent(): object | null;
 
-				setParent(parent: object): this;
+                setParent(parent: object): this;
 
-				getMap(): Map;
+                getMap(): Map;
 
-				getSegments(): GeoObjectCollection;
-			}
+                getSegments(): GeoObjectCollection;
+            }
 
-			class PathModel implements IEventEmitter {
-				events: IEventManager;
-				properties: data.Manager;
-				route: RouteModel;
+            class PathModel implements IEventEmitter {
+                events: IEventManager;
+                properties: data.Manager;
+                route: RouteModel;
 
-				destroy(): void;
+                destroy(): void;
 
-				getSegments(): SegmentModel[];
+                getSegments(): SegmentModel[];
 
-				getType(): string;
+                getType(): string;
 
-				update(pathJson: object): void;
-			}
+                update(pathJson: object): void;
+            }
 
-			class Route implements IGeoObject {
-				geometry: IGeometry | null;
-				properties: IDataManager;
-				state: IDataManager;
-				events: IEventManager;
-				options: IOptionManager;
+            class Route implements IGeoObject {
+                geometry: IGeometry | null;
+                properties: IDataManager;
+                state: IDataManager;
+                events: IEventManager;
+                options: IOptionManager;
 
-				getOverlay(): Promise<IOverlay | null>;
+                getOverlay(): Promise<IOverlay | null>;
 
-				getOverlaySync(): IOverlay | null;
+                getOverlaySync(): IOverlay | null;
 
-				getParent(): object | null;
+                getParent(): object | null;
 
-				setParent(parent: object): this;
+                setParent(parent: object): this;
 
-				getMap(): Map;
+                getMap(): Map;
 
-				getPaths(): GeoObjectCollection;
-			}
+                getPaths(): GeoObjectCollection;
+            }
 
-			class RouteModel implements IEventEmitter {
-				events: IEventManager;
-				multiRoute: MultiRouteModel;
-				properties: data.Manager;
+            class RouteModel implements IEventEmitter {
+                events: IEventManager;
+                multiRoute: MultiRouteModel;
+                properties: data.Manager;
 
-				destroy(): void;
+                destroy(): void;
 
-				getPaths(): PathModel[];
+                getPaths(): PathModel[];
 
-				update(routeJson: object): void;
+                update(routeJson: object): void;
 
-				getType(): string;
-			}
+                getType(): string;
+            }
 
-			class Segment implements IGeoObject {
-				geometry: IGeometry | null;
-				properties: data.Manager;
-				state: IDataManager;
-				events: IEventManager;
-				options: IOptionManager;
+            class Segment implements IGeoObject {
+                geometry: IGeometry | null;
+                properties: data.Manager;
+                state: IDataManager;
+                events: IEventManager;
+                options: IOptionManager;
 
-				getOverlay(): Promise<IOverlay | null>;
+                getOverlay(): Promise<IOverlay | null>;
 
-				getOverlaySync(): IOverlay | null;
+                getOverlaySync(): IOverlay | null;
 
-				getParent(): object | null;
+                getParent(): object | null;
 
-				setParent(parent: object): this;
+                setParent(parent: object): this;
 
-				getMap(): Map;
-			}
+                getMap(): Map;
+            }
 
-			class SegmentModel implements IEventEmitter {
-				events: IEventManager;
-				geometry: geometry.base.LineString;
-				path: PathModel;
+            class SegmentModel implements IEventEmitter {
+                events: IEventManager;
+                geometry: geometry.base.LineString;
+                path: PathModel;
 
-				destroy(): void;
+                destroy(): void;
 
-				getType(): string;
+                getType(): string;
 
-				getViaPoints(): ViaPointModel[];
+                getViaPoints(): ViaPointModel[];
 
-				update(segmentJson: object): void;
-			}
-		}
+                update(segmentJson: object): void;
+            }
+        }
 
-		namespace masstransit {
-			class Path implements IGeoObject {
-				geometry: IGeometry | null;
-				properties: data.Manager;
-				state: IDataManager;
-				events: IEventManager;
-				options: IOptionManager;
-				model: PathModel;
+        namespace masstransit {
+            class Path implements IGeoObject {
+                geometry: IGeometry | null;
+                properties: data.Manager;
+                state: IDataManager;
+                events: IEventManager;
+                options: IOptionManager;
+                model: PathModel;
 
-				getOverlay(): Promise<IOverlay | null>;
+                getOverlay(): Promise<IOverlay | null>;
 
-				getOverlaySync(): IOverlay | null;
+                getOverlaySync(): IOverlay | null;
 
-				getParent(): object | null;
+                getParent(): object | null;
 
-				setParent(parent: object): this;
+                setParent(parent: object): this;
 
-				getMap(): Map;
+                getMap(): Map;
 
-				getSegmentMarkers(): GeoObjectCollection;
+                getSegmentMarkers(): GeoObjectCollection;
 
-				getSegments(): GeoObjectCollection;
-			}
+                getSegments(): GeoObjectCollection;
+            }
 
-			class PathModel implements IEventEmitter {
-				events: IEventManager;
-				properties: data.Manager;
-				route: RouteModel;
+            class PathModel implements IEventEmitter {
+                events: IEventManager;
+                properties: data.Manager;
+                route: RouteModel;
 
-				destroy(): void;
+                destroy(): void;
 
-				getSegments(): Array<TransferSegmentModel | TransportSegmentModel | WalkSegmentModel>;
+                getSegments(): Array<TransferSegmentModel | TransportSegmentModel | WalkSegmentModel>;
 
-				getType(): string;
+                getType(): string;
 
-				update(pathJson: object): void;
-			}
+                update(pathJson: object): void;
+            }
 
-			class Route implements IGeoObject {
-				geometry: IGeometry | null;
-				properties: data.Manager;
-				model: RouteModel;
-				state: IDataManager;
-				events: IEventManager;
-				options: IOptionManager;
+            class Route implements IGeoObject {
+                geometry: IGeometry | null;
+                properties: data.Manager;
+                model: RouteModel;
+                state: IDataManager;
+                events: IEventManager;
+                options: IOptionManager;
 
-				getOverlay(): Promise<IOverlay | null>;
+                getOverlay(): Promise<IOverlay | null>;
 
-				getOverlaySync(): IOverlay | null;
+                getOverlaySync(): IOverlay | null;
 
-				getParent(): object | null;
+                getParent(): object | null;
 
-				setParent(parent: object): this;
+                setParent(parent: object): this;
 
-				getMap(): Map;
+                getMap(): Map;
 
-				getPaths(): GeoObjectCollection;
-			}
+                getPaths(): GeoObjectCollection;
+            }
 
-			class RouteModel implements IEventEmitter {
-				events: IEventManager;
-				multiRoute: MultiRouteModel;
-				properties: data.Manager;
+            class RouteModel implements IEventEmitter {
+                events: IEventManager;
+                multiRoute: MultiRouteModel;
+                properties: data.Manager;
 
-				destroy(): void;
+                destroy(): void;
 
-				getPaths(): PathModel[];
+                getPaths(): PathModel[];
 
-				getType(): string;
+                getType(): string;
 
-				update(routeJson: object): void;
-			}
+                update(routeJson: object): void;
+            }
 
-			class StopModel implements IEventEmitter {
-				events: IEventManager;
-				geometry: geometry.base.Point;
-				properties: data.Manager;
-				segment: TransportSegmentModel;
+            class StopModel implements IEventEmitter {
+                events: IEventManager;
+                geometry: geometry.base.Point;
+                properties: data.Manager;
+                segment: TransportSegmentModel;
 
-				update(stopJson: object): void;
-			}
+                update(stopJson: object): void;
+            }
 
-			class TransferSegment implements IGeoObject {
-				geometry: IGeometry | null;
-				properties: data.Manager;
-				state: IDataManager;
-				events: IEventManager;
-				options: IOptionManager;
-				model: TransferSegmentModel;
+            class TransferSegment implements IGeoObject {
+                geometry: IGeometry | null;
+                properties: data.Manager;
+                state: IDataManager;
+                events: IEventManager;
+                options: IOptionManager;
+                model: TransferSegmentModel;
 
-				getOverlay(): Promise<IOverlay | null>;
+                getOverlay(): Promise<IOverlay | null>;
 
-				getOverlaySync(): IOverlay | null;
+                getOverlaySync(): IOverlay | null;
 
-				getParent(): object | null;
+                getParent(): object | null;
 
-				setParent(parent: object): this;
+                setParent(parent: object): this;
 
-				getMap(): Map;
-			}
+                getMap(): Map;
+            }
 
-			class TransferSegmentModel implements IEventEmitter {
-				events: IEventManager;
-				geometry: geometry.base.LineString;
-				path: PathModel;
-				properties: data.Manager;
+            class TransferSegmentModel implements IEventEmitter {
+                events: IEventManager;
+                geometry: geometry.base.LineString;
+                path: PathModel;
+                properties: data.Manager;
 
-				destroy(segmentJson: object): void;
+                destroy(segmentJson: object): void;
 
-				getType(): string;
-			}
+                getType(): string;
+            }
 
-			class TransportSegment implements IGeoObject {
-				geometry: IGeometry | null;
-				properties: data.Manager;
-				state: IDataManager;
-				events: IEventManager;
-				options: IOptionManager;
-				model: TransportSegmentModel;
+            class TransportSegment implements IGeoObject {
+                geometry: IGeometry | null;
+                properties: data.Manager;
+                state: IDataManager;
+                events: IEventManager;
+                options: IOptionManager;
+                model: TransportSegmentModel;
 
-				getOverlay(): Promise<IOverlay | null>;
+                getOverlay(): Promise<IOverlay | null>;
 
-				getOverlaySync(): IOverlay | null;
+                getOverlaySync(): IOverlay | null;
 
-				getParent(): object | null;
+                getParent(): object | null;
 
-				setParent(parent: object): this;
+                setParent(parent: object): this;
 
-				getMap(): Map;
-			}
+                getMap(): Map;
+            }
 
-			class TransportSegmentModel implements IEventEmitter {
-				events: IEventManager;
-				geometry: geometry.base.LineString;
-				path: PathModel;
-				properties: data.Manager;
+            class TransportSegmentModel implements IEventEmitter {
+                events: IEventManager;
+                geometry: geometry.base.LineString;
+                path: PathModel;
+                properties: data.Manager;
 
-				destroy(): void;
+                destroy(): void;
 
-				getStops(): StopModel[];
+                getStops(): StopModel[];
 
-				getType(): string;
+                getType(): string;
 
-				update(segmentJson: object): void;
-			}
+                update(segmentJson: object): void;
+            }
 
-			class WalkSegment implements IGeoObject {
-				geometry: IGeometry | null;
-				properties: data.Manager;
-				state: IDataManager;
-				events: IEventManager;
-				options: IOptionManager;
-				model: WalkSegmentModel;
+            class WalkSegment implements IGeoObject {
+                geometry: IGeometry | null;
+                properties: data.Manager;
+                state: IDataManager;
+                events: IEventManager;
+                options: IOptionManager;
+                model: WalkSegmentModel;
 
-				getOverlay(): Promise<IOverlay | null>;
+                getOverlay(): Promise<IOverlay | null>;
 
-				getOverlaySync(): IOverlay | null;
+                getOverlaySync(): IOverlay | null;
 
-				getParent(): object | null;
+                getParent(): object | null;
 
-				setParent(parent: object): this;
+                setParent(parent: object): this;
 
-				getMap(): Map;
-			}
+                getMap(): Map;
+            }
 
-			class WalkSegmentModel implements IEventEmitter {
-				events: IEventManager;
-				geometry: geometry.base.LineString;
-				path: PathModel;
-				properties: data.Manager;
+            class WalkSegmentModel implements IEventEmitter {
+                events: IEventManager;
+                geometry: geometry.base.LineString;
+                path: PathModel;
+                properties: data.Manager;
 
-				destroy(): void;
+                destroy(): void;
 
-				getType(): string;
-			}
-		}
+                getType(): string;
+            }
+        }
 
-		class EditorAddon implements ICustomizable, IEventEmitter {
-			options: IOptionManager;
-			events: IEventManager;
-			state: data.Manager;
+        class EditorAddon implements ICustomizable, IEventEmitter {
+            options: IOptionManager;
+            events: IEventManager;
+            state: data.Manager;
 
-			isActive(): boolean;
+            isActive(): boolean;
 
-			start(state: object): void;
+            start(state: object): void;
 
-			stop(): void;
-		}
+            stop(): void;
+        }
 
-		class MultiRoute implements IGeoObject {
-			constructor(model: MultiRouteModel | IMultiRouteModelJson, options?: {
-				activeRouteAutoSelection?: boolean;
-				boundsAutoApply?: boolean;
-				dragUpdateInterval?: string | number;
-				preventDragUpdate?: boolean;
-				useMapMargin?: boolean;
-				zoomMargin?: number[][] | number[] | number;
-				[index: string]: any;
-			});
+        class MultiRoute implements IGeoObject {
+            constructor(model: MultiRouteModel | IMultiRouteModelJson, options?: {
+                activeRouteAutoSelection?: boolean;
+                boundsAutoApply?: boolean;
+                dragUpdateInterval?: string | number;
+                preventDragUpdate?: boolean;
+                useMapMargin?: boolean;
+                zoomMargin?: number[][] | number[] | number;
+                [index: string]: any;
+            });
 
-			editor: EditorAddon;
-			model: MultiRouteModel;
-			geometry: IGeometry | null;
-			properties: IDataManager;
-			state: IDataManager;
-			events: IEventManager;
-			options: IOptionManager;
+            editor: EditorAddon;
+            model: MultiRouteModel;
+            geometry: IGeometry | null;
+            properties: IDataManager;
+            state: IDataManager;
+            events: IEventManager;
+            options: IOptionManager;
 
-			getOverlay(): Promise<IOverlay | null>;
+            getOverlay(): Promise<IOverlay | null>;
 
-			getOverlaySync(): IOverlay | null;
+            getOverlaySync(): IOverlay | null;
 
-			getParent(): object | null;
+            getParent(): object | null;
 
-			setParent(parent: object): this;
+            setParent(parent: object): this;
 
-			getMap(): Map;
+            getMap(): Map;
 
-			getActiveRoute(): driving.Route | masstransit.Route | null;
+            getActiveRoute(): driving.Route | masstransit.Route | null;
 
-			getBounds(): number[][] | null;
+            getBounds(): number[][] | null;
 
-			getPixelBounds(): number[][] | null;
+            getPixelBounds(): number[][] | null;
 
-			getRoutes(): GeoObjectCollection;
+            getRoutes(): GeoObjectCollection;
 
-			getViaPoints(): GeoObjectCollection;
+            getViaPoints(): GeoObjectCollection;
 
-			getWayPoints(): GeoObjectCollection;
+            getWayPoints(): GeoObjectCollection;
 
-			setActiveRoute(route: driving.Route | masstransit.Route | null): void;
-		}
+            setActiveRoute(route: driving.Route | masstransit.Route | null): void;
+        }
 
-		class MultiRouteModel implements IEventEmitter {
-			constructor(referencePoints: IMultiRouteReferencePoint[], params?: IMultiRouteParams);
+        class MultiRouteModel implements IEventEmitter {
+            constructor(referencePoints: IMultiRouteReferencePoint[], params?: IMultiRouteParams);
 
-			events: IEventManager;
-			properties: data.Manager;
+            events: IEventManager;
+            properties: data.Manager;
 
-			destroy(): void;
+            destroy(): void;
 
-			getAllPoints(): Array<WayPointModel | ViaPointModel>;
+            getAllPoints(): Array<WayPointModel | ViaPointModel>;
 
-			getJson(): object;
+            getJson(): object;
 
-			getParams(): IMultiRouteParams;
+            getParams(): IMultiRouteParams;
 
-			getPoints(): Array<WayPointModel | ViaPointModel>;
+            getPoints(): Array<WayPointModel | ViaPointModel>;
 
-			getReferencePointIndexes(): object;
+            getReferencePointIndexes(): object;
 
-			getReferencePoints(): IMultiRouteReferencePoint[];
+            getReferencePoints(): IMultiRouteReferencePoint[];
 
-			getRoutes(): driving.RouteModel[] | masstransit.RouteModel[];
+            getRoutes(): driving.RouteModel[] | masstransit.RouteModel[];
 
-			getViaPoints(): ViaPointModel[];
+            getViaPoints(): ViaPointModel[];
 
-			getWayPoints(): WayPointModel[];
+            getWayPoints(): WayPointModel[];
 
-			setParams(params: IMultiRouteParams, extend?: boolean, clearRequests?: boolean): void;
+            setParams(params: IMultiRouteParams, extend?: boolean, clearRequests?: boolean): void;
 
-			setReferencePoints(referencePoints: IMultiRouteReferencePoint[], viaIndexes?: number[], clearRequests?: boolean): void;
-		}
+            setReferencePoints(referencePoints: IMultiRouteReferencePoint[], viaIndexes?: number[], clearRequests?: boolean): void;
+        }
 
-		class ViaPoint implements IGeoObject {
-			geometry: IGeometry | null;
-			properties: data.Manager;
-			state: IDataManager;
-			events: IEventManager;
-			options: IOptionManager;
+        class ViaPoint implements IGeoObject {
+            geometry: IGeometry | null;
+            properties: data.Manager;
+            state: IDataManager;
+            events: IEventManager;
+            options: IOptionManager;
 
-			getOverlay(): Promise<IOverlay | null>;
+            getOverlay(): Promise<IOverlay | null>;
 
-			getOverlaySync(): IOverlay | null;
+            getOverlaySync(): IOverlay | null;
 
-			getParent(): object | null;
+            getParent(): object | null;
 
-			setParent(parent: object): this;
+            setParent(parent: object): this;
 
-			getMap(): Map;
-		}
+            getMap(): Map;
+        }
 
-		class ViaPointModel implements IEventEmitter {
-			events: IEventManager;
-			geometry: geometry.base.Point;
-			multiRoute: MultiRouteModel;
-			properties: data.Manager;
+        class ViaPointModel implements IEventEmitter {
+            events: IEventManager;
+            geometry: geometry.base.Point;
+            multiRoute: MultiRouteModel;
+            properties: data.Manager;
 
-			destroy(): void;
+            destroy(): void;
 
-			getReferencePoint(): object;
+            getReferencePoint(): object;
 
-			getReferencePointIndex(): number;
+            getReferencePointIndex(): number;
 
-			setReferencePoint(referencePoint: object): void;
+            setReferencePoint(referencePoint: object): void;
 
-			update(viaPointJson: object): void;
-		}
+            update(viaPointJson: object): void;
+        }
 
-		class WayPoint implements IGeoObject {
-			geometry: IGeometry | null;
-			properties: data.Manager;
-			state: IDataManager;
-			events: IEventManager;
-			options: IOptionManager;
-			model: WayPointModel;
+        class WayPoint implements IGeoObject {
+            geometry: IGeometry | null;
+            properties: data.Manager;
+            state: IDataManager;
+            events: IEventManager;
+            options: IOptionManager;
+            model: WayPointModel;
 
-			getOverlay(): Promise<IOverlay | null>;
+            getOverlay(): Promise<IOverlay | null>;
 
-			getOverlaySync(): IOverlay | null;
+            getOverlaySync(): IOverlay | null;
 
-			getParent(): object | null;
+            getParent(): object | null;
 
-			setParent(parent: object): this;
+            setParent(parent: object): this;
 
-			getMap(): Map;
-		}
+            getMap(): Map;
+        }
 
-		class WayPointModel implements IEventEmitter {
-			events: IEventManager;
-			geometry: geometry.base.Point;
-			multiRoute: MultiRouteModel;
-			properties: data.Manager;
+        class WayPointModel implements IEventEmitter {
+            events: IEventManager;
+            geometry: geometry.base.Point;
+            multiRoute: MultiRouteModel;
+            properties: data.Manager;
 
-			destroy(): void;
+            destroy(): void;
 
-			getReferencePoint(): object;
+            getReferencePoint(): object;
 
-			getReferencePointIndex(): number;
+            getReferencePointIndex(): number;
 
-			setReferencePoint(referencePoint: object): void;
+            setReferencePoint(referencePoint: object): void;
 
-			update(wayPointJson: object): void;
-		}
-	}
+            update(wayPointJson: object): void;
+        }
+    }
 
-	namespace option {
-		class Manager implements IOptionManager {
-			constructor(options?: object, parent?: IOptionManager, name?: string);
+    namespace option {
+        class Manager implements IOptionManager {
+            constructor(options?: object, parent?: IOptionManager, name?: string);
 
-			events: IEventManager;
+            events: IEventManager;
 
-			get(key: string, defaultValue: object): object;
+            get(key: string, defaultValue: object): object;
 
-			getAll(): object;
+            getAll(): object;
 
-			getName(): string;
+            getName(): string;
 
-			getNative(key: string): object;
+            getNative(key: string): object;
 
-			resolve(key: string, name?: string): object;
+            resolve(key: string, name?: string): object;
 
-			set(key: object | string, value?: object): this;
+            set(key: object | string, value?: object): this;
 
-			unset(keys: string[][] | string[] | string): this;
+            unset(keys: string[][] | string[] | string): this;
 
-			unsetAll(): this;
+            unsetAll(): this;
 
-			setName(name: string): void;
+            setName(name: string): void;
 
-			getParent(): null | IOptionManager;
+            getParent(): null | IOptionManager;
 
-			setParent(parent: IOptionManager): this;
+            setParent(parent: IOptionManager): this;
 
-			freeze(): IFreezable;
+            freeze(): IFreezable;
 
-			isFrozen(): boolean;
+            isFrozen(): boolean;
 
-			unfreeze(): IFreezable;
+            unfreeze(): IFreezable;
 
-			add(types: string[][] | string[] | string, callback: (event: (object | IEvent)) => void, context?: object, priority?: number): this;
+            add(types: string[][] | string[] | string, callback: (event: (object | IEvent)) => void, context?: object, priority?: number): this;
 
-			group(): IEventGroup;
+            group(): IEventGroup;
 
-			remove(types: string[][] | string[] | string, callback: (event: (object | IEvent)) => void, context?: object, priority?: number): this;
+            remove(types: string[][] | string[] | string, callback: (event: (object | IEvent)) => void, context?: object, priority?: number): this;
 
-			fire(type: string, eventobject: object | IEvent): this;
-		}
-	}
+            fire(type: string, eventobject: object | IEvent): this;
+        }
+    }
 
-	namespace panorama {
-		class Manager implements IEventEmitter {
-			events: IEventManager;
+    namespace panorama {
+        class Manager implements IEventEmitter {
+            events: IEventManager;
 
-			closePlayer(): void;
+            closePlayer(): void;
 
-			disableLookup(): void;
+            disableLookup(): void;
 
-			enableLookup(): void;
+            enableLookup(): void;
 
-			getPlayer(): Player;
+            getPlayer(): Player;
 
-			isLookupEnabled(): boolean;
+            isLookupEnabled(): boolean;
 
-			openPlayer(panorama: IPanorama[] | number): Promise<void>;
-		}
+            openPlayer(panorama: IPanorama[] | number): Promise<void>;
+        }
 
-		class Player implements IEventEmitter {
-			constructor(element: HTMLElement | string, panorama: IPanorama, options?: {
-				autoFitToViewport?: "none" | "ifNull" | "always";
-				controls?: string[];
-				direction?: number[] | string;
-				hotkeysEnabled?: boolean;
-				scrollZoomBehavior?: boolean;
-				span?: number[] | string;
-				suppressMapOpenBlock?: boolean;
-			})
+        class Player implements IEventEmitter {
+            constructor(element: HTMLElement | string, panorama: IPanorama, options?: {
+                autoFitToViewport?: "none" | "ifNull" | "always";
+                controls?: string[];
+                direction?: number[] | string;
+                hotkeysEnabled?: boolean;
+                scrollZoomBehavior?: boolean;
+                span?: number[] | string;
+                suppressMapOpenBlock?: boolean;
+            })
 
-			events: IEventManager;
+            events: IEventManager;
 
-			destroy(): void;
+            destroy(): void;
 
-			fitToViewport(): void;
+            fitToViewport(): void;
 
-			getDirection(): number[];
+            getDirection(): number[];
 
-			getPanorama(): IPanorama;
+            getPanorama(): IPanorama;
 
-			getSpan(): number[];
+            getSpan(): number[];
 
-			lookAt(point: number[]): this;
+            lookAt(point: number[]): this;
 
-			moveTo(point: number[], options?: {
-				direction?: number[] | string;
-				layer?: "yandex#panorama" | "yandex#airPanorama";
-				span?: number[] | string;
-			}): Promise<void>;
+            moveTo(point: number[], options?: {
+                direction?: number[] | string;
+                layer?: "yandex#panorama" | "yandex#airPanorama";
+                span?: number[] | string;
+            }): Promise<void>;
 
-			setDirection(direction: number[] | string): this;
+            setDirection(direction: number[] | string): this;
 
-			setPanorama(panorama: IPanorama): this;
+            setPanorama(panorama: IPanorama): this;
 
-			setSpan(span: number[] | string): this;
-		}
-	}
+            setSpan(span: number[] | string): this;
+        }
+    }
 
-	namespace router {
-		class Editor implements ICustomizable, IEventEmitter {
-			options: IOptionManager;
-			events: IEventManager;
+    namespace router {
+        class Editor implements ICustomizable, IEventEmitter {
+            options: IOptionManager;
+            events: IEventManager;
 
-			start(options?: {
-				addViaPoints?: boolean;
-				addWayPoints?: boolean;
-				editViaPoints?: boolean;
-				editWayPoints?: boolean;
-				removeViaPoints?: boolean;
-				removeWayPoints?: boolean;
-			}): void;
+            start(options?: {
+                addViaPoints?: boolean;
+                addWayPoints?: boolean;
+                editViaPoints?: boolean;
+                editWayPoints?: boolean;
+                removeViaPoints?: boolean;
+                removeWayPoints?: boolean;
+            }): void;
 
-			stop(): void;
-		}
+            stop(): void;
+        }
 
-		abstract class Route implements IGeoObject {
-			geometry: IGeometry | null;
-			properties: IDataManager;
-			state: IDataManager;
-			events: IEventManager;
-			options: IOptionManager;
-			editor: Editor;
+        abstract class Route implements IGeoObject {
+            geometry: IGeometry | null;
+            properties: IDataManager;
+            state: IDataManager;
+            events: IEventManager;
+            options: IOptionManager;
+            editor: Editor;
 
-			getOverlay(): Promise<IOverlay | null>;
+            getOverlay(): Promise<IOverlay | null>;
 
-			getOverlaySync(): IOverlay | null;
+            getOverlaySync(): IOverlay | null;
 
-			getParent(): null | IControlParent;
+            getParent(): null | IControlParent;
 
-			setParent(parent: IControlParent): this;
+            setParent(parent: IControlParent): this;
 
-			getMap(): Map;
+            getMap(): Map;
 
-			getHumanJamsTime(): string;
+            getHumanJamsTime(): string;
 
-			getHumanLength(): string;
+            getHumanLength(): string;
 
-			getHumanTime(): string;
+            getHumanTime(): string;
 
-			getJamsTime(): number;
+            getJamsTime(): number;
 
-			getLength(): number;
+            getLength(): number;
 
-			getPaths(): GeoObjectCollection;
+            getPaths(): GeoObjectCollection;
 
-			getTime(): number;
+            getTime(): number;
 
-			getViaPoints(): GeoObjectCollection;
+            getViaPoints(): GeoObjectCollection;
 
-			getWayPoints(): GeoObjectCollection;
-		}
-	}
+            getWayPoints(): GeoObjectCollection;
+        }
+    }
 
-	class Balloon extends Popup<Balloon> implements IBaloon<Balloon> {
-		constructor(map: Map, options?: IBalloonOptions);
+    class Balloon extends Popup<Balloon> implements IBaloon<Balloon> {
+        constructor(map: Map, options?: IBalloonOptions);
 
-		getData(): object;
+        getData(): object;
 
-		close(force?: boolean): Promise<Balloon>;
+        close(force?: boolean): Promise<Balloon>;
 
-		getParent(): Balloon | null;
+        getParent(): Balloon | null;
 
-		setParent(parent: Balloon): this;
+        setParent(parent: Balloon): this;
 
-		autoPan(): Promise<Balloon>;
+        autoPan(): Promise<Balloon>;
 
-		freeze(): IFreezable;
+        freeze(): IFreezable;
 
-		isFrozen(): boolean;
+        isFrozen(): boolean;
 
-		unfreeze(): IFreezable;
+        unfreeze(): IFreezable;
 
-		add(types: string[][] | string[] | string, callback: (event: (object | IEvent)) => void, context?: object, priority?: number): this;
+        add(types: string[][] | string[] | string, callback: (event: (object | IEvent)) => void, context?: object, priority?: number): this;
 
-		group(): IEventGroup;
+        group(): IEventGroup;
 
-		remove(types: string[][] | string[] | string, callback: (event: (object | IEvent)) => void, context?: object, priority?: number): this;
+        remove(types: string[][] | string[] | string, callback: (event: (object | IEvent)) => void, context?: object, priority?: number): this;
 
-		fire(type: string, eventobject: object | IEvent): this;
-	}
+        fire(type: string, eventobject: object | IEvent): this;
+    }
 
-	interface IBalloonOptions {
-		autoPan?: boolean;
-		autoPanCheckZoomRange?: boolean;
-		autoPanDuration?: number;
-		autoPanMargin?: number[][] | number[] | number;
-		autoPanUseMapMargin?: boolean;
-		closeButton?: boolean;
-		contentLayout?: IClassConstructor<ILayout> | string;
-		layout?: IClassConstructor<ILayout> | string;
-		maxHeight?: number;
-		maxWidth?: number;
-		minHeight?: number;
-		minWidth?: number;
-		offset?: number[];
-		pane?: string;
-		panelContentLayout?: IClassConstructor<ILayout> | string;
-		panelMaxHeightRatio?: number;
-		panelMaxMapArea?: number;
-		shadow?: boolean;
-		shadowLayout?: IClassConstructor<ILayout> | string;
-		shadowOffset?: number[];
-	}
-
-	class Circle implements GeoObject {
-		constructor(geometry: ICircleGeometry[][][][] | number[][] | object, properties?: object | IDataManager, options?: ICircleOptions)
-
-		balloon: geoObject.Balloon;
-		editor: IGeometryEditor;
-		hint: geoObject.Hint;
-		events: event.Manager;
-		options: option.Manager;
-		properties: data.Manager;
-		state: data.Manager;
+    interface IBalloonOptions {
+        autoPan?: boolean;
+        autoPanCheckZoomRange?: boolean;
+        autoPanDuration?: number;
+        autoPanMargin?: number[][] | number[] | number;
+        autoPanUseMapMargin?: boolean;
+        closeButton?: boolean;
+        contentLayout?: IClassConstructor<ILayout> | string;
+        layout?: IClassConstructor<ILayout> | string;
+        maxHeight?: number;
+        maxWidth?: number;
+        minHeight?: number;
+        minWidth?: number;
+        offset?: number[];
+        pane?: string;
+        panelContentLayout?: IClassConstructor<ILayout> | string;
+        panelMaxHeightRatio?: number;
+        panelMaxMapArea?: number;
+        shadow?: boolean;
+        shadowLayout?: IClassConstructor<ILayout> | string;
+        shadowOffset?: number[];
+    }
+
+    class Circle implements GeoObject {
+        constructor(geometry: ICircleGeometry[][][][] | number[][] | object, properties?: object | IDataManager, options?: ICircleOptions)
+
+        balloon: geoObject.Balloon;
+        editor: IGeometryEditor;
+        hint: geoObject.Hint;
+        events: event.Manager;
+        options: option.Manager;
+        properties: data.Manager;
+        state: data.Manager;
 
-		geometry: IGeometry | null;
-		indices: ArrayBuffer;
-		vertices: ArrayBuffer;
+        geometry: IGeometry | null;
+        indices: ArrayBuffer;
+        vertices: ArrayBuffer;
 
-		getOverlay(): Promise<IOverlay | null>;
+        getOverlay(): Promise<IOverlay | null>;
 
-		getOverlaySync(): IOverlay | null;
+        getOverlaySync(): IOverlay | null;
 
-		getParent(): null | IControlParent;
+        getParent(): null | IControlParent;
 
-		setParent(parent: IControlParent): this;
+        setParent(parent: IControlParent): this;
 
-		getMap(): Map;
-	}
+        getMap(): Map;
+    }
 
-	interface ICircleOptions {
-		circleOverlay?: string | ((geometry: IPixelCircleGeometry, data: object, options: object) => Promise<IOverlay>);
-		cursor?: string;
-		draggable?: boolean;
-		fill?: boolean;
-		fillColor?: string;
-		fillImageHref?: string;
-		fillMethod?: "stretch" | "tile";
-		fillOpacity?: number;
-		hasBalloon?: boolean;
-		hasHint?: boolean;
-		hideIconOnBalloonOpen?: boolean;
-		interactiveZIndex?: boolean;
-		interactivityModel?: InteractivityModelKey;
-		opacity?: number;
-		openBalloonOnClick?: boolean;
-		openEmptyBalloon?: boolean;
-		openEmptyHint?: boolean;
-		openHintOnHover?: boolean;
-		outline?: boolean;
-		pane?: string;
-		strokeColor?: string[][] | string[] | string;
-		strokeOpacity?: number[][] | number[] | number;
-		strokeStyle?: string[][][] | object[][] | string[] | object[] | string | object;
-		strokeWidth?: number[][] | number[] | number;
-		syncOverlayInit?: boolean;
-		useMapMarginInDragging?: boolean;
-		visible?: boolean;
-		zIndex?: number;
-		zIndexActive?: number;
-		zIndexDrag?: number;
-		zIndexHover?: number;
-	}
-
-	class Clusterer implements IChildOnMap, ICustomizable, IEventEmitter, IParentOnMap {
-		constructor(options?: IClustererOptions);
-
-		events: IEventManager;
-		options: IOptionManager;
-		balloon: clusterer.Balloon;
-		// 	balloonopen:
-		hint: clusterer.Hint;
-
-		getParent(): null | IControlParent;
-
-		setParent(parent: IControlParent): this;
-
-		// balloonclose:
-
-		getMap(): Map;
-	}
-
-	interface IClustererOptions {
-		gridSize?: number;
-		groupByCoordinates?: boolean;
-		hasBalloon?: boolean;
-		hasHint?: boolean;
-		margin?: number[][] | number[] | number;
-		maxZoom?: number[] | number;
-		minClusterSize?: number;
-		preset?: PresetKey;
-		showInAlphabeticalOrder?: boolean;
-		useMapMargin?: boolean;
-		viewportMargin?: number[][] | number[] | number;
-		zoomMargin?: number[][] | number[] | number;
-	}
-
-	class ClusterPlacemark implements IGeoObject, collection.Item {
-		constructor(geometry: number[] | object | IPointGeometry, properties: IClusterPlacemarkProperties, options?: IClusterPlacemarkOptions);
+    interface ICircleOptions {
+        circleOverlay?: string | ((geometry: IPixelCircleGeometry, data: object, options: object) => Promise<IOverlay>);
+        cursor?: string;
+        draggable?: boolean;
+        fill?: boolean;
+        fillColor?: string;
+        fillImageHref?: string;
+        fillMethod?: "stretch" | "tile";
+        fillOpacity?: number;
+        hasBalloon?: boolean;
+        hasHint?: boolean;
+        hideIconOnBalloonOpen?: boolean;
+        interactiveZIndex?: boolean;
+        interactivityModel?: InteractivityModelKey;
+        opacity?: number;
+        openBalloonOnClick?: boolean;
+        openEmptyBalloon?: boolean;
+        openEmptyHint?: boolean;
+        openHintOnHover?: boolean;
+        outline?: boolean;
+        pane?: string;
+        strokeColor?: string[][] | string[] | string;
+        strokeOpacity?: number[][] | number[] | number;
+        strokeStyle?: string[][][] | object[][] | string[] | object[] | string | object;
+        strokeWidth?: number[][] | number[] | number;
+        syncOverlayInit?: boolean;
+        useMapMarginInDragging?: boolean;
+        visible?: boolean;
+        zIndex?: number;
+        zIndexActive?: number;
+        zIndexDrag?: number;
+        zIndexHover?: number;
+    }
+
+    class Clusterer implements IChildOnMap, ICustomizable, IEventEmitter, IParentOnMap {
+        constructor(options?: IClustererOptions);
+
+        events: IEventManager;
+        options: IOptionManager;
+        balloon: clusterer.Balloon;
+        // 	balloonopen:
+        hint: clusterer.Hint;
+
+        getParent(): null | IControlParent;
+
+        setParent(parent: IControlParent): this;
+
+        // balloonclose:
+
+        getMap(): Map;
+    }
+
+    interface IClustererOptions {
+        gridSize?: number;
+        groupByCoordinates?: boolean;
+        hasBalloon?: boolean;
+        hasHint?: boolean;
+        margin?: number[][] | number[] | number;
+        maxZoom?: number[] | number;
+        minClusterSize?: number;
+        preset?: PresetKey;
+        showInAlphabeticalOrder?: boolean;
+        useMapMargin?: boolean;
+        viewportMargin?: number[][] | number[] | number;
+        zoomMargin?: number[][] | number[] | number;
+    }
+
+    class ClusterPlacemark implements IGeoObject, collection.Item {
+        constructor(geometry: number[] | object | IPointGeometry, properties: IClusterPlacemarkProperties, options?: IClusterPlacemarkOptions);
 
-		geometry: IGeometry | null;
-		properties: IDataManager;
-		events: IEventManager;
-		options: IOptionManager;
-		state: data.Manager;
+        geometry: IGeometry | null;
+        properties: IDataManager;
+        events: IEventManager;
+        options: IOptionManager;
+        state: data.Manager;
 
-		getOverlay(): Promise<IOverlay | null>;
+        getOverlay(): Promise<IOverlay | null>;
 
-		getOverlaySync(): IOverlay | null;
+        getOverlaySync(): IOverlay | null;
 
-		getParent(): null | IControlParent;
+        getParent(): null | IControlParent;
 
-		setParent(parent: IControlParent): this;
+        setParent(parent: IControlParent): this;
 
-		getMap(): Map;
+        getMap(): Map;
 
-		onAddToMap(map: Map): void;
+        onAddToMap(map: Map): void;
 
-		onRemoveFromMap(oldMap: Map): void;
+        onRemoveFromMap(oldMap: Map): void;
 
-		getBounds(): number[][] | null;
+        getBounds(): number[][] | null;
 
-		getGeoObjects(): IGeoObject[];
-	}
+        getGeoObjects(): IGeoObject[];
+    }
 
-	interface IClusterPlacemarkProperties extends IDataManager {
-		geoObjects: IGeoObject[];
-	}
+    interface IClusterPlacemarkProperties extends IDataManager {
+        geoObjects: IGeoObject[];
+    }
 
-	interface IClusterPlacemarkOptions {
-		balloonContentLayout?: "cluster#balloonTwoColumns" | "cluster#balloonCarousel" | "cluster#balloonAccordion" | string | IClassConstructor<ILayout>;
-		balloonContentLayoutHeight?: number;
-		balloonContentLayoutWidth?: number;
-		balloonItemContentLayout?: ILayout | string;
-		balloonPanelContentLayout?: string | IClassConstructor<ILayout>;
-		cursor?: string;
-		disableClickZoom?: boolean;
-		hideIconOnBalloonOpen?: boolean;
-		iconColor?: string;
-		iconContentLayout?: string | IClassConstructor<ILayout>;
-		iconLayout?: string | IClassConstructor<ILayout>;
-		icons?: Array<{
-			href: string;
-			size: number[];
-			ooffset: number[];
-			shape?: IShape | IGeometryJson;
-		}>;
-		iconShape?: IGeometryJson;
-		interactivityModel?: InteractivityModelKey;
-		numbers?: number[];
-		openBalloonOnClick?: boolean;
-		openEmptyHint?: boolean;
-		openHintOnHover?: boolean;
-		zIndexHover?: number;
-	}
+    interface IClusterPlacemarkOptions {
+        balloonContentLayout?: "cluster#balloonTwoColumns" | "cluster#balloonCarousel" | "cluster#balloonAccordion" | string | IClassConstructor<ILayout>;
+        balloonContentLayoutHeight?: number;
+        balloonContentLayoutWidth?: number;
+        balloonItemContentLayout?: ILayout | string;
+        balloonPanelContentLayout?: string | IClassConstructor<ILayout>;
+        cursor?: string;
+        disableClickZoom?: boolean;
+        hideIconOnBalloonOpen?: boolean;
+        iconColor?: string;
+        iconContentLayout?: string | IClassConstructor<ILayout>;
+        iconLayout?: string | IClassConstructor<ILayout>;
+        icons?: Array<{
+            href: string;
+            size: number[];
+            ooffset: number[];
+            shape?: IShape | IGeometryJson;
+        }>;
+        iconShape?: IGeometryJson;
+        interactivityModel?: InteractivityModelKey;
+        numbers?: number[];
+        openBalloonOnClick?: boolean;
+        openEmptyHint?: boolean;
+        openHintOnHover?: boolean;
+        zIndexHover?: number;
+    }
 
-	class Collection implements ICollection, collection.Item {
-		constructor(options?: object);
+    class Collection implements ICollection, collection.Item {
+        constructor(options?: object);
 
-		events: IEventManager;
-		options: IOptionManager;
+        events: IEventManager;
+        options: IOptionManager;
 
-		add(object: object): this;
+        add(object: object): this;
 
-		getIterator(): IIterator;
+        getIterator(): IIterator;
 
-		remove(object: object): this;
+        remove(object: object): this;
 
-		getParent(): null | IControlParent;
+        getParent(): null | IControlParent;
 
-		setParent(parent: IControlParent): this;
+        setParent(parent: IControlParent): this;
 
-		getMap(): Map;
+        getMap(): Map;
 
-		onAddToMap(map: Map): void;
+        onAddToMap(map: Map): void;
 
-		onRemoveFromMap(oldMap: Map): void;
+        onRemoveFromMap(oldMap: Map): void;
 
-		filter(filterFunction: (object: object) => boolean): object[];
+        filter(filterFunction: (object: object) => boolean): object[];
 
-		get(index: number): object;
+        get(index: number): object;
 
-		getAll(): object[];
+        getAll(): object[];
 
-		getLength(): number;
+        getLength(): number;
 
-		indexOf(childToFind: object): number;
+        indexOf(childToFind: object): number;
 
-		removeAll(): this;
-	}
+        removeAll(): this;
+    }
 
-	class Event implements IEvent {
-		constructor(originalEvent: object, sourceEvent: IEvent);
+    class Event implements IEvent {
+        constructor(originalEvent: object, sourceEvent: IEvent);
 
-		allowMapEvent(): void;
+        allowMapEvent(): void;
 
-		callMethod(name: string): void;
+        callMethod(name: string): void;
 
-		get(name: string): object;
+        get(name: string): object;
 
-		getSourceEvent(): IEvent | null;
+        getSourceEvent(): IEvent | null;
 
-		isDefaultPrevented(): boolean;
+        isDefaultPrevented(): boolean;
 
-		isImmediatePropagationStopped(): boolean;
+        isImmediatePropagationStopped(): boolean;
 
-		isMapEventAllowed(): boolean;
+        isMapEventAllowed(): boolean;
 
-		isPropagationStopped(): boolean;
+        isPropagationStopped(): boolean;
 
-		preventDefault(): boolean;
+        preventDefault(): boolean;
 
-		stopImmediatePropagation(): boolean;
+        stopImmediatePropagation(): boolean;
 
-		stopPropagation(): boolean;
-	}
+        stopPropagation(): boolean;
+    }
 
-	class GeoObject implements IGeoObject {
-		constructor(feature?: IGeoObjectFeature, options?: IGeoObjectOptions);
+    class GeoObject implements IGeoObject {
+        constructor(feature?: IGeoObjectFeature, options?: IGeoObjectOptions);
 
-		geometry: IGeometry | null;
-		balloon: geoObject.Balloon;
-		editor: IGeometryEditor;
-		hint: geoObject.Hint;
-		events: event.Manager;
-		options: option.Manager;
-		properties: data.Manager;
-		state: data.Manager;
+        geometry: IGeometry | null;
+        balloon: geoObject.Balloon;
+        editor: IGeometryEditor;
+        hint: geoObject.Hint;
+        events: event.Manager;
+        options: option.Manager;
+        properties: data.Manager;
+        state: data.Manager;
 
-		getOverlay(): Promise<IOverlay | null>;
+        getOverlay(): Promise<IOverlay | null>;
 
-		getOverlaySync(): IOverlay | null;
+        getOverlaySync(): IOverlay | null;
 
-		getParent(): null | IControlParent;
+        getParent(): null | IControlParent;
 
-		setParent(parent: IControlParent): this;
+        setParent(parent: IControlParent): this;
 
-		getMap(): Map;
-	}
+        getMap(): Map;
+    }
 
-	interface IGeoObjectFeature {
-		geometry?: IGeometry | IGeometryJson | object;
-		properties?: IDataManager | object;
-	}
+    interface IGeoObjectFeature {
+        geometry?: IGeometry | IGeometryJson | object;
+        properties?: IDataManager | object;
+    }
 
-	interface IGeoObjectOptions extends ICircleOptions {
-		iconCaptionMaxWidth?: number;
-		iconColor?: string;
-		iconContentLayout?: string | IClassConstructor<ILayout>;
-		iconContentOffset?: number[];
-		iconContentPadding?: number[];
-		iconContentSize?: number[];
-		iconImageClipRect?: number[][];
-		iconImageHref?: string;
-		iconImageOffset?: number[];
-		iconImageShape?: IShape | null;
-		iconImageSize?: number[];
-		iconLayout?: string | IClassConstructor<ILayout>;
-		iconMaxHeight?: number;
-		iconMaxWidth?: number;
-		iconOffset?: number[];
-		iconShadow?: boolean;
-		iconShadowImageClipRect?: number[][];
-		iconShadowImageHref?: string;
-		iconShadowImageOffset?: number[];
-		iconShadowImageSize?: number[];
-		iconShadowLayout?: string | IClassConstructor<ILayout>;
-		iconShadowOffset?: number[];
-		lineStringOverlay?: OverlayKey;
-		pointOverlay?: OverlayKey;
-		polygonOverlay?: OverlayKey;
-		preset?: string;
-		rectangleOverlay?: OverlayKey;
-		setMapCursorInDragging?: boolean;
-	}
+    interface IGeoObjectOptions extends ICircleOptions {
+        iconCaptionMaxWidth?: number;
+        iconColor?: string;
+        iconContentLayout?: string | IClassConstructor<ILayout>;
+        iconContentOffset?: number[];
+        iconContentPadding?: number[];
+        iconContentSize?: number[];
+        iconImageClipRect?: number[][];
+        iconImageHref?: string;
+        iconImageOffset?: number[];
+        iconImageShape?: IShape | null;
+        iconImageSize?: number[];
+        iconLayout?: string | IClassConstructor<ILayout>;
+        iconMaxHeight?: number;
+        iconMaxWidth?: number;
+        iconOffset?: number[];
+        iconShadow?: boolean;
+        iconShadowImageClipRect?: number[][];
+        iconShadowImageHref?: string;
+        iconShadowImageOffset?: number[];
+        iconShadowImageSize?: number[];
+        iconShadowLayout?: string | IClassConstructor<ILayout>;
+        iconShadowOffset?: number[];
+        lineStringOverlay?: OverlayKey;
+        pointOverlay?: OverlayKey;
+        polygonOverlay?: OverlayKey;
+        preset?: string;
+        rectangleOverlay?: OverlayKey;
+        setMapCursorInDragging?: boolean;
+    }
 
-	class GeoObjectCollection implements IGeoObject, IGeoObjectCollection {
-		constructor(feature?: {
-			children?: IGeoObject[];
-			geometry?: IGeometry | object;
-			properties?: IDataManager | object;
-		}, options?: object);
+    class GeoObjectCollection implements IGeoObject, IGeoObjectCollection {
+        constructor(feature?: {
+            children?: IGeoObject[];
+            geometry?: IGeometry | object;
+            properties?: IDataManager | object;
+        }, options?: object);
 
-		geometry: IGeometry | null;
-		properties: IDataManager;
-		state: IDataManager;
-		events: IEventManager;
-		options: IOptionManager;
+        geometry: IGeometry | null;
+        properties: IDataManager;
+        state: IDataManager;
+        events: IEventManager;
+        options: IOptionManager;
 
-		getOverlay(): Promise<IOverlay | null>;
+        getOverlay(): Promise<IOverlay | null>;
 
-		getOverlaySync(): IOverlay | null;
+        getOverlaySync(): IOverlay | null;
 
-		getParent(): null | IControlParent;
+        getParent(): null | IControlParent;
 
-		setParent(parent: IControlParent): this;
+        setParent(parent: IControlParent): this;
 
-		getMap(): Map;
+        getMap(): Map;
 
-		add(child: IGeoObject, index?: number): this;
+        add(child: IGeoObject, index?: number): this;
 
-		each(callback: (object: IGeoObject) => void, context: object): void;
+        each(callback: (object: IGeoObject) => void, context: object): void;
 
-		get(index: number): IGeoObject;
+        get(index: number): IGeoObject;
 
-		getBounds(): number[][] | null;
+        getBounds(): number[][] | null;
 
-		getIterator(): IIterator;
+        getIterator(): IIterator;
 
-		getLength(): number;
+        getLength(): number;
 
-		getPixelBounds(): number[][] | null;
+        getPixelBounds(): number[][] | null;
 
-		indexOf(object: IGeoObject): number;
+        indexOf(object: IGeoObject): number;
 
-		remove(child: IGeoObject): this;
+        remove(child: IGeoObject): this;
 
-		removeAll(): this;
+        removeAll(): this;
 
-		set(index: number, child: IGeoObject): this;
+        set(index: number, child: IGeoObject): this;
 
-		splice(index: number, length: number): this;
+        splice(index: number, length: number): this;
 
-		toArray(): IGeoObject[];
-	}
+        toArray(): IGeoObject[];
+    }
 
-	class Layer implements ILayer, IParentOnMap, IPositioningContext {
-		constructor(tileUrlTemplate: string | ((tileNumber: number[], tileZoom: number) => string));
+    class Layer implements ILayer, IParentOnMap, IPositioningContext {
+        constructor(tileUrlTemplate: string | ((tileNumber: number[], tileZoom: number) => string));
 
-		events: IEventManager;
-		options: IOptionManager;
+        events: IEventManager;
+        options: IOptionManager;
 
-		fromClientPixels(clientPixelPoint: number[]): number[];
+        fromClientPixels(clientPixelPoint: number[]): number[];
 
-		getZoom(): number;
+        getZoom(): number;
 
-		toClientPixels(globalPixelPoint: number[]): number[];
+        toClientPixels(globalPixelPoint: number[]): number[];
 
-		getParent(): null | IControlParent;
+        getParent(): null | IControlParent;
 
-		setParent(parent: IControlParent): this;
+        setParent(parent: IControlParent): this;
 
-		getMap(): Map;
-	}
+        getMap(): Map;
+    }
 
-	class Map implements IDomEventEmitter {
-		constructor(parentElement: HTMLElement | string, state: IMapState, options?: IMapOptions)
+    class Map implements IDomEventEmitter {
+        constructor(parentElement: HTMLElement | string, state: IMapState, options?: IMapOptions)
 
-		action: map.action.Manager;
-		balloon: map.Balloon;
-		behaviors: map.behavior.Manager;
-		container: map.Container;
-		controls: control.Manager;
-		converter: map.Converter;
-		copyrights: map.Copyrights;
-		cursors: util.cursor.Manager;
-		events: event.Manager;
-		geoObjects: map.GeoObjects;
-		hint: map.Hint;
-		layers: map.layer.Manager;
-		margin: map.margin.Manager;
-		options: option.Manager;
-		panes: map.pane.Manager;
-		zoomRange: map.ZoomRange;
+        action: map.action.Manager;
+        balloon: map.Balloon;
+        behaviors: map.behavior.Manager;
+        container: map.Container;
+        controls: control.Manager;
+        converter: map.Converter;
+        copyrights: map.Copyrights;
+        cursors: util.cursor.Manager;
+        events: event.Manager;
+        geoObjects: map.GeoObjects;
+        hint: map.Hint;
+        layers: map.layer.Manager;
+        margin: map.margin.Manager;
+        options: option.Manager;
+        panes: map.pane.Manager;
+        zoomRange: map.ZoomRange;
 
-		destroy(): void;
+        destroy(): void;
 
-		getBounds(options?: IMapMarginOptions): number[][];
+        getBounds(options?: IMapMarginOptions): number[][];
 
-		getCenter(options?: IMapMarginOptions): number[];
+        getCenter(options?: IMapMarginOptions): number[];
 
-		getGlobalPixelCenter(options?: IMapMarginOptions): number[];
+        getGlobalPixelCenter(options?: IMapMarginOptions): number[];
 
-		getPanoramaManager(): Promise<panorama.Manager>;
+        getPanoramaManager(): Promise<panorama.Manager>;
 
-		getType(): string | MapType;
+        getType(): string | MapType;
 
-		getZoom(): number;
+        getZoom(): number;
 
-		panTo(center: number[] | object[], options?: IMapPanOptions): Promise<void>;
+        panTo(center: number[] | object[], options?: IMapPanOptions): Promise<void>;
 
-		setBounds(bounds: number[][], options?: IMapBoundsOptions): Promise<void>;
+        setBounds(bounds: number[][], options?: IMapBoundsOptions): Promise<void>;
 
-		setCenter(center: number[], zoom?: number, options?: IMapPositionOptions): Promise<void>;
+        setCenter(center: number[], zoom?: number, options?: IMapPositionOptions): Promise<void>;
 
-		setGlobalPixelCenter(globalPixelCenter: number[], zoom?: number, options?: IMapPositionOptions): Promise<void>;
+        setGlobalPixelCenter(globalPixelCenter: number[], zoom?: number, options?: IMapPositionOptions): Promise<void>;
 
-		setType(type: string | MapType, options?: IMapCheckZoomRangeOptions): Promise<void>;
+        setType(type: string | MapType, options?: IMapCheckZoomRangeOptions): Promise<void>;
 
-		setZoom(zoom: number, options?: IMapZoomOptions): Promise<void>;
-	}
+        setZoom(zoom: number, options?: IMapZoomOptions): Promise<void>;
+    }
 
-	interface IMapMarginOptions {
-		useMapMargin?: boolean;
-	}
+    interface IMapMarginOptions {
+        useMapMargin?: boolean;
+    }
 
-	interface IMapCheckZoomRangeOptions {
-		checkZoomRange?: boolean;
-	}
+    interface IMapCheckZoomRangeOptions {
+        checkZoomRange?: boolean;
+    }
 
-	interface IMapZoomOptions extends IMapMarginOptions, IMapCheckZoomRangeOptions {
-		duration?: number;
-	}
+    interface IMapZoomOptions extends IMapMarginOptions, IMapCheckZoomRangeOptions {
+        duration?: number;
+    }
 
-	interface IMapPositionOptions extends IMapZoomOptions {
-		timingFunction?: string;
-	}
+    interface IMapPositionOptions extends IMapZoomOptions {
+        timingFunction?: string;
+    }
 
-	interface IMapBoundsOptions extends IMapPositionOptions {
-		preciseZoom?: boolean;
-		zoomMargin?: number[][] | number[];
-	}
+    interface IMapBoundsOptions extends IMapPositionOptions {
+        preciseZoom?: boolean;
+        zoomMargin?: number[][] | number[];
+    }
 
-	interface IMapPanOptions extends IMapPositionOptions {
-		delay?: number;
-		flying?: boolean;
-		safe?: boolean;
-	}
+    interface IMapPanOptions extends IMapPositionOptions {
+        delay?: number;
+        flying?: boolean;
+        safe?: boolean;
+    }
 
-	class MapType {
-		constructor(name: string, layers: Array<IClassConstructor<Layer> | string>)
-	}
+    class MapType {
+        constructor(name: string, layers: Array<IClassConstructor<Layer> | string>)
+    }
 
-	interface IMapState {
-		behaviors?: string[];
-		bounds?: number[][];
-		center?: number[];
-		controls?: string[];
-		margin?: number[][] | number[];
-		type?: "yandex#map" | "yandex#satellite" | "yandex#hybrid";
-		zoom?: number;
-	}
+    interface IMapState {
+        behaviors?: string[];
+        bounds?: number[][];
+        center?: number[];
+        controls?: string[];
+        margin?: number[][] | number[];
+        type?: "yandex#map" | "yandex#satellite" | "yandex#hybrid";
+        zoom?: number;
+    }
 
-	interface IMapOptions {
-		autoFitToViewport?: "none" | "ifNull" | "always";
-		avoidFractionalZoom?: boolean;
-		exitFullscreenByEsc?: boolean;
-		fullscreenZIndex?: number;
-		mapAutoFocus?: boolean;
-		maxAnimationZoomDifference?: number;
-		maxZoom?: number;
-		minZoom?: number;
-		nativeFullscreen?: boolean;
-		projection?: IProjection;
-		restrictMapArea?: boolean;
-		suppressMapOpenBlock?: boolean;
-		suppressObsoleteBrowserNotifier?: boolean;
-		yandexMapAutoSwitch?: boolean;
-		yandexMapDisablePoiInteractivity?: boolean;
-	}
+    interface IMapOptions {
+        autoFitToViewport?: "none" | "ifNull" | "always";
+        avoidFractionalZoom?: boolean;
+        exitFullscreenByEsc?: boolean;
+        fullscreenZIndex?: number;
+        mapAutoFocus?: boolean;
+        maxAnimationZoomDifference?: number;
+        maxZoom?: number;
+        minZoom?: number;
+        nativeFullscreen?: boolean;
+        projection?: IProjection;
+        restrictMapArea?: boolean;
+        suppressMapOpenBlock?: boolean;
+        suppressObsoleteBrowserNotifier?: boolean;
+        yandexMapAutoSwitch?: boolean;
+        yandexMapDisablePoiInteractivity?: boolean;
+    }
 
-	class Placemark extends GeoObject {
-		constructor(geometry: number[] | object | IPointGeometry, properties: object | IDataManager, options?: IPlacemarkOptions)
-	}
+    class Placemark extends GeoObject {
+        constructor(geometry: number[] | object | IPointGeometry, properties: object | IDataManager, options?: IPlacemarkOptions)
+    }
 
-	interface IPlacemarkOptions {
-		cursor?: string;
-		draggable?: boolean;
+    interface IPlacemarkOptions {
+        cursor?: string;
+        draggable?: boolean;
 
-		[index: string]: any;
-	}
+        [index: string]: any;
+    }
 
-	class Popup<T> implements IPopup<T> {
-		constructor(map: Map, options?: IPopupOptions);
+    class Popup<T> implements IPopup<T> {
+        constructor(map: Map, options?: IPopupOptions);
 
-		options: IOptionManager;
-		events: IEventManager;
+        options: IOptionManager;
+        events: IEventManager;
 
-		close(force?: boolean): Promise<T>;
+        close(force?: boolean): Promise<T>;
 
-		getData(): object;
+        getData(): object;
 
-		getOverlay(): Promise<IOverlay>;
+        getOverlay(): Promise<IOverlay>;
 
-		getOverlaySync(): IOverlay;
+        getOverlaySync(): IOverlay;
 
-		getPosition(): number[];
+        getPosition(): number[];
 
-		isOpen(): boolean;
+        isOpen(): boolean;
 
-		open(position: number[], data: object | string | HTMLElement): Promise<T>;
+        open(position: number[], data: object | string | HTMLElement): Promise<T>;
 
-		setData(data: object | string | HTMLElement): Promise<T>;
+        setData(data: object | string | HTMLElement): Promise<T>;
 
-		setPosition(position: number[]): Promise<T>;
-	}
+        setPosition(position: number[]): Promise<T>;
+    }
 
-	interface IPopupOptions {
-		closeTimeout?: number;
-		interactivityModel?: InteractivityModelKey;
-		openTimeout?: number;
-		pane?: IPane | string;
-		projection?: IProjection;
-		zIndex?: number;
-	}
+    interface IPopupOptions {
+        closeTimeout?: number;
+        interactivityModel?: InteractivityModelKey;
+        openTimeout?: number;
+        pane?: IPane | string;
+        projection?: IProjection;
+        zIndex?: number;
+    }
 
-	function ready(successCallback?: () => any | IReadyobject, errorCallback?: () => any, context?: object): Promise<void>;
+    function ready(successCallback?: () => any | IReadyobject, errorCallback?: () => any, context?: object): Promise<void>;
 
-	interface IReadyobject {
-		require?: string[];
-		context?: object;
+    interface IReadyobject {
+        require?: string[];
+        context?: object;
 
-		successCallback?(): void;
+        successCallback?(): void;
 
-		errorCallback?(): void;
-	}
+        errorCallback?(): void;
+    }
 
-	namespace templateLayoutFactory {
-		function createClass(template: string, overrides?: object, staticMethods?: object): IClassConstructor<layout.templateBased.Base>;
-	}
+    namespace templateLayoutFactory {
+        function createClass(template: string, overrides?: object, staticMethods?: object): IClassConstructor<layout.templateBased.Base>;
+    }
 
-	namespace util {
-		namespace cursor {
-			class Accessor {
-				constructor(key: string);
+    namespace util {
+        namespace cursor {
+            class Accessor {
+                constructor(key: string);
 
-				getKey(): string;
+                getKey(): string;
 
-				remove(): void;
+                remove(): void;
 
-				setKey(): void;
-			}
+                setKey(): void;
+            }
 
-			class Manager {
-				constructor(element: HTMLElement);
+            class Manager {
+                constructor(element: HTMLElement);
 
-				push(key: string): Accessor;
-			}
-		}
+                push(key: string): Accessor;
+            }
+        }
 
-		class Storage {
-			add(key: string, object: object): this;
+        class Storage {
+            add(key: string, object: object): this;
 
-			get(key: string | object): object | string;
+            get(key: string | object): object | string;
 
-			remove(key: string): object;
-		}
-	}
+            remove(key: string): object;
+        }
+    }
 
-	/*Interfaces*/
+    /*Interfaces*/
 
-	interface IBaloon<T> extends IPopup<T>, ICustomizable, IChild<T>, IFreezable {
-		autoPan(): Promise<T>;
-	}
+    interface IBaloon<T> extends IPopup<T>, ICustomizable, IChild<T>, IFreezable {
+        autoPan(): Promise<T>;
+    }
 
-	interface IBalloonManager<T> extends IPopupManager<T> {
-		autoPan(): Promise<T>;
-	}
+    interface IBalloonManager<T> extends IPopupManager<T> {
+        autoPan(): Promise<T>;
+    }
 
-	interface IBaseGeometry extends IEventEmitter {
-		getBounds(): number[][] | null;
+    interface IBaseGeometry extends IEventEmitter {
+        getBounds(): number[][] | null;
 
-		getType(): string;
-	}
+        getType(): string;
+    }
 
-	interface IBaseLineStringGeometry extends IBaseGeometry, ILineStringGeometryAccess {//tslint:disable-line no-empty-interface no-empty-interfaces
-	}
+    interface IBaseLineStringGeometry extends IBaseGeometry, ILineStringGeometryAccess {//tslint:disable-line no-empty-interface no-empty-interfaces
+    }
 
-	interface IBasePointGeometry extends IBaseGeometry, IPointGeometryAccess {//tslint:disable-line no-empty-interface no-empty-interfaces
-	}
+    interface IBasePointGeometry extends IBaseGeometry, IPointGeometryAccess {//tslint:disable-line no-empty-interface no-empty-interfaces
+    }
 
-	interface IBehavior extends IChildOnMap, ICustomizable {
-		disable(): void;
+    interface IBehavior extends IChildOnMap, ICustomizable {
+        disable(): void;
 
-		enable(): void;
+        enable(): void;
 
-		isEnabled(): boolean;
-	}
+        isEnabled(): boolean;
+    }
 
-	interface IChild<T> extends IEventEmitter {
-		getParent(): object | null;
+    interface IChild<T> extends IEventEmitter {
+        getParent(): object | null;
 
-		setParent(parent: object | null): this;
-	}
+        setParent(parent: object | null): this;
+    }
 
-	interface IChildOnMap extends IChild<IControlParent> { //tslint:disable-line no-empty-interface no-empty-interfaces
-	}
+    interface IChildOnMap extends IChild<IControlParent> { //tslint:disable-line no-empty-interface no-empty-interfaces
+    }
 
-	interface ICircleGeometry extends ICircleGeometryAccess, IGeometry { //tslint:disable-line no-empty-interface no-empty-interfaces
-	}
+    interface ICircleGeometry extends ICircleGeometryAccess, IGeometry { //tslint:disable-line no-empty-interface no-empty-interfaces
+    }
 
-	interface ICircleGeometryAccess extends IFreezable {
-		contains(position: number[]): boolean;
+    interface ICircleGeometryAccess extends IFreezable {
+        contains(position: number[]): boolean;
 
-		getClosest(anchorPosition: number[]): object;
+        getClosest(anchorPosition: number[]): object;
 
-		getCoordinates(): number[] | null;
+        getCoordinates(): number[] | null;
 
-		getRadius(): number;
+        getRadius(): number;
 
-		setCoordinates(coordinates: number[] | null): this;
+        setCoordinates(coordinates: number[] | null): this;
 
-		setRadius(radius: number): this;
-	}
+        setRadius(radius: number): this;
+    }
 
-	interface ICollection extends IEventEmitter {
-		add(object: object): this;
+    interface ICollection extends IEventEmitter {
+        add(object: object): this;
 
-		getIterator(): IIterator;
+        getIterator(): IIterator;
 
-		remove(object: object): this;
-	}
+        remove(object: object): this;
+    }
 
-	interface IControl extends IChildOnMap { //tslint:disable-line no-empty-interface no-empty-interfaces
-		// new (options?: object);
-	}
+    interface IControl extends IChildOnMap { //tslint:disable-line no-empty-interface no-empty-interfaces
+        // new (options?: object);
+    }
 
-	interface IControlParent extends IParentOnMap {
-		getChildElement(child: IControl): Promise<HTMLElement>;
-	}
+    interface IControlParent extends IParentOnMap {
+        getChildElement(child: IControl): Promise<HTMLElement>;
+    }
 
-	interface ICoordSystem {
-		getDistance(point1: number[], point2: number[]): number;
+    interface ICoordSystem {
+        getDistance(point1: number[], point2: number[]): number;
 
-		solveDirectProblem(startPoint: number[], direction: number[], distance: number): object;
+        solveDirectProblem(startPoint: number[], direction: number[], distance: number): object;
 
-		solveInverseProblem(startPoint: number[], endPoint: number[], reverseDirection?: boolean): object;
-	}
+        solveInverseProblem(startPoint: number[], endPoint: number[], reverseDirection?: boolean): object;
+    }
 
-	interface ICopyrightsAccessor extends ICopyrightsProvider { //tslint:disable-line no-empty-interface no-empty-interfaces
-	}
+    interface ICopyrightsAccessor extends ICopyrightsProvider { //tslint:disable-line no-empty-interface no-empty-interfaces
+    }
 
-	interface ICopyrightsProvider extends IEventEmitter {
-		getCopyrights(coords: number[], zoom: number): Promise<Array<string | HTMLElement>>;
+    interface ICopyrightsProvider extends IEventEmitter {
+        getCopyrights(coords: number[], zoom: number): Promise<Array<string | HTMLElement>>;
 
-		remove(): void;
+        remove(): void;
 
-		setCopyrights(copyrights: string | HTMLElement | Array<string | HTMLElement>): void;
-	}
+        setCopyrights(copyrights: string | HTMLElement | Array<string | HTMLElement>): void;
+    }
 
-	interface ICustomizable extends IEventEmitter {
-		options: IOptionManager;
-	}
+    interface ICustomizable extends IEventEmitter {
+        options: IOptionManager;
+    }
 
-	interface IDataManager extends IEventEmitter {
-		get(path: string, defaultValue: object): object;
-	}
+    interface IDataManager extends IEventEmitter {
+        get(path: string, defaultValue: object): object;
+    }
 
-	interface IDomEventEmitter extends IEventEmitter { //tslint:disable-line no-empty-interface no-empty-interfaces
-	}
+    interface IDomEventEmitter extends IEventEmitter { //tslint:disable-line no-empty-interface no-empty-interfaces
+    }
 
-	interface IEvent {
-		allowMapEvent(): void;
+    interface IEvent {
+        allowMapEvent(): void;
 
-		callMethod(name: string): void;
+        callMethod(name: string): void;
 
-		get(name: string): object;
+        get(name: string): object;
 
-		getSourceEvent(): IEvent | null;
+        getSourceEvent(): IEvent | null;
 
-		isDefaultPrevented(): boolean;
+        isDefaultPrevented(): boolean;
 
-		isImmediatePropagationStopped(): boolean;
+        isImmediatePropagationStopped(): boolean;
 
-		isMapEventAllowed(): boolean;
+        isMapEventAllowed(): boolean;
 
-		isPropagationStopped(): boolean;
+        isPropagationStopped(): boolean;
 
-		preventDefault(): boolean;
+        preventDefault(): boolean;
 
-		stopImmediatePropagation(): boolean;
+        stopImmediatePropagation(): boolean;
 
-		stopPropagation(): boolean;
-	}
+        stopPropagation(): boolean;
+    }
 
-	interface IEventController {
-		onStartListening?(events: IEventManager, type: string): void;
+    interface IEventController {
+        onStartListening?(events: IEventManager, type: string): void;
 
-		onStopListening?(events: IEventManager, type: string): void;
-	}
+        onStopListening?(events: IEventManager, type: string): void;
+    }
 
-	interface IEventEmitter {
-		events: IEventManager;
-	}
+    interface IEventEmitter {
+        events: IEventManager;
+    }
 
-	interface IEventGroup {
-		add(types: string[][] | string[] | string, callback: (event: object | IEvent) => void, context?: object, priority?: number): this;
+    interface IEventGroup {
+        add(types: string[][] | string[] | string, callback: (event: object | IEvent) => void, context?: object, priority?: number): this;
 
-		remove(types: string[][] | string[] | string, callback: (event: object | IEvent) => void, context?: object, priority?: number): this;
+        remove(types: string[][] | string[] | string, callback: (event: object | IEvent) => void, context?: object, priority?: number): this;
 
-		removeAll(): this;
-	}
+        removeAll(): this;
+    }
 
-	interface IEventManager extends IEventTrigger {
-		add(types: string[][] | string[] | string, callback: (event: object | IEvent) => void, context?: object, priority?: number): this;
+    interface IEventManager extends IEventTrigger {
+        add(types: string[][] | string[] | string, callback: (event: object | IEvent) => void, context?: object, priority?: number): this;
 
-		getParent(): object | null;
+        getParent(): object | null;
 
-		group(): IEventGroup;
+        group(): IEventGroup;
 
-		//remove(types: string[][] | string[] | string, callback: (event: object | IEvent) => void, context?: object, priority?: number): this;
+        //remove(types: string[][] | string[] | string, callback: (event: object | IEvent) => void, context?: object, priority?: number): this;
 
-		setParent(parent: object | null): this;
-	}
+        setParent(parent: object | null): this;
+    }
 
-	interface IEventTrigger {
-		fire(type: string, eventobject: object | IEvent): this;
-	}
+    interface IEventTrigger {
+        fire(type: string, eventobject: object | IEvent): this;
+    }
 
-	interface IEventWorkflowController extends IEventController {
-		onAfterEventFiring?(events: IEventManager, type: string, event?: IEvent): void;
+    interface IEventWorkflowController extends IEventController {
+        onAfterEventFiring?(events: IEventManager, type: string, event?: IEvent): void;
 
-		onBeforeEventFiring?(events: IEventManager, type: string, event?: IEvent): void;
-	}
+        onBeforeEventFiring?(events: IEventManager, type: string, event?: IEvent): void;
+    }
 
-	interface IExpandableControlLayout extends ILayout { //tslint:disable-line no-empty-interface no-empty-interfaces
-	}
+    interface IExpandableControlLayout extends ILayout { //tslint:disable-line no-empty-interface no-empty-interfaces
+    }
 
-	interface IFreezable extends IEventManager {
-		freeze(): IFreezable;
+    interface IFreezable extends IEventManager {
+        freeze(): IFreezable;
 
-		isFrozen(): boolean;
+        isFrozen(): boolean;
 
-		unfreeze(): IFreezable;
-	}
+        unfreeze(): IFreezable;
+    }
 
-	interface IGeocodeProvider {
-		geocode(request: string, options?: { boundedBy?: number[][], results?: number, skip?: number, strictBounds?: boolean }): Promise<object>;
+    interface IGeocodeProvider {
+        geocode(request: string, options?: { boundedBy?: number[][], results?: number, skip?: number, strictBounds?: boolean }): Promise<object>;
 
-		suggest(request: string, options?: { boundedBy?: number[][], results?: number, strictBounds?: boolean }): Promise<object>;
-	}
+        suggest(request: string, options?: { boundedBy?: number[][], results?: number, strictBounds?: boolean }): Promise<object>;
+    }
 
-	interface IGeometry extends IBaseGeometry, ICustomizable {
-		getMap(): Map | null;
+    interface IGeometry extends IBaseGeometry, ICustomizable {
+        getMap(): Map | null;
 
-		getPixelGeometry(options?: object): IPixelGeometry;
+        getPixelGeometry(options?: object): IPixelGeometry;
 
-		setMap(map: Map): void;
-	}
+        setMap(map: Map): void;
+    }
 
-	interface IGeometryEditor extends ICustomizable, IEventEmitter {
-		startEditing(): void;
+    interface IGeometryEditor extends ICustomizable, IEventEmitter {
+        startEditing(): void;
 
-		stopEditing(): void;
-	}
+        stopEditing(): void;
+    }
 
-	interface IGeometryJson {
-		type: string;
-	}
+    interface IGeometryJson {
+        type: string;
+    }
 
-	interface IGeoObject extends IChildOnMap, ICustomizable, IDomEventEmitter, IParentOnMap {
-		geometry: IGeometry | null;
-		properties: IDataManager;
-		state: IDataManager;
+    interface IGeoObject extends IChildOnMap, ICustomizable, IDomEventEmitter, IParentOnMap {
+        geometry: IGeometry | null;
+        properties: IDataManager;
+        state: IDataManager;
 
-		getOverlay(): Promise<IOverlay | null>;
+        getOverlay(): Promise<IOverlay | null>;
 
-		getOverlaySync(): IOverlay | null;
-	}
+        getOverlaySync(): IOverlay | null;
+    }
 
-	interface IGeoObjectCollection extends ICustomizable, IEventEmitter, IParentOnMap {
-		add(child: IGeoObject, index?: number): this;
+    interface IGeoObjectCollection extends ICustomizable, IEventEmitter, IParentOnMap {
+        add(child: IGeoObject, index?: number): this;
 
-		each(callback: (object: IGeoObject) => void, context: object): void;
+        each(callback: (object: IGeoObject) => void, context: object): void;
 
-		get(index: number): IGeoObject;
+        get(index: number): IGeoObject;
 
-		getBounds(): number[][] | null;
+        getBounds(): number[][] | null;
 
-		getIterator(): IIterator;
+        getIterator(): IIterator;
 
-		getLength(): number;
+        getLength(): number;
 
-		getPixelBounds(): number[][] | null;
+        getPixelBounds(): number[][] | null;
 
-		indexOf(object: IGeoObject): number;
+        indexOf(object: IGeoObject): number;
 
-		remove(child: IGeoObject): this;
+        remove(child: IGeoObject): this;
 
-		removeAll(): this;
+        removeAll(): this;
 
-		set(index: number, child: IGeoObject): this;
+        set(index: number, child: IGeoObject): this;
 
-		splice(index: number, length: number): this;
-	}
+        splice(index: number, length: number): this;
+    }
 
-	interface IGeoObjectSequence extends ICustomizable, IEventEmitter, IParentOnMap {
-		each(callback: (geoObject: IGeoObject) => void, context?: object): void;
+    interface IGeoObjectSequence extends ICustomizable, IEventEmitter, IParentOnMap {
+        each(callback: (geoObject: IGeoObject) => void, context?: object): void;
 
-		get(index: number): IGeoObject;
+        get(index: number): IGeoObject;
 
-		getBounds(): number[][] | null;
+        getBounds(): number[][] | null;
 
-		getIterator(): IIterator;
+        getIterator(): IIterator;
 
-		getLength(): number;
+        getLength(): number;
 
-		getPixelBounds(): number[][] | null;
+        getPixelBounds(): number[][] | null;
 
-		indexOf(geoObject: IGeoObject): number;
-	}
+        indexOf(geoObject: IGeoObject): number;
+    }
 
-	interface IHintManager<T> extends IPopupManager<T> { //tslint:disable-line no-empty-interface no-empty-interfaces
-	}
+    interface IHintManager<T> extends IPopupManager<T> { //tslint:disable-line no-empty-interface no-empty-interfaces
+    }
 
-	interface IIterator {
-		getNext(): object | null;
-	}
+    interface IIterator {
+        getNext(): object | null;
+    }
 
-	interface ILayer extends IChildOnMap, ICustomizable, IEventEmitter {
-		getBrightness?(): number;
+    interface ILayer extends IChildOnMap, ICustomizable, IEventEmitter {
+        getBrightness?(): number;
 
-		getCopyrights?(coords: number[], zoom: number): Promise<Array<string | HTMLElement>>;
+        getCopyrights?(coords: number[], zoom: number): Promise<Array<string | HTMLElement>>;
 
-		getZoomRange?(point: number[]): Promise<number[]>;
-	}
+        getZoomRange?(point: number[]): Promise<number[]>;
+    }
 
-	interface ILayout extends IDomEventEmitter {
-		// new (data: object);
-		destroy(): void;
+    interface ILayout extends IDomEventEmitter {
+        // new (data: object);
+        destroy(): void;
 
-		getData(): object;
+        getData(): object;
 
-		getParentElement(): HTMLElement;
+        getParentElement(): HTMLElement;
 
-		getShape(): IShape | null;
+        getShape(): IShape | null;
 
-		isEmpty(): boolean;
+        isEmpty(): boolean;
 
-		setData(data: object): void;
+        setData(data: object): void;
 
-		setParentElement(parent: HTMLElement | null): void;
-	}
+        setParentElement(parent: HTMLElement | null): void;
+    }
 
-	interface ILineStringGeometry extends IGeometry, ILineStringGeometryAccess {  //tslint:disable-line no-empty-interface no-empty-interfaces
-	}
+    interface ILineStringGeometry extends IGeometry, ILineStringGeometryAccess {  //tslint:disable-line no-empty-interface no-empty-interfaces
+    }
 
-	interface ILineStringGeometryAccess extends IFreezable {
-		get(index: number): number[];
+    interface ILineStringGeometryAccess extends IFreezable {
+        get(index: number): number[];
 
-		getChildGeometry(index: number): IPointGeometryAccess;
+        getChildGeometry(index: number): IPointGeometryAccess;
 
-		getClosest(anchorPosition: number[]): object;
+        getClosest(anchorPosition: number[]): object;
 
-		getCoordinates(): number[][];
+        getCoordinates(): number[][];
 
-		getLength(): number;
+        getLength(): number;
 
-		insert(index: number, coordinates: number[][]): ILineStringGeometryAccess;
+        insert(index: number, coordinates: number[][]): ILineStringGeometryAccess;
 
-		remove(index: number): number[];
+        remove(index: number): number[];
 
-		set(index: number, coordinates: number[]): ILineStringGeometryAccess;
+        set(index: number, coordinates: number[]): ILineStringGeometryAccess;
 
-		setCoordinates(coordinates: number[]): ILineStringGeometryAccess;
+        setCoordinates(coordinates: number[]): ILineStringGeometryAccess;
 
-		splice(index: number, length: number): number[][];
-	}
+        splice(index: number, length: number): number[][];
+    }
 
-	interface IMapAction extends IEventEmitter {
-		begin(mapActionManager: map.action.Manager): void;
+    interface IMapAction extends IEventEmitter {
+        begin(mapActionManager: map.action.Manager): void;
 
-		end(): void;
-	}
+        end(): void;
+    }
 
-	interface IMapObjectCollection extends ICollection, ICustomizable, IParentOnMap {  //tslint:disable-line no-empty-interface no-empty-interfaces
-	}
+    interface IMapObjectCollection extends ICollection, ICustomizable, IParentOnMap {  //tslint:disable-line no-empty-interface no-empty-interfaces
+    }
 
-	interface IMultiRouteModelJson {
-		params: IMultiRouteParams;
-		referencePoints: IMultiRouteReferencePoint[];
-	}
+    interface IMultiRouteModelJson {
+        params: IMultiRouteParams;
+        referencePoints: IMultiRouteReferencePoint[];
+    }
 
-	interface IMultiRouteParams {
-		avoidTrafficJams?: boolean;
-		boundedBy?: number[][] | null;
-		requestSendInterval?: string | number;
-		results?: number;
-		reverseGeocoding?: boolean;
-		routingMode?: "auto" | "masstransit" | "pedestrian";
-		searchCoordOrder?: string;
-		strictBounds?: boolean;
-		viaIndexes?: number[];
-	}
+    interface IMultiRouteParams {
+        avoidTrafficJams?: boolean;
+        boundedBy?: number[][] | null;
+        requestSendInterval?: string | number;
+        results?: number;
+        reverseGeocoding?: boolean;
+        routingMode?: "auto" | "masstransit" | "pedestrian";
+        searchCoordOrder?: string;
+        strictBounds?: boolean;
+        viaIndexes?: number[];
+    }
 
-	type IMultiRouteReferencePoint = string | number[] | geometry.Point;
+    type IMultiRouteReferencePoint = string | number[] | geometry.Point;
 
-	interface IOptionManager extends IChild<IOptionManager>, IEventEmitter, IFreezable {
-		get(key: string, defaultValue: object): object;
+    interface IOptionManager extends IChild<IOptionManager>, IEventEmitter, IFreezable {
+        get(key: string, defaultValue: object): object;
 
-		getAll(): object;
+        getAll(): object;
 
-		getName(): string;
+        getName(): string;
 
-		getNative(key: string): object;
+        getNative(key: string): object;
 
-		resolve(key: string, name?: string): object;
+        resolve(key: string, name?: string): object;
 
-		setName(name: string): void;
-	}
+        setName(name: string): void;
+    }
 
-	interface IOverlay extends ICustomizable, IDomEventEmitter {
-		getData(): object;
+    interface IOverlay extends ICustomizable, IDomEventEmitter {
+        getData(): object;
 
-		getGeometry(): IPixelGeometry;
+        getGeometry(): IPixelGeometry;
 
-		getMap(): Map | null;
+        getMap(): Map | null;
 
-		getShape(): IShape | null;
+        getShape(): IShape | null;
 
-		isEmpty(): boolean;
+        isEmpty(): boolean;
 
-		setData(data: object): void;
+        setData(data: object): void;
 
-		setGeometry(geometry: IPixelGeometry): void;
+        setGeometry(geometry: IPixelGeometry): void;
 
-		setMap(map: Map | null): void;
-	}
+        setMap(map: Map | null): void;
+    }
 
-	interface IPane extends IEventEmitter {
-		destroy(): void;
+    interface IPane extends IEventEmitter {
+        destroy(): void;
 
-		getElement(): HTMLElement;
+        getElement(): HTMLElement;
 
-		getMap(): Map;
+        getMap(): Map;
 
-		getOverflow(): "visible" | "hidden";
+        getOverflow(): "visible" | "hidden";
 
-		getZIndex(): number;
-	}
+        getZIndex(): number;
+    }
 
-	interface IPanorama {
-		getAngularBBox(): number[];
+    interface IPanorama {
+        getAngularBBox(): number[];
 
-		getConnectionArrows(): IPanoramaConnectionArrow[];
+        getConnectionArrows(): IPanoramaConnectionArrow[];
 
-		getConnectionMarkers(): IPanoramaConnectionMarker[];
+        getConnectionMarkers(): IPanoramaConnectionMarker[];
 
-		getCoordSystem(): ICoordSystem;
+        getCoordSystem(): ICoordSystem;
 
-		getDefaultDirection(): number[];
+        getDefaultDirection(): number[];
 
-		getDefaultSpan(): number[];
+        getDefaultSpan(): number[];
 
-		getGraph(): IPanoramaGraph | null;
+        getGraph(): IPanoramaGraph | null;
 
-		getMarkers(): IPanoramaMarker[];
+        getMarkers(): IPanoramaMarker[];
 
-		getName(): string;
+        getName(): string;
 
-		getPosition(): number[];
+        getPosition(): number[];
 
-		getTileLevels(): IPanoramaTileLevel[];
+        getTileLevels(): IPanoramaTileLevel[];
 
-		getTileSize(): number[];
-	}
+        getTileSize(): number[];
+    }
 
-	interface IPanoramaConnection {
-		getConnectedPanorama(): Promise<IPanorama>;
-	}
+    interface IPanoramaConnection {
+        getConnectedPanorama(): Promise<IPanorama>;
+    }
 
-	interface IPanoramaConnectionArrow extends IPanoramaConnection {
-		properties: data.Manager;
+    interface IPanoramaConnectionArrow extends IPanoramaConnection {
+        properties: data.Manager;
 
-		getDirection(): number[];
+        getDirection(): number[];
 
-		getPanorama(): IPanorama;
-	}
+        getPanorama(): IPanorama;
+    }
 
-	interface IPanoramaConnectionMarker extends IPanoramaConnection, IPanoramaMarker {  //tslint:disable-line no-empty-interface no-empty-interfaces
-	}
+    interface IPanoramaConnectionMarker extends IPanoramaConnection, IPanoramaMarker {  //tslint:disable-line no-empty-interface no-empty-interfaces
+    }
 
-	interface IPanoramaGraph {
-		getEdges(): IPanoramaGraphEdge[];
+    interface IPanoramaGraph {
+        getEdges(): IPanoramaGraphEdge[];
 
-		getNodes(): IPanoramaGraphEdge[];
+        getNodes(): IPanoramaGraphEdge[];
 
-		getPanorama(): IPanorama;
-	}
+        getPanorama(): IPanorama;
+    }
 
-	interface IPanoramaGraphEdge {
-		getEndNodes(): IPanoramaGraphNode[];
-	}
+    interface IPanoramaGraphEdge {
+        getEndNodes(): IPanoramaGraphNode[];
+    }
 
-	interface IPanoramaGraphNode {
-		getConnectedPanorama(): Promise<IPanorama>;
-	}
+    interface IPanoramaGraphNode {
+        getConnectedPanorama(): Promise<IPanorama>;
+    }
 
-	interface IPanoramaMarker {
-		properties: data.Manager;
+    interface IPanoramaMarker {
+        properties: data.Manager;
 
-		getIconSet(): Promise<IPanoramaMarkerIconSet>;
+        getIconSet(): Promise<IPanoramaMarkerIconSet>;
 
-		getPanorama(): IPanorama;
+        getPanorama(): IPanorama;
 
-		getPosition(): number[];
-	}
+        getPosition(): number[];
+    }
 
-	interface IPanoramaMarkerIcon {
-		image: HTMLCanvasElement | HTMLImageElement;
-		offset: number[];
-	}
+    interface IPanoramaMarkerIcon {
+        image: HTMLCanvasElement | HTMLImageElement;
+        offset: number[];
+    }
 
-	interface IPanoramaMarkerIconSet {
-		default: IPanoramaMarkerIcon | null;
-		expanded: IPanoramaMarkerIcon | null;
-		expandedHovered: IPanoramaMarkerIcon | null;
-		hovered: IPanoramaMarkerIcon | null;
-	}
+    interface IPanoramaMarkerIconSet {
+        default: IPanoramaMarkerIcon | null;
+        expanded: IPanoramaMarkerIcon | null;
+        expandedHovered: IPanoramaMarkerIcon | null;
+        hovered: IPanoramaMarkerIcon | null;
+    }
 
-	interface IPanoramaTileLevel {
-		getImageSize(): number[];
+    interface IPanoramaTileLevel {
+        getImageSize(): number[];
 
-		getTileUrl(x: number, y: number): string;
-	}
+        getTileUrl(x: number, y: number): string;
+    }
 
-	interface IParentOnMap {
-		getMap(): Map;
-	}
+    interface IParentOnMap {
+        getMap(): Map;
+    }
 
-	interface IPixelCircleGeometry extends IPixelGeometry {
-		getCoordinates(): number[];
+    interface IPixelCircleGeometry extends IPixelGeometry {
+        getCoordinates(): number[];
 
-		getRadius(): number;
-	}
+        getRadius(): number;
+    }
 
-	interface IPixelLineStringGeometry extends IPixelGeometry {
-		getClosest(anchorPosition: number[]): object;
+    interface IPixelLineStringGeometry extends IPixelGeometry {
+        getClosest(anchorPosition: number[]): object;
 
-		getCoordinates(): number[][];
+        getCoordinates(): number[][];
 
-		getLength(): number;
-	}
+        getLength(): number;
+    }
 
-	interface IPixelGeometry extends IBaseGeometry {
-		equals(geometry: IPixelGeometry): boolean;
+    interface IPixelGeometry extends IBaseGeometry {
+        equals(geometry: IPixelGeometry): boolean;
 
-		getMetaData(): object;
+        getMetaData(): object;
 
-		scale(factor: number): IPixelGeometry;
+        scale(factor: number): IPixelGeometry;
 
-		shift(offset: number[]): IPixelGeometry;
-	}
+        shift(offset: number[]): IPixelGeometry;
+    }
 
-	interface IPointGeometry extends IGeometry, IPointGeometryAccess { //tslint:disable-line no-empty-interface no-empty-interfaces
-	}
+    interface IPointGeometry extends IGeometry, IPointGeometryAccess { //tslint:disable-line no-empty-interface no-empty-interfaces
+    }
 
-	interface IPointGeometryAccess {
-		getCoordinates(): number[] | null;
+    interface IPointGeometryAccess {
+        getCoordinates(): number[] | null;
 
-		setCoordinates(coordinates: number[] | null): this;
-	}
+        setCoordinates(coordinates: number[] | null): this;
+    }
 
-	interface IPopup<T> extends ICustomizable, IEventEmitter {
-		close(force?: boolean): Promise<T>;
+    interface IPopup<T> extends ICustomizable, IEventEmitter {
+        close(force?: boolean): Promise<T>;
 
-		getData(): object;
+        getData(): object;
 
-		getOverlay(): Promise<IOverlay>;
+        getOverlay(): Promise<IOverlay>;
 
-		getOverlaySync(): IOverlay;
+        getOverlaySync(): IOverlay;
 
-		getPosition(): number[];
+        getPosition(): number[];
 
-		isOpen(): boolean;
+        isOpen(): boolean;
 
-		open(position: number[], data: object | string | HTMLElement): Promise<T>;
+        open(position: number[], data: object | string | HTMLElement): Promise<T>;
 
-		setData(data: object | string | HTMLElement): Promise<T>;
+        setData(data: object | string | HTMLElement): Promise<T>;
 
-		setPosition(position: number[]): Promise<T>;
-	}
+        setPosition(position: number[]): Promise<T>;
+    }
 
-	interface IPopupManager<T> extends IEventEmitter {
-		close(force?: boolean): Promise<T>;
+    interface IPopupManager<T> extends IEventEmitter {
+        close(force?: boolean): Promise<T>;
 
-		destroy(): void;
+        destroy(): void;
 
-		getData(): object | null;
+        getData(): object | null;
 
-		getOptions(): IOptionManager | null;
+        getOptions(): IOptionManager | null;
 
-		getOverlay(): Promise<IOverlay | null>;
+        getOverlay(): Promise<IOverlay | null>;
 
-		getOverlaySync(): IOverlay | null;
+        getOverlaySync(): IOverlay | null;
 
-		getPosition(): number[] | null;
+        getPosition(): number[] | null;
 
-		isOpen(): boolean;
+        isOpen(): boolean;
 
-		open(position?: number[], data?: object | string | HTMLElement, options?: object): Promise<T>;
+        open(position?: number[], data?: object | string | HTMLElement, options?: object): Promise<T>;
 
-		setData(data: object | string | HTMLElement): Promise<T>;
+        setData(data: object | string | HTMLElement): Promise<T>;
 
-		setOptions(options: object): Promise<T>;
+        setOptions(options: object): Promise<T>;
 
-		setPosition(position: number[]): Promise<T>;
-	}
+        setPosition(position: number[]): Promise<T>;
+    }
 
-	interface IPositioningContext {
-		fromClientPixels(clientPixelPoint: number[]): number[];
+    interface IPositioningContext {
+        fromClientPixels(clientPixelPoint: number[]): number[];
 
-		getZoom(): number;
+        getZoom(): number;
 
-		toClientPixels(globalPixelPoint: number[]): number[];
-	}
+        toClientPixels(globalPixelPoint: number[]): number[];
+    }
 
-	interface IProjection {
-		fromGlobalPixels(globalPixelPoint: number[], zoom: number): number[];
+    interface IProjection {
+        fromGlobalPixels(globalPixelPoint: number[], zoom: number): number[];
 
-		getCoordSystem(): ICoordSystem;
+        getCoordSystem(): ICoordSystem;
 
-		isCycled(): boolean[];
+        isCycled(): boolean[];
 
-		toGlobalPixels(coordPoint: number[], zoom: number): number[];
-	}
+        toGlobalPixels(coordPoint: number[], zoom: number): number[];
+    }
 
-	interface IRoutePanel {
-		options: IOptionManager;
-		state: IDataManager;
+    interface IRoutePanel {
+        options: IOptionManager;
+        state: IDataManager;
 
-		getRoute(): multiRouter.MultiRoute;
+        getRoute(): multiRouter.MultiRoute;
 
-		switchPoints(): void;
-	}
+        switchPoints(): void;
+    }
 
-	interface ISearchControlLayout extends IExpandableControlLayout { //tslint:disable-line no-empty-interface no-empty-interfaces
-	}
+    interface ISearchControlLayout extends IExpandableControlLayout { //tslint:disable-line no-empty-interface no-empty-interfaces
+    }
 
-	interface ISelectableControl extends IControl {
-		deselect(): void;
+    interface ISelectableControl extends IControl {
+        deselect(): void;
 
-		disable(): void;
+        disable(): void;
 
-		enable(): void;
+        enable(): void;
 
-		isEnabled(): boolean;
+        isEnabled(): boolean;
 
-		isSelected(): boolean;
+        isSelected(): boolean;
 
-		select(): void;
-	}
+        select(): void;
+    }
 
-	interface ISelectableControlLayout extends ILayout { //tslint:disable-line no-empty-interface no-empty-interfaces
-	}
+    interface ISelectableControlLayout extends ILayout { //tslint:disable-line no-empty-interface no-empty-interfaces
+    }
 
-	interface IShape {
-		contains(position: number[]): boolean;
+    interface IShape {
+        contains(position: number[]): boolean;
 
-		equals(shape: IShape): boolean;
+        equals(shape: IShape): boolean;
 
-		getBounds(): number[][] | null;
+        getBounds(): number[][] | null;
 
-		getGeometry(): IPixelGeometry;
+        getGeometry(): IPixelGeometry;
 
-		getType(): string;
+        getType(): string;
 
-		scale(factor: number): IShape;
+        scale(factor: number): IShape;
+
+        shift(offset: number[]): IShape;
+    }
+
+    class Monitor {
+        constructor(dataManager: IDataManager | IOptionManager);
+        add(name: string[] | string, changeCallback: (event: (object | IEvent)) => void, context?: any, params?: any): Monitor;
+        forceChange(): Monitor;
+        get(name: string): any;
+        remove(name: string): Monitor;
+        removeAll(): Monitor;
+    }
 
-		shift(offset: number[]): IShape;
-	}
-        
-	class Monitor {
-    	constructor(dataManager: IDataManager | IOptionManager);
-   		add(name: string[] | string, changeCallback: (event: (object | IEvent)) => void, context?: any, params?: any): Monitor;
-    	forceChange(): Monitor;
-    	get(name: string): any;
-    	remove(name: string): Monitor;
-    	removeAll(): Monitor;
-	}
-    
     class Polyline extends GeoObject {
         constructor(geometry: number[][] | object | ILineStringGeometry, properties: object | IDataManager, options?: IPolylineOptions);
     }
 
-    interface IPolylineOptions {      
-        cursor?: string;        
+    interface IPolylineOptions {
+        cursor?: string;
         [index: string]: any;
     }
 }

From d61496670ffe1e77ca8451afa1f58c4614782fc7 Mon Sep 17 00:00:00 2001
From: AlexeyTokmakov <alexei619@gmail.com>
Date: Fri, 7 Dec 2018 15:16:05 +0300
Subject: [PATCH 759/836] Update yandex-maps-tests.ts

---
 types/yandex-maps/yandex-maps-tests.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/types/yandex-maps/yandex-maps-tests.ts b/types/yandex-maps/yandex-maps-tests.ts
index 2406ef6cd6..c300679d35 100644
--- a/types/yandex-maps/yandex-maps-tests.ts
+++ b/types/yandex-maps/yandex-maps-tests.ts
@@ -22,8 +22,8 @@ const balloonLayout = ymaps.templateLayoutFactory.createClass(
 	"<div class=\"map-marker-balloon\"></div>",
 	{
 		build(this: ymaps.ILayout): void {
-			(<ymaps.layout.templateBased.Base> (<any> this.constructor).superclass).build.call(this);
-			this.getParentElement().children.item(0)!.children.item(0)!.appendChild((<any> this.getData()).properties.get("balloonContent"));
+			((this.constructor as any).superclass as ymaps.layout.templateBased.Base).build.call(this);
+			this.getParentElement().children.item(0)!.children.item(0)!.appendChild((this.getData() as any).properties.get("balloonContent"));
 		}
 	}
 );
@@ -52,6 +52,6 @@ mapMarker.events.add("click", (event: ymaps.Event) => {
 
 map.geoObjects.add(mapMarker);
 
-map.setCenter((<ymaps.IPointGeometry> mapMarker.geometry).getCoordinates() || [55.76, 37.64]);
+map.setCenter((mapMarker.geometry as ymaps.IPointGeometry).getCoordinates() || [55.76, 37.64]);
 
 map.setZoom(13);

From be97f863f040390410f692dbe6a284e32cb884dd Mon Sep 17 00:00:00 2001
From: Alexaner T <alexander.v.tarasyuk@gmail.com>
Date: Fri, 7 Dec 2018 16:20:48 +0200
Subject: [PATCH 760/836] Add invertStickyHeaders prop to ScrollView

---
 types/react-native/index.d.ts     | 6 ++++++
 types/react-native/test/index.tsx | 1 +
 2 files changed, 7 insertions(+)

diff --git a/types/react-native/index.d.ts b/types/react-native/index.d.ts
index 24e4aee9dc..ae3127bc1d 100644
--- a/types/react-native/index.d.ts
+++ b/types/react-native/index.d.ts
@@ -6337,6 +6337,12 @@ export interface ScrollViewProps
      */
     horizontal?: boolean;
 
+    /**
+     * If sticky headers should stick at the bottom instead of the top of the
+     * ScrollView. This is usually used with inverted ScrollViews.
+     */
+    invertStickyHeaders?: boolean;
+
     /**
      * Determines whether the keyboard gets dismissed in response to a drag.
      *   - 'none' (the default) drags do not dismiss the keyboard.
diff --git a/types/react-native/test/index.tsx b/types/react-native/test/index.tsx
index b5d7a5faeb..79c5a111ca 100644
--- a/types/react-native/test/index.tsx
+++ b/types/react-native/test/index.tsx
@@ -430,6 +430,7 @@ class ScrollerListComponentTest extends React.Component<
                         <ScrollView
                             horizontal={true}
                             nestedScrollEnabled={true}
+                            invertStickyHeaders={true}
                             contentOffset={{ x: 0, y: 0 }}
                             {...props}
                             style={[

From 4640272d6b54b97cee0e56976db8e2fa1c66a277 Mon Sep 17 00:00:00 2001
From: Dominik Palo <dominik@palo.sk>
Date: Fri, 7 Dec 2018 15:30:24 +0100
Subject: [PATCH 761/836] Add a missing getSlideById method to the Presentation

---
 types/google-apps-script/google-apps-script.slides.d.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/types/google-apps-script/google-apps-script.slides.d.ts b/types/google-apps-script/google-apps-script.slides.d.ts
index 90e034ff60..434e3ad4fc 100644
--- a/types/google-apps-script/google-apps-script.slides.d.ts
+++ b/types/google-apps-script/google-apps-script.slides.d.ts
@@ -840,6 +840,7 @@ declare namespace GoogleAppsScript {
       getPageWidth(): Number;
       getSelection(): Selection;
       getSlides(): Slide[];
+      getSlideById(id: string): Slide;  
       getUrl(): string;
       getViewers(): Base.User[];
       insertSlide(insertionIndex: Integer): Slide;

From 424cdc79f7e9d707ba08e3da1c81c5a61f52bb5c Mon Sep 17 00:00:00 2001
From: Dominik Palo <dominik@palo.sk>
Date: Fri, 7 Dec 2018 15:42:26 +0100
Subject: [PATCH 762/836] Fix ordering

---
 types/google-apps-script/google-apps-script.slides.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/google-apps-script/google-apps-script.slides.d.ts b/types/google-apps-script/google-apps-script.slides.d.ts
index 434e3ad4fc..68e61914a1 100644
--- a/types/google-apps-script/google-apps-script.slides.d.ts
+++ b/types/google-apps-script/google-apps-script.slides.d.ts
@@ -839,8 +839,8 @@ declare namespace GoogleAppsScript {
       getPageHeight(): Number;
       getPageWidth(): Number;
       getSelection(): Selection;
-      getSlides(): Slide[];
       getSlideById(id: string): Slide;  
+      getSlides(): Slide[];
       getUrl(): string;
       getViewers(): Base.User[];
       insertSlide(insertionIndex: Integer): Slide;

From 22671903858e1ce2c0fd4bf0c72bc6feebbec96d Mon Sep 17 00:00:00 2001
From: ThibaudAv <tavenier@leadformance.com>
Date: Fri, 7 Dec 2018 15:46:22 +0100
Subject: [PATCH 763/836] Update Intro.Js types

---
 types/intro.js/index.d.ts        |  6 +++++-
 types/intro.js/intro.js-tests.ts | 19 ++++++++++++++-----
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/types/intro.js/index.d.ts b/types/intro.js/index.d.ts
index ec27d19439..40603bed1d 100644
--- a/types/intro.js/index.d.ts
+++ b/types/intro.js/index.d.ts
@@ -7,7 +7,11 @@ declare namespace IntroJs {
     interface Step {
         intro: string;
         element?: string|HTMLElement|Element;
-        position?: string;
+        position?: "top"|"left"|"right"|"bottom"|"bottom-left-aligned"|"bottom-middle-aligned"|"bottom-right-aligned"|"auto";
+        tooltipClass?: string;
+        highlightClass?: string;
+        scrollTo?: "off"|"tooltip"|"element";
+        disableInteraction?: boolean;
     }
 
     interface Hint {
diff --git a/types/intro.js/intro.js-tests.ts b/types/intro.js/intro.js-tests.ts
index d40fbe3f36..44b2f238d3 100644
--- a/types/intro.js/intro.js-tests.ts
+++ b/types/intro.js/intro.js-tests.ts
@@ -31,13 +31,22 @@ intro.setOptions({
             position: 'left'
         },
         {
-            element : '#step4',
-            intro   : "Another step.",
-            position: 'bottom'
+            element       : '#step4',
+            intro         : "Another step.",
+            position      : 'bottom',
+            tooltipClass  : 'step4Class',
+            highlightClass: ''
         },
         {
-            element: '#step5',
-            intro  : 'Get it, use it.'
+            element : '#step4',
+            intro   : "Another step.",
+            position: 'bottom',
+            scrollTo: 'tooltip'
+        },
+        {
+            element           : '#step5',
+            intro             : 'Get it, use it.',
+            disableInteraction: true
         }
     ],
     hints: [

From 1a9082286f4f6d6f72787faa3fa9a647aff16c95 Mon Sep 17 00:00:00 2001
From: Dominik Palo <dominik@palo.sk>
Date: Fri, 7 Dec 2018 18:47:10 +0100
Subject: [PATCH 764/836] Add a missing getPageElementById method to the
 Presentation

---
 types/google-apps-script/google-apps-script.slides.d.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/types/google-apps-script/google-apps-script.slides.d.ts b/types/google-apps-script/google-apps-script.slides.d.ts
index 68e61914a1..3d1aac9227 100644
--- a/types/google-apps-script/google-apps-script.slides.d.ts
+++ b/types/google-apps-script/google-apps-script.slides.d.ts
@@ -836,6 +836,7 @@ declare namespace GoogleAppsScript {
       getNotesMaster(): NotesMaster;
       getNotesPageHeight(): Number;
       getNotesPageWidth(): Number;
+      getPageElementById(id: string): PageElement;	
       getPageHeight(): Number;
       getPageWidth(): Number;
       getSelection(): Selection;

From 3f5782e055177f76e0b754acb48947a364f262ea Mon Sep 17 00:00:00 2001
From: Dimitri Benin <dimitri.benin@gmail.com>
Date: Fri, 7 Dec 2018 21:20:54 +0100
Subject: [PATCH 765/836] Add types for @sindresorhus/to-milliseconds

---
 .../sindresorhus__to-milliseconds/index.d.ts  | 20 +++++++++++++
 .../sindresorhus__to-milliseconds-tests.ts    | 24 ++++++++++++++++
 .../tsconfig.json                             | 28 +++++++++++++++++++
 .../sindresorhus__to-milliseconds/tslint.json |  1 +
 4 files changed, 73 insertions(+)
 create mode 100644 types/sindresorhus__to-milliseconds/index.d.ts
 create mode 100644 types/sindresorhus__to-milliseconds/sindresorhus__to-milliseconds-tests.ts
 create mode 100644 types/sindresorhus__to-milliseconds/tsconfig.json
 create mode 100644 types/sindresorhus__to-milliseconds/tslint.json

diff --git a/types/sindresorhus__to-milliseconds/index.d.ts b/types/sindresorhus__to-milliseconds/index.d.ts
new file mode 100644
index 0000000000..8eb44b2a7b
--- /dev/null
+++ b/types/sindresorhus__to-milliseconds/index.d.ts
@@ -0,0 +1,20 @@
+// Type definitions for @sindresorhus/to-milliseconds 1.0
+// Project: https://github.com/sindresorhus/to-milliseconds
+// Definitions by: BendingBender <https://github.com/BendingBender>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export = toMilliseconds;
+
+declare function toMilliseconds(input: toMilliseconds.TimeSpec): number;
+
+declare namespace toMilliseconds {
+    interface TimeSpec {
+        days?: number;
+        hours?: number;
+        minutes?: number;
+        seconds?: number;
+        milliseconds?: number;
+        microseconds?: number;
+        nanoseconds?: number;
+    }
+}
diff --git a/types/sindresorhus__to-milliseconds/sindresorhus__to-milliseconds-tests.ts b/types/sindresorhus__to-milliseconds/sindresorhus__to-milliseconds-tests.ts
new file mode 100644
index 0000000000..aff7ba6fe0
--- /dev/null
+++ b/types/sindresorhus__to-milliseconds/sindresorhus__to-milliseconds-tests.ts
@@ -0,0 +1,24 @@
+import toMilliseconds = require('@sindresorhus/to-milliseconds');
+
+// $ExpectType number
+toMilliseconds({
+    days: 15,
+});
+toMilliseconds({
+    hours: 11,
+});
+toMilliseconds({
+    minutes: 23,
+});
+toMilliseconds({
+    seconds: 20,
+});
+toMilliseconds({
+    milliseconds: 1,
+});
+toMilliseconds({
+    microseconds: 1,
+});
+toMilliseconds({
+    nanoseconds: 1,
+});
diff --git a/types/sindresorhus__to-milliseconds/tsconfig.json b/types/sindresorhus__to-milliseconds/tsconfig.json
new file mode 100644
index 0000000000..be9b1a9bec
--- /dev/null
+++ b/types/sindresorhus__to-milliseconds/tsconfig.json
@@ -0,0 +1,28 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "paths": {
+            "@sindresorhus/to-milliseconds": [
+                "sindresorhus__to-milliseconds"
+            ]
+        },
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "sindresorhus__to-milliseconds-tests.ts"
+    ]
+}
diff --git a/types/sindresorhus__to-milliseconds/tslint.json b/types/sindresorhus__to-milliseconds/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/sindresorhus__to-milliseconds/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From b76386c8638d89874adc15f38e2dd4bb2c039027 Mon Sep 17 00:00:00 2001
From: Dimitri Benin <dimitri.benin@gmail.com>
Date: Fri, 7 Dec 2018 22:24:17 +0100
Subject: [PATCH 766/836] Add types for crypto-hash

---
 types/crypto-hash/crypto-hash-tests.ts | 29 ++++++++++++++++
 types/crypto-hash/index.d.ts           | 48 ++++++++++++++++++++++++++
 types/crypto-hash/tsconfig.json        | 23 ++++++++++++
 types/crypto-hash/tslint.json          |  1 +
 4 files changed, 101 insertions(+)
 create mode 100644 types/crypto-hash/crypto-hash-tests.ts
 create mode 100644 types/crypto-hash/index.d.ts
 create mode 100644 types/crypto-hash/tsconfig.json
 create mode 100644 types/crypto-hash/tslint.json

diff --git a/types/crypto-hash/crypto-hash-tests.ts b/types/crypto-hash/crypto-hash-tests.ts
new file mode 100644
index 0000000000..73e62ad1c6
--- /dev/null
+++ b/types/crypto-hash/crypto-hash-tests.ts
@@ -0,0 +1,29 @@
+import { sha1, sha256, sha384, sha512 } from 'crypto-hash';
+
+// $ExpectType Promise<string>
+sha1('🦄');
+// $ExpectType Promise<ArrayBuffer>
+sha1('🦄', { outputFormat: 'buffer' });
+// $ExpectType Promise<string>
+sha1('🦄', { outputFormat: 'hex' });
+
+// $ExpectType Promise<string>
+sha256('🦄');
+// $ExpectType Promise<ArrayBuffer>
+sha256('🦄', { outputFormat: 'buffer' });
+// $ExpectType Promise<string>
+sha256('🦄', { outputFormat: 'hex' });
+
+// $ExpectType Promise<string>
+sha384('🦄');
+// $ExpectType Promise<ArrayBuffer>
+sha384('🦄', { outputFormat: 'buffer' });
+// $ExpectType Promise<string>
+sha384('🦄', { outputFormat: 'hex' });
+
+// $ExpectType Promise<string>
+sha512('🦄');
+// $ExpectType Promise<ArrayBuffer>
+sha512('🦄', { outputFormat: 'buffer' });
+// $ExpectType Promise<string>
+sha512('🦄', { outputFormat: 'hex' });
diff --git a/types/crypto-hash/index.d.ts b/types/crypto-hash/index.d.ts
new file mode 100644
index 0000000000..c22864b2ae
--- /dev/null
+++ b/types/crypto-hash/index.d.ts
@@ -0,0 +1,48 @@
+// Type definitions for crypto-hash 1.0
+// Project: https://github.com/sindresorhus/crypto-hash#readme
+// Definitions by: BendingBender <https://github.com/BendingBender>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export function sha1(
+    buffer: string | ArrayBuffer | ArrayBufferView,
+    options?: OptionsHexOutput
+): Promise<string>;
+export function sha1(
+    buffer: string | ArrayBuffer | ArrayBufferView,
+    options: OptionBufferOutput
+): Promise<ArrayBuffer>;
+
+export function sha256(
+    buffer: string | ArrayBuffer | ArrayBufferView,
+    options?: OptionsHexOutput
+): Promise<string>;
+export function sha256(
+    buffer: string | ArrayBuffer | ArrayBufferView,
+    options: OptionBufferOutput
+): Promise<ArrayBuffer>;
+
+export function sha384(
+    buffer: string | ArrayBuffer | ArrayBufferView,
+    options?: OptionsHexOutput
+): Promise<string>;
+export function sha384(
+    buffer: string | ArrayBuffer | ArrayBufferView,
+    options: OptionBufferOutput
+): Promise<ArrayBuffer>;
+
+export function sha512(
+    buffer: string | ArrayBuffer | ArrayBufferView,
+    options?: OptionsHexOutput
+): Promise<string>;
+export function sha512(
+    buffer: string | ArrayBuffer | ArrayBufferView,
+    options: OptionBufferOutput
+): Promise<ArrayBuffer>;
+
+export interface OptionsHexOutput {
+    outputFormat?: 'hex';
+}
+
+export interface OptionBufferOutput {
+    outputFormat: 'buffer';
+}
diff --git a/types/crypto-hash/tsconfig.json b/types/crypto-hash/tsconfig.json
new file mode 100644
index 0000000000..410ee34985
--- /dev/null
+++ b/types/crypto-hash/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "crypto-hash-tests.ts"
+    ]
+}
diff --git a/types/crypto-hash/tslint.json b/types/crypto-hash/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/crypto-hash/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From cafab0196145ec7461463418b24f8b4f9d1cd4c0 Mon Sep 17 00:00:00 2001
From: Alvaro J Cruz <alvaro450@gmail.com>
Date: Fri, 7 Dec 2018 15:59:40 -0500
Subject: [PATCH 767/836] Add types for dynaTrace ADK

---
 types/dynatrace/dynatrace-tests.ts |  88 +++++++++++
 types/dynatrace/index.d.ts         | 234 +++++++++++++++++++++++++++++
 types/dynatrace/tsconfig.json      |  23 +++
 types/dynatrace/tslint.json        |   1 +
 4 files changed, 346 insertions(+)
 create mode 100644 types/dynatrace/dynatrace-tests.ts
 create mode 100644 types/dynatrace/index.d.ts
 create mode 100644 types/dynatrace/tsconfig.json
 create mode 100644 types/dynatrace/tslint.json

diff --git a/types/dynatrace/dynatrace-tests.ts b/types/dynatrace/dynatrace-tests.ts
new file mode 100644
index 0000000000..027b924cf9
--- /dev/null
+++ b/types/dynatrace/dynatrace-tests.ts
@@ -0,0 +1,88 @@
+function customActions() {
+    const actionId = dynaTrace.enterAction("my custom action", "click");
+    dynaTrace.leaveAction(actionId);
+}
+
+function customVisit() {
+    dynaTrace.tagVisit("My Custom Visit");
+    /** after some code execution we can end the visit early */
+    dynaTrace.endVisit();
+}
+
+function signal() {
+    dynaTrace.signalLoadStart();
+    dynaTrace.signalLoadEnd();
+    dynaTrace.signalOnLoadStart();
+    dynaTrace.signalOnLoadEnd();
+
+    dynaTrace.sendSignal(false, false, true);
+}
+
+function load() {
+    dynaTrace.setLoadEndManually();
+    dynaTrace.incrementOnLoadEndMarkers();
+}
+
+function automaticDetection() {
+    dynaTrace.setAutomaticActionDetection(false);
+}
+
+function reporting() {
+    dynaTrace.reportError(" Custom error");
+    const actionId = dynaTrace.enterAction("second action", "keypress");
+    dynaTrace.reportError("Second custom error", actionId);
+
+    dynaTrace.reportEvent("My Event");
+    dynaTrace.reportString("My Key", "Custom value");
+    dynaTrace.reportValue("Value Key", 2);
+    dynaTrace.reportWarning("Warning");
+}
+
+function thirdParty() {
+    const url = "http://somescript.com";
+    dynaTrace.startThirdParty("s", url);
+    dynaTrace.stopThirdParty(url, true, Date.now() - 1000, Date.now());
+}
+
+function listener() {
+    const clickListener = (key: string) => ({});
+    dynaTrace.addPageLeavingListener(clickListener);
+}
+
+function streaming() {
+    dynaTrace.addStreamingNode(
+        "http://youtube.com",
+        120,
+        true,
+        false,
+        120,
+        30,
+        10,
+        5,
+        "_info_"
+    );
+}
+
+function userInput() {
+    const userInput = dynaTrace.beginUserInput("", "click", "RETURN", 23);
+    dynaTrace.endUserInput(userInput);
+}
+
+function Xhr() {
+    const enterActionId = dynaTrace.enterXhrAction(
+        "Angular Http request",
+        0,
+        false
+    );
+    dynaTrace.enterXhrCallback(enterActionId);
+    dynaTrace.leaveXhrCallback(enterActionId);
+    dynaTrace.leaveXhrAction(enterActionId);
+}
+
+function appVersion() {
+    dynaTrace.setAppVersion("1.1.1");
+}
+
+function metadata() {
+    dynaTrace.setMetaData("some metadata", "value");
+}
diff --git a/types/dynatrace/index.d.ts b/types/dynatrace/index.d.ts
new file mode 100644
index 0000000000..5627e6b1db
--- /dev/null
+++ b/types/dynatrace/index.d.ts
@@ -0,0 +1,234 @@
+// Type definitions for dynatrace 1.0
+// Project: https://www.dynatrace.com/
+// Definitions by: Alvaro Cruz <https://github.com/alvaro450>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+interface dynaTrace {
+    /**
+     * @description disable automatic detection
+     * Use in conjuction with enterAction
+     * @example
+     *     dynaTrace.setAutomaticActionDetection(false);
+     *     dynaTrace.enterAction('action message', 'select', null, null);
+     */
+    setAutomaticActionDetection(on: boolean): void;
+    /**
+     * @description capture load event manually.
+     * followed by a signalLoadEnd to complete the capture.
+     */
+    setLoadEndManually(): void;
+    /**
+     * @description Signal load start. If load start can be determined more accurately
+     * than the automatic detection, this function can be used.
+     */
+    signalLoadStart(): void;
+    /**
+     * @description Signals that the page has finished loading
+     */
+    signalLoadEnd(): void;
+    /**
+     * @description Force signal sending to make certain that actions aren't lost.
+     * @param forceSync - Force synchronous sending of signal (if false, it'll be sent asynchronously)
+     * @param sendPreview - Force sending of preview signals which haven't been closed yet.
+     * @param killUnfinished - Kills unfinished actions and sends them immediately. Handle with care, actions might be inaccurate.
+     */
+    sendSignal(
+        forceSync: boolean,
+        sendPreview: boolean,
+        killUnfinished: boolean
+    ): void;
+    /**
+     * @description parentAction: optional id of parent action.
+     *     - if parameter is not passed => appended to currently running action
+     *     - if a number is passed => action is added as subaction to action with given id
+     *     - if false => new root action is started.
+     * The function returns an internal tracking object that represents the action that was started.
+     * This tracking object must be passed to dynaTrace.leaveAction().
+     * @param name - name of the action
+     * @param type
+     * @param startTime - time in milliseconds. if null, current time is used.
+     * @param parentAction optional id of parent action. if parameter is not passed=> appended to
+     *  currently running action, if false => root action, if a number is passed, action is added
+     *  as subaction to action with given id.
+     * @returns id of created action
+     */
+    enterAction(
+        name: string,
+        type: string,
+        time?: number,
+        parentAction?: number | boolean
+    ): number;
+    /**
+     * @description stops the action that is represented by the given tracking object.
+     * @param actionId - id of action to leave. must be the value returned by enterAction
+     * @param time - end time in milliseconds
+     * @param startTime - optional start time in milliseconds (necessary if start time should be modified)
+     */
+    leaveAction(actionId: number, time?: number, startTime?: number): void;
+    /**
+     * @description Reports an error message
+     * @param parentAction - parent action id. if not passed or null, error is added to current action
+     */
+    reportError(error: string | Error, parentAction?: number): void;
+    /**
+     * @description Reports a warning message
+     * @param parentAction - parent action id. if not passed or null, error is added to current action
+     */
+    reportWarning(warning: string, parentAction?: number): void;
+    /**
+     * @description Reports an event
+     * @param parentAction - parent action id. if not passed or null, error is added to current action
+     */
+    reportEvent(msg: string, parentAction?: number): void;
+    /**
+     * @description Reports a key value pair to the server. The data can e.g. be used to create charts.
+     */
+    reportValue(key: string, value: number): void;
+    /**
+     * @description Reports a key value pair to the server. The data can e.g. be used to create charts.
+     * The difference to the reportValue function is that here the value is a string.
+     */
+    reportString(key: string, value: string): void;
+    /**
+     * @description The JavaScript ADK enables you to tag your visits with any value you want.
+     * Use tagVisit(visitName) to tag the current visit with the specified value
+     */
+    tagVisit(visitName: string): void;
+    /**
+     * @description Indicates start of a third party resource
+     * @param type - i = image, s = script, c = custom
+     */
+    startThirdParty(type: "i" | "s" | "c", url: string): void;
+    /**
+     * @description Indicates stop of a third party resource
+     * @param url - Complete URL of resource (must match URL provided in startThirdParty).
+     * @param success - True if the resource was loaded successfully, false if not.
+     * @param start - Absolute start time in milliseconds. When parameter is not passed or <= 0,
+     *     time of startThirdParty call is used.
+     * @param stop - Absolute stop time in milliseconds. When parameter is not passed or <= 0,
+     *     time of stopThirdParty call is used.
+     */
+    stopThirdParty(
+        url: string,
+        success: boolean,
+        start?: number,
+        stop?: number
+    ): void;
+    /**
+     * @description Adds a listener that is called when the user is leaving the page,
+     * but before the monitor signal is sent
+     * @param listener A function that will be called in case the user leaves the page.
+     */
+    addPageLeavingListener(listener: (key: string) => {}): void;
+    /**
+     * @description Sends a Streaming Node to the Server
+     * @param source - URL of the streaming resource
+     * @param duration - duration of the streaming resource in seconds
+     * @param userTriggered - did the user trigger the playback or did it start automatically?
+     * @param watchedCompletely - did the streaming resource play to the end?
+     * @param maxPlayTime - maximum progress this streaming resource had in seconds
+     * @param playTime - the time this streaming resource was playing in seconds
+     * @param bufferingCount - amount of bufferings that occured during the playback
+     * @param bufferingTime - total time spent with buffering in seconds
+     * @param type - action type of the streaming node. Is used for classifying events
+     *     on the serverside, e.g. _info_, _warn_, _error_
+     */
+    addStreamingNode(
+        source: string,
+        duration: number,
+        userTriggered: boolean,
+        watchedCompletely: boolean,
+        maxPlayTime: number,
+        playTime: number,
+        bufferingCount: number,
+        bufferingTime: number,
+        type: "_info_" | "_warn_" | "_error_"
+    ): void;
+    /**
+     * @description Indicates the start of a user input. User inputs must always
+     * be stopped by calling endUserInput. If an xhr call or a page load happens
+     *  it is checked if a user input is active. If yes, the user input is set to
+     * have triggered the page action.
+     * @param domNode - Which triggered the action (button, etc) is used for determining its caption
+     * @param type - Type of the user input: 'click', 'keypress', 'scroll',...
+     * @param addInfo - Additional info for user input such as key, mouse button, etc ('F5', 'RETURN',...)
+     * @param validTime - How long should the user input be able to open actions? default is 30ms
+     */
+    beginUserInput(
+        domNode: any,
+        type: string,
+        addInfo: string,
+        validTime: number
+    ): any;
+    /**
+     * @description the user input object returned by beginUserInput
+     */
+    endUserInput(userInputObject: any): void;
+    /**
+     * @description Initiate ajax action. Must be closed by leaveXhrAction afterwards.
+     * @param type Additional info about type of xhr (eg. framework name,etc)
+     * @param mode - The action mode: 0 .. just extend running ajax actions 1 .. extend any running action 2 ..
+     * extend any running action - visible subaction 3 .. start action if user input is present
+     * @param webSocket - Indicates if this action is a webSocket action or not
+     * @returns id of action
+     */
+    enterXhrAction(type: string, mode: number, webSocket: boolean): number;
+    /**
+     * @description Indicates the end of an xhr action. Must be started by leaveXhrAction beforehand.
+     * @param id -  id of action (must be the value returned by enterXhrAction)
+     */
+    leaveXhrAction(id: number): void;
+    /**
+     * @description Indicates that an xhr callback is active (eg. XMLHttpRequest onreadystatechange).
+     * This is necessary to automatically add actions started during a callback as subactions.
+     * Xhr callback must be stopped by leaveXhrCallback.
+     * @param actionId - id of action where callback belongs to
+     */
+    enterXhrCallback(actionId: number): void;
+    /**
+     * @description Indicates the end of an xhr callback. Must be called after enterXhrCallback.
+     * @param actionId - id of action where callback belongs to
+     */
+    leaveXhrCallback(actionId: number): void;
+    /**
+     * @description Indicates the start of a load action. Frameworks often have their own load callback functions.
+     * This can be used when framework starts load before "DOMContentLoaded".
+     */
+    signalOnLoadStart(): void;
+    /**
+     * @description Tells the JavaScript agent to wait for an additional call of signalOnLoadEnd.
+     * When the last call of signalOnLoadEnd is performed the "onload" action is closed.
+     *  Note: if this function is called, signalOnLoadEnd MUST be called afterwards to indicated the end of one load.
+     * Otherwise there will be unexpected action behaviour.
+     */
+    incrementOnLoadEndMarkers(): void;
+    /**
+     * @description Indicates the end of a load action. needs incrementOnLoadEndMarkers to be called before.
+     *  As soon as the last signalOnLoadEnd is called, the "onload" action is closed.
+     */
+    signalOnLoadEnd(): void;
+    /**
+     * @description By default a visit ends after a configurable inactivity time (default is 30 min.).
+     * Using the ADK, a visit can be ended forcibly, for example when a user logs out from an application.
+     * Simply call dynaTrace.endVisit() and the visit ends without waiting for the inactivity time.
+     * For correlation purposes the visit shows as active in the client for about three minutes,
+     *  but actions sent after dynaTrace.endVisit() are added to a new visit.
+     * End the current UEM visit. This is useful for "logout" buttons, so that,
+     * when the user logs out, the user's visit can also be closed by calling this method.
+     */
+    endVisit(): void;
+    /**
+     * @description Set the application version for this visit.
+     * This will be read on the server side and included as part of each visit for easy splitting.
+     * @param appVersion - The version string to be set.
+     */
+    setAppVersion(appVersion: string): void;
+    /**
+     * @description Set meta-data for the page via a key/value pair.
+     * @param key - The readable key for the value
+     * @param value - The value to associate with the identifier
+     */
+    setMetaData(key: string, value: string): void;
+}
+
+declare let dynaTrace: dynaTrace;
diff --git a/types/dynatrace/tsconfig.json b/types/dynatrace/tsconfig.json
new file mode 100644
index 0000000000..6c137be982
--- /dev/null
+++ b/types/dynatrace/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "dynatrace-tests.ts"
+    ]
+}
diff --git a/types/dynatrace/tslint.json b/types/dynatrace/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/dynatrace/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From b1d67d102779101709614ee6e60872bce77761aa Mon Sep 17 00:00:00 2001
From: Andrew Casey <andrew.casey@microsoft.com>
Date: Fri, 7 Dec 2018 13:36:29 -0800
Subject: [PATCH 768/836] Update CODEOWNERS

---
 .github/CODEOWNERS | 431 +++++++++++++++++++++++++++++++--------------
 1 file changed, 302 insertions(+), 129 deletions(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 94701801da..7e3c9ccc69 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -9,6 +9,7 @@
 /types/absolute/                                    @AyaMorisawa
 /types/abstract-leveldown/                          @MeirionHughes @danwbyrne
 /types/acc-wizard/                                  @cyrilschumacher
+/types/accept/                                      @feinoujc
 /types/accept-language-parser/                      @kampfgnom
 /types/accepts/                                     @bomret @brikou
 /types/accounting/                                  @gerich-home @chrisleck
@@ -159,7 +160,7 @@
 /types/ansi-escapes/                                @jacobbubu
 /types/ansi-regex/                                  @mvachhar
 /types/ansi-styles/                                 @brynbellomy @plylrnsdy
-/types/ansicolors/                                  @rogierschouten
+/types/ansicolors/                                  @balupton
 /types/antlr4/                                      @mcchatman8009
 /types/antlr4-autosuggest/                          @jonfreedman
 /types/any-db/                                      @rogierschouten
@@ -175,6 +176,7 @@
 /types/apollo-codegen/                              @bradleyayers @kostspielig
 /types/apollo-upload-client/                        @Slessi
 /types/apostrophe/                                  @afholderman
+/types/app-module-path/                             @darkwebdev
 /types/app-root-dir/                                @chenyang-biu
 /types/app-root-path/                               @shantmarouti
 /types/appdmg/                                      @unindented
@@ -212,7 +214,7 @@
 /types/asenv/                                       @remisery
 /types/asn1js/                                      @microshine
 /types/aspnet-identity-pw/                          @jt000
-/types/assert/                                      @nicoabie
+/types/assert/                                      @nicoabie @LinusU
 /types/assert-equal-jsx/                            @seryl
 /types/assert-plus/                                 @KostyaTretyak
 /types/assertsharp/                                 @brunolm
@@ -231,6 +233,7 @@
 /types/atlaskit__inline-edit/                       @lstanden
 /types/atlaskit__layer/                             @lstanden
 /types/atlaskit__single-select/                     @lstanden
+/types/atlaskit__tree/                              @benhjames
 /types/atlassian-crowd-client/                      @mtgto
 /types/atmosphere.js/                               @toedter @Mory1879 @Scipion
 /types/atob/                                        @johngeorgewright
@@ -254,6 +257,7 @@
 /types/autoprefixer/                                @odnamrataizem @murt
 /types/autosize/                                    @kingdango @keika299 @NeekSandhu
 /types/autosuggest-highlight/                       @senukartur
+/types/await-timeout/                               @szhu
 /types/awesomplete/                                 @webbiesdk @bmdixon @tbekolay @chrislopresto
 /types/aws-iot-device-sdk/                          @niik @mlamp
 /types/aws-lambda/                                  @skarum @tobyhede @buggy @y13i @wwwy3y3 @OrthoDex @MichaelMarner @daniel-cottone @kostya-misura @coderbyheart @palmithor @daniloraisi @simonbuchan @Haydabase @repl-chris @aneilbaboo @jeznag @louislarry @dpapukchiev @ohookins @trevor-leach @jagregory
@@ -279,20 +283,19 @@
 /types/babel__code-frame/                           @mohsen1 @ForbesLindesay
 /types/babel__core/                                 @yortus @marvinhagemeister @mgroenhoff
 /types/babel__generator/                            @yortus @johnnyestilles @mgroenhoff
-/types/babel__parser/                               @yortus @marvinhagemeister @mgroenhoff
 /types/babel__template/                             @yortus @marvinhagemeister @mgroenhoff
 /types/babel__traverse/                             @yortus @marvinhagemeister @rpetrich @mgroenhoff
 /types/babelify/                                    @TeamworkGuy2 @marvinhagemeister
 /types/babylon/                                     @yortus @marvinhagemeister
 /types/babylon-walk/                                @czbuchi
 /types/babyparse/                                   @cdiddy77
-/types/backbone/                                    @borisyankov @nvivo @kenjiru
+/types/backbone/                                    @borisyankov @nvivo @kenjiru @jjoekoullas
 /types/backbone-associations/                       @craigbrett17
 /types/backbone-fetch-cache/                        @delphinus35
 /types/backbone-relational/                         @eirikhm
 /types/backbone.layoutmanager/                      @hejiang2000
 /types/backbone.localstorage/                       @lgrignon
-/types/backbone.marionette/                         @zhamid @nvivo @sventschui @razorness @confususs
+/types/backbone.marionette/                         @zhamid @nvivo @sventschui @razorness @confususs @jjoekoullas
 /types/backbone.paginator/                          @Nyamazing
 /types/backbone.radio/                              @alphaleonis
 /types/backgrid/                                    @jlujan
@@ -301,6 +304,7 @@
 /types/backoff/                                     @BendingBender
 /types/baconjs/                                     @alexander-matsievsky @gekkio
 /types/bagpipes/                                    @micmro
+/types/baidu-app/                                   @taoqf
 /types/barbellweights/                              @evelijn
 /types/barcode/                                     @pvomhoff
 /types/bardjs/                                      @TepigMC
@@ -329,7 +333,7 @@
 /types/better-curry/                                @pocesar
 /types/better-queue/                                @maozedong
 /types/better-scroll/                               @stoneChen @cnjack
-/types/better-sqlite3/                              @Morfent @matrumz
+/types/better-sqlite3/                              @Morfent @matrumz @sant123
 /types/bezier-easing/                               @ptlis
 /types/bezier-js/                                   @danmarshall @Epskampie
 /types/bgiframe/                                    @sumegizoltan
@@ -340,7 +344,7 @@
 /types/bignum/                                      @Patman64
 /types/bigscreen/                                   @dduugg
 /types/bin-pack/                                    @orentrutner
-/types/binary-parser/                               @riggs @dolanmiu
+/types/binary-parser/                               @riggs @dolanmiu @yuhr
 /types/bind-ponyfill/                               @skysteve
 /types/bindings/                                    @unindented
 /types/bintrees/                                    @CjS77
@@ -352,7 +356,7 @@
 /types/bitcoinjs-lib/                               @mhegazy @dlebrecht @rbuckton @micksatana @youssefgh @kento1218
 /types/bitcore-lib/                                 @lautarodragan
 /types/bittorrent-protocol/                         @feross @tlaziuk
-/types/bitwise-xor/                                 @rogierschouten
+/types/bitwise-xor/                                 @rogierschouten @BendingBender
 /types/bl/                                          @Bartvds @reconbot
 /types/blacklist/                                   @mhegazy
 /types/blazy/                                       @julienpa
@@ -425,6 +429,7 @@
 /types/browser-resolve/                             @marionebl
 /types/browser-sync/                                @joeskeen @aznnomness
 /types/browserify/                                  @AndrewGaspar @jvilk @leonard-thieu @LinusU
+/types/browserslist/                                @davecardwell
 /types/bs58/                                        @chrootsu
 /types/bson/                                        @horiuchi @CaselIT
 /types/btoa/                                        @johngeorgewright
@@ -438,7 +443,7 @@
 /types/bufferstream/                                @Bartvds
 /types/builtin-modules/                             @ajafff
 /types/bull/v2/                                     @bgrieder @JProgrammer
-/types/bull/                                        @bgrieder @JProgrammer @marshall007 @weeco @blaugold @iamolegga @koblas @bondz @wuha-team @aleccool213 @danmana
+/types/bull/                                        @bgrieder @JProgrammer @marshall007 @weeco @blaugold @iamolegga @koblas @bondz @wuha-team @aleccool213 @danmana @kjellmorten @pc-jedi
 /types/bump-regex/                                  @silkentrance
 /types/bunnymq/                                     @cyrilschumacher
 /types/bunyan/                                      @amikhalev
@@ -457,6 +462,7 @@
 /types/bytewise/                                    @danwbyrne
 /types/c3/                                          @mcliment @gerinjacob @denyo @dmitryshindin @timn
 /types/cache-manager/                               @GausSim
+/types/cached-path-relative/                        @TeamworkGuy2
 /types/cal-heatmap/                                 @RetroChrisB
 /types/caller/                                      @ignocide
 /types/callsite/                                    @newclear
@@ -468,6 +474,7 @@
 /types/camo/                                        @lucasmciruzzi
 /types/cancan/                                      @Vincent-Pang
 /types/caniuse-api/                                 @davecardwell
+/types/caniuse-lite/                                @mutech
 /types/cannon/                                      @clark-stevenson @Gelio
 /types/canvas-confetti/                             @matracey
 /types/canvas-gauges/                               @Mikhus
@@ -482,10 +489,12 @@
 /types/cassandra-driver/                            @Svjard @pc-jedi
 /types/catbox/v7/                                   @jasonswearingen @AJamesPhillips
 /types/catbox/                                      @jasonswearingen @AJamesPhillips @saboya
+/types/catbox-memory/                               @SimonSchick
 /types/catbox-redis/                                @SimonSchick
 /types/cbor/                                        @pushplay
 /types/ccap/                                        @taoqf
 /types/cesium/                                      @Zuzon @hnipps @szechyjs @golyalpha
+/types/cfn-response/                                @ivoisbelongtous
 /types/chai/v2/                                     @Bartvds @AGBrown
 /types/chai/                                        @jedmao @Bartvds @AGBrown @olivr70 @mwistrand @joshuakgoldberg @shaunluttin @Naktibalda @micksatana @ErikSchierboom
 /types/chai-arrays/                                 @clementprevot
@@ -520,7 +529,7 @@
 /types/check-types/                                 @idchlife
 /types/checkstyle-formatter/                        @mhegazy
 /types/checksum/                                    @rogierschouten
-/types/cheerio/                                     @blittle @wmaurer @umarniz @LiJinyao @chennakrishna8
+/types/cheerio/                                     @blittle @wmaurer @umarniz @LiJinyao @chennakrishna8 @AzSiAz
 /types/chess.js/                                    @JacobFischer
 /types/chessboardjs/                                @sliverb @davidmpaz
 /types/chmodr/                                      @BendingBender
@@ -538,7 +547,8 @@
 /types/circuit-breaker-js/                          @DeTeam
 /types/circular-json/                               @jpevarnek
 /types/ckeditor/v2/                                 @wittwert
-/types/ckeditor/                                    @wittwert @stuartlong
+/types/ckeditor/                                    @wittwert @stuartlong @viktorpegy
+/types/ckeditor__ckeditor5-utils/                   @denisname
 /types/clamp-js/                                    @Hikariii
 /types/clamp-js-main/                               @sinziananicolae
 /types/classnames/                                  @adidahiya @JKillian @seansfkelley @mradamczyk @marvinhagemeister
@@ -552,6 +562,7 @@
 /types/clearbladejs-server/                         @ClearBlade
 /types/cleave.js/                                   @clentfort @jasongi-at-sportsbet @sashashakun
 /types/cli/                                         @kayahr
+/types/cli-box/                                     @athasach
 /types/cli-color/                                   @ChaosinaCan
 /types/cli-interact/                                @ffflorian
 /types/cli-progress/                                @mhegazy
@@ -579,7 +590,7 @@
 /types/co-body/                                     @geoffreak
 /types/co-views/                                    @devlee @geoffreak
 /types/code/                                        @prashaantt
-/types/codemirror/                                  @mihailik @nrbernard @Pr1st0n @rileymiller
+/types/codemirror/                                  @mihailik @nrbernard @Pr1st0n @rileymiller @toddself
 /types/codependency/                                @morphatic
 /types/coffeeify/                                   @tkQubo
 /types/coinbase/                                    @rogierschouten
@@ -598,9 +609,10 @@
 /types/com.darktalker.cordova.screenshot/           @akarienta
 /types/com.wikitude.phonegap.wikitudeplugin/        @zbarbuto
 /types/combine-source-map/                          @TeamworkGuy2
-/types/combined-stream/                             @felixge @tlaziuk
+/types/combined-stream/                             @felixge @tlaziuk @konpikwastaken
 /types/combokeys/                                   @iclanton
 /types/cometd/                                      @derekcicerone @unindented @alxHenry
+/types/command-exists/                              @BendingBender
 /types/command-line-args/v4/                        @CzBuCHi @75lb
 /types/command-line-args/                           @75lb
 /types/command-line-commands/                       @CzBuCHi
@@ -610,9 +622,10 @@
 /types/commercetools__enzyme-extensions/            @screendriver
 /types/common-errors/                               @icopp
 /types/common-prefix/                               @seangenabe
-/types/common-tags/                                 @zuzusik @tzupengwang
+/types/common-tags/                                 @zuzusik @tzupengwang @BendingBender
 /types/commondir/                                   @leonard-thieu
 /types/commonmark/                                  @nicojs @leonard-thieu
+/types/compare-func/                                @fennibay
 /types/compare-version/                             @jpevarnek
 /types/compare-versions/                            @LogvinovLeon
 /types/complex/                                     @AyaMorisawa @pavasich
@@ -662,7 +675,7 @@
 /types/convert-layout/                              @xeningem
 /types/convert-source-map/                          @AndrewGaspar @mgroenhoff @TeamworkGuy2
 /types/convict/                                     @Nemo157 @vesse @elyscape @vanthiyathevan
-/types/cookie/                                      @pine613
+/types/cookie/                                      @pine
 /types/cookie-parser/                               @santialbo @BendingBender
 /types/cookie-session/                              @borislavjivkov
 /types/cookie-signature/                            @lith-light-g
@@ -706,7 +719,8 @@
 /types/countdown/                                   @gjuchault
 /types/counterpart/                                 @santiagodoldan
 /types/countries-and-timezones/                     @zero51
-/types/country-list/                                @iRoachie
+/types/country-list/v1/                             @iRoachie
+/types/country-list/                                @iRoachie @Kimahriman
 /types/country-select-js/                           @humrochagf
 /types/countup.js/                                  @shermendev
 /types/coverup/                                     @bevalorous
@@ -717,6 +731,8 @@
 /types/cradle/                                      @panuhorsmalahti
 /types/crc/                                         @YuJianrong
 /types/create-error/                                @tkrotoff
+/types/create-hash/                                 @BendingBender
+/types/create-hmac/                                 @BendingBender
 /types/create-react-class/                          @jgoz
 /types/create-subscription/                         @Asana @vsiao
 /types/createjs/                                    @evilangelist @gyohk
@@ -731,20 +747,24 @@
 /types/crossfilter/                                 @schmuli @iebaker @nordfjord
 /types/crossroads/                                  @diullei
 /types/crpc/                                        @0xdeafcafe
+/types/crumb/                                       @lenovouser @SimonSchick
 /types/cryptiles/                                   @awendland
 /types/crypto-js/                                   @misak113
 /types/crypto-random-string/                        @MrManny
 /types/cryptojs/                                    @giabao
+/types/cryptr/                                      @rrogowski
 /types/cson/                                        @stpettersens
+/types/cson-parser/                                 @lenovouser
 /types/csprng/                                      @winksaville
 /types/csrf/                                        @markis
 /types/css/                                         @ilich
 /types/css-font-loading-module/                     @slikts
 /types/css-modules/                                 @NeekSandhu
 /types/css-to-style/                                @bengry
+/types/css-tree/                                    @erik-kallen
 /types/cssbeautify/                                 @rictic
 /types/cssnano/                                     @odnamrataizem
-/types/csso/                                        @screendriver
+/types/csso/                                        @screendriver @erik-kallen
 /types/csurf/                                       @horiuchi
 /types/csv-parse/                                   @davidm77 @obi-jan-kenobi
 /types/csv-stringify/                               @rogierschouten @arjenvanderende
@@ -777,7 +797,7 @@
 /types/d3-delaunay/                                 @BTOdell
 /types/d3-dispatch/                                 @tomwanzek @gustavderdrache @borisyankov @denisname
 /types/d3-drag/                                     @tomwanzek @gustavderdrache @borisyankov
-/types/d3-dsv/                                      @tomwanzek @gustavderdrache @borisyankov
+/types/d3-dsv/                                      @tomwanzek @gustavderdrache @borisyankov @denisname
 /types/d3-ease/                                     @tomwanzek @gustavderdrache @borisyankov
 /types/d3-fetch/                                    @ledragon
 /types/d3-force/                                    @tomwanzek @gustavderdrache @borisyankov
@@ -843,7 +863,8 @@
 /types/dd-trace/                                    @ColinBradley @alloy
 /types/deasync/                                     @Sicilica
 /types/debessmann/                                  @vkorehov
-/types/debounce/                                    @denis-sokolov @joshuakgoldberg
+/types/debounce/                                    @denis-sokolov @joshuakgoldberg @wcarson
+/types/debounce-promise/                            @whtsky
 /types/debug/                                       @swook @galtalmor @zamb3zi @brasten
 /types/decamelize/                                  @samverschueren
 /types/decay/                                       @enaeseth
@@ -876,10 +897,13 @@
 /types/depd/                                        @danny8002 @BendingBender
 /types/dependency-tree/                             @joscha
 /types/deployjava/                                  @cyrilschumacher
+/types/deprecate/                                   @Toilal
+/types/deps-sort/                                   @TeamworkGuy2
 /types/derhuerst__cli-on-key/                       @jacobbubu
 /types/destroy/                                     @BendingBender
 /types/destroy-on-hwm/                              @BendingBender
-/types/detect-browser/                              @rogierschouten
+/types/detect-browser/                              @rogierschouten @carusology
+/types/detect-character-encoding/                   @BendingBender
 /types/detect-hover/                                @thomastilkema
 /types/detect-indent/v0/                            @Bartvds
 /types/detect-indent/                               @Bartvds @BendingBender
@@ -901,17 +925,21 @@
 /types/di-lite/                                     @dcrusader
 /types/diacritics/                                  @otociulis
 /types/dialogflow/                                  @dyladan
+/types/dicer/                                       @GoupilRobin @BendingBender
 /types/diff/                                        @vvakame @szdc @moc-yuto
 /types/diff2html/                                   @rtfpessoa
+/types/diffie-hellman/                              @BendingBender
 /types/digibyte/                                    @lautarodragan @werewolfe
+/types/dinero.js/                                   @BendingBender
 /types/dir-resolve/                                 @andy-ms
 /types/discontinuous-range/                         @OiCMudkips
+/types/discord-rpc/                                 @jasonhaxstuff
 /types/discourse-sso/                               @championswimmer
 /types/dispatchr/                                   @Ragg-
 /types/disposable-email-domains/                    @geoffreak
 /types/dnssd/                                       @angelmerino @Maxr1998
 /types/doccookies/                                  @jonegerton
-/types/dockerode/                                   @seikho @nlaplante @isac322 @lazarusx @meisenzahl @thegecko
+/types/dockerode/                                   @seikho @nlaplante @isac322 @lazarusx @meisenzahl @thegecko @CameronDiver
 /types/docopt/                                      @giggio
 /types/doctrine/                                    @rictic
 /types/document-promises/                           @NotWoods
@@ -923,6 +951,7 @@
 /types/dom-clipboard-api/                           @43081j
 /types/dom-inputevent/                              @diagramatics
 /types/dom-loaded/                                  @ltetzlaff
+/types/dom-mediacapture-record/                     @eliasmeire
 /types/dom-to-image/                                @JipSterk
 /types/dom4/                                        @adidahiya @giladgray
 /types/domo/                                        @Steve-Fenton
@@ -937,7 +966,7 @@
 /types/dotdir-regex/                                @mrmlnc
 /types/dotdotdot/                                   @milanjaros
 /types/dotenv/v2/                                   @jussikinnula @borekb @enaeseth
-/types/dotenv/                                      @jussikinnula @borekb @enaeseth
+/types/dotenv/                                      @jussikinnula @borekb @enaeseth @maxbeatty
 /types/dotenv-safe/                                 @krenor
 /types/dotenv-webpack/                              @karol-majewski
 /types/dotfile-regex/                               @mrmlnc
@@ -984,7 +1013,7 @@
 /types/easy-xapi/                                   @DeadAlready
 /types/easy-xapi-utils/                             @DeadAlready
 /types/ebongarde-root/                              @Ebongarde
-/types/echarts/                                     @xieisabug @AntiMoron @liveangela @Ovilia
+/types/echarts/                                     @xieisabug @AntiMoron @liveangela @Ovilia @iRON5
 /types/ecma-proposal-math-extensions/               @ksm2
 /types/ecurve/                                      @mhegazy
 /types/ed25519/                                     @erikma
@@ -1018,7 +1047,7 @@
 /types/electron-winstaller/                         @shiftkey @unindented
 /types/elegant-spinner/                             @danwbyrne
 /types/element-ready/                               @BendingBender
-/types/element-resize-detector/                     @saranshkataria
+/types/element-resize-detector/                     @saranshkataria @franklixuefei
 /types/element-resize-event/                        @rogierschouten @plgregoire
 /types/elementtree/                                 @dwieeb
 /types/elliptic/                                    @danwbyrne
@@ -1062,6 +1091,7 @@
 /types/emoji-regex/                                 @iKBAHT
 /types/emojione/                                    @dbrgn
 /types/empower/                                     @vvakame
+/types/empty-dir/                                   @BendingBender
 /types/emscripten/                                  @zakki @periklis
 /types/encoding-down/                               @MeirionHughes @danwbyrne
 /types/end-of-stream/                               @strax
@@ -1079,6 +1109,7 @@
 /types/enzyme-adapter-react-15/                     @tkrotoff
 /types/enzyme-adapter-react-15.4/                   @nali
 /types/enzyme-adapter-react-16/                     @tkrotoff
+/types/enzyme-async-helpers/                        @kimehrenpohl
 /types/enzyme-redux/                                @knegusen
 /types/enzyme-to-json/                              @joscha
 /types/eonasdan-bootstrap-datetimepicker/           @ToastHawaii
@@ -1137,17 +1168,21 @@
 /types/exit/                                        @Bartvds
 /types/exit-hook/                                   @BendingBender
 /types/exorcist/                                    @TeamworkGuy2
+/types/expand-tilde/                                @carnesen
 /types/expect/                                      @jmreidy @merrywhether
 /types/expect-puppeteer/                            @JoshuaKGoldberg @tkrotoff
 /types/expect.js/                                   @teppeis
 /types/expectations/                                @vvakame
 /types/expired-storage/                             @intolerance
+/types/expirymanager/                               @DanielRose
 /types/expo/v23/                                    @KonstantinKai
 /types/expo/v24/                                    @KonstantinKai @martynaskadisa @janaagaard75 @ssanchezmarc @fhelwanger
 /types/expo/v25/                                    @KonstantinKai @martynaskadisa @janaagaard75 @ssanchezmarc @fhelwanger @umidbekkarimov
 /types/expo/v26/                                    @KonstantinKai @martynaskadisa @janaagaard75 @ssanchezmarc @fhelwanger @umidbekkarimov @tinaroh
 /types/expo/v27/                                    @KonstantinKai @martynaskadisa @janaagaard75 @ssanchezmarc @fhelwanger @umidbekkarimov @moshfeu @prokopcm @tinaroh @binki @mo
-/types/expo/                                        @KonstantinKai @martynaskadisa @janaagaard75 @ssanchezmarc @fhelwanger @umidbekkarimov @moshfeu @prokopcm @tinaroh @binki @mo
+/types/expo/v30/                                    @KonstantinKai @martynaskadisa @janaagaard75 @ssanchezmarc @fhelwanger @umidbekkarimov @moshfeu @prokopcm @tinaroh @binki @mo
+/types/expo/                                        @KonstantinKai @martynaskadisa @janaagaard75 @ssanchezmarc @fhelwanger @umidbekkarimov @moshfeu @prokopcm @tinaroh @binki @mo @levansuper @ihmpavel
+/types/expo-localization/                           @burtek
 /types/expo__status-bar-height/                     @dawnmist
 /types/expo__vector-icons/                          @incleaf
 /types/express/                                     @borisyankov
@@ -1188,6 +1223,7 @@
 /types/express-redis-cache/                         @ajliv
 /types/express-route-fs/                            @kripod
 /types/express-routemap/                            @icopp
+/types/express-routes-versioning/                   @weffe
 /types/express-sanitized/                           @cjbarth
 /types/express-serve-static-core/                   @borisyankov @19majkel94 @kacepe @micksatana @samijaber
 /types/express-session/                             @horiuchi @jacobbogers @builtinnya @ry7n
@@ -1195,6 +1231,8 @@
 /types/express-socket.io-session/                   @AylaJK
 /types/express-to-koa/                              @xiaohanzhang
 /types/express-unless/                              @wokim
+/types/express-version-request/                     @weffe
+/types/express-version-route/                       @weffe
 /types/express-wechat-access/                       @simmons8616
 /types/express-winston/                             @bricka
 /types/express-ws/                                  @ajliv
@@ -1226,11 +1264,11 @@
 /types/fancy-log/                                   @pine
 /types/fancybox/                                    @borisyankov
 /types/farbtastic/                                  @EnableSoftware
-/types/fast-diff/                                   @djrenren
 /types/fast-levenshtein/                            @mizunashi-mana
 /types/fast-list/                                   @BendingBender
 /types/fast-stats/                                  @rogierschouten
 /types/fastclick/                                   @shinnn
+/types/fastify-accepts/                             @leomelzer
 /types/fastify-cors/                                @jannikkeye
 /types/fastify-jwt/                                 @jannikkeye
 /types/fastify-multipart/                           @jannikkeye
@@ -1283,13 +1321,15 @@
 /types/finalhandler/                                @chrootsu
 /types/finch/                                       @DavidSichau
 /types/find/                                        @andypyrope
+/types/find-package-json/                           @BendingBender
 /types/find-parent-dir/                             @ikatyang
 /types/find-process/                                @buaban
 /types/find-project-root/                           @ikatyang
 /types/find-root/                                   @Alorel
 /types/find-up/                                     @BendingBender
-/types/find-versions/                               @LogvinovLeon
+/types/find-versions/                               @LogvinovLeon @carnesen
 /types/findup-sync/                                 @Bartvds @ngbrown
+/types/fined/                                       @BendingBender
 /types/fingerprintjs/                               @zaneli
 /types/fingerprintjs2/                              @curtstate
 /types/firebase-client/                             @fpsscarecrow
@@ -1301,7 +1341,9 @@
 /types/first-mate/                                  @GlenCFL
 /types/fixed-data-table/                            @pepaar @stephenjelfs
 /types/fixed-data-table-2/                          @ilivit
+/types/flagged-respawn/                             @BendingBender
 /types/flat/                                        @chrootsu
+/types/fleximap/                                    @DanielRose
 /types/flexslider/                                  @diullei
 /types/flickity/                                    @clmcgrath @wagich
 /types/flight/                                      @jonathanhedren
@@ -1309,6 +1351,7 @@
 /types/flipsnap/                                    @kubosho @gsino @mayuki
 /types/float-regex/                                 @wanganjun
 /types/flot/                                        @burlandm @Anticom @admiralsmaster
+/types/flowdoc/                                     @animify
 /types/flowjs/                                      @ryan10132
 /types/fluent-ffmpeg/                               @tcaesvk @DingWeizhe @mabidina
 /types/flush-write-stream/                          @djcsdy
@@ -1374,6 +1417,7 @@
 /types/fusioncharts/                                @rohitkr @shivarajkv
 /types/fuzzaldrin/                                  @mhegazy
 /types/fuzzaldrin-plus/                             @jeancroy @jkillian @reyronald
+/types/fuzzy-search/                                @alex-deas @BendingBender
 /types/fuzzyset/                                    @lgrignon @narainsagar
 /types/fuzzyset.js/                                 @lgrignon @narainsagar
 /types/fxn/                                         @charrondev
@@ -1547,6 +1591,7 @@
 /types/getos/                                       @BendingBender
 /types/gettext.js/                                  @jucrouzet
 /types/gh-pages/                                    @DanielRosenwasser
+/types/ghauth/                                      @Leko
 /types/gifffer/                                     @gatimus
 /types/gijgo/                                       @atatanasov
 /types/giraffe/                                     @darthapo
@@ -1555,11 +1600,17 @@
 /types/git-config/                                  @stpettersens
 /types/git-remote-origin-url/                       @janslow
 /types/git-rev-sync/                                @khoi-fish
+/types/git-root-dir/                                @ffflorian
 /types/git-url-parse/                               @ajafff
+/types/gitconfiglocal/                              @ffflorian
 /types/github-url-to-object/                        @ajafff
 /types/github-username-regex/                       @BehindTheMath
-/types/gitlab/                                      @yanqing6628780 @Arylo
 /types/gl-matrix/                                   @mattijskneppers @tatchx @nbabanov @auzmartist @surtr-isaz
+/types/gl-react/                                    @jussikinnula
+/types/gl-react-dom/                                @jussikinnula
+/types/gl-react-expo/                               @jussikinnula
+/types/gl-react-headless/                           @jussikinnula
+/types/gl-react-native/                             @jussikinnula
 /types/gl-shader/                                   @MathiasPaumgarten
 /types/gl-texture2d/                                @MathiasPaumgarten
 /types/gldatepicker/                                @qcz
@@ -1585,12 +1636,12 @@
 /types/google-apps-script-oauth2/                   @dhayab
 /types/google-cloud__datastore/                     @beaulac @ogawa0071 @ThomasdenH
 /types/google-cloud__pubsub/                        @pheromonez @LunaPg @msiviero
-/types/google-cloud__storage/                       @blove @nbperry @welkie @ogawa0071
 /types/google-earth/                                @icholy
 /types/google-images/                               @dolanmiu
 /types/google-libphonenumber/                       @leonyu @winfinit
 /types/google-map-react/                            @honzabrecka
 /types/google-maps/                                 @DeividasBakanas @GiedriusGrabauskas
+/types/google-maps-react/                           @gburgett @jpowell
 /types/google-protobuf/                             @marcuslongmuir
 /types/google-translate-api/                        @maple3142
 /types/google.analytics/                            @tyler-murphy
@@ -1598,7 +1649,7 @@
 /types/google.fonts/                                @danmarshall
 /types/google.geolocation/                          @vbortone
 /types/google.picker/                               @grapswiz
-/types/google.visualization/                        @danludwig @gmoore-sjcorg @danmana @mlcheng @IvanBisultanov @glebm
+/types/google.visualization/                        @danludwig @gmoore-sjcorg @danmana @mlcheng @IvanBisultanov @glebm @shrujalshah28
 /types/google__maps/                                @indrimuska
 /types/googlemaps/                                  @cgwrench @nertzy @xaolas @mrmcnerd @martincostello @svenkreiss @bolatovumar @gauthierm
 /types/googlemaps.infobubble/                       @Dashue
@@ -1616,6 +1667,7 @@
 /types/graphql-date/                                @enaeseth
 /types/graphql-deduplicator/                        @lfades
 /types/graphql-depth-limit/                         @eritikass
+/types/graphql-fields/                              @feinoujc
 /types/graphql-iso-date/                            @jwaldrip
 /types/graphql-list-fields/                         @filipows
 /types/graphql-query-complexity/                    @abhikmitra
@@ -1678,6 +1730,7 @@
 /types/gulp-jasmine/                                @andypyrope
 /types/gulp-jasmine-browser/                        @tkrotoff
 /types/gulp-json-editor/                            @peterjuras
+/types/gulp-json-validator/                         @pe8ter
 /types/gulp-jsonmin/                                @romain-faust
 /types/gulp-jsonminify/                             @pine
 /types/gulp-jspm/                                   @peterjuras
@@ -1722,12 +1775,14 @@
 /types/halogen/                                     @steller
 /types/hammerjs/                                    @milkisevil @codler
 /types/handlebars/                                  @borisyankov @evil-shrike
+/types/handlebars-helpers/                          @Toilal
 /types/hapi/v8/                                     @jasonswearingen
 /types/hapi/v12/                                    @jasonswearingen
 /types/hapi/v15/                                    @jasonswearingen
 /types/hapi/v16/                                    @jasonswearingen @AJamesPhillips
 /types/hapi/                                        @rafaelsouzaf @jhsimms @SimonSchick
 /types/hapi-auth-basic/                             @AJamesPhillips @saboya
+/types/hapi-auth-cookie/                            @lenovouser @SimonSchick @Mutmatt
 /types/hapi-auth-jwt2/v7/                           @warrenseymour
 /types/hapi-auth-jwt2/                              @warrenseymour @SimonSchick
 /types/hapi-decorators/                             @kenhowardpdx
@@ -1764,6 +1819,7 @@
 /types/hexo-fs/                                     @segayuu
 /types/hexo-log/                                    @segayuu
 /types/hexo-util/                                   @segayuu
+/types/hibp/                                        @lenovouser
 /types/highcharts/                                  @damianog @baltie @AlbertOzimek @hanssens
 /types/highcharts-ng/                               @scatcher
 /types/highland/                                    @Bartvds @hgwood @iwllyu @alvis @notbobthebuilder
@@ -1821,6 +1877,7 @@
 /types/humanparser/                                 @MichalPodeszwa
 /types/humps/                                       @nikeee
 /types/hyco-ws/                                     @mrcabellom
+/types/hyper-aws4/                                  @bambutz
 /types/hyperscript/                                 @spacejack @jmfirth
 /types/hypertext-application-language/              @maks3w
 /types/hystrixjs/                                   @igorsechyn
@@ -1867,7 +1924,7 @@
 /types/images/                                      @DingWeizhe
 /types/imagesloaded/                                @coldacid @apexskier
 /types/imap/                                        @psnider
-/types/imap-simple/                                 @pushplay
+/types/imap-simple/                                 @pushplay @iaarnio
 /types/imgur-rest-api/                              @lukewestby
 /types/imperium/                                    @gaetansenn
 /types/impress/                                     @borisyankov
@@ -1881,7 +1938,7 @@
 /types/inflected/                                   @dsci
 /types/inflection/                                  @shiwano
 /types/inherits/                                    @chrootsu
-/types/ini/                                         @marcinporebski
+/types/ini/                                         @marcinporebski @carnesen
 /types/iniparser/                                   @chrootsu
 /types/init-package-json/                           @kfarnung
 /types/inline-css/                                  @philipisapain
@@ -1890,33 +1947,38 @@
 /types/inquirer-npm-name/                           @manuth
 /types/insert-module-globals/                       @leonard-thieu
 /types/insight/                                     @vvakame
+/types/instabug-reactnative/                        @pengcao1
 /types/integer/                                     @Morfent
 /types/intercom-client/                             @jineshshah36 @peping
 /types/intercom-web/                                @fongandrew @salbahra @onatm
 /types/intercomjs/                                  @spencerwi
 /types/internal-ip/                                 @BendingBender
+/types/interpret/                                   @BendingBender
 /types/intl/                                        @RagibHasin
 /types/intl-locales-supported/                      @Slessi
 /types/intl-messageformat/                          @mhegazy
 /types/intl-relativeformat/                         @mohsen1
-/types/intl-tel-input/                              @fdnhkj @leonard-thieu
+/types/intl-tel-input/v13/                          @fdnhkj @leonard-thieu
+/types/intl-tel-input/                              @fdnhkj @leonard-thieu @molnarm
 /types/into-stream/                                 @BendingBender
 /types/intrinsic-scale/                             @shalomdotnet
 /types/intro.js/                                    @anahkiasen
 /types/invariant/                                   @bennett000
 /types/inversify-devtools/                          @inversify
+/types/iobroker/                                    @AlCalzone
 /types/ion-rangeslider/v1/                          @dduugg @Karel-van-de-Plassche
 /types/ion-rangeslider/                             @Karel-van-de-Plassche
 /types/ioredis/v3/                                  @plantain-00 @chrisleck @aliarham11 @br8h @shaharmor @palindrom615 @reconbot
-/types/ioredis/                                     @plantain-00 @chrisleck @aliarham11 @br8h @shaharmor @palindrom615 @reconbot @funthing @iamolegga
+/types/ioredis/                                     @plantain-00 @chrisleck @aliarham11 @br8h @shaharmor @palindrom615 @reconbot @funthing @iamolegga @tingwai-to
 /types/iota.lib.js/                                 @fogsh
 /types/ip/                                          @codeanimal
 /types/ip-address/                                  @icopp @danwbyrne
 /types/ip-regex/                                    @unindented
 /types/ipcheck/                                     @bengry
 /types/irc/                                         @phillips1012
+/types/iri/                                         @BendingBender
 /types/iron/                                        @simonschick @rafaelsouzaf
-/types/is/                                          @cabralRodrigo
+/types/is/                                          @cabralRodrigo @gricey432
 /types/is-absolute-url/                             @mhegazy
 /types/is-alphanumerical/                           @vutran
 /types/is-archive/                                  @mhegazy
@@ -1936,10 +1998,12 @@
 /types/is-my-json-valid/                            @kruncher
 /types/is-negated-glob/                             @ajafff
 /types/is-number/                                   @harryshipton
+/types/is-obj/                                      @forivall
 /types/is-object/                                   @wbhob
 /types/is-path-cwd/                                 @DanielRosenwasser
 /types/is-path-in-cwd/                              @mhegazy
 /types/is-promise/                                  @DanielRosenwasser
+/types/is-regexp/                                   @forivall
 /types/is-relative-url/                             @mhegazy
 /types/is-root/                                     @mhegazy
 /types/is-root-path/                                @mhegazy
@@ -1975,7 +2039,9 @@
 /types/jade/                                        @panuhorsmalahti
 /types/jalaali-js/                                  @alitaheri
 /types/japanese-holidays/                           @syamatoo
-/types/jasmine/                                     @borisyankov @theodorejb @davidparsson @gmoothart @lukas-zech-software @Engineer2B
+/types/jasmine/v1/                                  @borisyankov
+/types/jasmine/v2/                                  @borisyankov @theodorejb @davidparsson @gmoothart @lukas-zech-software @Engineer2B @cyungmann
+/types/jasmine/                                     @borisyankov @theodorejb @davidparsson @gmoothart @lukas-zech-software @Engineer2B @cyungmann @Roaders
 /types/jasmine-ajax/                                @lgrignon
 /types/jasmine-data-provider/                       @tlaziuk
 /types/jasmine-data_driven_tests/                   @AnthonyMacKinnon
@@ -1991,7 +2057,7 @@
 /types/jasminewd2/                                  @sjelin @gkalpak
 /types/java/                                        @jimlloyd @hrl7 @darti
 /types/java-applet/                                 @cyrilschumacher
-/types/javascript-astar/                            @ptlis
+/types/javascript-astar/                            @ptlis @lazerwalker
 /types/javascript-bignum/                           @sandersn
 /types/javascript-obfuscator/                       @sanex3339
 /types/javascript-state-machine/                    @borisyankov @mdocter @MrBigDog2U @samael65535 @taoqf
@@ -2021,10 +2087,11 @@
 /types/jexl/                                        @m-tomczyk
 /types/jfs/                                         @tlaziuk
 /types/jira-client/                                 @KOPTE3 @orta
+/types/jju/                                         @ecraig12345 @rlidwka
 /types/jjv/                                         @Nemo157
 /types/jjve/                                        @Nemo157
 /types/jmespath/                                    @pushplay
-/types/johnny-five/                                 @nakakura @ujvzolee @workshop2
+/types/johnny-five/                                 @nakakura @ujvzolee @workshop2 @xtrimsystems
 /types/joi/v6/                                      @Bartvds @laurence-myers @cglantschnig @DavidBR-SW
 /types/joi/v10/                                     @Bartvds @laurence-myers @cglantschnig @DavidBR-SW @GaelMagnan @ralekna @schfkt @rokoroku @aconanlai
 /types/joi/v13/                                     @Bartvds @laurence-myers @cglantschnig @DavidBR-SW @GaelMagnan @ralekna @schfkt @rokoroku @dankraus @wanganjun @rafaelkallis @aconanlai @zaphoyd @thewillg @SimonSchick
@@ -2173,7 +2240,7 @@
 /types/js-sha512/                                   @nicojs
 /types/js-string-escape/                            @viralpickaxe
 /types/js-to-java/                                  @skyitachi
-/types/js-url/                                      @pine613
+/types/js-url/                                      @pine
 /types/js-yaml/                                     @Bartvds @sclausen
 /types/js.spec/                                     @mattbishop
 /types/jsbn/                                        @Evgenus @al2xed
@@ -2201,6 +2268,7 @@
 /types/json-rpc-random-id/                          @micahriggan
 /types/json-rpc-ws/                                 @npenin @mlamp
 /types/json-schema/                                 @bcherny @cyrilletuzi @lucianbuzzo @rolandjitsu
+/types/json-server/                                 @jeremyben
 /types/json-socket/                                 @svi3c
 /types/json-stable-stringify/                       @mhfrantz
 /types/json-stringify-safe/                         @BendingBender
@@ -2208,6 +2276,7 @@
 /types/json2md/                                     @MartynasZilinskas
 /types/json3/                                       @NN---
 /types/json5/                                       @Esemesek
+/types/json_ml/                                     @pluma
 /types/jsonata/                                     @nick121212
 /types/jsoneditor/                                  @alejo90 @errietta
 /types/jsoneditor-for-react/                        @joshuakgoldberg
@@ -2225,7 +2294,7 @@
 /types/jsonwebtoken/                                @SomaticIT @danielheim @brikou @vpk @rlgod
 /types/jsonwebtoken-promisified/                    @SomaticIT @danielheim @brikou @aneilbaboo
 /types/jspath/                                      @dex4er
-/types/jspdf/                                       @amberjs
+/types/jspdf/                                       @amberjs @lleios @jemerald
 /types/jsqrcode/                                    @lordazzi
 /types/jsrender/                                    @zakki
 /types/jsreport-core/                               @taoqf
@@ -2253,6 +2322,7 @@
 /types/jui-grid/                                    @easylogic
 /types/just-debounce-it/                            @azizhk
 /types/just-extend/                                 @pe8ter
+/types/just-pick/                                   @pe8ter
 /types/jweixin/                                     @taoqf @gomydodo
 /types/jwplayer/                                    @martinduparc @kutomer @philippguertler @danielmcgraw @bpdsw
 /types/jws/                                         @JustinBeckwith
@@ -2268,7 +2338,7 @@
 /types/karma/                                       @tkrotoff @43081j @devoto13
 /types/karma-chai/                                  @JayAndCatchFire
 /types/karma-chai-sinon/                            @vasek17
-/types/karma-coverage/                              @tkrotoff
+/types/karma-coverage/                              @tkrotoff @devoto13
 /types/karma-fixture/                               @evictor @afshawnlotfi
 /types/karma-jasmine/                               @michelsalib
 /types/karma-viewport/                              @karak
@@ -2276,9 +2346,11 @@
 /types/katex/                                       @mrand01
 /types/kcors/                                       @Xstoudi @izayoiko
 /types/kdbush/                                      @DenisCarriere @chrfrasco
+/types/kdbxweb/                                     @Roang-zero1
 /types/keen-tracking/                               @rui-ferreira
 /types/kefir/                                       @AyaMorisawa @HitoriSensei
 /types/kendo-ui/                                    @telerik
+/types/kerberos/                                    @velezsarain
 /types/keyboardjs/                                  @vbortone @piranha771 @teoxoy
 /types/keycloak-connect/                            @gstamac
 /types/keygrip/                                     @jkeylu
@@ -2293,10 +2365,10 @@
 /types/klaw/                                        @mceachen
 /types/klaw-sync/                                   @shiftkey
 /types/kms-json/                                    @sunnyone
-/types/knex/                                        @tkQubo @MeLlamoPablo @mastermatt @micksatana @shreyjain1994
+/types/knex/                                        @tkQubo @MeLlamoPablo @mastermatt @micksatana @shreyjain1994 @joelshepherd
 /types/knex-postgis/                                @vesse
 /types/knockback/                                   @borisyankov
-/types/knockout/                                    @borisyankov @Igorbek @moonpyk @EnableSoftware @BenjaminEckardt @ffMathy @ltlombardi
+/types/knockout/                                    @borisyankov @Igorbek @moonpyk @EnableSoftware @BenjaminEckardt @ffMathy @ltlombardi @Retsam
 /types/knockout-amd-helpers/                        @DavidSichau
 /types/knockout-secure-binding/                     @pine613
 /types/knockout-transformations/                    @johnnyreilly @Nemo157
@@ -2317,7 +2389,8 @@
 /types/koa/                                         @DavidCai1993 @jkeylu @brikou
 /types/koa-basic-auth/                              @Tobias4872
 /types/koa-better-body/                             @danwbyrne
-/types/koa-bodyparser/                              @hellopao @anup-2s
+/types/koa-bodyparser/                              @hellopao @anup-2s @hirochachacha
+/types/koa-bouncer/                                 @maruware
 /types/koa-bunyan-logger/                           @sjmcdowall
 /types/koa-cache-control/                           @pe8ter
 /types/koa-compose/                                 @jkeylu
@@ -2332,9 +2405,10 @@
 /types/koa-hbs/                                     @jcbmln @mudkipme
 /types/koa-helmet/                                  @me
 /types/koa-html-minifier/                           @romain-faust
-/types/koa-joi-router/                              @wingsbob @move-zig
+/types/koa-joi-router/                              @wingsbob @move-zig @hirochachacha
 /types/koa-json/                                    @brooklyndev
 /types/koa-json-error/                              @mudkipme
+/types/koa-log/                                     @havenchyk
 /types/koa-logger/                                  @geoffreak @tlaziuk
 /types/koa-logger-winston/                          @stevehipwell
 /types/koa-morgan/                                  @vesse
@@ -2343,14 +2417,16 @@
 /types/koa-passport/                                @horiuchi @tlaziuk @brendtumi
 /types/koa-pino-logger/                             @khell
 /types/koa-pug/                                     @Xstoudi
+/types/koa-qs/                                      @RemyJeancolas
 /types/koa-range/                                   @strax
 /types/koa-ratelimit/                               @OutdatedVersion
+/types/koa-ratelimit-lru/                           @danwbyrne
 /types/koa-redis/                                   @nsimmons
 /types/koa-redis-cache/                             @dimamukhin
 /types/koa-requestid/                               @sjmcdowall
 /types/koa-response-time/                           @thorsedeke @sjmcdowall
 /types/koa-route/                                   @migstopheles @jacogr
-/types/koa-router/                                  @hellopao @schfkt @JounQin @romain-faust
+/types/koa-router/                                  @hellopao @schfkt @JounQin @romain-faust @Guillaume-Mayer @falinor
 /types/koa-send/                                    @pe8ter @tlaziuk
 /types/koa-session/                                 @kerol2r20 @tlaziuk
 /types/koa-session-minimal/                         @longztian
@@ -2358,6 +2434,7 @@
 /types/koa-static/                                  @hellopao @tlaziuk
 /types/koa-static-cache/                            @JounQin
 /types/koa-static-server/                           @wulunyi
+/types/koa-useragent/                               @rvboris
 /types/koa-views/                                   @brooklyndev
 /types/koa-webpack/                                 @malj @leebenson @miZyind @tlaziuk
 /types/koa-websocket/                               @moimael @jacogr @zdila @Kroisse
@@ -2387,6 +2464,7 @@
 /types/lazy-value/                                  @ikatyang
 /types/lazy.js/                                     @Bartvds @miso440
 /types/lazypipe/                                    @tomc974
+/types/ldap-filters/                                @pluma
 /types/ldapjs/                                      @cvillemure @peterkooijmans
 /types/leadfoot/                                    @theintern
 /types/leaflet/v0/                                  @rgripper
@@ -2441,6 +2519,7 @@
 /types/libxmljs/                                    @fdecampredon @ComFreek
 /types/libxslt/                                     @alejo90
 /types/license-checker/                             @rogierschouten @unindented
+/types/liftoff/                                     @BendingBender
 /types/lil-uuid/                                    @Pr1st0n
 /types/lime-js/                                     @arthur-xavier
 /types/line-by-line/                                @etomsen
@@ -2450,6 +2529,8 @@
 /types/lingui__macro/                               @huan086
 /types/lingui__react/                               @huan086
 /types/linkify-it/                                  @praxxis
+/types/linkifyjs/                                   @szhu
+/types/list-stream/                                 @IanStorm
 /types/listr/                                       @durad
 /types/lls/                                         @borislavjivkov
 /types/load-json-file/                              @SamVerschueren
@@ -2767,6 +2848,7 @@
 /types/lokijs/                                      @TeamworkGuy2 @thomasconner
 /types/lolex/                                       @Nemo157 @joshuakgoldberg @rogierschouten
 /types/long/                                        @peterkooijmans
+/types/looks-same/                                  @xcatliu
 /types/loopback/                                    @kattsushi @enko @sequoia @drmikecrowe @karimsa
 /types/loopback-boot/                               @kattsushi
 /types/lorem-ipsum/                                 @durad
@@ -2778,12 +2860,12 @@
 /types/lozad/                                       @plantain-00
 /types/lru-cache/                                   @Bartvds @BendingBender
 /types/lscache/                                     @Chris-Martinezz
-/types/ltx/                                         @PJakcson
+/types/ltx/                                         @PJakcson @BendingBender
 /types/luaparse/                                    @stpettersens
 /types/lunr/v0/                                     @sebastian-lenz
 /types/lunr/                                        @seantanly
 /types/lusca/                                       @crutchcorn
-/types/luxon/                                       @colbydehart @FourwingsY @jsiebern
+/types/luxon/                                       @colbydehart @FourwingsY @jsiebern @mastermatt
 /types/lwip/                                        @AyaMorisawa
 /types/lz-string/                                   @M0ns1gn0r
 /types/lzma-native/                                 @leshow
@@ -2793,19 +2875,21 @@
 /types/mailcheck/                                   @pocesar
 /types/maildev/                                     @cyrilschumacher @zbarbuto
 /types/mailgen/                                     @vothanhkiet @jordanfarrer
-/types/mailgun-js/                                  @sampsonjoliver
+/types/mailgun-js/                                  @sampsonjoliver @andipaetzold
 /types/mailparser/                                  @psnider
 /types/main-bower-files/                            @k-kagurazaka
 /types/make-dir/                                    @ikatyang @BendingBender
 /types/maker.js/                                    @danmarshall
 /types/makeup-expander/                             @darkwebdev
 /types/makeup-floating-label/                       @darkwebdev
+/types/makeup-keyboard-trap/                        @darkwebdev
+/types/makeup-prevent-scroll-keys/                  @darkwebdev
 /types/makeup-screenreader-trap/                    @darkwebdev
 /types/mali-compose/                                @danwbyrne
 /types/mali-onerror/                                @danwbyrne
 /types/mandrill-api/                                @pocesar
 /types/map-obj/                                     @BendingBender
-/types/mapbox/                                      @anahkiasen
+/types/mapbox/                                      @anahkiasen @Fluccioni
 /types/mapbox-gl/                                   @dobrud @patrickr
 /types/mapbox-gl-leaflet/                           @agorshkov23
 /types/mapbox__geo-viewport/                        @fnberta
@@ -2822,7 +2906,7 @@
 /types/markdown-it-lazy-headers/                    @knom
 /types/markdown-pdf/                                @MonsieurMan
 /types/markdownlint/                                @ark120202
-/types/marked/                                      @worr @BendingBender @CrossR
+/types/marked/                                      @worr @BendingBender @CrossR @mwickett
 /types/marker-animate-unobtrusive/                  @viskin
 /types/markerclustererplus/                         @enanox @mxl
 /types/markitup/                                    @drillbits
@@ -2868,12 +2952,13 @@
 /types/materialize-css/                             @huww98 @MaximBalaganskiy @MonizDave @broccoliarchy
 /types/math3d/                                      @laszlojakab @jimsmart
 /types/mathjax/                                     @rolandzwaga
-/types/mathjs/                                      @siavol @andnp @bradbesserman
+/types/mathjs/                                      @siavol @andnp @bradbesserman @pawkrol
 /types/matter-js/                                   @piranha771 @hasparus
-/types/maxmind/                                     @geoffreak
+/types/mcrypt/                                      @pluma
 /types/mcustomscrollbar/                            @flurg
 /types/md5/                                         @arcdev1 @jprogrammer
 /types/md5-file/                                    @BamButz
+/types/mdast/                                       @lujun2
 /types/mdns/                                        @reppners
 /types/mdurl/                                       @rokt33r
 /types/media-typer/                                 @BendingBender
@@ -2892,6 +2977,7 @@
 /types/memwatch-next/                               @cyrilschumacher
 /types/meow/                                        @KnisterPeter @praxxis @bitjson
 /types/merge-descriptors/                           @danny8002
+/types/merge-env/                                   @BendingBender
 /types/merge-stream/                                @k-kagurazaka @tomxtobin @daniel-zazula @djcsdy
 /types/merge2/                                      @tkrotoff @smac89
 /types/merkle/                                      @kerol2r20
@@ -2945,12 +3031,12 @@
 /types/mixpanel/                                    @hjellek @Manduro
 /types/mixto/                                       @vvakame
 /types/mjml/                                        @aahoughton @marpstar
+/types/mjml-react/                                  @henrinormak
 /types/mkdirp/                                      @Bartvds @mrmlnc
 /types/mkdirp-promise/                              @pluma
 /types/mkpath/                                      @optical
 /types/ml-levenberg-marquardt/                      @m93a
 /types/mobx-apollo/                                 @pselden
-/types/mobx-cookie/                                 @t49tran
 /types/mobx-devtools-mst/                           @pluma
 /types/mocha/                                       @kazimanzurrashid @otiai10 @jt000 @enlight @cspotcode @1999
 /types/mocha-each/                                  @magnostherobot
@@ -2964,6 +3050,7 @@
 /types/mock-require/                                @gDelgado14
 /types/mockdate/                                    @brunolm
 /types/mockery/                                     @jt000
+/types/mockingoose/                                 @hirochachacha
 /types/modernizr/                                   @borisyankov @theodorejb @leonyu @lucax88x @nhardy
 /types/modesl/                                      @neeschit
 /types/module-alias/                                @KevinRamharak
@@ -2982,7 +3069,7 @@
 /types/money-math/                                  @taoqf
 /types/mongo-sanitize/                              @CedricCazin
 /types/mongodb/v2/                                  @CaselIT @alanmarcell @bitjson @dante-101 @mcortesi
-/types/mongodb/                                     @CaselIT @alanmarcell @bitjson @dante-101 @mcortesi @EnricoPicci @AJCStriker @julien-c @daprahamian @denys-bushulyak @BastienAr @sindbach @geraldinelemeur @jishi @various89 @angela-1 @lirbank @hector7 @floric
+/types/mongodb/                                     @CaselIT @alanmarcell @bitjson @dante-101 @mcortesi @EnricoPicci @AJCStriker @julien-c @daprahamian @denys-bushulyak @BastienAr @sindbach @geraldinelemeur @jishi @various89 @angela-1 @lirbank @hector7 @floric @erikc5000
 /types/mongodb-memory-server/                       @dmitryrogozhny
 /types/mongodb-uri/                                 @mernxl
 /types/mongoose/v4/                                 @simonxca @horiuchi @sindrenm @lukasz-zak
@@ -3040,6 +3127,7 @@
 /types/murmurhash3js/                               @dlee-nvisia
 /types/musicmetadata/                               @Xstoudi
 /types/mustache/                                    @markashleybell @manuth
+/types/mustache-express/                            @BendingBender
 /types/mutexify/                                    @maistho
 /types/mv/                                          @nenadalm
 /types/mysql/                                       @wjohnsto @kacepe @kpping @jdmunro
@@ -3078,6 +3166,8 @@
 /types/nes/                                         @NoHomey @saboya
 /types/nested-error-stacks/                         @woutervh-
 /types/net-keepalive/                               @hertzg
+/types/netease-captcha/                             @norubidium
+/types/netlify-identity-widget/                     @nkprince007
 /types/netmask/                                     @mhfrantz
 /types/network-interfaces/                          @anderswestberg
 /types/new-relic-browser/                           @renehamburger @piotrkubisa
@@ -3112,7 +3202,8 @@
 /types/ngtoaster/                                   @btesser
 /types/ngwysiwyg/                                   @patrick-mackay
 /types/nightmare/                                   @horiuchi @samyang-au @Bleser92
-/types/nightwatch/                                  @rkavalap @schlesiger
+/types/nightwatch/                                  @rkavalap @schlesiger @ClaytonAstrom
+/types/nise/                                        @a-tarasyuk
 /types/nivo-slider/                                 @AndersonFriaca
 /types/noble/                                       @swook @shantanubhadoria @lukel99 @bioball @keton @thegecko
 /types/nock/                                        @bonnici @horiuchi @afharo @mastermatt @damour @paambaati
@@ -3123,7 +3214,7 @@
 /types/node/v7/                                     @Microsoft @DefinitelyTyped @parambirs @tellnes @WilcoBakker @eps1lon @KSXGitHub @Archcry
 /types/node/v8/                                     @Microsoft @DefinitelyTyped @parambirs @tellnes @WilcoBakker @octo-sniffle @smac89 @Flarna @mwiktorczyk @wwwy3y3 @DeividasBakanas @kjin @alvis @eps1lon @Hannes-Magnusson-CK @jkomyno @hoo29 @n-e @brunoscheufler @KSXGitHub @islishude @r3nya
 /types/node/v9/                                     @Microsoft @DefinitelyTyped @parambirs @tellnes @WilcoBakker @octo-sniffle @smac89 @Flarna @mwiktorczyk @wwwy3y3 @DeividasBakanas @kjin @alvis @eps1lon @Hannes-Magnusson-CK @jkomyno @ajafff @hoo29 @n-e @brunoscheufler @mohsen1 @KSXGitHub @a-tarasyuk @islishude @r3nya @eyqs
-/types/node/                                        @Microsoft @DefinitelyTyped @jkomyno @a-tarasyuk @alvis @r3nya @brunoscheufler @smac89 @tellnes @DeividasBakanas @eyqs @Flarna @Hannes-Magnusson-CK @KSXGitHub @hoo29 @kjin @ajafff @islishude @mwiktorczyk @matthieusieben @mohsen1 @n-e @octo-sniffle @parambirs @eps1lon @SimonSchick @ThomasdenH @WilcoBakker @wwwy3y3 @ZaneHannanAU @jeremiergz
+/types/node/                                        @Microsoft @DefinitelyTyped @jkomyno @a-tarasyuk @alvis @r3nya @brunoscheufler @smac89 @tellnes @DeividasBakanas @eyqs @Flarna @Hannes-Magnusson-CK @KSXGitHub @hoo29 @kjin @ajafff @islishude @mwiktorczyk @matthieusieben @mohsen1 @n-e @octo-sniffle @parambirs @eps1lon @SimonSchick @ThomasdenH @WilcoBakker @wwwy3y3 @ZaneHannanAU @jeremiergz @samuela
 /types/node-7z/                                     @erkie
 /types/node-array-ext/                              @Beng89
 /types/node-cache/                                  @chrootsu @dthunell @useltmann
@@ -3137,7 +3228,7 @@
 /types/node-emoji/                                  @jonestristand @styu
 /types/node-fetch/                                  @torstenwerner @nikcorg
 /types/node-fibers/                                 @caryhaynie
-/types/node-forge/                                  @westy92 @flynetworks @a-k-g @rafal2228 @beenotung @joeflateau
+/types/node-forge/                                  @westy92 @flynetworks @a-k-g @rafal2228 @beenotung @joeflateau @Apologiz @timhwang21
 /types/node-gcm/                                    @horiuchi
 /types/node-geocoder/                               @rosek86
 /types/node-getopt/                                 @kcauchy
@@ -3212,7 +3303,7 @@
 /types/ns-api/                                      @Archcry
 /types/nslog/                                       @unindented
 /types/nsqjs/                                       @cezaryrk
-/types/nuka-carousel/                               @Romic @altaudio
+/types/nuka-carousel/                               @Romic @altaudio @matt-sungwook
 /types/number-is-nan/                               @mhegazy
 /types/number-to-words/                             @frederickfogerty
 /types/numeral/                                     @vbortone @BehindTheMath @klujanrosas
@@ -3226,8 +3317,9 @@
 /types/nwmatcher/                                   @woutervh-
 /types/o.js/                                        @IceOnFire @bradzacher @janhommes @jcchalte
 /types/oauth/                                       @nonAlgebraic @EduardoAC
+/types/oauth-shim/                                  @BendingBender
 /types/oauth.js/                                    @nobuoka
-/types/oauth2-server/                               @vangorra @cirick @d-fischer
+/types/oauth2-server/                               @vangorra @cirick @d-fischer @rvitorsantos
 /types/oauth2orize/                                 @wokim @heycalmdown @stevehipwell
 /types/obelisk.js/                                  @bdrupieski
 /types/obj-file-parser/                             @benc-uk
@@ -3248,6 +3340,7 @@
 /types/observe-js/                                  @herrmanno
 /types/oclazyload/                                  @rolandzwaga
 /types/odata/                                       @janhommes @jcchalte
+/types/oembed-parser/                               @BendingBender
 /types/ofe/                                         @Morfent
 /types/office-js/                                   @OfficeDev @LanceEA @Zlatkovsky @kbrandl @Rick-Kirkham @AlexJerabek @ElizabethSamuel-MSFT
 /types/office-runtime/                              @Zlatkovsky @mscharlock
@@ -3271,17 +3364,18 @@
 /types/opener/                                      @tikurahul
 /types/openfin/v17/                                 @chrisbarker
 /types/openfin/v29/                                 @chrisbarker @rdepena
-/types/openfin/                                     @chrisbarker @rdepena @whyn07m3
+/types/openfin/v34/                                 @chrisbarker @rdepena @whyn07m3
+/types/openfin/                                     @chrisbarker @rdepena @whyn07m3 @licui3936
 /types/openjscad/                                   @danmarshall
 /types/openlayers/v2/                               @bolhovsky
 /types/openlayers/v3/                               @osechet @matthiasdailey-ccri
 /types/openlayers/                                  @osechet @wb14123 @ailrun @mylen @iamthechad @danmana @yairtawil @pierremarc @hauke96 @gberaudo
-/types/openpgp/                                     @errietta @damonpam
+/types/openpgp/                                     @errietta @damonpam @po5i
 /types/openstack-wrapper/                           @sanjaymadane
 /types/opentok/                                     @westy92 @CatGuardian
 /types/opentype.js/                                 @danmarshall @edzis
 /types/opn/                                         @shinnn @SomaticIT @tlent
-/types/opossum/                                     @quinnlangille @lance
+/types/opossum/                                     @quinnlangille @merufm @lance
 /types/optics-agent/                                @crevil
 /types/optimist/                                    @soywiz @chbrown
 /types/optimize-css-assets-webpack-plugin/          @odnamrataizem
@@ -3310,7 +3404,7 @@
 /types/p-cancelable/                                @BendingBender
 /types/p-catch-if/                                  @LinusU
 /types/p-debounce/                                  @BendingBender
-/types/p-defer/                                     @SamVerschueren
+/types/p-defer/                                     @SamVerschueren @BendingBender
 /types/p-do-whilst/                                 @BendingBender
 /types/p-each-series/                               @BendingBender
 /types/p-event/                                     @BendingBender
@@ -3326,6 +3420,7 @@
 /types/p-one/                                       @BendingBender
 /types/p-progress/                                  @icopp
 /types/p-props/                                     @BendingBender
+/types/p-queue/v2/                                  @BendingBender @evanshortiss
 /types/p-queue/                                     @BendingBender @evanshortiss
 /types/p-reduce/                                    @BendingBender
 /types/p-reflect/                                   @BendingBender
@@ -3337,6 +3432,7 @@
 /types/p-throttle/                                  @BendingBender
 /types/p-timeout/                                   @BendingBender
 /types/p-try/                                       @BendingBender @LinusU
+/types/p-wait-for/v1/                               @BendingBender
 /types/p-wait-for/                                  @BendingBender
 /types/p-whilst/                                    @BendingBender
 /types/p2/                                          @clark-stevenson
@@ -3358,7 +3454,8 @@
 /types/parity-pmd/                                  @leovujanic @jewbre
 /types/parity-pmr/                                  @leovujanic
 /types/parity-poe/                                  @leovujanic
-/types/parse/                                       @dpoetzsch @jaeggerr @flavionegrao @wesleygrimes @owsas
+/types/parse/v1/                                    @dpoetzsch @jaeggerr @flavionegrao @wesleygrimes @owsas
+/types/parse/                                       @dpoetzsch @jaeggerr @flavionegrao @wesleygrimes @owsas @agoldis
 /types/parse-git-config/                            @leonard-thieu @deltaidea
 /types/parse-github-url/                            @ajafff
 /types/parse-glob/                                  @glen-84
@@ -3382,9 +3479,10 @@
 /types/parsimmon/                                   @Bartvds @mizunashi-mana @bcherny @bvanreeven @leonard-thieu @MrJohz
 /types/passport/                                    @horiuchi @enaeseth @theigor @tlaziuk @danielpa9708
 /types/passport-anonymous/                          @0x6368656174
-/types/passport-auth0/                              @johnbendi @iamvishnusankar
+/types/passport-auth0/                              @johnbendi @iamvishnusankar @duncanhall
 /types/passport-azure-ad/                           @ShekharNain
 /types/passport-beam/                               @AtlasDev
+/types/passport-bnet/                               @ivan94
 /types/passport-cognito/                            @mbutsykin
 /types/passport-discord/                            @kzay
 /types/passport-facebook/                           @staticfunction @lucasmacosta
@@ -3403,7 +3501,7 @@
 /types/passport-oauth2/                             @pasieronen @WangZishi @EduardoAC
 /types/passport-oauth2-client-password/             @akaNightmare
 /types/passport-remember-me-extended/               @AylaJK
-/types/passport-saml/                               @cjbarth @dassennato
+/types/passport-saml/                               @cjbarth @dassennato @ksamborski
 /types/passport-steam/                              @kzay
 /types/passport-strategy/                           @liorm
 /types/passport-twitter/                            @staticfunction
@@ -3425,6 +3523,7 @@
 /types/paypal-rest-sdk/                             @trainerbill
 /types/pbf/                                         @cschwarz
 /types/pbkdf2/                                      @timonegk
+/types/pdf2image/                                   @taoqf
 /types/pdfjs-dist/                                  @jbaldwin
 /types/pdfkit/                                      @erichillah
 /types/pdfmake/                                     @m1llen1um @radziksh @evolkmann
@@ -3467,13 +3566,13 @@
 /types/picturefill/                                 @alaz
 /types/pidusage/                                    @cyrilschumacher @mx601595686
 /types/pify/                                        @samverschueren @mad-mike @c7hm4r
-/types/pigpio/                                      @manerfan
+/types/pigpio/                                      @manerfan @erikma
 /types/pigpio-dht/                                  @erikma
 /types/pikaday/                                     @MidnightDesign @wake42 @mezoistvan
 /types/pikaday-time/                                @Sayan751
 /types/pinkyswear/                                  @chances
 /types/pino/v3/                                     @psnider
-/types/pino/                                        @psnider @BendingBender @screendriver @paambaati @alferpal
+/types/pino/                                        @psnider @BendingBender @screendriver @paambaati @alferpal @mortiy
 /types/pino-http/                                   @screendriver
 /types/pino-multi-stream/                           @JakeGinnivan
 /types/pinterest-sdk/                               @adamburmister
@@ -3483,6 +3582,7 @@
 /types/pixi.js/                                     @clark-stevenson
 /types/pkg-conf/                                    @jorgegonzalez
 /types/pkg-dir/                                     @NK-WEB-Git
+/types/pkg-up/                                      @forivall
 /types/pkijs/                                       @microshine
 /types/platform/                                    @JakeH
 /types/playcanvas/                                  @Neoflash1979
@@ -3503,6 +3603,12 @@
 /types/podcast/                                     @nikeee
 /types/podium/                                      @AJamesPhillips
 /types/point-in-polygon/                            @dyst5422 @kogai
+/types/pollyjs__adapter/                            @feinoujc
+/types/pollyjs__adapter-fetch/                      @feinoujc
+/types/pollyjs__core/                               @feinoujc
+/types/pollyjs__persister/                          @feinoujc
+/types/pollyjs__persister-fs/                       @feinoujc
+/types/pollyjs__utils/                              @feinoujc
 /types/polyfill-service/                            @Alorel
 /types/polylabel/                                   @DenisCarriere
 /types/polyline/                                    @Kern0
@@ -3513,7 +3619,11 @@
 /types/postal/                                      @lokeshpeta @myitcv
 /types/postcss-calc/                                @huan086
 /types/postcss-icss-values/                         @huan086
+/types/postcss-modules-extract-imports/             @huan086
+/types/postcss-modules-local-by-default/            @huan086
 /types/postcss-modules-resolve-imports/             @huan086
+/types/postcss-modules-scope/                       @huan086
+/types/postcss-url/                                 @lenovouser
 /types/postman-collection/                          @kbuzby
 /types/postmark/                                    @benbayard @jineshshah36
 /types/pouch-redux-middleware/                      @charrondev
@@ -3563,21 +3673,23 @@
 /types/promise-ftp/                                 @coolreader18
 /types/promise-ftp-common/                          @coolreader18
 /types/promise-map-limit/                           @kohlmannj
+/types/promise-memoize/                             @forivall
 /types/promise-pg/                                  @coldacid
-/types/promise-polyfill/                            @skysteve
+/types/promise-polyfill/                            @skysteve @djcsdy
 /types/promise-pool/                                @vilic
 /types/promise-queue/                               @LachlanStuart
 /types/promise-retry/                               @shirakaba
 /types/promise-sftp/                                @coolreader18
 /types/promise-timeout/                             @Aankhen
 /types/promise.prototype.finally/                   @slavik57 @BendingBender
+/types/promised-ldap/                               @pluma
 /types/promised-temp/                               @rokadias
 /types/promisify-node/                              @borekb
 /types/promisify-supertest/                         @aleung
 /types/prompt-sync/                                 @MugeSo
 /types/prompt-sync-history/                         @MugeSo
 /types/promptly/                                    @danrspencer
-/types/prompts/                                     @Berkays
+/types/prompts/                                     @Berkays @danielpa9708
 /types/prop-types/                                  @DovydasNavickas @ferdaber
 /types/proper-lockfile/                             @qlonik
 /types/properties-reader/                           @Goldsmith42
@@ -3610,12 +3722,13 @@
 /types/ptomasroos__react-native-multi-slider/       @Slessi
 /types/pty.js/                                      @enlight
 /types/public-ip/                                   @BendingBender
-/types/pubnub/                                      @bitbankinc @rollymaduk @vitosamson
+/types/pubnub/                                      @bitbankinc @rollymaduk @vitosamson @FlorianDr
 /types/pubsub-js/                                   @borisyankov
 /types/pug/                                         @TonyPythoneer @19majkel94
 /types/pulltorefreshjs/                             @DanielRosenwasser @humpedli
 /types/pump/                                        @tlaziuk
 /types/pumpify/                                     @JustinBeckwith @aoberoi
+/types/punycode/                                    @yavanosta
 /types/pupa/                                        @nju33
 /types/puppeteer/v0/                                @marvinhagemeister @cdeutsch
 /types/puppeteer/                                   @marvinhagemeister @cdeutsch @ksm2 @SimonSchick
@@ -3651,13 +3764,22 @@
 /types/qwest/                                       @lindsayevans
 /types/r-script/                                    @NaridaL
 /types/rabbit.js/                                   @wokim
+/types/rabbitmq-schema/                             @rulezzz1987
 /types/radium/                                      @alexgorbatchev @nupplaphil @asvetliakov
 /types/radius/                                      @codeanimal
+/types/radix64/                                     @huan086
 /types/ramda/                                       @donnut @tycho01 @mdekrey @mrdziuban @sbking @afharo @teves-castro @1M0reBug @hojberg @samsonkeung @angeloocana @raynerd @googol @moshensky @ethanresnick @leighman @CaptJakk @deftomat @deptno @blimusiek @biern @rayhaneh @rgm @drewwyatt
+/types/random-boolean/                              @BendingBender
+/types/random-float/                                @BendingBender
+/types/random-int/                                  @BendingBender
+/types/random-item/                                 @BendingBender
 /types/random-js/                                   @pistacchio
 /types/random-number/                               @OpenByteDev
+/types/random-obj-key/                              @BendingBender
+/types/random-obj-prop/                             @BendingBender
 /types/random-seed/                                 @endel
 /types/random-string/                               @stpettersens
+/types/randombytes/                                 @BendingBender
 /types/randomcolor/                                 @feitzi @BradyLiles
 /types/range-parser/                                @tlaziuk
 /types/rangyinputs/                                 @ersimont
@@ -3681,9 +3803,11 @@
 /types/raygun4js/                                   @xt0rted @BenjaminHarding @UberMouse
 /types/rbac-a/                                      @tlaziuk
 /types/rc/                                          @DanielRosenwasser
+/types/rc-progress/                                 @jussikinnula
 /types/rc-select/                                   @DenisTirilis
 /types/rc-slider/                                   @mantasmarcinkus @mattoni @paustint @j-fro @Deanna2
 /types/rc-time-picker/                              @Hoff97
+/types/rc-tooltip/                                  @rhysd @ahstro @vsaarinen
 /types/rc-tree/                                     @johnnyreilly @Methuselah96
 /types/rcloader/                                    @panuhorsmalahti
 /types/rdf-data-model/                              @rubensworks
@@ -3692,7 +3816,7 @@
 /types/re-base/                                     @jordandrako
 /types/reach__router/                               @kingdaro
 /types/react/v15/                                   @bbenezech @pzavolinsky @digiguru @ericanderson @tkrotoff @DovydasNavickas @onigoetz
-/types/react/                                       @johnnyreilly @bbenezech @pzavolinsky @digiguru @ericanderson @tkrotoff @DovydasNavickas @onigoetz @theruther4d @guilhermehubner @ferdaber @jrakotoharisoa @pascaloliv @hotell @franklixuefei
+/types/react/                                       @johnnyreilly @bbenezech @pzavolinsky @digiguru @ericanderson @tkrotoff @DovydasNavickas @onigoetz @theruther4d @guilhermehubner @ferdaber @jrakotoharisoa @pascaloliv @hotell @franklixuefei @Kovensky
 /types/react-adal/                                  @dkorolev1
 /types/react-albus/                                 @sseppola @conradreuter @kuirak
 /types/react-alert/v2/                              @ssyrell
@@ -3708,7 +3832,8 @@
 /types/react-avatar-editor/                         @diogocorrea @gabsprates
 /types/react-beautiful-dnd/                         @varHarrie @bradleyayers @paustint @marknelissen
 /types/react-better-password/                       @mhuynh1
-/types/react-big-calendar/                          @piotrwitek @paustint @pikpok @eps1lon @strongpauly
+/types/react-big-calendar/                          @piotrwitek @paustint @pikpok @eps1lon @strongpauly @janb87
+/types/react-blessed/                               @me
 /types/react-body-classname/                        @mhegazy
 /types/react-bootstrap/                             @walkerburgin @vsiao @danilojrr @Batbold-Gansukh @octatone @chengsieuly @mretolaza @katbusch @vitosamson @LKay @aaronbeall @jrakotoharisoa @r3nya @t49tran
 /types/react-bootstrap-date-picker/                 @LKay @ssi-hu-antal-bodnar
@@ -3720,6 +3845,7 @@
 /types/react-breadcrumbs-dynamic/                   @mitsuruog
 /types/react-broadcast/                             @kandros
 /types/react-burger-menu/                           @radziksh
+/types/react-cache/                                 @skovy
 /types/react-calendar-heatmap/                      @9renpoto
 /types/react-calendar-timeline/                     @radziksh @acemac
 /types/react-cartographer/                          @trevonmckay
@@ -3738,6 +3864,7 @@
 /types/react-countup/                               @danielbrodin
 /types/react-credit-cards/                          @vstrimaitis @olefrank
 /types/react-cropper/                               @stepancar
+/types/react-css-collapse/                          @dford07
 /types/react-css-modules/                           @KostyaEsmukov @skirsdeda
 /types/react-css-transition-replace/                @LKay
 /types/react-currency-formatter/                    @pastushenkoy @Jeka-Vasiliev
@@ -3748,7 +3875,7 @@
 /types/react-data-grid/                             @SupernaviX @KieranPeat @martinnov92 @baso53
 /types/react-datagrid/                              @stephenjelfs
 /types/react-date-range/                            @Junbong
-/types/react-datepicker/                            @radziksh @andrewBalekha @smrq @Rogach @royxue @KoalaHuman @seansfkelley
+/types/react-datepicker/                            @radziksh @andrewBalekha @smrq @Rogach @royxue @KoalaHuman @seansfkelley @justingrant @jakeboone02
 /types/react-daterange-picker/                      @uncovertruth @MartynasZilinskas @donaldtf @vladflorescu94
 /types/react-dates/                                 @ArturAmpilogov @NathanNZ
 /types/react-daum-postcode/                         @Sa-ryong
@@ -3775,7 +3902,7 @@
 /types/react-file-reader-input/                     @dmitryrogozhny @alitaheri
 /types/react-flag-icon-css/                         @jonfreedman
 /types/react-flags-select/                          @senukartur
-/types/react-flatpickr/                             @begincalendar
+/types/react-flatpickr/                             @begincalendar @snaveevans
 /types/react-flex/                                  @pushplay
 /types/react-flexr/                                 @pushplay
 /types/react-fontawesome/                           @timurrustamov @dublicator @vincaslt @gavingregory
@@ -3814,17 +3941,17 @@
 /types/react-infinite/                              @rhysd
 /types/react-infinite-calendar/                     @christianchown
 /types/react-infinite-scroll-component/             @sroy3 @burtek @davidkevork @JoshuaScript
-/types/react-infinite-scroller/                     @Lapanti @psrebniak @WrathZA
+/types/react-infinite-scroller/                     @Lapanti @psrebniak @WrathZA @daggerjames
 /types/react-input-autosize/                        @jsonunger @franklixuefei
 /types/react-input-calendar/                        @stepancar
 /types/react-input-mask/v1/                         @apare
 /types/react-input-mask/                            @apare @dima7a14
 /types/react-instantsearch/                         @gburgett @jpowell
-/types/react-instantsearch-core/                    @gburgett @jpowell
+/types/react-instantsearch-core/                    @gburgett @jpowell @davidfurlong
 /types/react-instantsearch-dom/                     @gburgett @jpowell
 /types/react-instantsearch-native/                  @gburgett @jpowell
 /types/react-intl/v1/                               @bgrieder
-/types/react-intl/                                  @bgrieder @cdroulers @gyzerok @tillwolff @LKay @bhouser @kristerkari @formatlos @lukyth
+/types/react-intl/                                  @bgrieder @cdroulers @gyzerok @tillwolff @LKay @bhouser @kristerkari @formatlos @lukyth @obedm503
 /types/react-intl-redux/                            @LKay
 /types/react-is/                                    @AviVahl @christianchown
 /types/react-is-deprecated/                         @seansfkelley
@@ -3838,6 +3965,7 @@
 /types/react-lazyload/                              @m0a
 /types/react-lazylog/                               @benjaminRomano
 /types/react-leaflet/                               @danzel @davschne @yuit
+/types/react-leaflet-markercluster/                 @Kimahriman
 /types/react-lifecycle-component/                   @pixelshaded
 /types/react-list/                                  @buptyyf @tomshen
 /types/react-loadable/                              @Kovensky @odensc @ianks @tlaziuk @iMobs
@@ -3865,16 +3993,18 @@
 /types/react-native-communications/                 @huhuanming @PaitoAnderson
 /types/react-native-custom-tabs/                    @philnova
 /types/react-native-datepicker/                     @jacobbaskin
-/types/react-native-dialog/                         @MrLuje
+/types/react-native-dialog/                         @MrLuje @stackbuilders @ibarrae
 /types/react-native-dialogflow/                     @jasonmerino
 /types/react-native-doc-viewer/                     @iRoachie
 /types/react-native-document-picker/                @plantain-00
+/types/react-native-draggable-flatlist/             @stackbuilders @ibarrae
 /types/react-native-drawer/                         @jnbt @suniahk
 /types/react-native-drawer-layout/                  @jmfirth
 /types/react-native-elevated-view/                  @fhelwanger
 /types/react-native-fabric/                         @josephroque
 /types/react-native-fbsdk/                          @ifiokjr
 /types/react-native-fetch-blob/                     @MNBuyskih
+/types/react-native-flip-card/                      @imjakechapman
 /types/react-native-fs/                             @pocesar @josephroque
 /types/react-native-google-signin/                  @j-fro @bm-software @christianchown @echentw
 /types/react-native-htmlview/                       @ifiokjr
@@ -3903,6 +4033,7 @@
 /types/react-native-referrer/                       @christianchown
 /types/react-native-restart/                        @christianchown
 /types/react-native-safari-view/                    @mrand01
+/types/react-native-safe-area/                      @pvinis
 /types/react-native-scaled-image/                   @Jaeger25
 /types/react-native-scrollable-tab-view/            @CaiHuan @egorshulga
 /types/react-native-sensor-manager/                 @SahinVardar
@@ -3927,7 +4058,7 @@
 /types/react-native-version-number/                 @VincentLanglet
 /types/react-native-video/                          @huhuanming
 /types/react-navigation/v1/                         @huhuanming @mhcgrq @fangpenlin @petejkim @iRoachie @phanalpha @charlesfamu @timwangdev @bang88 @svbutko @levito @YourGamesBeOver @ArmandoAssuncao @cliedeman @Slessi
-/types/react-navigation/                            @huhuanming @mhcgrq @fangpenlin @petejkim @iRoachie @phanalpha @charlesfamu @timwangdev @bang88 @svbutko @levito @YourGamesBeOver @ArmandoAssuncao @cliedeman @Slessi @magrinj @TizioFittizio @stigi @LinusU @jshosomichi @jakebooyah @brunoro @DenisFrezzato @mickaelw @maxdavidson @jkillian
+/types/react-navigation/                            @huhuanming @mhcgrq @fangpenlin @petejkim @iRoachie @phanalpha @charlesfamu @timwangdev @bang88 @svbutko @levito @YourGamesBeOver @ArmandoAssuncao @cliedeman @magrinj @TizioFittizio @stigi @LinusU @jshosomichi @jakebooyah @brunoro @DenisFrezzato @mickaelw @maxdavidson @alechill @builtbyproxy @jkillian @jeroenvervaeke @chagasaway
 /types/react-navigation-material-bottom-tabs/       @iRoachie
 /types/react-no-ssr/                                @rafalfilipek
 /types/react-notification-system/                   @GiedriusGrabauskas @DeividasBakanas @LKay @sztobar
@@ -3941,7 +4072,8 @@
 /types/react-overlays/                              @aaronbeall @vitosamson
 /types/react-owl-carousel/                          @tbounsiar @igorissen @KennethanCeyer
 /types/react-paginate/v4/                           @deevus @wouterhardeman @pegel03 @archy-bold
-/types/react-paginate/                              @deevus @wouterhardeman @pegel03 @archy-bold @yasupeke
+/types/react-paginate/v5/                           @deevus @wouterhardeman @pegel03 @archy-bold @yasupeke
+/types/react-paginate/                              @deevus @wouterhardeman @pegel03 @archy-bold @yasupeke @sugarshin
 /types/react-places-autocomplete/                   @guilhermehubner @r3nya
 /types/react-plotly.js/                             @jonfreedman
 /types/react-pointable/                             @istefo @mdibyo
@@ -3955,7 +4087,7 @@
 /types/react-recaptcha/                             @mhegazy @zzanol
 /types/react-reconciler/                            @Methuselah96
 /types/react-redux/v5/                              @tkqubo @thasner @kenzierocks @clayne11 @tansongyang @nicholasboll @mdibyo @pdeva
-/types/react-redux/                                 @tkqubo @kenzierocks @clayne11 @tansongyang @nicholasboll @mdibyo @pdeva @kallikrein @val1984 @jrakotoharisoa @apapirovski
+/types/react-redux/                                 @tkqubo @kenzierocks @clayne11 @tansongyang @nicholasboll @mdibyo @pdeva @kallikrein @val1984 @jrakotoharisoa @apapirovski @surgeboris
 /types/react-redux-epic/                            @forabi
 /types/react-redux-i18n/                            @clementdevos
 /types/react-redux-toastr/                          @Smiche @artyomsv @kulmajaba
@@ -3970,7 +4102,7 @@
 /types/react-router/v3/                             @sergey-buturlakin @mrk21 @vasek17 @ngbrown @awendland @KostyaEsmukov @johnnyreilly @LKay @DovydasNavickas @ssorallen @gillchristian @nulladdict
 /types/react-router/                                @sergey-buturlakin @mrk21 @vasek17 @ngbrown @awendland @KostyaEsmukov @johnnyreilly @LKay @DovydasNavickas @tkrotoff @huy-nguyen @grmiade @DaIgeb @egorshulga @neuoy @rraina @pret-a-porter @t49tran @8enSmith
 /types/react-router-bootstrap/                      @vlesierse @LKay @olmobrutall
-/types/react-router-config/                         @lith-light-g @johnnyreilly
+/types/react-router-config/                         @lith-light-g @johnnyreilly @NullMDR
 /types/react-router-dom/                            @tkrotoff @huy-nguyen @p-jackson @johnnyreilly
 /types/react-router-hash-link/                      @zoompie
 /types/react-router-native/                         @ezintz @fhelwanger
@@ -3989,7 +4121,7 @@
 /types/react-show-more/                             @naortor
 /types/react-side-effect/                           @remojansen @0xcaff
 /types/react-sidebar/                               @jeroenvervaeke
-/types/react-sketchapp/                             @ricokahler @DomiR
+/types/react-sketchapp/                             @ricokahler @DomiR @saschazar21
 /types/react-slick/                                 @andrewBalekha @GiedriusGrabauskas @r3nya
 /types/react-slider/                                @jsonunger
 /types/react-smooth-scrollbar/                      @asvetliakov
@@ -4000,12 +4132,13 @@
 /types/react-sparklines/                            @henrinormak
 /types/react-spinkit/v1/                            @tkqubo @mleko @pelotom
 /types/react-spinkit/                               @tkqubo @mleko @pelotom @zzanol
+/types/react-splitter-layout/                       @snaptags
 /types/react-star-rating-component/                 @marpstar
 /types/react-sticky/                                @curtisw0 @ajhyndman
 /types/react-sticky-box/                            @koss-lebedev
 /types/react-sticky-el/                             @jbraithwaite
 /types/react-stickynode/                            @tstirrat
-/types/react-stripe-elements/                       @dan-j @santiagodoldan @sonnysangha @9y5 @thchia
+/types/react-stripe-elements/                       @dan-j @santiagodoldan @sonnysangha @9y5 @thchia @yhnavein
 /types/react-svg-inline/                            @kiyopikko
 /types/react-svg-pan-zoom/                          @huy-nguyen
 /types/react-swf/                                   @stepancar
@@ -4013,7 +4146,7 @@
 /types/react-swipeable/                             @GiedriusGrabauskas @mctep @horiuchi
 /types/react-swipeable-views/                       @mxl @DeividasBakanas
 /types/react-syntax-highlighter/                    @NoHomey @ajgamble-milner
-/types/react-table/                                 @royxue @psakalo @Havret @andys8
+/types/react-table/                                 @royxue @psakalo @Havret @andys8 @Gelio
 /types/react-table-filter/                          @gjsln
 /types/react-tabs/                                  @danez @Equationist
 /types/react-tag-autocomplete/                      @jlismore
@@ -4043,9 +4176,9 @@
 /types/react-user-tour/                             @ccancellieri
 /types/react-vertical-timeline-component/           @stephane-monnot
 /types/react-virtual-keyboard/                      @bsurai
-/types/react-virtualized/                           @kaoDev @guntherjh @wasd171 @szabolcsx @kraenhansen @Stevearzh @mgoszcz2 @brandonhall
+/types/react-virtualized/                           @kaoDev @guntherjh @wasd171 @szabolcsx @kraenhansen @Stevearzh @mgoszcz2 @brandonhall @sbusch
 /types/react-virtualized-select/                    @seansfkelley
-/types/react-visibility-sensor/                     @JRasmusBm
+/types/react-visibility-sensor/                     @JRasmusBm @gcangussu
 /types/react-webcam/                                @squat
 /types/react-weui/                                  @tairan
 /types/react-widgets/                               @rogierschouten @sanyatuning @frodehansen2 @r3nya @MBillemaz @georg94
@@ -4068,14 +4201,15 @@
 /types/readline-sync/                               @jonestristand
 /types/readline-transform/                          @dex4er
 /types/reapop/                                      @Barrokgl
-/types/rebass/                                      @ryee-dev
+/types/rebass/                                      @ryee-dev @jamesmckenzie
 /types/rebass__grid/                                @antonvasin @vittorio @lhache @lavoaster
 /types/recaptcha2/                                  @l-jonas
 /types/recase/                                      @18steps
-/types/recharts/                                    @mthmulders @rapmue @royxue @ZheyangSong @richbai90 @caspeco-dan @pkeuter @jrsaunde @paulmelnikow @crusectrl @apalugniok
+/types/recharts/                                    @mthmulders @rapmue @royxue @ZheyangSong @richbai90 @caspeco-dan @pkeuter @jrsaunde @paulmelnikow @crusectrl @apalugniok @RobertStigsson
 /types/recharts-scale/                              @johnnyreilly
+/types/rechoir/                                     @BendingBender
 /types/recluster/                                   @dex4er
-/types/recompose/                                   @iskandersierra @mrapogee @clayne11 @Pajn @lucasterra @brian-lives-outdoors
+/types/recompose/                                   @iskandersierra @clayne11 @Pajn @lucasterra @brian-lives-outdoors @TiuSh
 /types/reconnect-core/                              @thw0rted
 /types/reconnectingwebsocket/                       @nguarracino
 /types/recorder-js/                                 @higuri
@@ -4084,7 +4218,7 @@
 /types/redis/                                       @soywiz @CodeAnimal @MugeSo @UppaJung @Rokt33r @43081j @barnski @1pete
 /types/redis-errors/                                @43081j
 /types/redis-mock/                                  @BendingBender
-/types/redis-rate-limiter/                          @westy92
+/types/redis-rate-limiter/                          @westy92 @nodify-at
 /types/redis-scripto/                               @westy92
 /types/redlock/v2/                                  @chrootsu
 /types/redlock/                                     @chrootsu @BendingBender
@@ -4102,7 +4236,7 @@
 /types/redux-devtools-dock-monitor/                 @mc-petry
 /types/redux-devtools-log-monitor/                  @mc-petry
 /types/redux-doghouse/                              @BendingBender
-/types/redux-first-router/                          @Valbrand @viggyfresh @janb87 @corydeppen @jscinoz @surgeboris
+/types/redux-first-router/                          @Valbrand @viggyfresh @janb87 @corydeppen @jscinoz @surgeboris @geirsagberg
 /types/redux-first-router-link/                     @janb87
 /types/redux-first-router-restore-scroll/           @icopp
 /types/redux-first-routing/                         @tlaziuk
@@ -4111,7 +4245,7 @@
 /types/redux-form/                                  @carsonf @aikoven @LKay @bancek @alsiola @tehbi4 @huwmartin @ethanresnick @reggino @maddijoyce @smifun
 /types/redux-immutable/v3/                          @oizie @sebald @gavingregory
 /types/redux-immutable/                             @oizie @sebald @gavingregory @lukyth
-/types/redux-immutable-state-invariant/             @remojansen @highflying
+/types/redux-immutable-state-invariant/             @remojansen @highflying @mihai-dinculescu
 /types/redux-infinite-scroll/                       @silkyfray
 /types/redux-injectable-store/                      @unindented
 /types/redux-localstorage/                          @LKay
@@ -4129,7 +4263,8 @@
 /types/redux-promise-middleware/                    @ianks
 /types/redux-recycle/                               @LKay
 /types/redux-router/                                @stepancar
-/types/redux-saga-tester/                           @BenLorantfy
+/types/redux-saga-tester/                           @BenLorantfy @lawsumisu
+/types/redux-sentry-middleware/                     @dolezel
 /types/redux-shortcuts/                             @tstirrat
 /types/redux-socket.io/                             @snakeego
 /types/redux-storage/                               @asvetliakov
@@ -4212,8 +4347,10 @@
 /types/riot-route/                                  @karak
 /types/riotcontrol/                                 @chrootsu
 /types/riotjs/                                      @vvakame
+/types/ripemd160/                                   @BendingBender
 /types/rison/                                       @impworks
 /types/rivets/                                      @TrevorDev @matjanos
+/types/rmc-drawer/                                  @Hoff97
 /types/rmfr/                                        @pluma
 /types/roads/                                       @dancespiele
 /types/roads-server/                                @dancespiele
@@ -4221,8 +4358,9 @@
 /types/roll/                                        @icopp
 /types/rolling-rate-limiter/                        @l-jonas
 /types/rollup-plugin-json/                          @asmockler @hotell
+/types/roman-numerals/                              @pluma
 /types/ronomon__crypto-async/                       @BendingBender
-/types/rosie/                                       @abner @subvertallchris @abukurov
+/types/rosie/                                       @abner @subvertallchris @abukurov @adam187
 /types/roslib/                                      @Pro @skycoop @dgorobopec
 /types/rot-js/                                      @atiaxi
 /types/round-to/                                    @seangenabe
@@ -4278,11 +4416,18 @@
 /types/sanitize-filename/                           @Nemo157
 /types/sanitize-html/                               @rogierschouten @afshin @BehindTheMath @biermeester @WillGibson @sirMerr
 /types/sap__xsenv/                                  @mad-mike
+/types/sasl-anonymous/                              @BendingBender
+/types/saslmechanisms/                              @BendingBender
+/types/sass/                                        @lenovouser
 /types/sass-graph/                                  @marvinhagemeister
 /types/sass-webpack-plugin/                         @AepKill
 /types/sat/                                         @omni360
 /types/satnav/                                      @DotNetNerd
 /types/saywhen/                                     @SeanSobey
+/types/sc-auth/                                     @DanielRose
+/types/sc-broker/                                   @DanielRose
+/types/sc-broker-cluster/                           @DanielRose
+/types/sc-channel/                                  @DanielRose
 /types/scalike/                                     @ryoppy
 /types/schedule/                                    @Methuselah96
 /types/scheduler/                                   @Methuselah96
@@ -4367,7 +4512,9 @@
 /types/session-file-store/                          @blendsdk @rokt33r
 /types/set-cookie-parser/                           @nickp10
 /types/set-value/                                   @DanielRosenwasser
+/types/setasap/                                     @djcsdy
 /types/settings/                                    @shreyjain1994
+/types/sha.js/                                      @BendingBender
 /types/sha1/                                        @arcdev1
 /types/sha256/                                      @nhardy
 /types/shallow-equals/                              @rsolomon
@@ -4391,6 +4538,7 @@
 /types/shot/                                        @AJamesPhillips @SimonSchick
 /types/should-sinon/                                @Arylo
 /types/showdown/                                    @cbowdon @tan9 @arielsaldana
+/types/shpjs/                                       @littlebtc
 /types/shrink-ray/                                  @forabi
 /types/shuffle-seed/                                @LeartS
 /types/siema/                                       @Irmiz @0x6368656174 @samnau
@@ -4407,7 +4555,7 @@
 /types/simple-lru/                                  @NN---
 /types/simple-mock/                                 @leonyu
 /types/simple-oauth2/v1/                            @mad-mike @troy-lamerton @netux
-/types/simple-oauth2/                               @mad-mike @troy-lamerton @netux
+/types/simple-oauth2/                               @mad-mike @troy-lamerton @netux @LinusU
 /types/simple-peer/                                 @tlaziuk
 /types/simple-url-cache/                            @a-lucas
 /types/simple-websocket/                            @dex4er
@@ -4420,7 +4568,7 @@
 /types/sindresorhus__df/                            @whatknight
 /types/single-line-log/                             @ffflorian
 /types/single-spa-react/                            @Garrett-Smith-iq
-/types/sinon/                                       @mrbigdog2u @rationull @lumaxis @nicojs @43081j @joshuakgoldberg @gjednaszewski
+/types/sinon/                                       @mrbigdog2u @rationull @lumaxis @nicojs @43081j @joshuakgoldberg @gjednaszewski @johnjesse
 /types/sinon-as-promised/                           @igrayson
 /types/sinon-chai/v2/                               @kazimanzurrashid @jedmao
 /types/sinon-chai/                                  @kazimanzurrashid @jedmao @elpdpt
@@ -4437,7 +4585,7 @@
 /types/sjcl/                                        @Evgenus
 /types/skatejs/                                     @Hotell
 /types/ski/                                         @AyaMorisawa
-/types/skyway/                                      @nakakura
+/types/skyway/                                      @nakakura @izmhr
 /types/slack-mock/                                  @kkalavantavanich
 /types/slack-node/                                  @geoffreak
 /types/slack-winston/                               @BlueHatbRit
@@ -4448,18 +4596,21 @@
 /types/slate-html-serializer/                       @YangusKhan
 /types/slate-irc/                                   @elisee
 /types/slate-plain-serializer/                      @YangusKhan @mkiefel
-/types/slate-react/                                 @andykent @majelbstoat @JanLoebel @PatrickSachs @YangusKhan @isubasti @sgreav
+/types/slate-react/                                 @andykent @majelbstoat @JanLoebel @PatrickSachs @YangusKhan @isubasti @sgreav @Kornil
 /types/sleep/                                       @rajarz
+/types/slice-ansi/                                  @dwieeb
 /types/slickgrid/                                   @jbaldwin
 /types/slideout/                                    @ToastHawaii
 /types/slimerjs/                                    @alexwall
 /types/slocket/                                     @BendingBender
 /types/slug/                                        @mhegazy
 /types/smart-fox-server/                            @ChanceM
+/types/smooth-scroll/                               @andreiho
 /types/smoothscroll-polyfill/                       @kryops
 /types/smtp-server/v1/                              @markisme @Taisiias
 /types/smtp-server/                                 @markisme @Taisiias @dex4er
 /types/smtpapi/                                     @a-morales
+/types/snakecase-keys/                              @BendingBender
 /types/snappy/                                      @reconbot
 /types/snapsvg/                                     @lhk @mattanja @kant2002
 /types/snazzy-info-window/                          @milosd92
@@ -4474,6 +4625,9 @@
 /types/socket.io-parser/                            @plantain-00
 /types/socket.io-redis/                             @nupplaphil @seeLuck
 /types/socket.io.users/                             @kataras
+/types/socketcluster/                               @DanielRose
+/types/socketcluster-client/                        @DanielRose
+/types/socketcluster-server/                        @DanielRose
 /types/socketio-jwt/                                @ehallander9591
 /types/socketio-jwt-auth/                           @codeanimal
 /types/socketio-wildcard/                           @BendingBender
@@ -4485,6 +4639,7 @@
 /types/solution-center-communicator/                @dami-gg
 /types/sonic-boom/                                  @alferpal
 /types/sort-array/                                  @mrmlnc
+/types/sort-object-keys/                            @forivall
 /types/sortablejs/                                  @Maw-Fox @maartenstaa
 /types/soundmanager2/                               @elton2048
 /types/soupbintcp/                                  @jewbre
@@ -4502,7 +4657,7 @@
 /types/spdy/                                        @tony19
 /types/speakeasy/                                   @legendecas @mrOlorin @xeoneux
 /types/speakingurl/                                 @Goldsmith42
-/types/spectacle/                                   @zmaybury
+/types/spectacle/                                   @zmaybury @kale-stew
 /types/spectrum/                                    @M-Zuber @Ailrun
 /types/split/                                       @marcinporebski
 /types/split.js/                                    @icholy
@@ -4514,6 +4669,7 @@
 /types/sprintf/                                     @soywiz @BendingBender
 /types/sprintf-js/                                  @jasonswearingen @BendingBender @cdagli
 /types/sql-bricks/                                  @adn05 @paleo
+/types/sql-template/                                @q42jaap
 /types/sql.js/                                      @Hozuki
 /types/sqlanywhere/                                 @pkeuter
 /types/sqlite3/                                     @nmalaguti @dpyro @BehindTheMath
@@ -4521,8 +4677,8 @@
 /types/squirejs/                                    @bradleyayers
 /types/srp/                                         @Patman64
 /types/ssh-key-decrypt/                             @BendingBender
-/types/ssh2/                                        @tkQubo @rbuckton @wrboyce
-/types/ssh2-sftp-client/                            @igrayson @ascariandrea @kartik2406
+/types/ssh2/                                        @tkQubo @rbuckton @wrboyce @lucasmotta
+/types/ssh2-sftp-client/                            @igrayson @ascariandrea @kartik2406 @viamuli
 /types/ssh2-streams/                                @rbuckton
 /types/sshpk/                                       @mabels
 /types/stack-mapper/                                @rogierschouten
@@ -4552,9 +4708,9 @@
 /types/sticky-cluster/                              @paustint
 /types/stompit/                                     @DanielRose
 /types/stompjs/                                     @jimic @Dr4k4n
-/types/stoppable/                                   @EricByers
+/types/stoppable/                                   @EricByers @jplusje
 /types/storage-helper/                              @ajafff
-/types/store/                                       @vbortone @harry0000 @Ky6uk
+/types/store/                                       @vbortone @harry0000 @Ky6uk @igl00
 /types/storybook-addon-jsx/                         @jameslnewell
 /types/storybook-readme/                            @lonyele
 /types/storybook__addon-a11y/                       @hyunseob
@@ -4566,10 +4722,10 @@
 /types/storybook__addon-knobs/                      @joscha @martynaskadisa @amacleay
 /types/storybook__addon-links/                      @joscha @jessepinho
 /types/storybook__addon-notes/                      @joscha @amacleay
-/types/storybook__addon-options/                    @joscha @simonhn @amacleay
+/types/storybook__addon-options/                    @joscha @simonhn @amacleay @gaetanmaisse @adam187
 /types/storybook__addon-storyshots/                 @bradleyayers
-/types/storybook__react/                            @joscha @wapgear
-/types/storybook__react-native/                     @joscha @wapgear @alechill @iRoachie
+/types/storybook__react/                            @joscha @wapgear @dandean
+/types/storybook__react-native/                     @joscha @wapgear @alechill @iRoachie @ceyhuno
 /types/storybook__vue/                              @pntgupta
 /types/stream-array/                                @Tyler-Murphy
 /types/stream-buffers/                              @Jason3S
@@ -4584,6 +4740,7 @@
 /types/stream-to-array/v0/                          @Bartvds
 /types/stream-to-array/                             @Bartvds @BendingBender
 /types/stream-to-promise/                           @Alorel
+/types/stream-to-string/                            @BendingBender
 /types/streaming-json-stringify/                    @BendingBender
 /types/streamjs/                                    @erosb
 /types/streamtest/                                  @lummish
@@ -4606,7 +4763,7 @@
 /types/stripe-checkout/                             @cgwrench
 /types/stripe-v2/                                   @ejsmith @amritk @adamcmiel @jleider @galuszkak
 /types/stripe-v3/                                   @ejsmith @amritk @adamcmiel @jleider @galuszkak
-/types/stripejs/                                    @RobinvanTienhoven
+/types/stripejs/                                    @RobinvanTienhoven @mattferderer
 /types/strong-cluster-control/                      @shuntksh
 /types/strong-error-handler/                        @blankstar85
 /types/strong-log-transformer/                      @azasypkin
@@ -4614,7 +4771,7 @@
 /types/strophe.js/                                  @DavidKDeutsch
 /types/structured-source/                           @azu
 /types/styled-components/v3/                        @Igorbek @Igmat
-/types/styled-components/                           @Igorbek @Igmat @lavoaster
+/types/styled-components/                           @Igorbek @Igmat @lavoaster @Kovensky
 /types/styled-jsx/                                  @R1ZZU
 /types/styled-react-modal/                          @Lavoaster
 /types/styled-system/                               @maxdeviant @phobon @zephraph @damassi @alloy @maoueh @lavoaster @jschuler
@@ -4634,7 +4791,7 @@
 /types/sumo-logger/                                 @forabi @clementallen
 /types/suncalc/                                     @horiuchi
 /types/superagent/v2/                               @varju @NicoZelaya @mxl
-/types/superagent/                                  @NicoZelaya @mxl @paplorinc @shreyjain1994 @zopf @beeequeue
+/types/superagent/                                  @NicoZelaya @mxl @paplorinc @shreyjain1994 @zopf @beeequeue @lukaselmer
 /types/superagent-bunyan/                           @bricka
 /types/superagent-no-cache/                         @mxl
 /types/superagent-prefix/                           @mxl
@@ -4658,7 +4815,7 @@
 /types/sw-precache/                                 @JounQin
 /types/sw-precache-webpack-plugin/                  @JounQin
 /types/swag/                                        @shiwano
-/types/swagger-express-middleware/                  @alexandreroba
+/types/swagger-express-middleware/                  @alexandreroba @tromgy
 /types/swagger-express-mw/                          @micmro
 /types/swagger-express-validator/                   @pinguet62
 /types/swagger-hapi/                                @micmro
@@ -4690,8 +4847,9 @@
 /types/tabbable/                                    @mokkan
 /types/table/                                       @evanshortiss @mrmlnc
 /types/tableau/                                     @protip
+/types/tableify/                                    @forivall
 /types/tabris-plugin-firebase/                      @eclipsesource
-/types/tabtab/                                      @vojtechhabarta
+/types/tabtab/                                      @vojtechhabarta @kamontat
 /types/tabulator/                                   @euginio
 /types/tail/                                        @spacejack
 /types/tapable/v0/                                  @e-cloud
@@ -4721,7 +4879,7 @@
 /types/tether-drop/                                 @adidahiya
 /types/tether-shepherd/                             @mtgibbs
 /types/text-buffer/                                 @GlenCFL
-/types/text-encoding/                               @pine613 @mohsen1 @nwmqpa
+/types/text-encoding/                               @pine @mohsen1 @nwmqpa
 /types/text-encoding-utf-8/                         @trxcllnt
 /types/text-table/                                  @saadq
 /types/textarea-caret/                              @shiftkey
@@ -4732,7 +4890,8 @@
 /types/theming/                                     @eps1lon
 /types/theo/                                        @petekp
 /types/thepiratebay/                                @jsorrell
-/types/three/                                       @gyohk @florentpoujol @SereznoKot @omni360 @ivoisbelongtous @piranha771 @qszhusightp @nakakura @s093294 @Pro @efokschaner @PsychoSTS @dhritzkiv @apurvaojas @NotWoods @sethk @elk941 @Methuselah96 @Dukuo @JulianSSS @devilsparta
+/types/three/                                       @gyohk @florentpoujol @SereznoKot @omni360 @ivoisbelongtous @piranha771 @qszhusightp @nakakura @s093294 @Pro @efokschaner @PsychoSTS @dhritzkiv @apurvaojas @NotWoods @sethk @elk941 @Methuselah96 @Dukuo @JulianSSS @devilsparta @KonstantinLukaschenko
+/types/three-tds-loader/                            @KonstantinLukaschenko @sschoensee
 /types/thrift/                                      @kamek-pf @kevin-greene-ck @jessezhang91
 /types/throng/                                      @cyrilschumacher @tatethurston
 /types/throttle/                                    @BendingBender
@@ -4742,6 +4901,7 @@
 /types/through2/                                    @Bartvds @jedmao @valotas @TeamworkGuy2 @Alorel
 /types/through2-concurrent/                         @Alorel
 /types/through2-map/                                @LucasHill
+/types/tildify/                                     @BendingBender
 /types/tile-reduce/                                 @DenisCarriere
 /types/tilebelt/                                    @DenisCarriere
 /types/time-span/                                   @BendingBender @mdvorscak
@@ -4749,6 +4909,8 @@
 /types/timelinejs3/                                 @MikeMatusz
 /types/timer-machine/                               @dolanmiu
 /types/timezone-js/                                 @bonnici
+/types/timing-safe-equal/                           @BendingBender
+/types/timsort/                                     @Vunovati
 /types/tinajs__tina/                                @Jimexist
 /types/tinajs__tina-redux/                          @Jimexist
 /types/tinder/                                      @pingec
@@ -4773,7 +4935,7 @@
 /types/toastr/                                      @borisyankov
 /types/tocktimer/                                   @evanshortiss
 /types/tokgen/                                      @l-jonas
-/types/toobusy-js/                                  @atd-schubert
+/types/toobusy-js/                                  @atd-schubert @BendingBender
 /types/tooltipster/                                 @stephenlautier @pjmagee @VorobeY1326 @leonard-thieu @janhi @joeskeen
 /types/topojson/                                    @ricardo-mello @chenzhutian @denisname
 /types/topojson-client/                             @denisname @ricardo-mello
@@ -4787,7 +4949,7 @@
 /types/tough-cookie/                                @leonard-thieu @LiJinyao @no2chem
 /types/tough-cookie-filestore/                      @friedow
 /types/traceback/                                   @misak113
-/types/tracking/                                    @pimterry
+/types/tracking/                                    @pimterry @bratter
 /types/transducers-js/                              @colinkahn @dphilipson @NaridaL
 /types/transducers.js/                              @dphilipson
 /types/transliteration/                             @tony19
@@ -4806,13 +4968,14 @@
 /types/tspromise/                                   @soywiz
 /types/ttf2woff2/                                   @ThomasdenH
 /types/tunnel/                                      @BendingBender
-/types/tus-js-client/                               @kevhiggins
+/types/tus-js-client/                               @kevhiggins @Acconut
 /types/tv4/                                         @Bartvds @psnider
 /types/tween.js/                                    @Amos47 @sunetos @jzarnikov @alexburner
 /types/tweenjs/                                     @evilangelist @jcyuan
 /types/tweezer.js/                                  @praxxis
 /types/twig/                                        @soywiz @enko
 /types/twilio/                                      @nickiannone @ashleybrener
+/types/twilio-common/                               @gatimus
 /types/twilio-video/                                @minddocdev @darioblanco
 /types/twit/                                        @Volox @sapphiredev @abraham @siwalikm @plhery
 /types/twitch-ext/                                  @beheh
@@ -4857,7 +5020,9 @@
 /types/uniqid/                                      @idchlife
 /types/unique-hash-stream/                          @BendingBender
 /types/unique-random/                               @Kuniwak
-/types/unist/                                       @bizen241
+/types/unique-random-array/                         @BendingBender
+/types/unist/                                       @bizen241 @lujun2 @hrajchert @wooorm @rokt33r
+/types/unist-util-is/                               @rokt33r
 /types/unity-webapi/                                @jmvrbanac
 /types/universal-analytics/                         @Bartvds @DarkerTV
 /types/universal-cookie/                            @tomi
@@ -4905,6 +5070,7 @@
 /types/uuid-validate/                               @HiromiShikata
 /types/uws/                                         @plantain-00 @orblazer
 /types/v-chart-plugin/                              @natemara
+/types/v8flags/                                     @BendingBender
 /types/valdr/                                       @ilbertz
 /types/valdr-message/                               @ilbertz
 /types/valerie/                                     @conficient
@@ -4920,7 +5086,6 @@
 /types/vast-client/                                 @jgainfort
 /types/vec3/                                        @xstoudi
 /types/vectorious/                                  @erikgerrits
-/types/vega/                                        @pelotom
 /types/velocity-animate/                            @smrq
 /types/verror/                                      @svi3c @max4t
 /types/vertx3-eventbus-client/                      @oddeirik
@@ -4928,7 +5093,8 @@
 /types/vexdb/                                       @MayorMonty
 /types/vexflow/                                     @rquiring @sebastianhaas @bohoffi @sschmidTU
 /types/vfile/                                       @bizen241 @rokt33r
-/types/vfile-location/                              @ikatyang
+/types/vfile-location/                              @ikatyang @rokt33r
+/types/vfile-message/                               @rokt33r
 /types/victory/                                     @asvetliakov @snerks @Havret @alredyExist
 /types/video.js/                                    @vbortone @scleriot @SWBennett06 @IgelCampus @giofreitas @gjanblaszczyk @sroucheray @AkxeOne @meikidd
 /types/viewability-helper/                          @lironzluf
@@ -4944,7 +5110,7 @@
 /types/vinyl-paths/                                 @tkQubo
 /types/virtual-dom/                                 @chbrown
 /types/virtual-keyboard/                            @bsurai
-/types/vis/                                         @MichaelBitard @macleodbroad-wf @adripanico @seveves @kaktus40 @mmaitre314 @supercargo @takato1314 @alex-kachura @dcop @avrahamcool
+/types/vis/                                         @MichaelBitard @macleodbroad-wf @adripanico @seveves @kaktus40 @mmaitre314 @supercargo @takato1314 @alex-kachura @dcop @avrahamcool @divideby
 /types/vision/v4/                                   @jasonswearingen @AJamesPhillips
 /types/vision/                                      @jasonswearingen @AJamesPhillips @lenovouser
 /types/vitalsigns/                                  @cyrilschumacher
@@ -4963,7 +5129,8 @@
 /types/vue-scrollto/                                @vincekovacs
 /types/vue-select/                                  @silh
 /types/vue2-datepicker/                             @ChristianStornowski
-/types/vuex-i18n/                                   @jaeggerr @noamkfir
+/types/vuelidate/                                   @janesser
+/types/vuex-i18n/                                   @jaeggerr @noamkfir @barahliush
 /types/w2ui/                                        @Ptival
 /types/w3c-generic-sensor/                          @kenchris
 /types/w3c-image-capture/                           @cosium
@@ -4984,17 +5151,19 @@
 /types/watson-developer-cloud/                      @waldo000000 @Naktibalda
 /types/wavesurfer.js/                               @higuri
 /types/waypoints/                                   @dominikbulaj @Koloto @evil-shrike
+/types/wcag-contrast/                               @plantain-00
 /types/wcwidth/                                     @rokt33r
 /types/weak/                                        @int0h
 /types/weapp-api/                                   @vargeek
 /types/web-animations-js/                           @kritollm
 /types/web-bluetooth/                               @urish
 /types/web-push/                                    @paullessing
+/types/web-resource-inliner/                        @BendingBender
 /types/web3/                                        @simon-jentzsch @nitzantomer @zurbo @yxliang01 @phra @naddison36 @icaroharry @linusnorton @jpeletier @anneau @matrushka @andrevmatos @levino @zlumer @archangel-irk @sogasg @donamk @dkent600 @nerddan
 /types/web3-eth-abi/                                @LogvinovLeon
 /types/web3-provider-engine/                        @LogvinovLeon
 /types/webappsec-credential-management/             @iainmcgin
-/types/webassembly-js-api/                          @periklis
+/types/webassembly-js-api/                          @periklis @chicoxyzzy
 /types/webassembly-web-api/                         @jhenninger
 /types/webcl/                                       @NCARalph
 /types/webcomponents.js/                            @adidahiya
@@ -5061,6 +5230,7 @@
 /types/wicg-mediasession/                           @jucrouzet
 /types/wif/                                         @danwbyrne
 /types/wiiu/                                        @mzsm
+/types/wikidata-sdk/                                @kamontat
 /types/window-or-global/                            @vvakame
 /types/window-size/                                 @pmkary
 /types/windows-1251/                                @RomanGolovanov
@@ -5113,7 +5283,8 @@
 /types/xmldom/                                      @tkqubo
 /types/xmlpoke/                                     @garthk
 /types/xmltojson/                                   @traviscrowe
-/types/xmpp__jid/                                   @PJakcson
+/types/xmpp__jid/                                   @PJakcson @BendingBender
+/types/xmpp__xml/                                   @BendingBender
 /types/xregexp/                                     @Bartvds @jfahrenkrug @sigo
 /types/xrm/v7/                                      @daryllabar
 /types/xrm/v8/                                      @6ix4our @mattngan @markusmauch @daryllabar @clownwilleatme @mariusagur
@@ -5137,7 +5308,8 @@
 /types/yayson/                                      @Codesleuth
 /types/yazl/                                        @taoqf @seangenabe
 /types/ydn-db/                                      @yathit @gabrielmaldi
-/types/yeoman-generator/                            @armorik83 @janslow @ikatyang
+/types/yeoman-assert/                               @Toilal
+/types/yeoman-generator/                            @armorik83 @janslow @ikatyang @tasadar2
 /types/yeoman-test/                                 @ikatyang
 /types/yesql/                                       @Sumolari
 /types/yoctodelay/                                  @seangenabe
@@ -5146,10 +5318,10 @@
 /types/yog2-kernel/                                 @ssddi456
 /types/yoga-layout/                                 @tnobody
 /types/yosay/                                       @armorik83
-/types/youtube/                                     @DazWilkin @JoshuaKGoldberg @eliotfallon213 @terrymun
+/types/youtube/                                     @DazWilkin @JoshuaKGoldberg @eliotfallon213 @terrymun @paulhobbel
 /types/youtube-dl/                                  @bsurai
 /types/yui/                                         @giabao
-/types/yup/                                         @dhardtke @vtserman @MoretonBayRC @sseppola @YashdalfTheGray
+/types/yup/                                         @dhardtke @vtserman @MoretonBayRC @sseppola @YashdalfTheGray @vincentjames501
 /types/z-schema/                                    @pgonzal
 /types/zapier-platform-core/                        @bradleyayers
 /types/zeit__next-typescript/                       @icopp
@@ -5172,5 +5344,6 @@
 /types/zmq/                                         @davemckeown
 /types/zookeeper/                                   @xialeistudio
 /types/zopflipng-bin/                               @hikoma
+/types/zrender/                                     @iRON5
 /types/zui/                                         @yuanxu
 /types/zxcvbn/                                      @mtraynham

From 1c127d70abbfc157125f25cb5906a854ed1ec73b Mon Sep 17 00:00:00 2001
From: Dimitri Benin <dimitri.benin@gmail.com>
Date: Fri, 7 Dec 2018 22:47:12 +0100
Subject: [PATCH 769/836] Add types for escape-goat

---
 types/escape-goat/escape-goat-tests.ts | 14 ++++++++++++++
 types/escape-goat/index.d.ts           |  9 +++++++++
 types/escape-goat/tsconfig.json        | 23 +++++++++++++++++++++++
 types/escape-goat/tslint.json          |  1 +
 4 files changed, 47 insertions(+)
 create mode 100644 types/escape-goat/escape-goat-tests.ts
 create mode 100644 types/escape-goat/index.d.ts
 create mode 100644 types/escape-goat/tsconfig.json
 create mode 100644 types/escape-goat/tslint.json

diff --git a/types/escape-goat/escape-goat-tests.ts b/types/escape-goat/escape-goat-tests.ts
new file mode 100644
index 0000000000..cfc1808495
--- /dev/null
+++ b/types/escape-goat/escape-goat-tests.ts
@@ -0,0 +1,14 @@
+import * as escapeGoat from 'escape-goat';
+
+// $ExpectType string
+escapeGoat.escape('🦄 & 🐐');
+
+// $ExpectType string
+escapeGoat.unescape('🦄 &amp; 🐐');
+
+// $ExpectType string
+escapeGoat.escape('Hello <em>World</em>');
+
+const url = 'https://sindresorhus.com?x="🦄"';
+// $ExpectType string
+escapeGoat.escapeTag`<a href="${url}">Unicorn</a>`;
diff --git a/types/escape-goat/index.d.ts b/types/escape-goat/index.d.ts
new file mode 100644
index 0000000000..f76f384fb0
--- /dev/null
+++ b/types/escape-goat/index.d.ts
@@ -0,0 +1,9 @@
+// Type definitions for escape-goat 1.3
+// Project: https://github.com/sindresorhus/escape-goat#readme
+// Definitions by: BendingBender <https://github.com/BendingBender>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export function escape(input: string): string;
+export function unescape(input: string): string;
+export function escapeTag(template: TemplateStringsArray, ...substitutions: any[]): string;
+export function unescapeTag(template: TemplateStringsArray, ...substitutions: any[]): string;
diff --git a/types/escape-goat/tsconfig.json b/types/escape-goat/tsconfig.json
new file mode 100644
index 0000000000..9715cb59e1
--- /dev/null
+++ b/types/escape-goat/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "escape-goat-tests.ts"
+    ]
+}
diff --git a/types/escape-goat/tslint.json b/types/escape-goat/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/escape-goat/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 78e24e6d88712405552da177c36032ece6d6be1e Mon Sep 17 00:00:00 2001
From: Andrew Branch <andrewbranch@users.noreply.github.com>
Date: Fri, 7 Dec 2018 13:47:53 -0800
Subject: [PATCH 770/836] [prop-types] Make ValidationMap not require a
 validator for every member (#31133)

* Make ValidationMap not require a validator for every member of the props interface

* Fix InferProps when there are no required keys
---
 types/prop-types/index.d.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/types/prop-types/index.d.ts b/types/prop-types/index.d.ts
index 3b0a1164d6..b6918d9d44 100644
--- a/types/prop-types/index.d.ts
+++ b/types/prop-types/index.d.ts
@@ -41,12 +41,12 @@ export interface Requireable<T> extends Validator<T | undefined | null> {
     isRequired: Validator<NonNullable<T>>;
 }
 
-export type ValidationMap<T> = { [K in keyof T]-?: Validator<T[K]> };
+export type ValidationMap<T> = { [K in keyof T]?: Validator<T[K]> };
 
 export type InferType<V> = V extends Validator<infer T> ? T : any;
 export type InferProps<V> =
-    & InferPropsInner<Pick<V, RequiredKeys<V>>>
-    & Partial<InferPropsInner<Pick<V, OptionalKeys<V>>>>;
+    & (RequiredKeys<V> extends undefined ? {} : InferPropsInner<Pick<V, RequiredKeys<V>>>)
+    & (OptionalKeys<V> extends undefined ? {} : Partial<InferPropsInner<Pick<V, OptionalKeys<V>>>>);
 
 export const any: Requireable<any>;
 export const array: Requireable<any[]>;

From fb9f925aa964a546e1f50d3623938a17670c7207 Mon Sep 17 00:00:00 2001
From: Dimitri Benin <dimitri.benin@gmail.com>
Date: Fri, 7 Dec 2018 22:57:51 +0100
Subject: [PATCH 771/836] Add types for bin-version

---
 types/bin-version/bin-version-tests.ts |  6 ++++++
 types/bin-version/index.d.ts           | 14 ++++++++++++++
 types/bin-version/tsconfig.json        | 23 +++++++++++++++++++++++
 types/bin-version/tslint.json          |  1 +
 4 files changed, 44 insertions(+)
 create mode 100644 types/bin-version/bin-version-tests.ts
 create mode 100644 types/bin-version/index.d.ts
 create mode 100644 types/bin-version/tsconfig.json
 create mode 100644 types/bin-version/tslint.json

diff --git a/types/bin-version/bin-version-tests.ts b/types/bin-version/bin-version-tests.ts
new file mode 100644
index 0000000000..7decda3e66
--- /dev/null
+++ b/types/bin-version/bin-version-tests.ts
@@ -0,0 +1,6 @@
+import binVersion = require('bin-version');
+
+// $ExpectType Promise<string>
+binVersion('curl');
+// $ExpectType Promise<string>
+binVersion('openssl', { args: ['version'] });
diff --git a/types/bin-version/index.d.ts b/types/bin-version/index.d.ts
new file mode 100644
index 0000000000..3db592bec7
--- /dev/null
+++ b/types/bin-version/index.d.ts
@@ -0,0 +1,14 @@
+// Type definitions for bin-version 3.0
+// Project: https://github.com/sindresorhus/bin-version#readme
+// Definitions by: BendingBender <https://github.com/BendingBender>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export = binVersion;
+
+declare function binVersion(binary: string, options?: binVersion.Options): Promise<string>;
+
+declare namespace binVersion {
+    interface Options {
+        args?: string[];
+    }
+}
diff --git a/types/bin-version/tsconfig.json b/types/bin-version/tsconfig.json
new file mode 100644
index 0000000000..e89af3fdb8
--- /dev/null
+++ b/types/bin-version/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "bin-version-tests.ts"
+    ]
+}
diff --git a/types/bin-version/tslint.json b/types/bin-version/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/bin-version/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From dbe4ab140d0156f81e839a3721f6fea6d7878c0c Mon Sep 17 00:00:00 2001
From: Dimitri Benin <dimitri.benin@gmail.com>
Date: Fri, 7 Dec 2018 23:39:39 +0100
Subject: [PATCH 772/836] Add types for @sindresorhus/class-names

---
 types/sindresorhus__class-names/index.d.ts    |  8 ++++++
 .../sindresorhus__class-names-tests.ts        | 25 +++++++++++++++++
 types/sindresorhus__class-names/tsconfig.json | 28 +++++++++++++++++++
 types/sindresorhus__class-names/tslint.json   |  1 +
 4 files changed, 62 insertions(+)
 create mode 100644 types/sindresorhus__class-names/index.d.ts
 create mode 100644 types/sindresorhus__class-names/sindresorhus__class-names-tests.ts
 create mode 100644 types/sindresorhus__class-names/tsconfig.json
 create mode 100644 types/sindresorhus__class-names/tslint.json

diff --git a/types/sindresorhus__class-names/index.d.ts b/types/sindresorhus__class-names/index.d.ts
new file mode 100644
index 0000000000..fbb81c48c6
--- /dev/null
+++ b/types/sindresorhus__class-names/index.d.ts
@@ -0,0 +1,8 @@
+// Type definitions for @sindresorhus/class-names 1.0
+// Project: https://github.com/sindresorhus/class-names
+// Definitions by: BendingBender <https://github.com/BendingBender>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export = classNames;
+
+declare function classNames(...input: any[]): string;
diff --git a/types/sindresorhus__class-names/sindresorhus__class-names-tests.ts b/types/sindresorhus__class-names/sindresorhus__class-names-tests.ts
new file mode 100644
index 0000000000..d8627cb705
--- /dev/null
+++ b/types/sindresorhus__class-names/sindresorhus__class-names-tests.ts
@@ -0,0 +1,25 @@
+import classNames = require('@sindresorhus/class-names');
+
+// $ExpectType string
+classNames('unicorn', 'rainbow');
+// $ExpectType string
+classNames({ awesome: true, foo: false }, 'unicorn', { rainbow: false });
+// $ExpectType string
+classNames('unicorn', null, undefined, 0, 1, { foo: null });
+
+const buttonType = 'main';
+// $ExpectType string
+classNames({ [`button-${buttonType}`]: true });
+
+const props = {
+    type: 'success',
+    small: true,
+    block: undefined,
+};
+
+// $ExpectType string
+classNames('button', {
+    [`button-${props.type}`]: props.type,
+    'button-block': props.block,
+    'button-small': props.small,
+});
diff --git a/types/sindresorhus__class-names/tsconfig.json b/types/sindresorhus__class-names/tsconfig.json
new file mode 100644
index 0000000000..a0b866ebdf
--- /dev/null
+++ b/types/sindresorhus__class-names/tsconfig.json
@@ -0,0 +1,28 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "paths": {
+            "@sindresorhus/class-names": [
+                "sindresorhus__class-names"
+            ]
+        },
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "sindresorhus__class-names-tests.ts"
+    ]
+}
diff --git a/types/sindresorhus__class-names/tslint.json b/types/sindresorhus__class-names/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/sindresorhus__class-names/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 8bfd76757eddd4e10958478e011ed949ecba7d16 Mon Sep 17 00:00:00 2001
From: Dimitri Benin <dimitri.benin@gmail.com>
Date: Fri, 7 Dec 2018 23:52:35 +0100
Subject: [PATCH 773/836] Add types for humanize-url

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

diff --git a/types/humanize-url/humanize-url-tests.ts b/types/humanize-url/humanize-url-tests.ts
new file mode 100644
index 0000000000..7556cfb1c4
--- /dev/null
+++ b/types/humanize-url/humanize-url-tests.ts
@@ -0,0 +1,4 @@
+import humanizeUrl = require('humanize-url');
+
+// $ExpectType string
+humanizeUrl('https://www.sindresorhus.com/');
diff --git a/types/humanize-url/index.d.ts b/types/humanize-url/index.d.ts
new file mode 100644
index 0000000000..c00f5c982f
--- /dev/null
+++ b/types/humanize-url/index.d.ts
@@ -0,0 +1,8 @@
+// Type definitions for humanize-url 2.0
+// Project: https://github.com/sindresorhus/humanize-url#readme
+// Definitions by: BendingBender <https://github.com/BendingBender>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export = humanizeUrl;
+
+declare function humanizeUrl(url: string): string;
diff --git a/types/humanize-url/tsconfig.json b/types/humanize-url/tsconfig.json
new file mode 100644
index 0000000000..dd9fec46b6
--- /dev/null
+++ b/types/humanize-url/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "humanize-url-tests.ts"
+    ]
+}
diff --git a/types/humanize-url/tslint.json b/types/humanize-url/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/humanize-url/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 948a00007eca26973add9d3b31ee7d95575e3341 Mon Sep 17 00:00:00 2001
From: Dimitri Benin <dimitri.benin@gmail.com>
Date: Sat, 8 Dec 2018 00:24:14 +0100
Subject: [PATCH 774/836] Add types for matcher

---
 types/matcher/index.d.ts       | 16 ++++++++++++++++
 types/matcher/matcher-tests.ts | 10 ++++++++++
 types/matcher/tsconfig.json    | 23 +++++++++++++++++++++++
 types/matcher/tslint.json      |  1 +
 4 files changed, 50 insertions(+)
 create mode 100644 types/matcher/index.d.ts
 create mode 100644 types/matcher/matcher-tests.ts
 create mode 100644 types/matcher/tsconfig.json
 create mode 100644 types/matcher/tslint.json

diff --git a/types/matcher/index.d.ts b/types/matcher/index.d.ts
new file mode 100644
index 0000000000..08e4e91f8f
--- /dev/null
+++ b/types/matcher/index.d.ts
@@ -0,0 +1,16 @@
+// Type definitions for matcher 1.1
+// Project: https://github.com/sindresorhus/matcher#readme
+// Definitions by: BendingBender <https://github.com/BendingBender>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export = matcher;
+
+declare function matcher(inputs: string[], patterns: string[], options?: matcher.Options): string[];
+
+declare namespace matcher {
+    function isMatch(input: string, pattern: string, options?: Options): boolean;
+
+    interface Options {
+        caseSensitive?: boolean;
+    }
+}
diff --git a/types/matcher/matcher-tests.ts b/types/matcher/matcher-tests.ts
new file mode 100644
index 0000000000..fbadf58e1e
--- /dev/null
+++ b/types/matcher/matcher-tests.ts
@@ -0,0 +1,10 @@
+import matcher = require('matcher');
+
+// $ExpectType string[]
+matcher(['foo', 'bar', 'moo'], ['*oo', '!foo']);
+matcher(['foo', 'bar', 'moo'], ['!*oo']);
+matcher(['foo', 'bar', 'moo'], ['!*oo'], { caseSensitive: true });
+
+// $ExpectType boolean
+matcher.isMatch('unicorn', 'uni*');
+matcher.isMatch('UNICORN', 'UNI*', { caseSensitive: true });
diff --git a/types/matcher/tsconfig.json b/types/matcher/tsconfig.json
new file mode 100644
index 0000000000..efa5f37200
--- /dev/null
+++ b/types/matcher/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "matcher-tests.ts"
+    ]
+}
diff --git a/types/matcher/tslint.json b/types/matcher/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/matcher/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From ec2874d4b8d43ed49da56ff303660fa242b614e2 Mon Sep 17 00:00:00 2001
From: runebaas <runebaas@gmail.com>
Date: Sat, 8 Dec 2018 01:19:16 +0100
Subject: [PATCH 775/836] [openapi-factory] set strictFunctionTypes to true and
 change import in example code

---
 types/openapi-factory/openapi-factory-tests.ts | 2 +-
 types/openapi-factory/tsconfig.json            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/types/openapi-factory/openapi-factory-tests.ts b/types/openapi-factory/openapi-factory-tests.ts
index ad24a5021d..8213104a44 100644
--- a/types/openapi-factory/openapi-factory-tests.ts
+++ b/types/openapi-factory/openapi-factory-tests.ts
@@ -1,4 +1,4 @@
-import * as OpenApiFactory from 'openapi-factory';
+import OpenApiFactory = require('openapi-factory');
 
 const api = new OpenApiFactory({});
 
diff --git a/types/openapi-factory/tsconfig.json b/types/openapi-factory/tsconfig.json
index e8528e8e84..e9035817a2 100644
--- a/types/openapi-factory/tsconfig.json
+++ b/types/openapi-factory/tsconfig.json
@@ -7,7 +7,7 @@
         "noImplicitAny": true,
         "noImplicitThis": true,
         "strictNullChecks": true,
-        "strictFunctionTypes": false,
+        "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [
             "../"

From 31e9d65a72f0f95b9884f4e058293025fcda2bf0 Mon Sep 17 00:00:00 2001
From: andreidigori <45198612+andreidigori@users.noreply.github.com>
Date: Sat, 8 Dec 2018 04:37:49 +0200
Subject: [PATCH 776/836] Update tsconfig.json

Set strictFunctionTypes to true
---
 types/gdal/tsconfig.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/gdal/tsconfig.json b/types/gdal/tsconfig.json
index 3a5bfaf917..5c11132a33 100644
--- a/types/gdal/tsconfig.json
+++ b/types/gdal/tsconfig.json
@@ -7,7 +7,7 @@
         "noImplicitAny": true,
         "noImplicitThis": true,
         "strictNullChecks": true,
-        "strictFunctionTypes": false,
+        "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [
             "../"

From 88174a627285886f0c1ad56dfd737454efa157b6 Mon Sep 17 00:00:00 2001
From: denis <denisname@users.noreply.github.com>
Date: Sat, 8 Dec 2018 15:31:04 +0100
Subject: [PATCH 777/836] Use JsDoc @deprecated

---
 types/d3-shape/index.d.ts | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/types/d3-shape/index.d.ts b/types/d3-shape/index.d.ts
index eccf7f1b80..0c0e27cbd7 100644
--- a/types/d3-shape/index.d.ts
+++ b/types/d3-shape/index.d.ts
@@ -38,7 +38,7 @@ export interface CanvasPath_D3Shape {
 // -----------------------------------------------------------------------------------
 
 /**
- * Interface corresponding to the minimum data type assumed by the accessor functions of  the Arc generator
+ * Interface corresponding to the minimum data type assumed by the accessor functions of the Arc generator
  */
 export interface DefaultArcObject {
     /**
@@ -994,14 +994,17 @@ export function lineRadial(): LineRadial<[number, number]>;
  */
 export function lineRadial<Datum>(): LineRadial<Datum>;
 
+/**
+ * @deprecated Use LineRadial<Datum>
+ */
 export type RadialLine<Datum> = LineRadial<Datum>;
 
 /**
- * DEPRECATED: Use lineRadial()
+ * @deprecated Use lineRadial()
  */
 export function radialLine(): RadialLine<[number, number]>;
 /**
- * DEPRECATED: Use lineRadial<Datum>()
+ * @deprecated Use lineRadial<Datum>()
  */
 export function radialLine<Datum>(): RadialLine<Datum>;
 
@@ -1620,16 +1623,16 @@ export function areaRadial(): AreaRadial<[number, number]>;
 export function areaRadial<Datum>(): AreaRadial<Datum>;
 
 /**
- * DEPRECATED: Use AreaRadial interface
+ * @deprecated Use AreaRadial interface
  */
 export type RadialArea<Datum> = AreaRadial<Datum>;
 
 /**
- * DEPRECATED: Use areaRadial()
+ * @deprecated Use areaRadial()
  */
 export function radialArea(): RadialArea<[number, number]>;
 /**
- * DEPRECATED: Use areaRadial<Datum>()
+ * @deprecated Use areaRadial<Datum>()
  */
 export function radialArea<Datum>(): RadialArea<Datum>;
 
@@ -2239,7 +2242,7 @@ export interface LinkRadial<This, LinkDatum, NodeDatum> {
 }
 
 /**
- * DEPRECATED: Use LinkRadial interface
+ * @deprecated Use LinkRadial interface
  */
 export type RadialLink<This, LinkDatum, NodeDatum> = LinkRadial<This, LinkDatum, NodeDatum>;
 

From 93e6117b3b8f1163e52594056218e6224693f73b Mon Sep 17 00:00:00 2001
From: Yutaka Nishimura <ytk.nishimura@gmail.com>
Date: Sun, 9 Dec 2018 01:50:33 +0900
Subject: [PATCH 778/836] update validator.isEmpty option

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

diff --git a/types/validator/index.d.ts b/types/validator/index.d.ts
index 1b51669d14..8ee398d850 100644
--- a/types/validator/index.d.ts
+++ b/types/validator/index.d.ts
@@ -83,7 +83,7 @@ declare namespace ValidatorJS {
     isEmail(str: string, options?: IsEmailOptions): boolean;
 
     // check if the string has a length of zero.
-    isEmpty(str: string): boolean;
+    isEmpty(str: string, options?: IsEmptyOptions): boolean;
 
     // check if the string is a fully qualified domain name (e.g. domain.com).
     isFQDN(str: string, options?: IsFQDNOptions): boolean;
@@ -310,6 +310,11 @@ declare namespace ValidatorJS {
     require_tld?: boolean;
   }
 
+  // options for isEmpty
+  interface IsEmptyOptions {
+    ignore_whitespace?: boolean;
+  }
+
   // options for isFQDN
   interface IsFQDNOptions {
     require_tld?: boolean;
diff --git a/types/validator/validator-tests.ts b/types/validator/validator-tests.ts
index 61c1c59e92..09a9a7ba17 100644
--- a/types/validator/validator-tests.ts
+++ b/types/validator/validator-tests.ts
@@ -425,7 +425,9 @@ let any: any;
   result = validator.isEmail('sample');
   result = validator.isEmail('sample', isEmailOptions);
 
+  let isEmptyOptions: ValidatorJS.IsEmptyOptions = {};
   result = validator.isEmpty('sample');
+  result = validator.isEmpty('sample', isEmptyOptions);
 
   let isFQDNOptions: ValidatorJS.IsFQDNOptions = {};
   result = validator.isFQDN('sample');

From cf2baee61a81f672275cfa7d43699a51ad82d7fc Mon Sep 17 00:00:00 2001
From: Leonard Thieu <leonard-thieu@users.noreply.github.com>
Date: Sun, 9 Dec 2018 03:53:44 -0500
Subject: [PATCH 779/836] [jquery] Add `originalEvent` property to
 `TriggeredEvent`. (#31189)

---
 types/jquery/jquery-tests.ts | 13 +++++++++++++
 types/jquery/misc.d.ts       |  1 +
 2 files changed, 14 insertions(+)

diff --git a/types/jquery/jquery-tests.ts b/types/jquery/jquery-tests.ts
index c533f1b235..b1f63f3ecf 100644
--- a/types/jquery/jquery-tests.ts
+++ b/types/jquery/jquery-tests.ts
@@ -4244,6 +4244,19 @@ function JQuery() {
                     event;
                 }
             });
+
+            // https://github.com/DefinitelyTyped/DefinitelyTyped/issues/31124
+            function issue_31124(el: Element, mouseX: number) {
+                $(el)
+                    .on("mousedown touchstart", (evt) => {
+                        // tslint:disable-next-line:prefer-conditional-expression
+                        if (evt.type === "mousedown") {
+                            mouseX = (evt.originalEvent as MouseEvent).clientX;
+                        } else {
+                            mouseX = (evt.originalEvent as TouchEvent).touches[0].clientX;
+                        }
+                    });
+            }
         }
 
         function one() {
diff --git a/types/jquery/misc.d.ts b/types/jquery/misc.d.ts
index 481b79e037..ebba2f7a31 100644
--- a/types/jquery/misc.d.ts
+++ b/types/jquery/misc.d.ts
@@ -4710,6 +4710,7 @@ $( "button" ).click(function( event ) {
 ```
          */
         namespace?: string;
+        originalEvent?: _Event;
         /**
          * The last value returned by an event handler that was triggered by this event, unless the value was undefined.
          * @see \`{@link https://api.jquery.com/event.result/ }\`

From ef8804d22c64195fecee77e1c4bf194be75c0516 Mon Sep 17 00:00:00 2001
From: Ilia Beliaev <ilia.beliaev@t-systems.com>
Date: Sun, 9 Dec 2018 21:47:10 +0300
Subject: [PATCH 780/836] Added old version.

---
 types/pretty-ms/v3.2/index.d.ts         | 19 +++++++++++++++
 types/pretty-ms/v3.2/pretty-ms-tests.ts | 10 ++++++++
 types/pretty-ms/v3.2/tsconfig.json      | 31 +++++++++++++++++++++++++
 types/pretty-ms/v3.2/tslint.json        |  1 +
 4 files changed, 61 insertions(+)
 create mode 100644 types/pretty-ms/v3.2/index.d.ts
 create mode 100644 types/pretty-ms/v3.2/pretty-ms-tests.ts
 create mode 100644 types/pretty-ms/v3.2/tsconfig.json
 create mode 100644 types/pretty-ms/v3.2/tslint.json

diff --git a/types/pretty-ms/v3.2/index.d.ts b/types/pretty-ms/v3.2/index.d.ts
new file mode 100644
index 0000000000..b1e151cd65
--- /dev/null
+++ b/types/pretty-ms/v3.2/index.d.ts
@@ -0,0 +1,19 @@
+// Type definitions for pretty-ms 3.2
+// Project: https://github.com/sindresorhus/pretty-ms#readme
+// Definitions by: BendingBender <https://github.com/BendingBender>
+//                 ocboogie <https://github.com/ocboogie>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export = prettyMs;
+
+declare function prettyMs(input: number, options?: prettyMs.PrettyMsOptions): string;
+
+declare namespace prettyMs {
+    interface PrettyMsOptions {
+        secDecimalDigits?: number;
+        msDecimalDigits?: number;
+        keepDecimalsOnWholeSeconds?: boolean;
+        compact?: boolean;
+        verbose?: boolean;
+    }
+}
diff --git a/types/pretty-ms/v3.2/pretty-ms-tests.ts b/types/pretty-ms/v3.2/pretty-ms-tests.ts
new file mode 100644
index 0000000000..ae5e8120b2
--- /dev/null
+++ b/types/pretty-ms/v3.2/pretty-ms-tests.ts
@@ -0,0 +1,10 @@
+import prettyMs = require('pretty-ms');
+
+let str: string;
+str = prettyMs(133);
+str = prettyMs(1337, {compact: true});
+str = prettyMs(1335669000, {verbose: true});
+str = prettyMs(1335669000, {keepDecimalsOnWholeSeconds: true});
+str = prettyMs(1335669000, {secDecimalDigits: 1});
+str = prettyMs(1335669000, {msDecimalDigits: 2});
+str = prettyMs(new Date(2014, 0, 1, 10, 40).getTime() - new Date(2014, 0, 1, 10, 5).getTime());
diff --git a/types/pretty-ms/v3.2/tsconfig.json b/types/pretty-ms/v3.2/tsconfig.json
new file mode 100644
index 0000000000..34da0f6d27
--- /dev/null
+++ b/types/pretty-ms/v3.2/tsconfig.json
@@ -0,0 +1,31 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../../",
+        "typeRoots": [
+            "../../"
+        ],
+        "paths": {
+            "pretty-ms": [
+                "pretty-ms/v3.2"
+            ],
+            "pretty-ms/*": [
+                "pretty-ms/v3.2/*"
+            ]
+        },
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "pretty-ms-tests.ts"
+    ]
+}
diff --git a/types/pretty-ms/v3.2/tslint.json b/types/pretty-ms/v3.2/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/pretty-ms/v3.2/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From b004a7fdd3bc327b8ed3b10ea736937c1abb9f3a Mon Sep 17 00:00:00 2001
From: Ilia Beliaev <ilia.beliaev@t-systems.com>
Date: Sun, 9 Dec 2018 22:34:18 +0300
Subject: [PATCH 781/836] Fixed folder naming.

---
 types/pretty-ms/{v3.2 => v3}/index.d.ts         | 0
 types/pretty-ms/{v3.2 => v3}/pretty-ms-tests.ts | 0
 types/pretty-ms/{v3.2 => v3}/tsconfig.json      | 5 +----
 types/pretty-ms/{v3.2 => v3}/tslint.json        | 0
 4 files changed, 1 insertion(+), 4 deletions(-)
 rename types/pretty-ms/{v3.2 => v3}/index.d.ts (100%)
 rename types/pretty-ms/{v3.2 => v3}/pretty-ms-tests.ts (100%)
 rename types/pretty-ms/{v3.2 => v3}/tsconfig.json (83%)
 rename types/pretty-ms/{v3.2 => v3}/tslint.json (100%)

diff --git a/types/pretty-ms/v3.2/index.d.ts b/types/pretty-ms/v3/index.d.ts
similarity index 100%
rename from types/pretty-ms/v3.2/index.d.ts
rename to types/pretty-ms/v3/index.d.ts
diff --git a/types/pretty-ms/v3.2/pretty-ms-tests.ts b/types/pretty-ms/v3/pretty-ms-tests.ts
similarity index 100%
rename from types/pretty-ms/v3.2/pretty-ms-tests.ts
rename to types/pretty-ms/v3/pretty-ms-tests.ts
diff --git a/types/pretty-ms/v3.2/tsconfig.json b/types/pretty-ms/v3/tsconfig.json
similarity index 83%
rename from types/pretty-ms/v3.2/tsconfig.json
rename to types/pretty-ms/v3/tsconfig.json
index 34da0f6d27..5d4f2d4c31 100644
--- a/types/pretty-ms/v3.2/tsconfig.json
+++ b/types/pretty-ms/v3/tsconfig.json
@@ -14,10 +14,7 @@
         ],
         "paths": {
             "pretty-ms": [
-                "pretty-ms/v3.2"
-            ],
-            "pretty-ms/*": [
-                "pretty-ms/v3.2/*"
+                "pretty-ms/v3"
             ]
         },
         "types": [],
diff --git a/types/pretty-ms/v3.2/tslint.json b/types/pretty-ms/v3/tslint.json
similarity index 100%
rename from types/pretty-ms/v3.2/tslint.json
rename to types/pretty-ms/v3/tslint.json

From 86f51b0d4bc0a7a5b748661d3f2c987e2a928a4c Mon Sep 17 00:00:00 2001
From: Maddi Joyce <maddi@maddijoyce.com>
Date: Mon, 10 Dec 2018 15:17:03 +1100
Subject: [PATCH 782/836] Using DrawerNavigationState instead of regular
 NavigationState in DrawerItemsProps

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

diff --git a/types/react-navigation/index.d.ts b/types/react-navigation/index.d.ts
index 85b42444b1..8e743465c6 100644
--- a/types/react-navigation/index.d.ts
+++ b/types/react-navigation/index.d.ts
@@ -899,7 +899,7 @@ export function createSwitchNavigator(
 export const DrawerItems: React.ComponentType<DrawerItemsProps>;
 
 export interface DrawerItemsProps {
-  navigation: NavigationScreenProp<NavigationState>;
+  navigation: NavigationScreenProp<DrawerNavigationState>;
   items: NavigationRoute[];
   activeItemKey?: string;
   activeTintColor?: string;

From f89573a6726d30d9c7dbaf66db308bca4ffe6ad9 Mon Sep 17 00:00:00 2001
From: Kevin O'Neil <6971504+kevoneil@users.noreply.github.com>
Date: Mon, 10 Dec 2018 15:25:48 +0900
Subject: [PATCH 783/836] webpack: adds inline-cheap-source-map and
 inline-cheap-module-source-map as options (#31224)

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

diff --git a/types/webpack/index.d.ts b/types/webpack/index.d.ts
index f5beb1dc63..40ce95bcad 100644
--- a/types/webpack/index.d.ts
+++ b/types/webpack/index.d.ts
@@ -538,12 +538,13 @@ declare namespace webpack {
 
     namespace Options {
         // tslint:disable-next-line:max-line-length
-        type Devtool = 'eval' | 'inline-source-map' | 'cheap-eval-source-map' | 'cheap-source-map' | 'cheap-module-eval-source-map' | 'cheap-module-source-map' | 'eval-source-map' | 'source-map' |
-            'nosources-source-map' | 'hidden-source-map' | 'nosources-source-map' | '@eval' | '@inline-source-map' | '@cheap-eval-source-map' | '@cheap-source-map' | '@cheap-module-eval-source-map' |
-            '@cheap-module-source-map' | '@eval-source-map' | '@source-map' | '@nosources-source-map' | '@hidden-source-map' | '@nosources-source-map' | '#eval' | '#inline-source-map' |
-            '#cheap-eval-source-map' | '#cheap-source-map' | '#cheap-module-eval-source-map' | '#cheap-module-source-map' | '#eval-source-map' | '#source-map' | '#nosources-source-map' |
-            '#hidden-source-map' | '#nosources-source-map' | '#@eval' | '#@inline-source-map' | '#@cheap-eval-source-map' | '#@cheap-source-map' | '#@cheap-module-eval-source-map' |
-            '#@cheap-module-source-map' | '#@eval-source-map' | '#@source-map' | '#@nosources-source-map' | '#@hidden-source-map' | '#@nosources-source-map' | boolean;
+        type Devtool = 'eval' | 'inline-source-map' | 'cheap-eval-source-map' | 'cheap-source-map' | 'cheap-module-eval-source-map' | 'cheap-module-source-map' | 'eval-source-map'
+            | 'source-map' | 'nosources-source-map' | 'hidden-source-map' | 'nosources-source-map' | 'inline-cheap-source-map' | 'inline-cheap-module-source-map' | '@eval'
+            | '@inline-source-map' | '@cheap-eval-source-map' | '@cheap-source-map' | '@cheap-module-eval-source-map' | '@cheap-module-source-map' | '@eval-source-map'
+            | '@source-map' | '@nosources-source-map' | '@hidden-source-map' | '@nosources-source-map' | '#eval' | '#inline-source-map' | '#cheap-eval-source-map'
+            | '#cheap-source-map' | '#cheap-module-eval-source-map' | '#cheap-module-source-map' | '#eval-source-map' | '#source-map' | '#nosources-source-map'
+            | '#hidden-source-map' | '#nosources-source-map' | '#@eval' | '#@inline-source-map' | '#@cheap-eval-source-map' | '#@cheap-source-map' | '#@cheap-module-eval-source-map'
+            | '#@cheap-module-source-map' | '#@eval-source-map' | '#@source-map' | '#@nosources-source-map' | '#@hidden-source-map' | '#@nosources-source-map' | boolean;
 
         interface Performance {
             /** This property allows webpack to control what files are used to calculate performance hints. */

From dea36b252750f3b56e61b73603d0669a97e5e196 Mon Sep 17 00:00:00 2001
From: arichter83 <ar@5mm.de>
Date: Mon, 10 Dec 2018 09:46:45 +0100
Subject: [PATCH 784/836] Removed comment

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

diff --git a/types/simpl-schema/index.d.ts b/types/simpl-schema/index.d.ts
index afd841e0c9..b09a8fde96 100644
--- a/types/simpl-schema/index.d.ts
+++ b/types/simpl-schema/index.d.ts
@@ -5,7 +5,6 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 export interface ValidationContext extends SimpleSchemaValidationContextStatic {
-    // constructor(ss: any);
     addValidationErrors(errors: any): void;
     clean(...args: any[]): any;
     getErrorForKey(key: any, ...args: any[]): any;

From 21962c480d69b619afe7aba837b05bbd9a02fd70 Mon Sep 17 00:00:00 2001
From: Meno Abels <meno.abels@adviser.com>
Date: Mon, 10 Dec 2018 13:31:09 +0100
Subject: [PATCH 785/836] fix: import from to import = require

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

diff --git a/types/resolve-pkg/resolve-pkg-tests.ts b/types/resolve-pkg/resolve-pkg-tests.ts
index 8794b0cc03..caa949a11e 100644
--- a/types/resolve-pkg/resolve-pkg-tests.ts
+++ b/types/resolve-pkg/resolve-pkg-tests.ts
@@ -1,4 +1,4 @@
-import * as rpkg from 'resolve-pkg';
+import rpkg = require('resolve-pkg');
 
 const test1 = rpkg('hello');
 const test2 = rpkg('hello', {});

From fddd7126b83dd03869ae54b0e2350db613ce7450 Mon Sep 17 00:00:00 2001
From: Haotian Chai <haotianchai@gmail.com>
Date: Mon, 10 Dec 2018 20:46:20 +0800
Subject: [PATCH 786/836] add autoIndex at top level of connection options

According to mongoose api doc of 5.3.15, autoIndex is set at the top
level of connection options object.
---
 types/mongoose/index.d.ts        | 1 +
 types/mongoose/mongoose-tests.ts | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/types/mongoose/index.d.ts b/types/mongoose/index.d.ts
index 83aaa33b2b..87ce57f05c 100644
--- a/types/mongoose/index.d.ts
+++ b/types/mongoose/index.d.ts
@@ -424,6 +424,7 @@ declare module "mongoose" {
        */
       autoIndex?: boolean;
     };
+    autoIndex?: boolean;
   }
 
   /** See the node-mongodb-native driver instance for options that it understands. */
diff --git a/types/mongoose/mongoose-tests.ts b/types/mongoose/mongoose-tests.ts
index f4fec31101..7d23e6be6b 100644
--- a/types/mongoose/mongoose-tests.ts
+++ b/types/mongoose/mongoose-tests.ts
@@ -27,7 +27,8 @@ const connection2: Promise<mongoose.Mongoose> = mongoose.connect(connectUri, {
   bufferCommands: false,
   useNewUrlParser: true,
   useFindAndModify: true,
-  useCreateIndex: true
+  useCreateIndex: true,
+  autoIndex: true
 });
 const connection3: null = mongoose.connect(connectUri, function (error) {
   error.stack;

From 3fcb1213a842f48ed2527a0ec4a2f643aa665965 Mon Sep 17 00:00:00 2001
From: AntoineC <aecz@gft.com>
Date: Mon, 10 Dec 2018 17:18:24 +0100
Subject: [PATCH 787/836] Fix type of scaling property from number to Point

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

diff --git a/types/paper/index.d.ts b/types/paper/index.d.ts
index d3c818b112..5709826f6a 100644
--- a/types/paper/index.d.ts
+++ b/types/paper/index.d.ts
@@ -4865,7 +4865,7 @@ declare module paper {
         /**
          * The current scale factor of the view, as described by its matrix.
          */
-        scaling: number;
+        scaling: Point;
 
         /**
          * The view’s transformation matrix, defining the view onto the project’s contents (position, zoom level, rotation, etc).

From efa3d46697306e80172b37b095a7a07d567ba6d8 Mon Sep 17 00:00:00 2001
From: Nikk Radetskiy <metsawyr@gmail.com>
Date: Mon, 10 Dec 2018 19:22:38 +0200
Subject: [PATCH 788/836] exports reorganized to match documentation, async
 function declared

---
 types/favicons/favicons-tests.ts |  14 ++-
 types/favicons/index.d.ts        | 153 ++++++++++++++++---------------
 2 files changed, 92 insertions(+), 75 deletions(-)

diff --git a/types/favicons/favicons-tests.ts b/types/favicons/favicons-tests.ts
index 485ea1d505..ce64c84e67 100644
--- a/types/favicons/favicons-tests.ts
+++ b/types/favicons/favicons-tests.ts
@@ -1,6 +1,6 @@
-import favicons, { Configuration } from "favicons";
+import * as favicons from "favicons";
 
-let config: Partial<Configuration> = {
+let config: Partial<favicons.Configuration> = {
     path: "/foo/bar"
 };
 
@@ -19,7 +19,15 @@ favicons("path/to/file.png", config, (err, res) => {
     }
 });
 
-favicons("file.png", (err, res) => {
+favicons("file.png", (err: any, res: any) => {
+    html = res.html.join("");
+
+    for (const { name, contents } of [...res.files, ...res.images]) {
+        html = name + contents.toString();
+    }
+});
+
+favicons("file.png").then((res) => {
     html = res.html.join("");
 
     for (const { name, contents } of [...res.files, ...res.images]) {
diff --git a/types/favicons/index.d.ts b/types/favicons/index.d.ts
index 47a9a9d24a..623fd0cb98 100644
--- a/types/favicons/index.d.ts
+++ b/types/favicons/index.d.ts
@@ -1,79 +1,84 @@
 // Type definitions for favicons 5.1
 // Project: https://github.com/evilebottnawi/favicons/blob/master/package.json
-// Definitions by: Mohsen Azimi <https://github.com/mohsen1>
+// Definitions by: Mohsen Azimi <https://github.com/mohsen1>, Nikk Radetskiy <https://github.com/metsawyr>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.1
 
 /// <reference types="node" />
 
-export interface Configuration {
-    /** Path for overriding default icons path @default "/" */
-    path: string;
-    /** Your application's name @default null */
-    appName: string | null;
-    /** Your application's description @default null */
-    appDescription: string | null;
-    /** Your (or your developer's) name @default null */
-    developerName: string | null;
-    /** Your (or your developer's) URL @default null */
-    developerURL: string | null;
-    /** Primary text direction for name, short_name, and description @default "auto" */
-    dir: string;
-    /** Primary language for name and short_name @default "en-US */
-    lang: string;
-    /** Background colour for flattened icons @default "#fff" */
-    background: string;
-    /** Theme color user for example in Android's task switcher @default "#fff" */
-    theme_color: string;
-    /** Preferred display mode: "fullscreen", "standalone", "minimal-ui" or "browser" @default "standalone" */
-    display: "fullscreen" | "standalone" | "minimal-ui" | "browser";
-    /** Default orientation: "any", "natural", "portrait" or "landscape" @default "any" */
-    orientation: "any" | "natural" | "portrait" | "landscape";
-    /** Start URL when launching the application from a device @default "/?homescreen=1" */
-    start_url: string;
-    /** Your application's version string @default "1.0" */
-    version: string;
-    /** Print logs to console? @default false */
-    logging: boolean;
-    /**
-     * Platform Options:
-     * - offset - offset in percentage
-     * - background:
-     *   * false - use default
-     *   * true - force use default, e.g. set background for Android icons
-     *   * color - set background for the specified icons
-     */
-    icons: Partial<{
-        /* Create Android homescreen icon.  */
-        android: boolean | { offset: string; background: string };
-        /* Create Apple touch icons.  */
-        appleIcon: boolean | { offset: string; background: string };
-        /* Create Apple startup images.  */
-        appleStartup: boolean | { offset: string; background: string };
-        /* Create Opera Coast icon.  */
-        coast: boolean | { offset: string; background: string };
-        /* Create regular favicons.  */
-        favicons: boolean;
-        /* Create Firefox OS icons.  */
-        firefox: boolean | { offset: string; background: string };
-        /* Create Windows 8 tile icons.   */
-        windows: boolean | { background: string };
-        /* Create Yandex browser icon. */
-        yandex: boolean | { background: string };
-    }>;
+import { Duplex } from "stream";
+
+declare namespace favicons {
+     interface Configuration {
+        /** Path for overriding default icons path @default "/" */
+        path: string;
+        /** Your application's name @default null */
+        appName: string | null;
+        /** Your application's description @default null */
+        appDescription: string | null;
+        /** Your (or your developer's) name @default null */
+        developerName: string | null;
+        /** Your (or your developer's) URL @default null */
+        developerURL: string | null;
+        /** Primary text direction for name, short_name, and description @default "auto" */
+        dir: string;
+        /** Primary language for name and short_name @default "en-US */
+        lang: string;
+        /** Background colour for flattened icons @default "#fff" */
+        background: string;
+        /** Theme color user for example in Android's task switcher @default "#fff" */
+        theme_color: string;
+        /** Preferred display mode: "fullscreen", "standalone", "minimal-ui" or "browser" @default "standalone" */
+        display: "fullscreen" | "standalone" | "minimal-ui" | "browser";
+        /** Default orientation: "any", "natural", "portrait" or "landscape" @default "any" */
+        orientation: "any" | "natural" | "portrait" | "landscape";
+        /** Start URL when launching the application from a device @default "/?homescreen=1" */
+        start_url: string;
+        /** Your application's version string @default "1.0" */
+        version: string;
+        /** Print logs to console? @default false */
+        logging: boolean;
+        /**
+         * Platform Options:
+         * - offset - offset in percentage
+         * - background:
+         *   * false - use default
+         *   * true - force use default, e.g. set background for Android icons
+         *   * color - set background for the specified icons
+         */
+        icons: Partial<{
+            /* Create Android homescreen icon.  */
+            android: boolean | { offset: string; background: string };
+            /* Create Apple touch icons.  */
+            appleIcon: boolean | { offset: string; background: string };
+            /* Create Apple startup images.  */
+            appleStartup: boolean | { offset: string; background: string };
+            /* Create Opera Coast icon.  */
+            coast: boolean | { offset: string; background: string };
+            /* Create regular favicons.  */
+            favicons: boolean;
+            /* Create Firefox OS icons.  */
+            firefox: boolean | { offset: string; background: string };
+            /* Create Windows 8 tile icons.   */
+            windows: boolean | { background: string };
+            /* Create Yandex browser icon. */
+            yandex: boolean | { background: string };
+        }>;
+    }
+
+     interface FavIconResponse {
+        images: Array<{ name: string; contents: Buffer }>;
+        files: Array<{ name: string; contents: Buffer }>;
+        html: string[];
+    }
+
+     type Callback = (error: Error | null, response: FavIconResponse) => void;
+
+    /** You can programmatically access Favicons configuration (icon filenames, HTML, manifest files, etc) with this export */
+     const config: Configuration;
+
+     function stream(configuration?: Configuration): Duplex;
 }
-
-export interface FavIconResponse {
-    images: Array<{ name: string; contents: Buffer }>;
-    files: Array<{ name: string; contents: Buffer }>;
-    html: string[];
-}
-
-export type Callback = (error: Error | null, response: FavIconResponse) => void;
-
-/** You can programmatically access Favicons configuration (icon filenames, HTML, manifest files, etc) with this export */
-export const config: Configuration;
-
 /**
  * Generate favicons
  * @param source Source image(s)
@@ -82,12 +87,16 @@ export const config: Configuration;
  */
 declare function favicons(
     source: string | Buffer | string[],
-    callback?: Callback
+    configuration?: Partial<favicons.Configuration>,
+): Promise<favicons.FavIconResponse>;
+declare function favicons(
+    source: string | Buffer | string[],
+    callback?: favicons.Callback
 ): void;
 declare function favicons(
     source: string | Buffer | string[],
-    configuration?: Partial<Configuration>,
-    callback?: Callback
+    configuration?: Partial<favicons.Configuration>,
+    callback?: favicons.Callback
 ): void;
 
-export default favicons;
+export = favicons;

From 242eb56ec6748c52a6b21182a75591c2b927d318 Mon Sep 17 00:00:00 2001
From: Nikk Radetskiy <metsawyr@gmail.com>
Date: Mon, 10 Dec 2018 19:29:00 +0200
Subject: [PATCH 789/836] version bump

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

diff --git a/types/favicons/index.d.ts b/types/favicons/index.d.ts
index 623fd0cb98..6bd3a4892e 100644
--- a/types/favicons/index.d.ts
+++ b/types/favicons/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for favicons 5.1
+// Type definitions for favicons 5.3
 // Project: https://github.com/evilebottnawi/favicons/blob/master/package.json
 // Definitions by: Mohsen Azimi <https://github.com/mohsen1>, Nikk Radetskiy <https://github.com/metsawyr>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped

From 77acc1c821bc309be2e1a947fb37c6503f8a66de Mon Sep 17 00:00:00 2001
From: Richie Foreman <richie.foreman@gmail.com>
Date: Mon, 10 Dec 2018 09:31:03 -0800
Subject: [PATCH 790/836] Add '$mdInkRippleProvider' defs to 'angular-material'

ref: https://github.com/angular/material/blob/master/src/core/services/ripple/ripple.js#L102
---
 types/angular-material/index.d.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/types/angular-material/index.d.ts b/types/angular-material/index.d.ts
index db74c97d10..cfa894b87f 100644
--- a/types/angular-material/index.d.ts
+++ b/types/angular-material/index.d.ts
@@ -152,6 +152,10 @@ declare module 'angular' {
             defaultViewBoxSize(viewBoxSize: number): IIconProvider; // default: 24
             defaultFontSet(name: string): IIconProvider;
         }
+    
+        interface IInkRippleProvider {
+            disableInkRipple(): void;
+        }
 
         type IMedia = (media: string) => boolean;
 

From 084b2d56eaad28caee9f7255fe7c0c881313909d Mon Sep 17 00:00:00 2001
From: "Charnoz, Antoine" <Antoine.Charnoz@gft.com>
Date: Mon, 10 Dec 2018 19:24:02 +0100
Subject: [PATCH 791/836] Add test for scaling of view

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

diff --git a/types/paper/paper-tests.ts b/types/paper/paper-tests.ts
index 165c64b2d8..1d1bc32abe 100644
--- a/types/paper/paper-tests.ts
+++ b/types/paper/paper-tests.ts
@@ -79,6 +79,8 @@ hitTestResults = paper.project.hitTestAll(hitTestPoint, hitOptionsInterfaceEmpty
 hitTestResults = paper.project.hitTestAll(hitTestPoint, hitOptionsInterfacePartial);
 hitTestResults = paper.project.hitTestAll(hitTestPoint, hitOptionsInterfaceFull);
 
+paper.view.scaling = new paper.Point(1, 1);
+
 function Examples() {
     function BooleanOperations(){
         let text = new paper.PointText({

From a410c93186c77eb745911eb0103cb17fa283dfad Mon Sep 17 00:00:00 2001
From: Dima Smirnov <email@dimasmirnov.ru>
Date: Mon, 10 Dec 2018 22:12:29 +0300
Subject: [PATCH 792/836] added FindOptionsOrderArray type for find options

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

diff --git a/types/sequelize/index.d.ts b/types/sequelize/index.d.ts
index 06f27421cb..6898a82ca4 100644
--- a/types/sequelize/index.d.ts
+++ b/types/sequelize/index.d.ts
@@ -3291,6 +3291,11 @@ declare namespace sequelize {
      */
     type FindOptionsAttributesArray = Array<string | literal | [string, string] | fn | [fn, string] | cast | [cast, string] | [literal, string]>;
 
+    /**
+     * Shortcut for order type in FindOptions.attributes
+     */
+    type FindOptionsOrderArray = Array<string | number | Model<any, any> | { model: Model<any, any>, as?: string } | fn>;
+
     /**
      * Options that are passed to any model creating a SELECT query
      *
@@ -3331,7 +3336,7 @@ declare namespace sequelize {
          * first element is the column / function to order by, the second is the direction. For example:
          * `order: [['name', 'DESC']]`. In this way the column will be escaped, but the direction will not.
          */
-        order?: string | col | literal | Array<string | number | Model<any, any> | { model: Model<any, any>, as?: string } | fn> | fn | Array<string | col | literal | Array<string | number | Model<any, any> | { model: Model<any, any>, as?: string }| fn>| fn>;
+        order?: string | col | literal | FindOptionsOrderArray | fn | Array<string | col | literal | FindOptionsOrderArray | fn>;
 
         /**
          * Limit the results

From a10c1b112f97c3104a6b73f1e9022eeeab27ef2a Mon Sep 17 00:00:00 2001
From: Dimitri Benin <dimitri.benin@gmail.com>
Date: Mon, 10 Dec 2018 23:21:51 +0100
Subject: [PATCH 793/836] Add types for has-emoji

---
 types/has-emoji/has-emoji-tests.ts |  6 ++++++
 types/has-emoji/index.d.ts         |  8 ++++++++
 types/has-emoji/tsconfig.json      | 23 +++++++++++++++++++++++
 types/has-emoji/tslint.json        |  1 +
 4 files changed, 38 insertions(+)
 create mode 100644 types/has-emoji/has-emoji-tests.ts
 create mode 100644 types/has-emoji/index.d.ts
 create mode 100644 types/has-emoji/tsconfig.json
 create mode 100644 types/has-emoji/tslint.json

diff --git a/types/has-emoji/has-emoji-tests.ts b/types/has-emoji/has-emoji-tests.ts
new file mode 100644
index 0000000000..f1453f4cf5
--- /dev/null
+++ b/types/has-emoji/has-emoji-tests.ts
@@ -0,0 +1,6 @@
+import hasEmoji = require('has-emoji');
+
+// $ExpectType boolean
+hasEmoji('Unicorn 🦄');
+// $ExpectType boolean
+hasEmoji('Cat');
diff --git a/types/has-emoji/index.d.ts b/types/has-emoji/index.d.ts
new file mode 100644
index 0000000000..2160e66497
--- /dev/null
+++ b/types/has-emoji/index.d.ts
@@ -0,0 +1,8 @@
+// Type definitions for has-emoji 1.0
+// Project: https://github.com/sindresorhus/has-emoji#readme
+// Definitions by: BendingBender <https://github.com/BendingBender>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export = hasEmoji;
+
+declare function hasEmoji(candidate: string): boolean;
diff --git a/types/has-emoji/tsconfig.json b/types/has-emoji/tsconfig.json
new file mode 100644
index 0000000000..646f983707
--- /dev/null
+++ b/types/has-emoji/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "has-emoji-tests.ts"
+    ]
+}
diff --git a/types/has-emoji/tslint.json b/types/has-emoji/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/has-emoji/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From dcd364079b5b48c940bf14a9c113268d62a74254 Mon Sep 17 00:00:00 2001
From: Richie Foreman <richie.foreman@gmail.com>
Date: Mon, 10 Dec 2018 18:59:51 -0800
Subject: [PATCH 794/836] Update index.d.ts

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

diff --git a/types/angular-material/index.d.ts b/types/angular-material/index.d.ts
index cfa894b87f..9202829175 100644
--- a/types/angular-material/index.d.ts
+++ b/types/angular-material/index.d.ts
@@ -152,7 +152,7 @@ declare module 'angular' {
             defaultViewBoxSize(viewBoxSize: number): IIconProvider; // default: 24
             defaultFontSet(name: string): IIconProvider;
         }
-    
+
         interface IInkRippleProvider {
             disableInkRipple(): void;
         }

From ee2d459f330f322e7531ace80692b0d31541c69e Mon Sep 17 00:00:00 2001
From: Ben Talbot <ben@tbotlabs.com>
Date: Mon, 10 Dec 2018 19:28:08 -0800
Subject: [PATCH 795/836] Remove declare module '@google-cloud/kms' and change
 to use 4 spaces instead of tabs.

---
 .../google-cloud__kms-tests.ts                | 170 +++----
 types/google-cloud__kms/index.d.ts            | 428 +++++++++---------
 types/google-cloud__kms/tslint.json           |   5 +-
 3 files changed, 299 insertions(+), 304 deletions(-)

diff --git a/types/google-cloud__kms/google-cloud__kms-tests.ts b/types/google-cloud__kms/google-cloud__kms-tests.ts
index e3f6648310..96ab80c7c1 100644
--- a/types/google-cloud__kms/google-cloud__kms-tests.ts
+++ b/types/google-cloud__kms/google-cloud__kms-tests.ts
@@ -4,114 +4,114 @@ let kmsClientV1: kms.v1.KeyManagementServiceClient;
 kmsClientV1 = new kms.v1.KeyManagementServiceClient();
 
 const credentials = {
-	type: 'service_account',
-	project_id: '****',
-	private_key_id: '****',
-	private_key: '****',
-	client_email: '****',
-	client_id: '****',
-	auth_uri: 'https://accounts.google.com/o/oauth2/auth',
-	token_uri: 'https://oauth2.googleapis.com/token',
-	auth_provider_x509_cert_url: 'https://www.googleapis.com/oauth2/v1/certs',
-	client_x509_cert_url: '****'
+    type: 'service_account',
+    project_id: '****',
+    private_key_id: '****',
+    private_key: '****',
+    client_email: '****',
+    client_id: '****',
+    auth_uri: 'https://accounts.google.com/o/oauth2/auth',
+    token_uri: 'https://oauth2.googleapis.com/token',
+    auth_provider_x509_cert_url: 'https://www.googleapis.com/oauth2/v1/certs',
+    client_x509_cert_url: '****'
 };
 
 let kmsClient: kms.KeyManagementServiceClient;
 kmsClient = new kms.KeyManagementServiceClient({ credentials });
 
 async function exampleListKeyRings() {
-	const locationPath = kmsClient.locationPath('[PROJECT_ID]', '[LOCATION]');
-	const [ asyncKeyRings ] = await kmsClient.listKeyRings({parent: locationPath});
-	if  (asyncKeyRings.length > 0) {
-		const keyRing = asyncKeyRings[ 0 ];
-		console.log(`KeyRing: ${keyRing.name}`);
-	}
+    const locationPath = kmsClient.locationPath('[PROJECT_ID]', '[LOCATION]');
+    const [ asyncKeyRings ] = await kmsClient.listKeyRings({parent: locationPath});
+    if  (asyncKeyRings.length > 0) {
+        const keyRing = asyncKeyRings[ 0 ];
+        console.log(`KeyRing: ${keyRing.name}`);
+    }
 
-	kmsClient.listKeyRings({parent: locationPath}, (err, [ callbackKeyRings ]) => {
-		if  (callbackKeyRings.length > 0) {
-			const keyRing = callbackKeyRings[ 0 ];
-			console.log(`KeyRing: ${keyRing.name}`);
-		}
-	});
+    kmsClient.listKeyRings({parent: locationPath}, (err, [ callbackKeyRings ]) => {
+        if  (callbackKeyRings.length > 0) {
+            const keyRing = callbackKeyRings[ 0 ];
+            console.log(`KeyRing: ${keyRing.name}`);
+        }
+    });
 
-	kmsClient.listKeyRings({parent: locationPath}, { timeout: 1000 }, (err, [ callbackWithOptionsKeyRings ]) => {
-		if  (callbackWithOptionsKeyRings.length > 0) {
-			const keyRing = callbackWithOptionsKeyRings[ 0 ];
-			console.log(`KeyRing: ${keyRing.name}`);
-		}
-	});
+    kmsClient.listKeyRings({parent: locationPath}, { timeout: 1000 }, (err, [ callbackWithOptionsKeyRings ]) => {
+        if  (callbackWithOptionsKeyRings.length > 0) {
+            const keyRing = callbackWithOptionsKeyRings[ 0 ];
+            console.log(`KeyRing: ${keyRing.name}`);
+        }
+    });
 }
 
 async function exampleListCryptoKeys() {
-	const keyRingPath = kmsClient.keyRingPath('[PROJECT_ID]', '[LOCATION]', '[KEYRING_ID]');
-	const [ asyncKeys ] = await kmsClient.listCryptoKeys({parent: keyRingPath});
-	if (asyncKeys.length > 0) {
-		const key = asyncKeys[ 0 ];
-		console.log(`CryptoKey: ${key.name} Version: ${key.primary.name}`);
-	}
+    const keyRingPath = kmsClient.keyRingPath('[PROJECT_ID]', '[LOCATION]', '[KEYRING_ID]');
+    const [ asyncKeys ] = await kmsClient.listCryptoKeys({parent: keyRingPath});
+    if (asyncKeys.length > 0) {
+        const key = asyncKeys[ 0 ];
+        console.log(`CryptoKey: ${key.name} Version: ${key.primary.name}`);
+    }
 
-	kmsClient.listCryptoKeys({parent: keyRingPath}, (err, [ callbackKeys ]) => {
-		if  (callbackKeys.length > 0) {
-			const key = callbackKeys[ 0 ];
-			console.log(`CryptoKey: ${key.name} Version: ${key.primary.name}`);
-		}
-	});
+    kmsClient.listCryptoKeys({parent: keyRingPath}, (err, [ callbackKeys ]) => {
+        if  (callbackKeys.length > 0) {
+            const key = callbackKeys[ 0 ];
+            console.log(`CryptoKey: ${key.name} Version: ${key.primary.name}`);
+        }
+    });
 
-	kmsClient.listCryptoKeys({parent: keyRingPath}, { timeout: 1000 }, (err, [ callbackWithOptionsKeys ]) => {
-		if  (callbackWithOptionsKeys.length > 0) {
-			const key = callbackWithOptionsKeys[ 0 ];
-			console.log(`CryptoKey: ${key.name} Version: ${key.primary.name}`);
-		}
-	});
+    kmsClient.listCryptoKeys({parent: keyRingPath}, { timeout: 1000 }, (err, [ callbackWithOptionsKeys ]) => {
+        if  (callbackWithOptionsKeys.length > 0) {
+            const key = callbackWithOptionsKeys[ 0 ];
+            console.log(`CryptoKey: ${key.name} Version: ${key.primary.name}`);
+        }
+    });
 }
 
 async function exampleEncrypt() {
-	const formattedName = kmsClient.cryptoKeyPath('[PROJECT_ID]', '[LOCATION]', '[KEYRING_ID]', '[KEY_ID]');
-	const unencryptedText = new Buffer('Hello World');
+    const formattedName = kmsClient.cryptoKeyPath('[PROJECT_ID]', '[LOCATION]', '[KEYRING_ID]', '[KEY_ID]');
+    const unencryptedText = new Buffer('Hello World');
 
-	const [ asyncEncryptResult ] = await kmsClient.encrypt({ name: formattedName, plaintext: unencryptedText.toString('base64') });
-	if (asyncEncryptResult != null) {
-		console.log(`Encrypted: ${asyncEncryptResult.ciphertext.toString('base64')}`);
-	}
+    const [ asyncEncryptResult ] = await kmsClient.encrypt({ name: formattedName, plaintext: unencryptedText.toString('base64') });
+    if (asyncEncryptResult != null) {
+        console.log(`Encrypted: ${asyncEncryptResult.ciphertext.toString('base64')}`);
+    }
 
-	kmsClient.encrypt({ name: formattedName, plaintext: unencryptedText.toString('base64') }, (err, [ callbackEncryptResult ]) => {
-		if (callbackEncryptResult != null) {
-			console.log(`Encrypted: ${callbackEncryptResult.ciphertext.toString('base64')}`);
-		}
-	});
+    kmsClient.encrypt({ name: formattedName, plaintext: unencryptedText.toString('base64') }, (err, [ callbackEncryptResult ]) => {
+        if (callbackEncryptResult != null) {
+            console.log(`Encrypted: ${callbackEncryptResult.ciphertext.toString('base64')}`);
+        }
+    });
 
-	kmsClient.encrypt({ name: formattedName, plaintext: unencryptedText.toString('base64') }, { timeout: 1000 }, (err, [ callbackWithOptionsEncryptResult ]) => {
-		if (callbackWithOptionsEncryptResult != null) {
-			console.log(`Encrypted: ${callbackWithOptionsEncryptResult.ciphertext.toString('base64')}`);
-		}
-	});
+    kmsClient.encrypt({ name: formattedName, plaintext: unencryptedText.toString('base64') }, { timeout: 1000 }, (err, [ callbackWithOptionsEncryptResult ]) => {
+        if (callbackWithOptionsEncryptResult != null) {
+            console.log(`Encrypted: ${callbackWithOptionsEncryptResult.ciphertext.toString('base64')}`);
+        }
+    });
 }
 
 async function exampleDecrypt() {
-	// Example pulling a file from Cloud Storage
-	// const secretsStorage = new Storage({ credentials });
-	// const bucket = secretsStorage.bucket('[KMS_STORAGE_BUCKET]');
-	// const filePath = '[PATH_TO_KMS_ENCRYPTED_FILE';
-	// const file = bucket.file(filePath);
-	// const buffers = await file.download();
-	// const buffer = buffers[ 0 ];
+    // Example pulling a file from Cloud Storage
+    // const secretsStorage = new Storage({ credentials });
+    // const bucket = secretsStorage.bucket('[KMS_STORAGE_BUCKET]');
+    // const filePath = '[PATH_TO_KMS_ENCRYPTED_FILE';
+    // const file = bucket.file(filePath);
+    // const buffers = await file.download();
+    // const buffer = buffers[ 0 ];
 
-	const buffer = new Buffer('[ENCRYPTED_SOURCE_BUFFER]');
-	const formattedName = kmsClient.cryptoKeyPath('[PROJECT_ID]', '[LOCATION]', '[KEYRING_ID]', '[KEY_ID]');
-	const [ asyncDecryptResult ] = await kmsClient.decrypt({name: formattedName, ciphertext: buffer.toString('base64') });
-	if (asyncDecryptResult != null) {
-		console.log(`Decrypted: ${asyncDecryptResult.plaintext}`);
-	}
+    const buffer = new Buffer('[ENCRYPTED_SOURCE_BUFFER]');
+    const formattedName = kmsClient.cryptoKeyPath('[PROJECT_ID]', '[LOCATION]', '[KEYRING_ID]', '[KEY_ID]');
+    const [ asyncDecryptResult ] = await kmsClient.decrypt({name: formattedName, ciphertext: buffer.toString('base64') });
+    if (asyncDecryptResult != null) {
+        console.log(`Decrypted: ${asyncDecryptResult.plaintext}`);
+    }
 
-	kmsClient.decrypt({ name: formattedName, ciphertext: buffer.toString('base64') }, (err, [ callbackDecryptResult ]) => {
-		if (callbackDecryptResult != null) {
-			console.log(`Decrypted: ${callbackDecryptResult.plaintext}`);
-		}
-	});
+    kmsClient.decrypt({ name: formattedName, ciphertext: buffer.toString('base64') }, (err, [ callbackDecryptResult ]) => {
+        if (callbackDecryptResult != null) {
+            console.log(`Decrypted: ${callbackDecryptResult.plaintext}`);
+        }
+    });
 
-	kmsClient.decrypt({ name: formattedName, ciphertext: buffer.toString('base64') }, (err, [ callbackWithOptionsDecryptResult ]) => {
-		if (callbackWithOptionsDecryptResult != null) {
-			console.log(`Decrypted: ${callbackWithOptionsDecryptResult.plaintext}`);
-		}
-	});
+    kmsClient.decrypt({ name: formattedName, ciphertext: buffer.toString('base64') }, (err, [ callbackWithOptionsDecryptResult ]) => {
+        if (callbackWithOptionsDecryptResult != null) {
+            console.log(`Decrypted: ${callbackWithOptionsDecryptResult.plaintext}`);
+        }
+    });
 }
diff --git a/types/google-cloud__kms/index.d.ts b/types/google-cloud__kms/index.d.ts
index 7f14a731bd..237c7115a0 100644
--- a/types/google-cloud__kms/index.d.ts
+++ b/types/google-cloud__kms/index.d.ts
@@ -8,268 +8,266 @@
 
 import * as google_protobuf_timestamp_pb from "google-protobuf/google/protobuf/timestamp_pb";
 
-declare module '@google-cloud/kms' {
-	namespace v1 {
-		enum CryptoKeyVersionAlgorithm {
-			// Not specified.
-			CRYPTO_KEY_VERSION_ALGORITHM_UNSPECIFIED = 0,
+export namespace v1 {
+    enum CryptoKeyVersionAlgorithm {
+        // Not specified.
+        CRYPTO_KEY_VERSION_ALGORITHM_UNSPECIFIED = 0,
 
-			// Creates symmetric encryption keys.
-			GOOGLE_SYMMETRIC_ENCRYPTION = 1,
+        // Creates symmetric encryption keys.
+        GOOGLE_SYMMETRIC_ENCRYPTION = 1,
 
-			// RSASSA-PSS 2048 bit key with a SHA256 digest.
-			RSA_SIGN_PSS_2048_SHA256 = 2,
+        // RSASSA-PSS 2048 bit key with a SHA256 digest.
+        RSA_SIGN_PSS_2048_SHA256 = 2,
 
-			// RSASSA-PSS 3072 bit key with a SHA256 digest.
-			RSA_SIGN_PSS_3072_SHA256 = 3,
+        // RSASSA-PSS 3072 bit key with a SHA256 digest.
+        RSA_SIGN_PSS_3072_SHA256 = 3,
 
-			// RSASSA-PSS 4096 bit key with a SHA256 digest.
-			RSA_SIGN_PSS_4096_SHA256 = 4,
+        // RSASSA-PSS 4096 bit key with a SHA256 digest.
+        RSA_SIGN_PSS_4096_SHA256 = 4,
 
-			// RSASSA-PKCS1-v1_5 with a 2048 bit key and a SHA256 digest.
-			RSA_SIGN_PKCS1_2048_SHA256 = 5,
+        // RSASSA-PKCS1-v1_5 with a 2048 bit key and a SHA256 digest.
+        RSA_SIGN_PKCS1_2048_SHA256 = 5,
 
-			// RSASSA-PKCS1-v1_5 with a 3072 bit key and a SHA256 digest.
-			RSA_SIGN_PKCS1_3072_SHA256 = 6,
+        // RSASSA-PKCS1-v1_5 with a 3072 bit key and a SHA256 digest.
+        RSA_SIGN_PKCS1_3072_SHA256 = 6,
 
-			// RSASSA-PKCS1-v1_5 with a 4096 bit key and a SHA256 digest.
-			RSA_SIGN_PKCS1_4096_SHA256 = 7,
+        // RSASSA-PKCS1-v1_5 with a 4096 bit key and a SHA256 digest.
+        RSA_SIGN_PKCS1_4096_SHA256 = 7,
 
-			// RSAES-OAEP 2048 bit key with a SHA256 digest.
-			RSA_DECRYPT_OAEP_2048_SHA256 = 8,
+        // RSAES-OAEP 2048 bit key with a SHA256 digest.
+        RSA_DECRYPT_OAEP_2048_SHA256 = 8,
 
-			// RSAES-OAEP 3072 bit key with a SHA256 digest.
-			RSA_DECRYPT_OAEP_3072_SHA256 = 9,
+        // RSAES-OAEP 3072 bit key with a SHA256 digest.
+        RSA_DECRYPT_OAEP_3072_SHA256 = 9,
 
-			// RSAES-OAEP 4096 bit key with a SHA256 digest.
-			RSA_DECRYPT_OAEP_4096_SHA256 = 10,
+        // RSAES-OAEP 4096 bit key with a SHA256 digest.
+        RSA_DECRYPT_OAEP_4096_SHA256 = 10,
 
-			// ECDSA on the NIST P-256 curve with a SHA256 digest.
-			EC_SIGN_P256_SHA256 = 12,
+        // ECDSA on the NIST P-256 curve with a SHA256 digest.
+        EC_SIGN_P256_SHA256 = 12,
 
-			// ECDSA on the NIST P-384 curve with a SHA384 digest.
-			EC_SIGN_P384_SHA384 = 13,
-		}
+        // ECDSA on the NIST P-384 curve with a SHA384 digest.
+        EC_SIGN_P384_SHA384 = 13,
+    }
 
-		enum CryptoKeyVersionState {
-			// Not specified.
-			CRYPTO_KEY_VERSION_STATE_UNSPECIFIED = 0,
+    enum CryptoKeyVersionState {
+        // Not specified.
+        CRYPTO_KEY_VERSION_STATE_UNSPECIFIED = 0,
 
-			// This version is still being generated. It may not be used, enabled,
-			// disabled, or destroyed yet. Cloud KMS will automatically mark this
-			// version [ENABLED][google.cloud.kms.v1.CryptoKeyVersion.CryptoKeyVersionState.ENABLED] as soon as the version is ready.
-			PENDING_GENERATION = 5,
+        // This version is still being generated. It may not be used, enabled,
+        // disabled, or destroyed yet. Cloud KMS will automatically mark this
+        // version [ENABLED][google.cloud.kms.v1.CryptoKeyVersion.CryptoKeyVersionState.ENABLED] as soon as the version is ready.
+        PENDING_GENERATION = 5,
 
-			// This version may be used for cryptographic operations.
-			ENABLED = 1,
+        // This version may be used for cryptographic operations.
+        ENABLED = 1,
 
-			// This version may not be used, but the key material is still available,
-			// and the version can be placed back into the [ENABLED][google.cloud.kms.v1.CryptoKeyVersion.CryptoKeyVersionState.ENABLED] state.
-			DISABLED = 2,
+        // This version may not be used, but the key material is still available,
+        // and the version can be placed back into the [ENABLED][google.cloud.kms.v1.CryptoKeyVersion.CryptoKeyVersionState.ENABLED] state.
+        DISABLED = 2,
 
-			// This version is destroyed, and the key material is no longer stored.
-			// A version may not leave this state once entered.
-			DESTROYED = 3,
+        // This version is destroyed, and the key material is no longer stored.
+        // A version may not leave this state once entered.
+        DESTROYED = 3,
 
-			// This version is scheduled for destruction, and will be destroyed soon.
-			// Call
-			// [RestoreCryptoKeyVersion][google.cloud.kms.v1.KeyManagementService.RestoreCryptoKeyVersion]
-			// to put it back into the [DISABLED][google.cloud.kms.v1.CryptoKeyVersion.CryptoKeyVersionState.DISABLED] state.
-			DESTROY_SCHEDULED = 4,
-		}
+        // This version is scheduled for destruction, and will be destroyed soon.
+        // Call
+        // [RestoreCryptoKeyVersion][google.cloud.kms.v1.KeyManagementService.RestoreCryptoKeyVersion]
+        // to put it back into the [DISABLED][google.cloud.kms.v1.CryptoKeyVersion.CryptoKeyVersionState.DISABLED] state.
+        DESTROY_SCHEDULED = 4,
+    }
 
-		enum CryptoKeyVersionView {
-			// Default view for each [CryptoKeyVersion][google.cloud.kms.v1.CryptoKeyVersion]. Does not include
-			// the [attestation][google.cloud.kms.v1.CryptoKeyVersion.attestation] field.
-			CRYPTO_KEY_VERSION_VIEW_UNSPECIFIED = 0,
+    enum CryptoKeyVersionView {
+        // Default view for each [CryptoKeyVersion][google.cloud.kms.v1.CryptoKeyVersion]. Does not include
+        // the [attestation][google.cloud.kms.v1.CryptoKeyVersion.attestation] field.
+        CRYPTO_KEY_VERSION_VIEW_UNSPECIFIED = 0,
 
-			// Provides all fields in each [CryptoKeyVersion][google.cloud.kms.v1.CryptoKeyVersion], including the
-			// [attestation][google.cloud.kms.v1.CryptoKeyVersion.attestation].
-			FULL = 1,
-		}
+        // Provides all fields in each [CryptoKeyVersion][google.cloud.kms.v1.CryptoKeyVersion], including the
+        // [attestation][google.cloud.kms.v1.CryptoKeyVersion.attestation].
+        FULL = 1,
+    }
 
-		enum ProtectionLevel {
-			// Not specified.
-			PROTECTION_LEVEL_UNSPECIFIED = 0,
+    enum ProtectionLevel {
+        // Not specified.
+        PROTECTION_LEVEL_UNSPECIFIED = 0,
 
-			// Crypto operations are performed in software.
-			SOFTWARE = 1,
+        // Crypto operations are performed in software.
+        SOFTWARE = 1,
 
-			// Crypto operations are performed in a Hardware Security Module.
-			HSM = 2,
-		}
+        // Crypto operations are performed in a Hardware Security Module.
+        HSM = 2,
+    }
 
-		enum AttestationFormat {
-			ATTESTATION_FORMAT_UNSPECIFIED = 0,
+    enum AttestationFormat {
+        ATTESTATION_FORMAT_UNSPECIFIED = 0,
 
-			// Cavium HSM attestation compressed with gzip. Note that this format is
-			// defined by Cavium and subject to change at any time.
-			CAVIUM_V1_COMPRESSED = 3,
-		}
+        // Cavium HSM attestation compressed with gzip. Note that this format is
+        // defined by Cavium and subject to change at any time.
+        CAVIUM_V1_COMPRESSED = 3,
+    }
 
-		interface KeyOperationAttestation {
-			format: AttestationFormat;
-		}
+    interface KeyOperationAttestation {
+        format: AttestationFormat;
+    }
 
-		interface CryptoKeyVersion {
-			name: string;
-			state: CryptoKeyVersionState;
-			protectionLevel: ProtectionLevel;
-			algorithm: CryptoKeyVersionAlgorithm;
-			attestation?: KeyOperationAttestation;
-			createTime: google_protobuf_timestamp_pb.Timestamp.AsObject;
-			generateTime: google_protobuf_timestamp_pb.Timestamp.AsObject;
-			destroyTime?: google_protobuf_timestamp_pb.Timestamp.AsObject;
-			destroyEventTime?: google_protobuf_timestamp_pb.Timestamp.AsObject;
-		}
+    interface CryptoKeyVersion {
+        name: string;
+        state: CryptoKeyVersionState;
+        protectionLevel: ProtectionLevel;
+        algorithm: CryptoKeyVersionAlgorithm;
+        attestation?: KeyOperationAttestation;
+        createTime: google_protobuf_timestamp_pb.Timestamp.AsObject;
+        generateTime: google_protobuf_timestamp_pb.Timestamp.AsObject;
+        destroyTime?: google_protobuf_timestamp_pb.Timestamp.AsObject;
+        destroyEventTime?: google_protobuf_timestamp_pb.Timestamp.AsObject;
+    }
 
-		interface CryptoKeyVersionTemplate {
-			protectionLevel: ProtectionLevel;
-			algorithm: CryptoKeyVersionAlgorithm;
-		}
+    interface CryptoKeyVersionTemplate {
+        protectionLevel: ProtectionLevel;
+        algorithm: CryptoKeyVersionAlgorithm;
+    }
 
-		enum CryptoKeyPurpose {
-			// Not specified.
-			CRYPTO_KEY_PURPOSE_UNSPECIFIED = 0,
+    enum CryptoKeyPurpose {
+        // Not specified.
+        CRYPTO_KEY_PURPOSE_UNSPECIFIED = 0,
 
-			// [CryptoKeys][google.cloud.kms.v1.CryptoKey] with this purpose may be used with
-			// [Encrypt][google.cloud.kms.v1.KeyManagementService.Encrypt] and
-			// [Decrypt][google.cloud.kms.v1.KeyManagementService.Decrypt].
-			ENCRYPT_DECRYPT = 1,
+        // [CryptoKeys][google.cloud.kms.v1.CryptoKey] with this purpose may be used with
+        // [Encrypt][google.cloud.kms.v1.KeyManagementService.Encrypt] and
+        // [Decrypt][google.cloud.kms.v1.KeyManagementService.Decrypt].
+        ENCRYPT_DECRYPT = 1,
 
-			// [CryptoKeys][google.cloud.kms.v1.CryptoKey] with this purpose may be used with
-			// [AsymmetricSign][google.cloud.kms.v1.KeyManagementService.AsymmetricSign] and
-			// [GetPublicKey][google.cloud.kms.v1.KeyManagementService.GetPublicKey].
-			ASYMMETRIC_SIGN = 5,
+        // [CryptoKeys][google.cloud.kms.v1.CryptoKey] with this purpose may be used with
+        // [AsymmetricSign][google.cloud.kms.v1.KeyManagementService.AsymmetricSign] and
+        // [GetPublicKey][google.cloud.kms.v1.KeyManagementService.GetPublicKey].
+        ASYMMETRIC_SIGN = 5,
 
-			// [CryptoKeys][google.cloud.kms.v1.CryptoKey] with this purpose may be used with
-			// [AsymmetricDecrypt][google.cloud.kms.v1.KeyManagementService.AsymmetricDecrypt] and
-			// [GetPublicKey][google.cloud.kms.v1.KeyManagementService.GetPublicKey].
-			ASYMMETRIC_DECRYPT = 6,
-		}
+        // [CryptoKeys][google.cloud.kms.v1.CryptoKey] with this purpose may be used with
+        // [AsymmetricDecrypt][google.cloud.kms.v1.KeyManagementService.AsymmetricDecrypt] and
+        // [GetPublicKey][google.cloud.kms.v1.KeyManagementService.GetPublicKey].
+        ASYMMETRIC_DECRYPT = 6,
+    }
 
-		interface CryptoKey {
-			name: string;
-			primary: CryptoKeyVersion;
-			purpose: CryptoKeyPurpose;
-			createTime: google_protobuf_timestamp_pb.Timestamp.AsObject;
-			nextRotationTime?: google_protobuf_timestamp_pb.Timestamp.AsObject;
-			versionTemplate: CryptoKeyVersionTemplate;
-			labels: { [s: string]: string; };
-		}
+    interface CryptoKey {
+        name: string;
+        primary: CryptoKeyVersion;
+        purpose: CryptoKeyPurpose;
+        createTime: google_protobuf_timestamp_pb.Timestamp.AsObject;
+        nextRotationTime?: google_protobuf_timestamp_pb.Timestamp.AsObject;
+        versionTemplate: CryptoKeyVersionTemplate;
+        labels: { [s: string]: string; };
+    }
 
-		interface KeyRing {
-			name: string;
-			createTime: google_protobuf_timestamp_pb.Timestamp.AsObject;
-		}
+    interface KeyRing {
+        name: string;
+        createTime: google_protobuf_timestamp_pb.Timestamp.AsObject;
+    }
 
-		namespace KeyManagementServiceClient {
-			interface ConfigurationObject {
-				credentials?: {
-					client_email?: string;
-					private_key?: string
-				};
-				email?: string;
-				keyFilename?: string;
-				port?: number;
-				projectId?: string;
-				promise?: any;
-				servicePath?: string;
-			}
+    namespace KeyManagementServiceClient {
+        interface ConfigurationObject {
+            credentials?: {
+                client_email?: string;
+                private_key?: string
+            };
+            email?: string;
+            keyFilename?: string;
+            port?: number;
+            projectId?: string;
+            promise?: any;
+            servicePath?: string;
+        }
 
-			interface EncryptRequest {
-				name: string;
-				plaintext: string;
-				additionalAuthenticatedData?: string;
-			}
-			interface EncryptResponse {
-				name: string;
-				ciphertext: Buffer;
-			}
-			type EncryptCallback = (err: Error | null, apiResponse: [EncryptResponse, any, any]) => void;
+        interface EncryptRequest {
+            name: string;
+            plaintext: string;
+            additionalAuthenticatedData?: string;
+        }
+        interface EncryptResponse {
+            name: string;
+            ciphertext: Buffer;
+        }
+        type EncryptCallback = (err: Error | null, apiResponse: [EncryptResponse, any, any]) => void;
 
-			interface DecryptRequest {
-				name: string;
-				ciphertext: string;
-				additionalAuthenticatedData?: string;
-			}
-			interface DecryptResponse {
-				plaintext: Buffer;
-			}
-			type DecryptCallback = (err: Error | null, apiResponse: [DecryptResponse, any, any]) => void;
+        interface DecryptRequest {
+            name: string;
+            ciphertext: string;
+            additionalAuthenticatedData?: string;
+        }
+        interface DecryptResponse {
+            plaintext: Buffer;
+        }
+        type DecryptCallback = (err: Error | null, apiResponse: [DecryptResponse, any, any]) => void;
 
-			interface ListKeyRingsRequest {
-				parent: string;
-				page_size?: number;
-				page_token?: string;
-			}
-			type ListKeyRingsCallback = (err: Error | null, apiResponse: [KeyRing[], any, any]) => void;
+        interface ListKeyRingsRequest {
+            parent: string;
+            page_size?: number;
+            page_token?: string;
+        }
+        type ListKeyRingsCallback = (err: Error | null, apiResponse: [KeyRing[], any, any]) => void;
 
-			interface ListCryptoKeysRequest {
-				parent: string;
-				page_size?: number;
-				page_token?: string;
-			}
-			type ListCryptoKeysCallback = (err: Error | null, apiResponse: [CryptoKey[], any, any]) => void;
-		}
+        interface ListCryptoKeysRequest {
+            parent: string;
+            page_size?: number;
+            page_token?: string;
+        }
+        type ListCryptoKeysCallback = (err: Error | null, apiResponse: [CryptoKey[], any, any]) => void;
+    }
 
-		class KeyManagementServiceClient {
-			constructor(options?: KeyManagementServiceClient.ConfigurationObject);
+    class KeyManagementServiceClient {
+        constructor(options?: KeyManagementServiceClient.ConfigurationObject);
 
-			keyRingPath(project: string, location: string, keyRing: string): string;
-			cryptoKeyPathPath(project: string, location: string, keyRing: string, cryptoKeyPath: string): string;
-			locationPath(project: string, location: string): string;
-			cryptoKeyPath(project: string, location: string, keyRing: string, cryptoKey: string): string;
-			cryptoKeyVersionPath(project: string, location: string, keyRing: string, cryptoKey: string, cryptoKeyVersion: string): string;
+        keyRingPath(project: string, location: string, keyRing: string): string;
+        cryptoKeyPathPath(project: string, location: string, keyRing: string, cryptoKeyPath: string): string;
+        locationPath(project: string, location: string): string;
+        cryptoKeyPath(project: string, location: string, keyRing: string, cryptoKey: string): string;
+        cryptoKeyVersionPath(project: string, location: string, keyRing: string, cryptoKey: string, cryptoKeyVersion: string): string;
 
-			encrypt(request: KeyManagementServiceClient.EncryptRequest, gaxOpts?: GAX.CallOptions): Promise<[KeyManagementServiceClient.EncryptResponse, any, any]>;
-			encrypt(request: KeyManagementServiceClient.EncryptRequest, callback: KeyManagementServiceClient.EncryptCallback): void;
-			encrypt(request: KeyManagementServiceClient.EncryptRequest, gaxOpts: GAX.CallOptions, callback: KeyManagementServiceClient.EncryptCallback): void;
+        encrypt(request: KeyManagementServiceClient.EncryptRequest, gaxOpts?: GAX.CallOptions): Promise<[KeyManagementServiceClient.EncryptResponse, any, any]>;
+        encrypt(request: KeyManagementServiceClient.EncryptRequest, callback: KeyManagementServiceClient.EncryptCallback): void;
+        encrypt(request: KeyManagementServiceClient.EncryptRequest, gaxOpts: GAX.CallOptions, callback: KeyManagementServiceClient.EncryptCallback): void;
 
-			decrypt(request: KeyManagementServiceClient.DecryptRequest, gaxOpts?: GAX.CallOptions): Promise<[KeyManagementServiceClient.DecryptResponse, any, any]>;
-			decrypt(request: KeyManagementServiceClient.DecryptRequest, callback: KeyManagementServiceClient.DecryptCallback): void;
-			decrypt(request: KeyManagementServiceClient.DecryptRequest, gaxOpts: GAX.CallOptions, callback: KeyManagementServiceClient.DecryptCallback): void;
+        decrypt(request: KeyManagementServiceClient.DecryptRequest, gaxOpts?: GAX.CallOptions): Promise<[KeyManagementServiceClient.DecryptResponse, any, any]>;
+        decrypt(request: KeyManagementServiceClient.DecryptRequest, callback: KeyManagementServiceClient.DecryptCallback): void;
+        decrypt(request: KeyManagementServiceClient.DecryptRequest, gaxOpts: GAX.CallOptions, callback: KeyManagementServiceClient.DecryptCallback): void;
 
-			listKeyRings(request: KeyManagementServiceClient.ListKeyRingsRequest, gaxOpts?: GAX.CallOptions): Promise<[KeyRing[], any, any]>;
-			listKeyRings(request: KeyManagementServiceClient.ListKeyRingsRequest, callback: KeyManagementServiceClient.ListKeyRingsCallback): void;
-			listKeyRings(request: KeyManagementServiceClient.ListKeyRingsRequest, gaxOpts: GAX.CallOptions, callback: KeyManagementServiceClient.ListKeyRingsCallback): void;
+        listKeyRings(request: KeyManagementServiceClient.ListKeyRingsRequest, gaxOpts?: GAX.CallOptions): Promise<[KeyRing[], any, any]>;
+        listKeyRings(request: KeyManagementServiceClient.ListKeyRingsRequest, callback: KeyManagementServiceClient.ListKeyRingsCallback): void;
+        listKeyRings(request: KeyManagementServiceClient.ListKeyRingsRequest, gaxOpts: GAX.CallOptions, callback: KeyManagementServiceClient.ListKeyRingsCallback): void;
 
-			listCryptoKeys(request: KeyManagementServiceClient.ListCryptoKeysRequest, gaxOpts?: GAX.CallOptions): Promise<[CryptoKey[], any, any]>;
-			listCryptoKeys(request: KeyManagementServiceClient.ListCryptoKeysRequest, callback: KeyManagementServiceClient.ListCryptoKeysCallback): void;
-			listCryptoKeys(request: KeyManagementServiceClient.ListCryptoKeysRequest, gaxOpts: GAX.CallOptions, callback: KeyManagementServiceClient.ListCryptoKeysCallback): void;
-		}
-	}
+        listCryptoKeys(request: KeyManagementServiceClient.ListCryptoKeysRequest, gaxOpts?: GAX.CallOptions): Promise<[CryptoKey[], any, any]>;
+        listCryptoKeys(request: KeyManagementServiceClient.ListCryptoKeysRequest, callback: KeyManagementServiceClient.ListCryptoKeysCallback): void;
+        listCryptoKeys(request: KeyManagementServiceClient.ListCryptoKeysRequest, gaxOpts: GAX.CallOptions, callback: KeyManagementServiceClient.ListCryptoKeysCallback): void;
+    }
+}
 
-	class KeyManagementServiceClient extends v1.KeyManagementServiceClient {
-		constructor(options?: v1.KeyManagementServiceClient.ConfigurationObject);
-	}
+export class KeyManagementServiceClient extends v1.KeyManagementServiceClient {
+    constructor(options?: v1.KeyManagementServiceClient.ConfigurationObject);
+}
 
-	namespace GAX {
-		/** https://googleapis.github.io/gax-nodejs/global.html#CallOptions */
-		interface CallOptions {
-			timeout?: number;
-			retry?: RetryOptions;
-			autoPaginate?: boolean;
-			pageToken?: object;
-			isBundling?: boolean;
-			longrunning?: BackoffSettings;
-			promise?: PromiseConstructor; // FIXME Unsure if this is the correct type; remove this comment if it is
-		}
+export namespace GAX {
+    /** https://googleapis.github.io/gax-nodejs/global.html#CallOptions */
+    interface CallOptions {
+        timeout?: number;
+        retry?: RetryOptions;
+        autoPaginate?: boolean;
+        pageToken?: object;
+        isBundling?: boolean;
+        longrunning?: BackoffSettings;
+        promise?: PromiseConstructor; // FIXME Unsure if this is the correct type; remove this comment if it is
+    }
 
-		/** https://googleapis.github.io/gax-nodejs/global.html#RetryOptions */
-		interface RetryOptions {
-			retryCodes: string[];
-			backoffSettings: BackoffSettings;
-		}
+    /** https://googleapis.github.io/gax-nodejs/global.html#RetryOptions */
+    interface RetryOptions {
+        retryCodes: string[];
+        backoffSettings: BackoffSettings;
+    }
 
-		/** https://googleapis.github.io/gax-nodejs/global.html#BackoffSettings */
-		interface BackoffSettings {
-			initialRetryDelayMillis: number;
-			retryDelayMultiplier: number;
-			maxRetryDelayMillis: number;
-			initialRpcTimeoutMillis: number;
-			maxRpcTimeoutMillis: number;
-			totalTimeoutMillis: number;
-		}
-	}
+    /** https://googleapis.github.io/gax-nodejs/global.html#BackoffSettings */
+    interface BackoffSettings {
+        initialRetryDelayMillis: number;
+        retryDelayMultiplier: number;
+        maxRetryDelayMillis: number;
+        initialRpcTimeoutMillis: number;
+        maxRpcTimeoutMillis: number;
+        totalTimeoutMillis: number;
+    }
 }
diff --git a/types/google-cloud__kms/tslint.json b/types/google-cloud__kms/tslint.json
index ffaae9bd46..f93cf8562a 100644
--- a/types/google-cloud__kms/tslint.json
+++ b/types/google-cloud__kms/tslint.json
@@ -1,6 +1,3 @@
 {
-	"extends": "dtslint/dt.json",
-	"rules": {
-		"indent": [true, "tabs"]
-	}
+    "extends": "dtslint/dt.json"
 }

From d3ba03f75649289aaa7562d452a8ebdf5ea292e0 Mon Sep 17 00:00:00 2001
From: Junyoung Choi <fluke8259@gmail.com>
Date: Tue, 11 Dec 2018 13:48:40 +0900
Subject: [PATCH 796/836] Discard context type checking

---
 types/unist-util-is/index.d.ts             |  6 +++---
 types/unist-util-is/unist-util-is-tests.ts | 12 ++----------
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/types/unist-util-is/index.d.ts b/types/unist-util-is/index.d.ts
index ae92217c6e..82e6e1fdc8 100644
--- a/types/unist-util-is/index.d.ts
+++ b/types/unist-util-is/index.d.ts
@@ -14,8 +14,8 @@ declare namespace unistUtilIs {
      * @param index Position of node in parent
      * @param parent Parent of node
      */
-    type TestFunction<C = {}> = (this: C, node: unknown, index?: number, parent?: Unist.Parent) => boolean | void;
-    type Test<C = {}> = TestFunction<C> | Partial<Unist.Node> | string | null;
+    type TestFunction = (node: unknown, index?: number, parent?: Unist.Parent) => boolean | void;
+    type Test = TestFunction | Partial<Unist.Node> | string | null;
 }
 
 /**
@@ -31,6 +31,6 @@ declare namespace unistUtilIs {
  * @param context Context object to invoke `test` with
  * @returns Whether test passed and `node` is a `Node` (object with `type` set to non-empty `string`).
  */
-declare function unistUtilIs<C = {}>(test: unistUtilIs.Test<C> | Array<unistUtilIs.Test<C>>, node: unknown, index?: number, parent?: Unist.Parent, context?: any): boolean;
+declare function unistUtilIs(test: unistUtilIs.Test | unistUtilIs.Test[], node: unknown, index?: number, parent?: Unist.Parent, context?: any): boolean;
 
 export = unistUtilIs;
diff --git a/types/unist-util-is/unist-util-is-tests.ts b/types/unist-util-is/unist-util-is-tests.ts
index 4d355c90ec..9f3eecc680 100644
--- a/types/unist-util-is/unist-util-is-tests.ts
+++ b/types/unist-util-is/unist-util-is-tests.ts
@@ -20,15 +20,7 @@ is(test, node);
 is(test, node, 4, parent);
 is(test, node, 5, parent);
 
-interface TestContext {
-  some: string;
-}
-function testWithContext(this: TestContext, node: unknown) {}
-is<TestContext>(testWithContext, node);
+function testFunc(node: unknown) {}
+is(testFunc, node);
 
 const wrongTestFunc: is.TestFunction = (node: unknown, n: string) => {}; // $ExpectError
-
-interface OtherTestContext {
-  some: number;
-}
-is<OtherTestContext>(testWithContext, node); // $ExpectError

From d83c38e33756f0d4865de5cd34beffb399d595cd Mon Sep 17 00:00:00 2001
From: Brian Faust <faustbrian@users.noreply.github.com>
Date: Tue, 11 Dec 2018 08:55:38 +0200
Subject: [PATCH 797/836] Add the `unsafe` method to the NumberSchema of Joi

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

diff --git a/types/joi/index.d.ts b/types/joi/index.d.ts
index 096847a82c..1af519dd5a 100644
--- a/types/joi/index.d.ts
+++ b/types/joi/index.d.ts
@@ -504,6 +504,11 @@ export interface NumberSchema extends AnySchema {
      */
     integer(): this;
 
+    /**
+     * Allows the number to be outside of JavaScript's safety range (Number.MIN_SAFE_INTEGER & Number.MAX_SAFE_INTEGER).
+     */
+    unsafe(enabled: boolean): this;
+
     /**
      * Specifies the maximum number of decimal places where:
      * @param limit - the maximum number of decimal places allowed.

From 0a70db0e4c7aa9a78523188c703c07e7d0c44d34 Mon Sep 17 00:00:00 2001
From: Brian Faust <hello@basecode.sh>
Date: Tue, 11 Dec 2018 09:07:03 +0200
Subject: [PATCH 798/836] Add test for `unsafe` for the NumberSchema of Joi

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

diff --git a/types/joi/index.d.ts b/types/joi/index.d.ts
index 1af519dd5a..404e0339ef 100644
--- a/types/joi/index.d.ts
+++ b/types/joi/index.d.ts
@@ -507,7 +507,7 @@ export interface NumberSchema extends AnySchema {
     /**
      * Allows the number to be outside of JavaScript's safety range (Number.MIN_SAFE_INTEGER & Number.MAX_SAFE_INTEGER).
      */
-    unsafe(enabled: boolean): this;
+    unsafe(enabled?: boolean): this;
 
     /**
      * Specifies the maximum number of decimal places where:
diff --git a/types/joi/joi-tests.ts b/types/joi/joi-tests.ts
index 716fc70c16..e21310396b 100644
--- a/types/joi/joi-tests.ts
+++ b/types/joi/joi-tests.ts
@@ -618,6 +618,7 @@ numSchema = numSchema.greater(ref);
 numSchema = numSchema.less(num);
 numSchema = numSchema.less(ref);
 numSchema = numSchema.integer();
+numSchema = numSchema.unsafe();
 numSchema = numSchema.precision(num);
 numSchema = numSchema.multiple(num);
 numSchema = numSchema.positive();

From 1f04344d92116837def38f25dd14586e8def467d Mon Sep 17 00:00:00 2001
From: Bradley Ayers <bradley.ayers@gmail.com>
Date: Tue, 11 Dec 2018 18:15:20 +1100
Subject: [PATCH 799/836] fix(react-router): match can be null (#31212)

* fix(react-router): match can be null

* fix(react-router): update tests
---
 types/react-router-dom/react-router-dom-tests.tsx         | 4 ++++
 types/react-router/index.d.ts                             | 2 +-
 .../test/examples-from-react-router-website/Ambiguous.tsx | 2 +-
 .../test/examples-from-react-router-website/Animation.tsx | 6 +++---
 .../test/examples-from-react-router-website/Basic.tsx     | 4 ++--
 .../examples-from-react-router-website/ModalGallery.tsx   | 8 ++++++++
 .../test/examples-from-react-router-website/Params.tsx    | 2 +-
 .../test/examples-from-react-router-website/Recursive.tsx | 4 ++++
 8 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/types/react-router-dom/react-router-dom-tests.tsx b/types/react-router-dom/react-router-dom-tests.tsx
index a550a579fa..a7715e9ea1 100644
--- a/types/react-router-dom/react-router-dom-tests.tsx
+++ b/types/react-router-dom/react-router-dom-tests.tsx
@@ -27,6 +27,10 @@ type OtherProps = RouteComponentProps<{
 }>;
 
 const Component: React.SFC<OtherProps> = props => {
+  if (!props.match) {
+    return null;
+  }
+
   const { id } = props.match.params;
   return (
     <div>{id}</div>
diff --git a/types/react-router/index.d.ts b/types/react-router/index.d.ts
index f62fc44b18..fff900d458 100644
--- a/types/react-router/index.d.ts
+++ b/types/react-router/index.d.ts
@@ -68,7 +68,7 @@ export interface StaticContext {
 export interface RouteComponentProps<Params extends { [K in keyof Params]?: string } = {}, C extends StaticContext = StaticContext, S = H.LocationState> {
   history: H.History;
   location: H.Location<S>;
-  match: match<Params>;
+  match: match<Params> | null;
   staticContext?: C;
 }
 
diff --git a/types/react-router/test/examples-from-react-router-website/Ambiguous.tsx b/types/react-router/test/examples-from-react-router-website/Ambiguous.tsx
index 6e6598fd71..3f2dbc2223 100644
--- a/types/react-router/test/examples-from-react-router-website/Ambiguous.tsx
+++ b/types/react-router/test/examples-from-react-router-website/Ambiguous.tsx
@@ -41,7 +41,7 @@ const AmbiguousExample = () => (
 
 const About = () => <h2>About</h2>;
 const Company = () => <h2>Company</h2>;
-const User: React.SFC<RouteComponentProps<{user: string}>> = ({ match }) => (
+const User: React.SFC<RouteComponentProps<{user: string}>> = ({ match }) => match && (
   <div>
     <h2>User: {match.params.user}</h2>
   </div>
diff --git a/types/react-router/test/examples-from-react-router-website/Animation.tsx b/types/react-router/test/examples-from-react-router-website/Animation.tsx
index 8133528179..306ad14ea4 100644
--- a/types/react-router/test/examples-from-react-router-website/Animation.tsx
+++ b/types/react-router/test/examples-from-react-router-website/Animation.tsx
@@ -72,12 +72,12 @@ interface HSLParams {
   l: string;
 }
 
-const HSL: React.SFC<RouteComponentProps<HSLParams>> = ({ match: { params } }) => (
+const HSL: React.SFC<RouteComponentProps<HSLParams>> = ({ match }) => match && (
   <div style={{
     ...styles.fill,
     ...styles.hsl,
-    background: `hsl(${params.h}, ${params.s}%, ${params.l}%)`
-  }}>hsl({params.h}, {params.s}%, {params.l}%)</div>
+    background: `hsl(${match.params.h}, ${match.params.s}%, ${match.params.l}%)`
+  }}>hsl({match.params.h}, {match.params.s}%, {match.params.l}%)</div>
 );
 
 const styles: any = {};
diff --git a/types/react-router/test/examples-from-react-router-website/Basic.tsx b/types/react-router/test/examples-from-react-router-website/Basic.tsx
index ba6a5eabe5..05e2101f85 100644
--- a/types/react-router/test/examples-from-react-router-website/Basic.tsx
+++ b/types/react-router/test/examples-from-react-router-website/Basic.tsx
@@ -36,7 +36,7 @@ const About = () => (
   </div>
 );
 
-const Topics: React.SFC<RouteComponentProps> = ({ match }) => (
+const Topics: React.SFC<RouteComponentProps> = ({ match }) => match === null ? null : (
   <div>
     <h2>Topics</h2>
     <ul>
@@ -64,7 +64,7 @@ const Topics: React.SFC<RouteComponentProps> = ({ match }) => (
   </div>
 );
 
-const Topic: React.SFC<RouteComponentProps<{topicId: string}>> = ({ match }) => (
+const Topic: React.SFC<RouteComponentProps<{topicId: string}>> = ({ match }) => match && (
   <div>
     <h3>{match.params.topicId}</h3>
   </div>
diff --git a/types/react-router/test/examples-from-react-router-website/ModalGallery.tsx b/types/react-router/test/examples-from-react-router-website/ModalGallery.tsx
index c51d63ac0f..be9bd1c322 100644
--- a/types/react-router/test/examples-from-react-router-website/ModalGallery.tsx
+++ b/types/react-router/test/examples-from-react-router-website/ModalGallery.tsx
@@ -114,6 +114,10 @@ const Gallery = () => (
 );
 
 const ImageView: React.SFC<RouteComponentProps<{ id: string }>> = ({ match }) => {
+  if (!match) {
+    return null;
+  }
+
   const image = IMAGES[parseInt(match.params.id, 10)];
   if (!image) {
     return <div>Image not found</div>;
@@ -128,6 +132,10 @@ const ImageView: React.SFC<RouteComponentProps<{ id: string }>> = ({ match }) =>
 };
 
 const Modal: React.SFC<RouteComponentProps<{ id: string }>> = ({ match, history }) => {
+  if (!match) {
+    return null;
+  }
+
   const image = IMAGES[parseInt(match.params.id, 10)];
   if (!image) {
     return null;
diff --git a/types/react-router/test/examples-from-react-router-website/Params.tsx b/types/react-router/test/examples-from-react-router-website/Params.tsx
index a6d0bded7f..801a889d79 100644
--- a/types/react-router/test/examples-from-react-router-website/Params.tsx
+++ b/types/react-router/test/examples-from-react-router-website/Params.tsx
@@ -22,7 +22,7 @@ const ParamsExample = () => (
   </Router>
 );
 
-const Child: React.SFC<RouteComponentProps<{id: string}>> = ({ match }) => (
+const Child: React.SFC<RouteComponentProps<{id: string}>> = ({ match }) => match && (
   <div>
     <h3>ID: {match.params.id}</h3>
   </div>
diff --git a/types/react-router/test/examples-from-react-router-website/Recursive.tsx b/types/react-router/test/examples-from-react-router-website/Recursive.tsx
index 534fe52931..9489d2fb25 100644
--- a/types/react-router/test/examples-from-react-router-website/Recursive.tsx
+++ b/types/react-router/test/examples-from-react-router-website/Recursive.tsx
@@ -39,6 +39,10 @@ interface InitialPersonProps {
 type PersonProps = RouteComponentProps<{ id: string }>;
 
 const Person: React.SFC<InitialPersonProps | PersonProps> = ({ match }) => {
+  if (!match) {
+    return null;
+  }
+
   const person = find(match.params.id);
 
   return (

From bccc29241bd1993164f45b16225bb93f2b416982 Mon Sep 17 00:00:00 2001
From: gaston <gastwork@yandex.ru>
Date: Tue, 11 Dec 2018 23:44:47 +0700
Subject: [PATCH 800/836] Added polygon type, geometryEditor namespace, filled
 placemark options, added vow namespace

---
 types/yandex-maps/index.d.ts | 5345 ++++++++++++++++++----------------
 1 file changed, 2884 insertions(+), 2461 deletions(-)

diff --git a/types/yandex-maps/index.d.ts b/types/yandex-maps/index.d.ts
index e7078b4b28..d3c6975e98 100644
--- a/types/yandex-maps/index.d.ts
+++ b/types/yandex-maps/index.d.ts
@@ -1,6 +1,7 @@
 // Type definitions for yandex-maps 2.1
 // Project: https://github.com/Delagen/typings-yandex-maps
 // Definitions by: Delagen <https://github.com/Delagen>
+//                 gastwork13 <https://github.com/gastwork13>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.4
 
@@ -140,1795 +141,2485 @@ declare namespace ymaps {
             duration?: number;
         }
 
-        class RouteEditor implements IBehavior {
-            events: IEventManager;
-            options: IOptionManager;
+		class RouteEditor implements IBehavior {
+			events: IEventManager;
+			options: IOptionManager;
 
-            disable(): void;
+			disable(): void;
 
-            enable(): void;
+			enable(): void;
 
-            isEnabled(): boolean;
+			isEnabled(): boolean;
 
-            getParent(): null | IControlParent;
+			getParent(): null | IControlParent;
 
-            setParent(parent: IControlParent): this;
+			setParent(parent: IControlParent): this;
 
-            getRoute(): router.Route;
+			getRoute(): router.Route;
 
-            getState(): string;
+			getState(): string;
 
-            setState(state: string | null): void;
-        }
+			setState(state: string | null): void;
+		}
 
-        class Ruler implements IBehavior {
-            constructor(options?: IRulerOptions)
+		class Ruler implements IBehavior {
+			constructor(options?: IRulerOptions)
 
-            events: IEventManager;
-            options: IOptionManager;
+			events: IEventManager;
+			options: IOptionManager;
 
-            disable(): void;
+			disable(): void;
 
-            enable(): void;
+			enable(): void;
 
-            isEnabled(): boolean;
+			isEnabled(): boolean;
 
-            getParent(): null | IControlParent;
+			getParent(): null | IControlParent;
 
-            setParent(parent: IControlParent): this;
+			setParent(parent: IControlParent): this;
 
-            close(): boolean;
+			close(): boolean;
 
-            getState(): string;
+			getState(): string;
 
-            setState(state: string | null): void;
-        }
+			setState(state: string | null): void;
+		}
 
-        interface IRulerOptions {
-            balloonAutoPan?: boolean;
-        }
+		interface IRulerOptions {
+			balloonAutoPan?: boolean;
+		}
 
-        class ScrollZoom implements IBehavior {
-            constructor(options?: IScrollZoomOptions)
+		class ScrollZoom implements IBehavior {
+			constructor(options?: IScrollZoomOptions)
 
-            events: IEventManager;
-            options: IOptionManager;
+			events: IEventManager;
+			options: IOptionManager;
 
-            disable(): void;
+			disable(): void;
 
-            enable(): void;
+			enable(): void;
 
-            isEnabled(): boolean;
+			isEnabled(): boolean;
 
-            getParent(): null | IControlParent;
+			getParent(): null | IControlParent;
 
-            setParent(parent: IControlParent): this;
-        }
+			setParent(parent: IControlParent): this;
+		}
 
-        interface IScrollZoomOptions {
-            maximumDelta?: number;
-            speed?: number;
-        }
+		interface IScrollZoomOptions {
+			maximumDelta?: number;
+			speed?: number;
+		}
 
-        const storage: util.Storage;
-    }
+		const storage: util.Storage;
+	}
 
-    namespace clusterer {
-        class Balloon implements IBalloonManager<Clusterer> { //tslint:disable-line no-shadowed-variable
-            constructor(clusterer: Clusterer);
+	namespace clusterer {
+		class Balloon implements IBalloonManager<Clusterer> { //tslint:disable-line no-shadowed-variable
+			constructor(clusterer: Clusterer);
 
-            events: IEventManager;
+			events: IEventManager;
 
-            autoPan(): Promise<Clusterer>;
+			autoPan(): Promise<Clusterer>;
 
-            close(force?: boolean): Promise<Clusterer>;
+			close(force?: boolean): Promise<Clusterer>;
 
-            destroy(): void;
+			destroy(): void;
 
-            getData(): object | null;
+			getData(): object | null;
 
-            getOptions(): IOptionManager | null;
+			getOptions(): IOptionManager | null;
 
-            getOverlay(): Promise<IOverlay | null>;
+			getOverlay(): Promise<IOverlay | null>;
 
-            getOverlaySync(): IOverlay | null;
+			getOverlaySync(): IOverlay | null;
 
-            getPosition(): number[] | null;
+			getPosition(): number[] | null;
 
-            isOpen(): boolean;
+			isOpen(): boolean;
 
-            open(position?: number[], data?: object | string | HTMLElement, options?: object): Promise<Clusterer>;
+			open(position?: number[], data?: object | string | HTMLElement, options?: object): Promise<Clusterer>;
 
-            setData(data: object | string | HTMLElement): Promise<Clusterer>;
+			setData(data: object | string | HTMLElement): Promise<Clusterer>;
 
-            setOptions(options: object): Promise<Clusterer>;
+			setOptions(options: object): Promise<Clusterer>;
 
-            setPosition(position: number[]): Promise<Clusterer>;
-        }
+			setPosition(position: number[]): Promise<Clusterer>;
+		}
 
-        class Hint implements IHintManager<Clusterer> {
-            constructor(clusterer: Clusterer);
+		class Hint implements IHintManager<Clusterer> {
+			constructor(clusterer: Clusterer);
 
-            events: IEventManager;
+			events: IEventManager;
 
-            close(force?: boolean): Promise<Clusterer>;
+			close(force?: boolean): Promise<Clusterer>;
 
-            destroy(): void;
+			destroy(): void;
 
-            getData(): object | null;
+			getData(): object | null;
 
-            getOptions(): IOptionManager | null;
+			getOptions(): IOptionManager | null;
 
-            getOverlay(): Promise<IOverlay | null>;
+			getOverlay(): Promise<IOverlay | null>;
 
-            getOverlaySync(): IOverlay | null;
+			getOverlaySync(): IOverlay | null;
 
-            getPosition(): number[] | null;
+			getPosition(): number[] | null;
 
-            isOpen(): boolean;
+			isOpen(): boolean;
 
-            open(position?: number[], data?: object | string | HTMLElement, options?: object): Promise<Clusterer>;
+			open(position?: number[], data?: object | string | HTMLElement, options?: object): Promise<Clusterer>;
 
-            setData(data: object | string | HTMLElement): Promise<Clusterer>;
+			setData(data: object | string | HTMLElement): Promise<Clusterer>;
 
-            setOptions(options: object): Promise<Clusterer>;
+			setOptions(options: object): Promise<Clusterer>;
 
-            setPosition(position: number[]): Promise<Clusterer>;
-        }
-    }
+			setPosition(position: number[]): Promise<Clusterer>;
+		}
+	}
 
-    namespace collection {
-        class Item implements IChildOnMap, ICustomizable, IEventEmitter, IParentOnMap {
-            constructor(options?: object);
+	namespace collection {
+		class Item implements IChildOnMap, ICustomizable, IEventEmitter, IParentOnMap {
+			constructor(options?: object);
 
-            events: IEventManager;
-            options: IOptionManager;
+			events: IEventManager;
+			options: IOptionManager;
 
-            getParent(): null | IControlParent;
+			getParent(): null | IControlParent;
 
-            setParent(parent: IControlParent): this;
+			setParent(parent: IControlParent): this;
 
-            getMap(): Map;
+			getMap(): Map;
 
-            onAddToMap(map: Map): void;
+			onAddToMap(map: Map): void;
 
-            onRemoveFromMap(oldMap: Map): void;
-        }
-    }
+			onRemoveFromMap(oldMap: Map): void;
+		}
+	}
 
-    namespace control {
-        class Button implements ICustomizable, ISelectableControl {
-            constructor(parameters?: IButtonParameters | string);
+	namespace control {
+		class Button implements ICustomizable, ISelectableControl {
+			constructor(parameters?: IButtonParameters | string);
 
-            options: IOptionManager;
-            events: IEventManager;
-            data: data.Manager;
-            state: data.Manager;
+			options: IOptionManager;
+			events: IEventManager;
+			data: data.Manager;
+			state: data.Manager;
 
-            deselect(): void;
+			deselect(): void;
 
-            disable(): void;
+			disable(): void;
 
-            enable(): void;
+			enable(): void;
 
-            isEnabled(): boolean;
+			isEnabled(): boolean;
 
-            isSelected(): boolean;
+			isSelected(): boolean;
 
-            select(): void;
+			select(): void;
 
-            getParent(): null | IControlParent;
+			getParent(): null | IControlParent;
 
-            setParent(parent: IControlParent): this;
-        }
+			setParent(parent: IControlParent): this;
+		}
 
-        interface IBaseButtonParametersOptions {
-            adjustMapMargin?: boolean;
-            float?: "none" | "left" | "right";
-            floatIndex?: number;
-            layout?: IClassConstructor<ISelectableControlLayout> | string;
-            maxWidth?: number[][] | number[] | number;
-            position?: {
-                bottom?: number | string;
-                left?: number | string;
-                right?: number | string;
-                top?: number | string;
-            };
-            visible?: boolean;
-        }
+		interface IBaseButtonParametersOptions {
+			adjustMapMargin?: boolean;
+			float?: "none" | "left" | "right";
+			floatIndex?: number;
+			layout?: IClassConstructor<ISelectableControlLayout> | string;
+			maxWidth?: number[][] | number[] | number;
+			position?: {
+				bottom?: number | string;
+				left?: number | string;
+				right?: number | string;
+				top?: number | string;
+			};
+			visible?: boolean;
+		}
 
-        interface IButtonParameters {
-            data?: {
-                content?: string;
-                image?: string;
-                title?: string;
-            };
-            options?: IBaseButtonParametersOptions & {
-                selectOnClick?: boolean;
-                size?: "auto" | "small" | "medium" | "large";
-            };
-            state?: {
-                enabled?: boolean;
-                selected?: boolean;
-            };
-        }
+		interface IButtonParameters {
+			data?: {
+				content?: string;
+				image?: string;
+				title?: string;
+			};
+			options?: IBaseButtonParametersOptions & {
+				selectOnClick?: boolean;
+				size?: "auto" | "small" | "medium" | "large";
+			};
+			state?: {
+				enabled?: boolean;
+				selected?: boolean;
+			};
+		}
 
-        class FullscreenControl extends Button {
-            constructor(parameters?: IFullscreenControlParameters);
+		class FullscreenControl extends Button {
+			constructor(parameters?: IFullscreenControlParameters);
 
-            enterFullscreen(): void;
+			enterFullscreen(): void;
 
-            exitFullscreen(): void;
-        }
+			exitFullscreen(): void;
+		}
 
-        interface IFullscreenControlParameters {
-            data?: {
-                title?: string;
-            };
-            options?: IBaseButtonParametersOptions & {
-                collapseOnBlur?: boolean;
-                expandOnClick?: boolean;
-                popupFloat?: "left" | "right";
-            };
-            state?: {
-                expanded?: boolean;
-            };
-        }
+		interface IFullscreenControlParameters {
+			data?: {
+				title?: string;
+			};
+			options?: IBaseButtonParametersOptions & {
+				collapseOnBlur?: boolean;
+				expandOnClick?: boolean;
+				popupFloat?: "left" | "right";
+			};
+			state?: {
+				expanded?: boolean;
+			};
+		}
 
-        class GeolocationControl extends Button {
-            constructor(parameters?: IGeolocationControlParameters);
-        }
+		class GeolocationControl extends Button {
+			constructor(parameters?: IGeolocationControlParameters);
+		}
 
-        interface IGeolocationControlParameters extends IButtonParameters {
-            data?: {
-                image?: string;
-                title?: string;
-            };
-            options?: IBaseButtonParametersOptions;
-        }
+		interface IGeolocationControlParameters extends IButtonParameters {
+			data?: {
+				image?: string;
+				title?: string;
+			};
+			options?: IBaseButtonParametersOptions;
+		}
 
-        class ListBox implements ICollection, IControl, ICustomizable {
-            constructor(parameters?: IListBoxParameters);
+		class ListBox implements ICollection, IControl, ICustomizable {
+			constructor(parameters?: IListBoxParameters);
 
-            events: IEventManager;
-            options: IOptionManager;
-            data: data.Manager;
-            state: data.Manager;
+			events: IEventManager;
+			options: IOptionManager;
+			data: data.Manager;
+			state: data.Manager;
 
-            add(object: object): this;
+			add(object: object): this;
 
-            getIterator(): IIterator;
+			getIterator(): IIterator;
 
-            remove(object: object): this;
+			remove(object: object): this;
 
-            getParent(): null | IControlParent;
+			getParent(): null | IControlParent;
 
-            setParent(parent: IControlParent): this;
-        }
+			setParent(parent: IControlParent): this;
+		}
 
-        interface IListBoxParameters extends IButtonParameters {
-            options?: IBaseButtonParametersOptions & {
-                noPlacemark?: boolean;
-            };
-        }
-
-        class ListBoxItem implements ICustomizable, ISelectableControl {
-            constructor(parameters?: IListBoxItemParameters);
-
-            options: IOptionManager;
-            events: IEventManager;
-            data: data.Manager;
-            state: data.Manager;
-
-            deselect(): void;
-
-            disable(): void;
-
-            enable(): void;
-
-            isEnabled(): boolean;
-
-            isSelected(): boolean;
-
-            select(): void;
-
-            getParent(): null | IControlParent;
-
-            setParent(parent: IControlParent): this;
-
-            getMap(): Map;
-        }
-
-        interface IListBoxItemParameters {
-            data?: {
-                content?: string;
-            };
-            options?: {
-                layout?: string | IClassConstructor<ISelectableControlLayout>;
-                selectableLayout?: string | IClassConstructor<ISelectableControlLayout>;
-                selectOnClick?: boolean;
-                separatorLayout?: string | IClassConstructor<ISelectableControlLayout>;
-                type?: "selectable" | "separator";
-                visible?: boolean;
-            };
-            state?: {
-                selected?: boolean;
-            };
-        }
-
-        class Manager {
-            constructor(map: Map, controls?: Array<string | IControl>, options?: IManagerOptions);
-
-            events: event.Manager;
-            options: option.Manager;
-            state: data.Manager;
-
-            add(control: IControl | ControlKey, options?: IManagerControlOptions): this;
-
-            each(callback: (control: IControl) => void, context: object): this;
-
-            get(index: number | string): IControl | null;
-
-            getChildElement(control: IControl): Promise<HTMLElement>;
-
-            getContainer(): HTMLElement;
-
-            getMap(): Map;
-
-            indexOf(childToFind: IControl | string): number;
-
-            remove(control: IControl | string): this;
-        }
-
-        interface IManagerOptions {
-            margin?: number;
-            pane?: IPane;
-            states?: string[];
-        }
+		interface IListBoxParameters extends IButtonParameters {
+			options?: IBaseButtonParametersOptions & {
+				noPlacemark?: boolean;
+			};
+		}
+
+		class ListBoxItem implements ICustomizable, ISelectableControl {
+			constructor(parameters?: IListBoxItemParameters);
+
+			options: IOptionManager;
+			events: IEventManager;
+			data: data.Manager;
+			state: data.Manager;
+
+			deselect(): void;
+
+			disable(): void;
+
+			enable(): void;
+
+			isEnabled(): boolean;
+
+			isSelected(): boolean;
+
+			select(): void;
+
+			getParent(): null | IControlParent;
+
+			setParent(parent: IControlParent): this;
+
+			getMap(): Map;
+		}
+
+		interface IListBoxItemParameters {
+			data?: {
+				content?: string;
+			};
+			options?: {
+				layout?: string | IClassConstructor<ISelectableControlLayout>;
+				selectableLayout?: string | IClassConstructor<ISelectableControlLayout>;
+				selectOnClick?: boolean;
+				separatorLayout?: string | IClassConstructor<ISelectableControlLayout>;
+				type?: "selectable" | "separator";
+				visible?: boolean;
+			};
+			state?: {
+				selected?: boolean;
+			};
+		}
+
+		class Manager {
+			constructor(map: Map, controls?: Array<string | IControl>, options?: IManagerOptions);
+
+			events: event.Manager;
+			options: option.Manager;
+			state: data.Manager;
+
+			add(control: IControl | ControlKey, options?: IManagerControlOptions): this;
+
+			each(callback: (control: IControl) => void, context: object): this;
+
+			get(index: number | string): IControl | null;
+
+			getChildElement(control: IControl): Promise<HTMLElement>;
+
+			getContainer(): HTMLElement;
+
+			getMap(): Map;
+
+			indexOf(childToFind: IControl | string): number;
+
+			remove(control: IControl | string): this;
+		}
+
+		interface IManagerOptions {
+			margin?: number;
+			pane?: IPane;
+			states?: string[];
+		}
 
-        interface IManagerControlOptions {
-            float?: "none" | "left" | "right";
-            floatIndex?: number;
-            position?: {
-                bottom?: number | string;
-                left?: number | string;
-                right?: number | string;
-                top?: number | string;
-            };
-        }
+		interface IManagerControlOptions {
+			float?: "none" | "left" | "right";
+			floatIndex?: number;
+			position?: {
+				bottom?: number | string;
+				left?: number | string;
+				right?: number | string;
+				top?: number | string;
+			};
+		}
 
-        class RouteButton implements IControl, ICustomizable {
-            constructor(parameters?: IRouteButtonParameters);
+		class RouteButton implements IControl, ICustomizable {
+			constructor(parameters?: IRouteButtonParameters);
 
-            events: IEventManager;
-            options: IOptionManager;
-            routePanel: IRoutePanel;
+			events: IEventManager;
+			options: IOptionManager;
+			routePanel: IRoutePanel;
 
-            getParent(): null | IControlParent;
+			getParent(): null | IControlParent;
 
-            setParent(parent: IControlParent): this;
-        }
+			setParent(parent: IControlParent): this;
+		}
 
-        interface IRouteButtonParameters {
-            options?: {
-                adjustMapMargin?: boolean;
-                collapseOnBlur?: boolean;
-                float?: "none" | "left" | "right";
-                floatIndex?: number;
-                popupAnimate?: boolean;
-                popupFloat?: "auto" | "left" | "right";
-                popupWidth?: string;
-                position?: {
-                    bottom?: number | string;
-                    left?: number | string;
-                    right?: number | string;
-                    top?: number | string;
-                };
-                size?: "auto" | "small" | "medium" | "large";
-                visible?: boolean;
-            };
-            state?: {
-                expanded?: boolean;
-            };
-        }
-
-        class RouteEditor extends Button {
-            constructor(parameters?: IRouteEditorParameters);
-
-            getRoute(): router.Route;
-        }
-
-        interface IRouteEditorParameters {
-            data?: {
-                image?: string;
-                title?: string;
-            };
-            options?: IBaseButtonParametersOptions;
-            state?: {};
-        }
-
-        class RulerControl extends Button {
-            constructor(parameters?: IRulerControlParameters);
-        }
-
-        interface IRulerControlParameters {
-            data?: {};
-            options?: {
-                adjustMapMargin?: boolean;
-                position?: {
-                    bottom?: number | string;
-                    left?: number | string;
-                    right?: number | string;
-                    top?: number | string;
-                };
-                scaleLine?: boolean;
-                visible?: boolean;
-            };
-            state?: {};
-        }
-
-        class SearchControl implements IControl, ICustomizable {
-            constructor(parameters?: ISearchControlParameters);
-
-            events: IEventManager;
-            options: IOptionManager;
-            state: data.Manager;
-
-            getParent(): null | IControlParent;
-
-            setParent(parent: IControlParent): this;
-
-            clear(): void;
-
-            getMap(): Map;
-
-            getRequestString(): string;
-
-            getResponseMetaData(): object;
-
-            getResult(index: number): Promise<object>;
-
-            getResultsArray(): object[];
-
-            getResultsCount(): number;
+		interface IRouteButtonParameters {
+			options?: {
+				adjustMapMargin?: boolean;
+				collapseOnBlur?: boolean;
+				float?: "none" | "left" | "right";
+				floatIndex?: number;
+				popupAnimate?: boolean;
+				popupFloat?: "auto" | "left" | "right";
+				popupWidth?: string;
+				position?: {
+					bottom?: number | string;
+					left?: number | string;
+					right?: number | string;
+					top?: number | string;
+				};
+				size?: "auto" | "small" | "medium" | "large";
+				visible?: boolean;
+			};
+			state?: {
+				expanded?: boolean;
+			};
+		}
+
+		class RouteEditor extends Button {
+			constructor(parameters?: IRouteEditorParameters);
+
+			getRoute(): router.Route;
+		}
+
+		interface IRouteEditorParameters {
+			data?: {
+				image?: string;
+				title?: string;
+			};
+			options?: IBaseButtonParametersOptions;
+			state?: {};
+		}
+
+		class RulerControl extends Button {
+			constructor(parameters?: IRulerControlParameters);
+		}
+
+		interface IRulerControlParameters {
+			data?: {};
+			options?: {
+				adjustMapMargin?: boolean;
+				position?: {
+					bottom?: number | string;
+					left?: number | string;
+					right?: number | string;
+					top?: number | string;
+				};
+				scaleLine?: boolean;
+				visible?: boolean;
+			};
+			state?: {};
+		}
+
+		class SearchControl implements IControl, ICustomizable {
+			constructor(parameters?: ISearchControlParameters);
+
+			events: IEventManager;
+			options: IOptionManager;
+			state: data.Manager;
+
+			getParent(): null | IControlParent;
+
+			setParent(parent: IControlParent): this;
+
+			clear(): void;
+
+			getMap(): Map;
+
+			getRequestString(): string;
+
+			getResponseMetaData(): object;
+
+			getResult(index: number): Promise<object>;
+
+			getResultsArray(): object[];
+
+			getResultsCount(): number;
 
-            getSelectedIndex(): number;
+			getSelectedIndex(): number;
 
-            hideResult(): void;
+			hideResult(): void;
 
-            search(request: string): Promise<void>;
+			search(request: string): Promise<void>;
 
-            showResult(index: number): this;
-        }
+			showResult(index: number): this;
+		}
 
-        interface ISearchControlParameters {
-            data?: {};
-            options?: {
-                adjustMapMargin?: boolean;
-                boundedBy?: number[][];
-                fitMaxWidth?: boolean;
-                float?: "none" | "left" | "right";
-                floatIndex?: number;
-                formLayout?: string | IClassConstructor<ILayout>;
-                kind?: "house" | "street" | "metro" | "district" | "locality";
-                layout?: string | IClassConstructor<ISearchControlLayout>;
-                maxWidth?: number[][] | number[] | number;
-                noCentering?: boolean;
-                noPlacemark?: boolean;
-                noPopup?: boolean;
-                noSelect?: boolean;
-                noSuggestPanel?: boolean;
-                placeholderContent?: string;
-                popupItemLayout?: string | IClassConstructor<ILayout>;
-                popupLayout?: string | IClassConstructor<ILayout>;
-                position?: {
-                    bottom?: number | string;
-                    left?: number | string;
-                    right?: number | string;
-                    top?: number | string;
-                };
-                provider?: IGeocodeProvider | "yandex#map" | "yandex#search";
-                searchCoordOrder?: "latlong" | "longlat";
-                size?: "auto" | "small" | "medium" | "large";
-                strictBounds?: boolean;
-                suppressYandexSearch?: boolean;
-                useMapBounds?: boolean;
-                zoomMargin?: number;
-                visible?: boolean;
-            };
-            state?: {};
-        }
-    }
+		interface ISearchControlParameters {
+			data?: {};
+			options?: {
+				adjustMapMargin?: boolean;
+				boundedBy?: number[][];
+				fitMaxWidth?: boolean;
+				float?: "none" | "left" | "right";
+				floatIndex?: number;
+				formLayout?: string | IClassConstructor<ILayout>;
+				kind?: "house" | "street" | "metro" | "district" | "locality";
+				layout?: string | IClassConstructor<ISearchControlLayout>;
+				maxWidth?: number[][] | number[] | number;
+				noCentering?: boolean;
+				noPlacemark?: boolean;
+				noPopup?: boolean;
+				noSelect?: boolean;
+				noSuggestPanel?: boolean;
+				placeholderContent?: string;
+				popupItemLayout?: string | IClassConstructor<ILayout>;
+				popupLayout?: string | IClassConstructor<ILayout>;
+				position?: {
+					bottom?: number | string;
+					left?: number | string;
+					right?: number | string;
+					top?: number | string;
+				};
+				provider?: IGeocodeProvider | "yandex#map" | "yandex#search";
+				searchCoordOrder?: "latlong" | "longlat";
+				size?: "auto" | "small" | "medium" | "large";
+				strictBounds?: boolean;
+				suppressYandexSearch?: boolean;
+				useMapBounds?: boolean;
+				zoomMargin?: number;
+				visible?: boolean;
+			};
+			state?: {};
+		}
+	}
 
-    namespace data {
-        class Manager implements IDataManager, IFreezable {
-            constructor(data?: object);
+	namespace data {
+		class Manager implements IDataManager, IFreezable {
+			constructor(data?: object);
 
-            events: IEventManager;
+			events: IEventManager;
 
-            get(path: string, defaultValue: object): object;
+			get(path: string, defaultValue: object): object;
 
-            getAll(): object;
+			getAll(): object;
 
-            set(path: object | string, value: object): this;
+			set(path: object | string, value: object): this;
 
-            setAll(): this;
+			setAll(): this;
 
-            unset(path: object | string): this;
+			unset(path: object | string): this;
 
-            unsetAll(): this;
+			unsetAll(): this;
 
-            freeze(): IFreezable;
+			freeze(): IFreezable;
 
-            isFrozen(): boolean;
+			isFrozen(): boolean;
 
-            unfreeze(): IFreezable;
+			unfreeze(): IFreezable;
 
-            add(types: string[][] | string[] | string, callback: (event: (object | IEvent)) => void, context?: object, priority?: number): this;
+			add(types: string[][] | string[] | string, callback: (event: (object | IEvent)) => void, context?: object, priority?: number): this;
 
-            getParent(): IEventManager | null;
+			getParent(): IEventManager | null;
 
-            group(): IEventGroup;
+			group(): IEventGroup;
 
-            remove(types: string[][] | string[] | string, callback: (event: (object | IEvent)) => void, context?: object, priority?: number): this;
+			remove(types: string[][] | string[] | string, callback: (event: (object | IEvent)) => void, context?: object, priority?: number): this;
 
-            setParent(parent: IEventManager | null): this;
+			setParent(parent: IEventManager | null): this;
 
-            fire(type: string, eventobject: object | IEvent): this;
-        }
-    }
+			fire(type: string, eventobject: object | IEvent): this;
+		}
+	}
 
-    namespace event {
-        class Manager implements IEventManager {
-            constructor(params?: { context?: object; controllers?: IEventWorkflowController[]; parent?: IEventManager });
+	namespace event {
+		class Manager implements IEventManager {
+			constructor(params?: { context?: object; controllers?: IEventWorkflowController[]; parent?: IEventManager });
 
-            add(types: string[][] | string[] | string, callback: (event: (object | IEvent)) => void, context?: object, priority?: number): this;
+			add(types: string[][] | string[] | string, callback: (event: (object | IEvent)) => void, context?: object, priority?: number): this;
 
-            getParent(): IEventManager | null;
+			getParent(): IEventManager | null;
 
-            group(): IEventGroup;
+			group(): IEventGroup;
 
-            remove(types: string[][] | string[] | string, callback: (event: (object | IEvent)) => void, context?: object, priority?: number): this;
+			remove(types: string[][] | string[] | string, callback: (event: (object | IEvent)) => void, context?: object, priority?: number): this;
 
-            setParent(parent: IEventManager | null): this;
+			setParent(parent: IEventManager | null): this;
 
-            fire(type: string, eventobject: object | IEvent): this;
+			fire(type: string, eventobject: object | IEvent): this;
 
-            createEventobject(type: string, event: object, target: object): Event;
+			createEventobject(type: string, event: object, target: object): Event;
 
-            once(types: string[][] | string[] | string, callback: (event: IEvent) => any, context?: object, priority?: number): this;
-        }
-    }
-
-    namespace geometry {
-        namespace base {
-            class LineString implements IBaseLineStringGeometry { //tslint:disable-line no-shadowed-variable
-                static fromEncodedCoordinates(encodedCoordinates: string): geometry.LineString; //tslint:disable-line function-name
-
-                static toEncodedCoordinates(geometry: geometry.LineString): string; //tslint:disable-line function-name
+			once(types: string[][] | string[] | string, callback: (event: IEvent) => any, context?: object, priority?: number): this;
+		}
+	}
 
+	namespace geometry {
+		namespace base {
+			class LineString implements IBaseLineStringGeometry { //tslint:disable-line no-shadowed-variable
                 events: IEventManager;
 
-                getBounds(): number[][] | null;
+				static fromEncodedCoordinates(encodedCoordinates: string): geometry.LineString; //tslint:disable-line function-name
 
-                getType(): string;
+				static toEncodedCoordinates(geometry: geometry.LineString): string; //tslint:disable-line function-name
 
-                get(index: number): number[];
+				getBounds(): number[][] | null;
 
-                getChildGeometry(index: number): IPointGeometryAccess;
+				getType(): string;
 
-                getClosest(anchorPosition: number[]): object;
+				get(index: number): number[];
 
-                getCoordinates(): number[][];
+				getChildGeometry(index: number): IPointGeometryAccess;
 
-                getLength(): number;
+				getClosest(anchorPosition: number[]): object;
 
-                insert(index: number, coordinates: number[][]): ILineStringGeometryAccess;
+				getCoordinates(): number[][];
 
-                remove(index: number): number[];
+				getLength(): number;
 
-                remove(types: string[][] | string[] | string, callback: (event: (object | IEvent)) => void, context?: object, priority?: number): this;
+				insert(index: number, coordinates: number[][]): ILineStringGeometryAccess;
 
-                set(index: number, coordinates: number[]): ILineStringGeometryAccess;
+				remove(index: number): number[];
 
-                setCoordinates(coordinates: number[]): ILineStringGeometryAccess;
+				remove(types: string[][] | string[] | string, callback: (event: (object | IEvent)) => void, context?: object, priority?: number): this;
 
-                splice(index: number, length: number): number[][];
+				set(index: number, coordinates: number[]): ILineStringGeometryAccess;
 
-                freeze(): IFreezable;
+				setCoordinates(coordinates: number[]): ILineStringGeometryAccess;
 
-                isFrozen(): boolean;
+				splice(index: number, length: number): number[][];
 
-                unfreeze(): IFreezable;
+				freeze(): IFreezable;
 
-                add(types: string[][] | string[] | string, callback: (event: (object | IEvent)) => void, context?: object, priority?: number): this;
+				isFrozen(): boolean;
 
-                getParent(): object | null;
+				unfreeze(): IFreezable;
 
-                group(): IEventGroup;
+				add(types: string[][] | string[] | string, callback: (event: (object | IEvent)) => void, context?: object, priority?: number): this;
 
-                setParent(parent: IEventManager | null): this;
+				getParent(): object | null;
 
-                fire(type: string, eventobject: object | IEvent): this;
-            }
+				group(): IEventGroup;
 
-            class Point implements IBasePointGeometry { //tslint:disable-line no-shadowed-variable
-                events: IEventManager;
+				setParent(parent: IEventManager | null): this;
 
-                getBounds(): number[][] | null;
+				fire(type: string, eventobject: object | IEvent): this;
+			}
 
-                getType(): string;
+			class Point implements IBasePointGeometry { //tslint:disable-line no-shadowed-variable
+				events: IEventManager;
 
-                getCoordinates(): number[] | null;
+				getBounds(): number[][] | null;
 
-                setCoordinates(coordinates: number[] | null): this;
-            }
-        }
+				getType(): string;
 
-        class LineString implements ILineStringGeometry {
-            constructor(coordinates?: number[][], options?: {
-                coordRendering?: "shortestPath" | "straightPath";
-                geodesic?: boolean;
-                pixelRendering?: "jumpy" | "static";
-                projection?: IProjection;
-                simplification?: boolean;
-            });
+				getCoordinates(): number[] | null;
 
-            static fromEncodedCoordinates(encodedCoordinates: string): LineString; //tslint:disable-line function-name
+				setCoordinates(coordinates: number[] | null): this;
+			}
+		}
 
+		class LineString implements ILineStringGeometry {
+			constructor(coordinates?: number[][], options?: {
+				coordRendering?: "shortestPath" | "straightPath";
+				geodesic?: boolean;
+				pixelRendering?: "jumpy" | "static";
+				projection?: IProjection;
+				simplification?: boolean;
+			});
+
+            events: IEventManager;
+            options: IOptionManager;
+
+			static fromEncodedCoordinates(encodedCoordinates: string): LineString; //tslint:disable-line function-name
             static toEncodedCoordinates(geometry: LineString): string; //tslint:disable-line function-name
 
-            events: IEventManager;
-            options: IOptionManager;
+			getMap(): Map | null;
 
-            getMap(): Map | null;
+			getPixelGeometry(options?: object): IPixelGeometry;
 
-            getPixelGeometry(options?: object): IPixelGeometry;
+			setMap(map: Map): void;
 
-            setMap(map: Map): void;
+			getBounds(): number[][] | null;
 
-            getBounds(): number[][] | null;
+			getType(): string;
 
-            getType(): string;
+			get(index: number): number[];
 
-            get(index: number): number[];
+			getChildGeometry(index: number): IPointGeometryAccess;
 
-            getChildGeometry(index: number): IPointGeometryAccess;
+			getClosest(anchorPosition: number[]): object;
 
-            getClosest(anchorPosition: number[]): object;
+			getCoordinates(): number[][];
 
-            getCoordinates(): number[][];
+			getLength(): number;
 
-            getLength(): number;
+			insert(index: number, coordinates: number[][]): ILineStringGeometryAccess;
 
-            insert(index: number, coordinates: number[][]): ILineStringGeometryAccess;
+			remove(index: number): number[];
 
-            remove(index: number): number[];
+			remove(types: string[][] | string[] | string, callback: (event: (object | IEvent)) => void, context?: object, priority?: number): this;
 
-            remove(types: string[][] | string[] | string, callback: (event: (object | IEvent)) => void, context?: object, priority?: number): this;
+			set(index: number, coordinates: number[]): ILineStringGeometryAccess;
 
-            set(index: number, coordinates: number[]): ILineStringGeometryAccess;
+			setCoordinates(coordinates: number[]): ILineStringGeometryAccess;
 
-            setCoordinates(coordinates: number[]): ILineStringGeometryAccess;
+			splice(index: number, length: number): number[][];
 
-            splice(index: number, length: number): number[][];
+			freeze(): IFreezable;
 
-            freeze(): IFreezable;
+			isFrozen(): boolean;
 
-            isFrozen(): boolean;
+			unfreeze(): IFreezable;
 
-            unfreeze(): IFreezable;
+			add(types: string[][] | string[] | string, callback: (event: (object | IEvent)) => void, context?: object, priority?: number): this;
 
-            add(types: string[][] | string[] | string, callback: (event: (object | IEvent)) => void, context?: object, priority?: number): this;
+			getParent(): object | null;
 
-            getParent(): object | null;
+			group(): IEventGroup;
 
-            group(): IEventGroup;
+			setParent(parent: IEventManager | null): this;
 
-            setParent(parent: IEventManager | null): this;
+			fire(type: string, eventobject: object | IEvent): this;
+		}
 
-            fire(type: string, eventobject: object | IEvent): this;
-        }
+		class Point implements IPointGeometry {
+			constructor(coordinates?: number[] | null);
 
-        class Point implements IPointGeometry {
-            constructor(coordinates?: number[] | null);
+			options: IOptionManager;
+			events: IEventManager;
 
-            options: IOptionManager;
-            events: IEventManager;
+			getMap(): Map | null;
 
-            getMap(): Map | null;
+			getPixelGeometry(options?: object): IPixelGeometry;
 
-            getPixelGeometry(options?: object): IPixelGeometry;
+			setMap(map: Map): void;
 
-            setMap(map: Map): void;
+			getBounds(): number[][] | null;
 
-            getBounds(): number[][] | null;
+			getType(): string;
 
-            getType(): string;
-
-            getCoordinates(): number[] | null;
+			getCoordinates(): number[] | null;
 
             setCoordinates(coordinates: number[] | null): this;
         }
     }
 
-    namespace geoObject {
-        class Balloon implements IBalloonManager<GeoObject> { //tslint:disable-line no-shadowed-variable
-            constructor(geoObject: GeoObject);
+	namespace geometryEditor {
+        class Circle implements IGeometryEditor {
+	        constructor(geometry: ICircleGeometry, options?: object);
 
             events: IEventManager;
-
-            autoPan(): Promise<GeoObject>;
-
-            close(force?: boolean): Promise<GeoObject>;
-
-            destroy(): void;
-
-            getData(): object | null;
-
-            getOptions(): IOptionManager | null;
-
-            getOverlay(): Promise<IOverlay | null>;
-
-            getOverlaySync(): IOverlay | null;
-
-            getPosition(): number[] | null;
-
-            isOpen(): boolean;
-
-            open(position?: number[], data?: object | string | HTMLElement, options?: object): Promise<GeoObject>;
-
-            setData(data: object | string | HTMLElement): Promise<GeoObject>;
-
-            setOptions(options: object): Promise<GeoObject>;
-
-            setPosition(position: number[]): Promise<GeoObject>;
-        }
-
-        class Hint implements IHintManager<GeoObject> {
-            constructor(geoObject: GeoObject);
-
-            events: IEventManager;
-
-            close(force?: boolean): Promise<GeoObject>;
-
-            destroy(): void;
-
-            getData(): object | null;
-
-            getOptions(): IOptionManager | null;
-
-            getOverlay(): Promise<IOverlay | null>;
-
-            getOverlaySync(): IOverlay | null;
-
-            getPosition(): number[] | null;
-
-            isOpen(): boolean;
-
-            open(position?: number[], data?: object | string | HTMLElement, options?: object): Promise<GeoObject>;
-
-            setData(data: object | string | HTMLElement): Promise<GeoObject>;
-
-            setOptions(options: object): Promise<GeoObject>;
-
-            setPosition(position: number[]): Promise<GeoObject>;
-        }
-
-        class Sequence implements IGeoObject, IGeoObjectSequence {
-            constructor(geoObject: GeoObject);
-
-            geometry: IGeometry | null;
-            properties: IDataManager;
+            geometry: IGeometry;
+            options: IOptionManager;
             state: IDataManager;
+
+            startDrawing(): vow.Promise;
+
+            startEditing(): void;
+
+            stopDrawing(): vow.Promise;
+
+            stopEditing(): void;
+        }
+
+        class LineString implements IGeometryEditor {
+            constructor(geometry: ILineStringGeometry, options?: object);
+
             events: IEventManager;
+            geometry: IGeometry;
             options: IOptionManager;
-
-            getOverlay(): Promise<IOverlay | null>;
-
-            getOverlaySync(): IOverlay | null;
-
-            getParent(): null | IControlParent;
-
-            setParent(parent: IControlParent): this;
-
-            getMap(): Map;
-
-            each(callback: (geoObject: IGeoObject) => void, context?: object): void;
-
-            get(index: number): IGeoObject;
-
-            getBounds(): number[][] | null;
-
-            getIterator(): IIterator;
-
-            getLength(): number;
-
-            getPixelBounds(): number[][] | null;
-
-            indexOf(geoObject: IGeoObject): number;
-        }
-    }
-
-    namespace layout {
-        namespace templateBased {
-            class Base implements ILayout {
-                constructor(data: object);
-
-                events: IEventManager;
-
-                destroy(): void;
-
-                getData(): object;
-
-                getParentElement(): HTMLElement;
-
-                getShape(): IShape | null;
-
-                isEmpty(): boolean;
-
-                setData(data: object): void;
-
-                setParentElement(parent: HTMLElement | null): this;
-
-                build(): void;
-
-                clear(): void;
-
-                onSublayoutSizeChange(sublayoutInfo: object, nodeSizeByContent: object): void;
-
-                rebuild(): void;
-            }
-        }
-    }
-
-    namespace map {
-        namespace action {
-            class Manager implements IEventEmitter {
-                constructor(map: Map);
-
-                events: IEventManager;
-
-                breakTick(): void;
-
-                execute(action: IMapAction): void;
-
-                getCurrentState(): object;
-
-                getMap(): Map;
-
-                setCorrection(userFunction: () => void): void;
-
-                stop(): void;
-            }
-        }
-
-        namespace behavior { // tslint:disable-line no-shadowed-variable
-            class Manager implements ICustomizable, IEventEmitter, IParentOnMap {
-                constructor(map: Map, behaviors?: string[][] | string[], options?: object);
-
-                options: IOptionManager;
-                events: IEventManager;
-
-                getMap(): Map;
-
-                disable(behaviors: string[][] | string[] | string): this;
-
-                enable(behaviors: string[][] | string[] | string): this;
-
-                get(behaviorName: string): IBehavior;
-
-                isEnabled(behaviorName: string): boolean;
-            }
-        }
-
-        namespace layer {
-            class Manager implements ILayer, IMapObjectCollection {
-                constructor(map: Map, options?: {
-                    trafficImageZIndex?: number;
-                    trafficInfoZIndex?: number;
-                    trafficJamZIndex?: number;
-                });
-
-                events: IEventManager;
-                options: IOptionManager;
-
-                getParent(): null | IControlParent;
-
-                setParent(parent: IControlParent): this;
-
-                add(object: object): this;
-
-                getIterator(): IIterator;
-
-                remove(object: object): this;
-
-                getMap(): Map;
-            }
-        }
-
-        namespace margin {
-            class Accessor {
-                constructor(screenArea: object);
-
-                getArea(): object;
-
-                remove(): this;
-
-                setArea(screenArea: object): this;
-            }
-
-            class Manager {
-                constructor(map: Map);
-
-                addArea(screenArea: object): Accessor;
-
-                destroy(): this;
-
-                getMargin(): number[];
-
-                getOffset(): number[];
-
-                setDefaultMargin(margin: number[][] | number[] | number): void;
-            }
-        }
-
-        namespace pane {
-            class Manager {
-                constructor(map: Map);
-
-                append(key: string, pane: IPane): void;
-
-                destroy(): void;
-
-                get(key: string): IPane | null;
-
-                getLower(): string;
-
-                getUpper(): string;
-
-                insertBefore(key: string, pane: IPane, referenceKey: string): void;
-
-                remove(pane: IPane): void;
-            }
-        }
-
-        class Balloon implements IBalloonManager<Balloon>/*, IBalloonSharingManager*/ { //tslint:disable-line no-shadowed-variable
-            constructor(map: Map);
-
-            events: IEventManager;
-
-            autoPan(): Promise<Balloon>;
-
-            close(force?: boolean): Promise<Balloon>;
-
-            destroy(): void;
-
-            getData(): object | null;
-
-            getOptions(): IOptionManager | null;
-
-            getOverlay(): Promise<IOverlay | null>;
-
-            getOverlaySync(): IOverlay | null;
-
-            getPosition(): number[] | null;
-
-            isOpen(): boolean;
-
-            open(position?: number[], data?: object | string | HTMLElement, options?: object): Promise<Balloon>;
-
-            setData(data: object | string | HTMLElement): Promise<Balloon>;
-
-            setOptions(options: object): Promise<Balloon>;
-
-            setPosition(position: number[]): Promise<Balloon>;
-        }
-
-        class Container implements IDomEventEmitter {
-            constructor(parentElement: string | HTMLElement);
-
-            events: IEventManager;
-
-            enterFullscreen(): void;
-
-            exitFullscreen(): void;
-
-            fitToViewport(preservePixelPosition?: boolean): void;
-
-            getElement(): HTMLElement;
-
-            getOffset(): number[];
-
-            getParentElement(): HTMLElement;
-
-            getSize(): number[];
-
-            isFullscreen(): boolean;
-        }
-
-        class Converter {
-            constructor(map: Map);
-
-            globalToPage(globalPixelPoint: number[]): number[];
-
-            pageToGlobal(pagePixelPoint: number[]): number[];
-        }
-
-        class Copyrights {
-            constructor(map: Map);
-
-            add(customCopyrights: string | HTMLElement | Array<string | HTMLElement>): ICopyrightsAccessor;
-
-            addProvider(provider: ICopyrightsProvider): this;
-
-            get(point?: number[], zoom?: number): Promise<Array<string | HTMLElement>>;
-
-            getPromoLink(): string;
-
-            removeProvider(provider: ICopyrightsProvider): this;
-        }
-
-        class GeoObjects implements IGeoObjectCollection {
-            constructor(map: Map, options?: object);
-
-            options: IOptionManager;
-            events: IEventManager;
-
-            add(child: IGeoObject, index?: number): this;
-
-            each(callback: (object: IGeoObject) => void, context: object): void;
-
-            get(index: number): IGeoObject;
-
-            getBounds(): number[][] | null;
-
-            getIterator(): IIterator;
-
-            getLength(): number;
-
-            getPixelBounds(): number[][] | null;
-
-            indexOf(object: IGeoObject): number;
-
-            remove(child: IGeoObject): this;
-
-            removeAll(): this;
-
-            set(index: number, child: IGeoObject): this;
-
-            splice(index: number, length: number): this;
-
-            getMap(): Map;
-        }
-
-        class Hint implements IHintManager<Hint>/*, IHintSharingManager*/ {
-            constructor(map: Map);
-
-            events: IEventManager;
-
-            close(force?: boolean): Promise<Hint>;
-
-            destroy(): void;
-
-            getData(): object | null;
-
-            getOptions(): IOptionManager | null;
-
-            getOverlay(): Promise<IOverlay | null>;
-
-            getOverlaySync(): IOverlay | null;
-
-            getPosition(): number[] | null;
-
-            isOpen(): boolean;
-
-            open(position?: number[], data?: object | string | HTMLElement, options?: object): Promise<Hint>;
-
-            setData(data: object | string | HTMLElement): Promise<Hint>;
-
-            setOptions(options: object): Promise<Hint>;
-
-            setPosition(position: number[]): Promise<Hint>;
-        }
-
-        class ZoomRange implements IEventEmitter {
-            constructor(map: Map, constraints: number[]);
-
-            events: IEventManager;
-
-            get(coords?: number[]): Promise<number[]>;
-
-            getCurrent(): number[];
-        }
-    }
-
-    namespace multiRouter {
-        namespace driving {
-            class Path implements IGeoObject {
-                geometry: IGeometry | null;
-                properties: data.Manager;
-                state: IDataManager;
-                model: PathModel;
-                events: IEventManager;
-                options: IOptionManager;
-
-                getOverlay(): Promise<IOverlay | null>;
-
-                getOverlaySync(): IOverlay | null;
-
-                getParent(): object | null;
-
-                setParent(parent: object): this;
-
-                getMap(): Map;
-
-                getSegments(): GeoObjectCollection;
-            }
-
-            class PathModel implements IEventEmitter {
-                events: IEventManager;
-                properties: data.Manager;
-                route: RouteModel;
-
-                destroy(): void;
-
-                getSegments(): SegmentModel[];
-
-                getType(): string;
-
-                update(pathJson: object): void;
-            }
-
-            class Route implements IGeoObject {
-                geometry: IGeometry | null;
-                properties: IDataManager;
-                state: IDataManager;
-                events: IEventManager;
-                options: IOptionManager;
-
-                getOverlay(): Promise<IOverlay | null>;
-
-                getOverlaySync(): IOverlay | null;
-
-                getParent(): object | null;
-
-                setParent(parent: object): this;
-
-                getMap(): Map;
-
-                getPaths(): GeoObjectCollection;
-            }
-
-            class RouteModel implements IEventEmitter {
-                events: IEventManager;
-                multiRoute: MultiRouteModel;
-                properties: data.Manager;
-
-                destroy(): void;
-
-                getPaths(): PathModel[];
-
-                update(routeJson: object): void;
-
-                getType(): string;
-            }
-
-            class Segment implements IGeoObject {
-                geometry: IGeometry | null;
-                properties: data.Manager;
-                state: IDataManager;
-                events: IEventManager;
-                options: IOptionManager;
-
-                getOverlay(): Promise<IOverlay | null>;
-
-                getOverlaySync(): IOverlay | null;
-
-                getParent(): object | null;
-
-                setParent(parent: object): this;
-
-                getMap(): Map;
-            }
-
-            class SegmentModel implements IEventEmitter {
-                events: IEventManager;
-                geometry: geometry.base.LineString;
-                path: PathModel;
-
-                destroy(): void;
-
-                getType(): string;
-
-                getViaPoints(): ViaPointModel[];
-
-                update(segmentJson: object): void;
-            }
-        }
-
-        namespace masstransit {
-            class Path implements IGeoObject {
-                geometry: IGeometry | null;
-                properties: data.Manager;
-                state: IDataManager;
-                events: IEventManager;
-                options: IOptionManager;
-                model: PathModel;
-
-                getOverlay(): Promise<IOverlay | null>;
-
-                getOverlaySync(): IOverlay | null;
-
-                getParent(): object | null;
-
-                setParent(parent: object): this;
-
-                getMap(): Map;
-
-                getSegmentMarkers(): GeoObjectCollection;
-
-                getSegments(): GeoObjectCollection;
-            }
-
-            class PathModel implements IEventEmitter {
-                events: IEventManager;
-                properties: data.Manager;
-                route: RouteModel;
-
-                destroy(): void;
-
-                getSegments(): Array<TransferSegmentModel | TransportSegmentModel | WalkSegmentModel>;
-
-                getType(): string;
-
-                update(pathJson: object): void;
-            }
-
-            class Route implements IGeoObject {
-                geometry: IGeometry | null;
-                properties: data.Manager;
-                model: RouteModel;
-                state: IDataManager;
-                events: IEventManager;
-                options: IOptionManager;
-
-                getOverlay(): Promise<IOverlay | null>;
-
-                getOverlaySync(): IOverlay | null;
-
-                getParent(): object | null;
-
-                setParent(parent: object): this;
-
-                getMap(): Map;
-
-                getPaths(): GeoObjectCollection;
-            }
-
-            class RouteModel implements IEventEmitter {
-                events: IEventManager;
-                multiRoute: MultiRouteModel;
-                properties: data.Manager;
-
-                destroy(): void;
-
-                getPaths(): PathModel[];
-
-                getType(): string;
-
-                update(routeJson: object): void;
-            }
-
-            class StopModel implements IEventEmitter {
-                events: IEventManager;
-                geometry: geometry.base.Point;
-                properties: data.Manager;
-                segment: TransportSegmentModel;
-
-                update(stopJson: object): void;
-            }
-
-            class TransferSegment implements IGeoObject {
-                geometry: IGeometry | null;
-                properties: data.Manager;
-                state: IDataManager;
-                events: IEventManager;
-                options: IOptionManager;
-                model: TransferSegmentModel;
-
-                getOverlay(): Promise<IOverlay | null>;
-
-                getOverlaySync(): IOverlay | null;
-
-                getParent(): object | null;
-
-                setParent(parent: object): this;
-
-                getMap(): Map;
-            }
-
-            class TransferSegmentModel implements IEventEmitter {
-                events: IEventManager;
-                geometry: geometry.base.LineString;
-                path: PathModel;
-                properties: data.Manager;
-
-                destroy(segmentJson: object): void;
-
-                getType(): string;
-            }
-
-            class TransportSegment implements IGeoObject {
-                geometry: IGeometry | null;
-                properties: data.Manager;
-                state: IDataManager;
-                events: IEventManager;
-                options: IOptionManager;
-                model: TransportSegmentModel;
-
-                getOverlay(): Promise<IOverlay | null>;
-
-                getOverlaySync(): IOverlay | null;
-
-                getParent(): object | null;
-
-                setParent(parent: object): this;
-
-                getMap(): Map;
-            }
-
-            class TransportSegmentModel implements IEventEmitter {
-                events: IEventManager;
-                geometry: geometry.base.LineString;
-                path: PathModel;
-                properties: data.Manager;
-
-                destroy(): void;
-
-                getStops(): StopModel[];
-
-                getType(): string;
-
-                update(segmentJson: object): void;
-            }
-
-            class WalkSegment implements IGeoObject {
-                geometry: IGeometry | null;
-                properties: data.Manager;
-                state: IDataManager;
-                events: IEventManager;
-                options: IOptionManager;
-                model: WalkSegmentModel;
-
-                getOverlay(): Promise<IOverlay | null>;
-
-                getOverlaySync(): IOverlay | null;
-
-                getParent(): object | null;
-
-                setParent(parent: object): this;
-
-                getMap(): Map;
-            }
-
-            class WalkSegmentModel implements IEventEmitter {
-                events: IEventManager;
-                geometry: geometry.base.LineString;
-                path: PathModel;
-                properties: data.Manager;
-
-                destroy(): void;
-
-                getType(): string;
-            }
-        }
-
-        class EditorAddon implements ICustomizable, IEventEmitter {
-            options: IOptionManager;
-            events: IEventManager;
-            state: data.Manager;
-
-            isActive(): boolean;
-
-            start(state: object): void;
-
-            stop(): void;
-        }
-
-        class MultiRoute implements IGeoObject {
-            constructor(model: MultiRouteModel | IMultiRouteModelJson, options?: {
-                activeRouteAutoSelection?: boolean;
-                boundsAutoApply?: boolean;
-                dragUpdateInterval?: string | number;
-                preventDragUpdate?: boolean;
-                useMapMargin?: boolean;
-                zoomMargin?: number[][] | number[] | number;
-                [index: string]: any;
-            });
-
-            editor: EditorAddon;
-            model: MultiRouteModel;
-            geometry: IGeometry | null;
-            properties: IDataManager;
             state: IDataManager;
+
+            getModel(): vow.Promise;
+
+            getModelSync(): model.RootLineString | null;
+
+            getView(): vow.Promise;
+
+            getViewSync(): view.Path | null;
+
+            startDrawing(): vow.Promise;
+
+            startEditing(): vow.Promise;
+
+            startFraming(): vow.Promise;
+
+            stopDrawing(): void;
+
+            stopEditing(): void;
+
+            stopFraming(): void;
+        }
+
+        namespace model {
+            class ChildLinearRing extends ChildLineString {}
+
+            class ChildLineString implements IGeometryEditorChildModel {
+                editor: IGeometryEditor;
+                events: IEventManager;
+                geometry: IBaseGeometry;
+
+                destroy(): void;
+
+                getAllVerticesNumber(): number;
+
+                getEdgeModels(): Edge[];
+
+                getIndex(): number;
+
+                getParent(): IGeometryEditorModel;
+
+                getPixels(): number[];
+
+                getVertexModels(): ChildVertex[];
+
+                setIndex(index: number): void;
+
+                setPixels(pixels: number[]): void;
+
+                spliceVertices(start: number, deleteCount: number): number[][];
+            }
+
+            class ChildVertex implements IGeometryEditorChildModel {
+                editor: IGeometryEditor;
+                events: IEventManager;
+                geometry: IBaseGeometry;
+
+                destroy(): void;
+
+                getAllVerticesNumber(): number;
+
+                getIndex(): number;
+
+                getNextVertex(): ChildVertex | null;
+
+                getParent(): IGeometryEditorModel;
+
+                getPixels(): number[];
+
+                getPrevVertex(): ChildVertex | null;
+
+                setGlobalPixels(pixels: number[]): void;
+
+                setIndex(index: number): void;
+
+                setNextVertex(nextVertex: ChildVertex): void;
+
+                setPixels(pixels: number[]): void;
+
+                setPrevVertex(prevVertex: ChildVertex): void;
+            }
+
+            class Edge implements IGeometryEditorRootModel {
+                events: IEventManager;
+
+                destroy(): void;
+
+                getNextVertex(): ChildVertex | null;
+
+                getPixels(): number[];
+
+                getPrevVertex(): ChildVertex | null;
+
+                setNextVertex(nextVertex: ChildVertex): void;
+
+                setPrevVertex(prevVertex: ChildVertex): void;
+            }
+
+            class EdgeGeometry implements IGeometry {
+                events: IEventManager;
+                options: IOptionManager;
+
+                getBounds(): number[][] | null;
+
+                getMap(): Map | null;
+
+                getPixelGeometry(options?: object): IPixelGeometry;
+
+                getType(): string;
+
+                setMap(map: Map): void;
+            }
+
+            class RootLineString implements IGeometryEditorRootModel {
+                events: IEventManager;
+
+                destroy(): void;
+
+                getAllVerticesNumber(): number;
+
+                getPixels(): number[];
+
+                getVertexModels(): ChildVertex[];
+
+                spliceVertices(start: number, deleteCount: number): number[][];
+            }
+
+            class RootPolygon implements IGeometryEditorRootModel {
+                events: IEventManager;
+
+                destroy(): void;
+
+                getAllVerticesNumber(): number;
+
+                getPathModels(): ChildLinearRing[];
+
+                getPixels(): number[];
+
+                splicePaths(start: number, deleteCount: number): number[][];
+            }
+        }
+
+        class Point implements IGeometryEditor {
             events: IEventManager;
+            geometry: IGeometry;
             options: IOptionManager;
-
-            getOverlay(): Promise<IOverlay | null>;
-
-            getOverlaySync(): IOverlay | null;
-
-            getParent(): object | null;
-
-            setParent(parent: object): this;
-
-            getMap(): Map;
-
-            getActiveRoute(): driving.Route | masstransit.Route | null;
-
-            getBounds(): number[][] | null;
-
-            getPixelBounds(): number[][] | null;
-
-            getRoutes(): GeoObjectCollection;
-
-            getViaPoints(): GeoObjectCollection;
-
-            getWayPoints(): GeoObjectCollection;
-
-            setActiveRoute(route: driving.Route | masstransit.Route | null): void;
-        }
-
-        class MultiRouteModel implements IEventEmitter {
-            constructor(referencePoints: IMultiRouteReferencePoint[], params?: IMultiRouteParams);
-
-            events: IEventManager;
-            properties: data.Manager;
-
-            destroy(): void;
-
-            getAllPoints(): Array<WayPointModel | ViaPointModel>;
-
-            getJson(): object;
-
-            getParams(): IMultiRouteParams;
-
-            getPoints(): Array<WayPointModel | ViaPointModel>;
-
-            getReferencePointIndexes(): object;
-
-            getReferencePoints(): IMultiRouteReferencePoint[];
-
-            getRoutes(): driving.RouteModel[] | masstransit.RouteModel[];
-
-            getViaPoints(): ViaPointModel[];
-
-            getWayPoints(): WayPointModel[];
-
-            setParams(params: IMultiRouteParams, extend?: boolean, clearRequests?: boolean): void;
-
-            setReferencePoints(referencePoints: IMultiRouteReferencePoint[], viaIndexes?: number[], clearRequests?: boolean): void;
-        }
-
-        class ViaPoint implements IGeoObject {
-            geometry: IGeometry | null;
-            properties: data.Manager;
             state: IDataManager;
+
+            startDrawing(): vow.Promise;
+
+            startEditing(): void;
+
+            stopDrawing(): vow.Promise;
+
+            stopEditing(): void;
+        }
+
+        class Polygon implements IGeometryEditor {
+            constructor(geometry: IPolygonGeometry, options: object)
+
             events: IEventManager;
+            geometry: IGeometry;
             options: IOptionManager;
-
-            getOverlay(): Promise<IOverlay | null>;
-
-            getOverlaySync(): IOverlay | null;
-
-            getParent(): object | null;
-
-            setParent(parent: object): this;
-
-            getMap(): Map;
-        }
-
-        class ViaPointModel implements IEventEmitter {
-            events: IEventManager;
-            geometry: geometry.base.Point;
-            multiRoute: MultiRouteModel;
-            properties: data.Manager;
-
-            destroy(): void;
-
-            getReferencePoint(): object;
-
-            getReferencePointIndex(): number;
-
-            setReferencePoint(referencePoint: object): void;
-
-            update(viaPointJson: object): void;
-        }
-
-        class WayPoint implements IGeoObject {
-            geometry: IGeometry | null;
-            properties: data.Manager;
             state: IDataManager;
-            events: IEventManager;
-            options: IOptionManager;
-            model: WayPointModel;
 
-            getOverlay(): Promise<IOverlay | null>;
+            getModel(): vow.Promise;
 
-            getOverlaySync(): IOverlay | null;
+            getModelSync(): model.RootPolygon | null;
 
-            getParent(): object | null;
+            getView(): vow.Promise;
 
-            setParent(parent: object): this;
+            getViewSync(): view.MultiPath | null;
 
-            getMap(): Map;
+            startDrawing(): vow.Promise;
+
+            startEditing(): vow.Promise;
+
+            startFraming(): vow.Promise;
+
+            stopDrawing(): void;
+
+            stopEditing(): void;
+
+            stopFraming(): void;
         }
 
-        class WayPointModel implements IEventEmitter {
-            events: IEventManager;
-            geometry: geometry.base.Point;
-            multiRoute: MultiRouteModel;
-            properties: data.Manager;
+        namespace view {
+            class Edge {
+                getPlacemark(): GeoObject;
+            }
 
-            destroy(): void;
+            class MultiPath {
+                getEdgePlacemarks(): GeoObjectCollection;
 
-            getReferencePoint(): object;
+                getPathViews(): Path[];
 
-            getReferencePointIndex(): number;
+                getVertexPlacemarks(): GeoObjectCollection;
+            }
 
-            setReferencePoint(referencePoint: object): void;
+            class Path {
+                getEdgePlacemarks(): GeoObjectCollection;
 
-            update(wayPointJson: object): void;
+                getEdgeViews(): Edge[];
+
+                getVertexPlacemarks(): GeoObjectCollection;
+
+                getVertexViews(): Vertex[];
+            }
+
+            class Vertex {
+                getPlacemark(): GeoObject;
+            }
         }
     }
 
-    namespace option {
-        class Manager implements IOptionManager {
-            constructor(options?: object, parent?: IOptionManager, name?: string);
+	namespace geoObject {
+		class Balloon implements IBalloonManager<GeoObject> { //tslint:disable-line no-shadowed-variable
+			constructor(geoObject: GeoObject);
 
-            events: IEventManager;
+			events: IEventManager;
 
-            get(key: string, defaultValue: object): object;
+			autoPan(): Promise<GeoObject>;
 
-            getAll(): object;
+			close(force?: boolean): Promise<GeoObject>;
 
-            getName(): string;
+			destroy(): void;
 
-            getNative(key: string): object;
+			getData(): object | null;
 
-            resolve(key: string, name?: string): object;
+			getOptions(): IOptionManager | null;
 
-            set(key: object | string, value?: object): this;
+			getOverlay(): Promise<IOverlay | null>;
 
-            unset(keys: string[][] | string[] | string): this;
+			getOverlaySync(): IOverlay | null;
 
-            unsetAll(): this;
+			getPosition(): number[] | null;
 
-            setName(name: string): void;
+			isOpen(): boolean;
 
-            getParent(): null | IOptionManager;
+			open(position?: number[], data?: object | string | HTMLElement, options?: object): Promise<GeoObject>;
 
-            setParent(parent: IOptionManager): this;
+			setData(data: object | string | HTMLElement): Promise<GeoObject>;
 
-            freeze(): IFreezable;
+			setOptions(options: object): Promise<GeoObject>;
 
-            isFrozen(): boolean;
+			setPosition(position: number[]): Promise<GeoObject>;
+		}
 
-            unfreeze(): IFreezable;
+		class Hint implements IHintManager<GeoObject> {
+			constructor(geoObject: GeoObject);
 
-            add(types: string[][] | string[] | string, callback: (event: (object | IEvent)) => void, context?: object, priority?: number): this;
+			events: IEventManager;
 
-            group(): IEventGroup;
+			close(force?: boolean): Promise<GeoObject>;
 
-            remove(types: string[][] | string[] | string, callback: (event: (object | IEvent)) => void, context?: object, priority?: number): this;
+			destroy(): void;
 
-            fire(type: string, eventobject: object | IEvent): this;
-        }
-    }
+			getData(): object | null;
 
-    namespace panorama {
-        class Manager implements IEventEmitter {
-            events: IEventManager;
+			getOptions(): IOptionManager | null;
 
-            closePlayer(): void;
+			getOverlay(): Promise<IOverlay | null>;
 
-            disableLookup(): void;
+			getOverlaySync(): IOverlay | null;
 
-            enableLookup(): void;
+			getPosition(): number[] | null;
 
-            getPlayer(): Player;
+			isOpen(): boolean;
 
-            isLookupEnabled(): boolean;
+			open(position?: number[], data?: object | string | HTMLElement, options?: object): Promise<GeoObject>;
 
-            openPlayer(panorama: IPanorama[] | number): Promise<void>;
-        }
+			setData(data: object | string | HTMLElement): Promise<GeoObject>;
 
-        class Player implements IEventEmitter {
-            constructor(element: HTMLElement | string, panorama: IPanorama, options?: {
-                autoFitToViewport?: "none" | "ifNull" | "always";
-                controls?: string[];
-                direction?: number[] | string;
-                hotkeysEnabled?: boolean;
-                scrollZoomBehavior?: boolean;
-                span?: number[] | string;
-                suppressMapOpenBlock?: boolean;
-            })
+			setOptions(options: object): Promise<GeoObject>;
 
-            events: IEventManager;
+			setPosition(position: number[]): Promise<GeoObject>;
+		}
 
-            destroy(): void;
+		class Sequence implements IGeoObject, IGeoObjectSequence {
+			constructor(geoObject: GeoObject);
 
-            fitToViewport(): void;
+			geometry: IGeometry | null;
+			properties: IDataManager;
+			state: IDataManager;
+			events: IEventManager;
+			options: IOptionManager;
 
-            getDirection(): number[];
+			getOverlay(): Promise<IOverlay | null>;
 
-            getPanorama(): IPanorama;
+			getOverlaySync(): IOverlay | null;
 
-            getSpan(): number[];
+			getParent(): null | IControlParent;
 
-            lookAt(point: number[]): this;
+			setParent(parent: IControlParent): this;
 
-            moveTo(point: number[], options?: {
-                direction?: number[] | string;
-                layer?: "yandex#panorama" | "yandex#airPanorama";
-                span?: number[] | string;
-            }): Promise<void>;
+			getMap(): Map;
 
-            setDirection(direction: number[] | string): this;
+			each(callback: (geoObject: IGeoObject) => void, context?: object): void;
 
-            setPanorama(panorama: IPanorama): this;
+			get(index: number): IGeoObject;
 
-            setSpan(span: number[] | string): this;
-        }
-    }
+			getBounds(): number[][] | null;
 
-    namespace router {
-        class Editor implements ICustomizable, IEventEmitter {
-            options: IOptionManager;
-            events: IEventManager;
+			getIterator(): IIterator;
 
-            start(options?: {
-                addViaPoints?: boolean;
-                addWayPoints?: boolean;
-                editViaPoints?: boolean;
-                editWayPoints?: boolean;
-                removeViaPoints?: boolean;
-                removeWayPoints?: boolean;
-            }): void;
+			getLength(): number;
 
-            stop(): void;
-        }
+			getPixelBounds(): number[][] | null;
 
-        abstract class Route implements IGeoObject {
-            geometry: IGeometry | null;
-            properties: IDataManager;
-            state: IDataManager;
-            events: IEventManager;
-            options: IOptionManager;
-            editor: Editor;
+			indexOf(geoObject: IGeoObject): number;
+		}
+	}
 
-            getOverlay(): Promise<IOverlay | null>;
+	namespace layout {
+		namespace templateBased {
+			class Base implements ILayout {
+				constructor(data: object);
 
-            getOverlaySync(): IOverlay | null;
+				events: IEventManager;
 
-            getParent(): null | IControlParent;
+				destroy(): void;
 
-            setParent(parent: IControlParent): this;
+				getData(): object;
 
-            getMap(): Map;
+				getParentElement(): HTMLElement;
 
-            getHumanJamsTime(): string;
+				getShape(): IShape | null;
 
-            getHumanLength(): string;
+				isEmpty(): boolean;
 
-            getHumanTime(): string;
+				setData(data: object): void;
 
-            getJamsTime(): number;
+				setParentElement(parent: HTMLElement | null): this;
 
-            getLength(): number;
+				build(): void;
 
-            getPaths(): GeoObjectCollection;
+				clear(): void;
 
-            getTime(): number;
+				onSublayoutSizeChange(sublayoutInfo: object, nodeSizeByContent: object): void;
 
-            getViaPoints(): GeoObjectCollection;
+				rebuild(): void;
+			}
+		}
+	}
 
-            getWayPoints(): GeoObjectCollection;
-        }
-    }
+	namespace map {
+		namespace action {
+			class Manager implements IEventEmitter {
+				constructor(map: Map);
 
-    class Balloon extends Popup<Balloon> implements IBaloon<Balloon> {
-        constructor(map: Map, options?: IBalloonOptions);
+				events: IEventManager;
 
-        getData(): object;
+				breakTick(): void;
 
-        close(force?: boolean): Promise<Balloon>;
+				execute(action: IMapAction): void;
 
-        getParent(): Balloon | null;
+				getCurrentState(): object;
 
-        setParent(parent: Balloon): this;
+				getMap(): Map;
 
-        autoPan(): Promise<Balloon>;
+				setCorrection(userFunction: () => void): void;
 
-        freeze(): IFreezable;
+				stop(): void;
+			}
+		}
 
-        isFrozen(): boolean;
+		namespace behavior { //tslint:disable-line no-shadowed-variable
+			class Manager implements ICustomizable, IEventEmitter, IParentOnMap {
+				constructor(map: Map, behaviors?: string[][] | string[], options?: object);
 
-        unfreeze(): IFreezable;
+				options: IOptionManager;
+				events: IEventManager;
 
-        add(types: string[][] | string[] | string, callback: (event: (object | IEvent)) => void, context?: object, priority?: number): this;
+				getMap(): Map;
 
-        group(): IEventGroup;
+				disable(behaviors: string[][] | string[] | string): this;
 
-        remove(types: string[][] | string[] | string, callback: (event: (object | IEvent)) => void, context?: object, priority?: number): this;
+				enable(behaviors: string[][] | string[] | string): this;
 
-        fire(type: string, eventobject: object | IEvent): this;
-    }
+				get(behaviorName: string): IBehavior;
 
-    interface IBalloonOptions {
-        autoPan?: boolean;
-        autoPanCheckZoomRange?: boolean;
-        autoPanDuration?: number;
-        autoPanMargin?: number[][] | number[] | number;
-        autoPanUseMapMargin?: boolean;
-        closeButton?: boolean;
-        contentLayout?: IClassConstructor<ILayout> | string;
-        layout?: IClassConstructor<ILayout> | string;
-        maxHeight?: number;
-        maxWidth?: number;
-        minHeight?: number;
-        minWidth?: number;
-        offset?: number[];
+				isEnabled(behaviorName: string): boolean;
+			}
+		}
+
+		namespace layer {
+			class Manager implements ILayer, IMapObjectCollection {
+				constructor(map: Map, options?: {
+					trafficImageZIndex?: number;
+					trafficInfoZIndex?: number;
+					trafficJamZIndex?: number;
+				});
+
+				events: IEventManager;
+				options: IOptionManager;
+
+				getParent(): null | IControlParent;
+
+				setParent(parent: IControlParent): this;
+
+				add(object: object): this;
+
+				getIterator(): IIterator;
+
+				remove(object: object): this;
+
+				getMap(): Map;
+			}
+		}
+
+		namespace margin {
+			class Accessor {
+				constructor(screenArea: object);
+
+				getArea(): object;
+
+				remove(): this;
+
+				setArea(screenArea: object): this;
+			}
+
+			class Manager {
+				constructor(map: Map);
+
+				addArea(screenArea: object): Accessor;
+
+				destroy(): this;
+
+				getMargin(): number[];
+
+				getOffset(): number[];
+
+				setDefaultMargin(margin: number[][] | number[] | number): void;
+			}
+		}
+
+		namespace pane {
+			class Manager {
+				constructor(map: Map);
+
+				append(key: string, pane: IPane): void;
+
+				destroy(): void;
+
+				get(key: string): IPane | null;
+
+				getLower(): string;
+
+				getUpper(): string;
+
+				insertBefore(key: string, pane: IPane, referenceKey: string): void;
+
+				remove(pane: IPane): void;
+			}
+		}
+
+		class Balloon implements IBalloonManager<Balloon>/*, IBalloonSharingManager*/ { //tslint:disable-line no-shadowed-variable
+			constructor(map: Map);
+
+			events: IEventManager;
+
+			autoPan(): Promise<Balloon>;
+
+			close(force?: boolean): Promise<Balloon>;
+
+			destroy(): void;
+
+			getData(): object | null;
+
+			getOptions(): IOptionManager | null;
+
+			getOverlay(): Promise<IOverlay | null>;
+
+			getOverlaySync(): IOverlay | null;
+
+			getPosition(): number[] | null;
+
+			isOpen(): boolean;
+
+			open(position?: number[], data?: object | string | HTMLElement, options?: object): Promise<Balloon>;
+
+			setData(data: object | string | HTMLElement): Promise<Balloon>;
+
+			setOptions(options: object): Promise<Balloon>;
+
+			setPosition(position: number[]): Promise<Balloon>;
+		}
+
+		class Container implements IDomEventEmitter {
+			constructor(parentElement: string | HTMLElement);
+
+			events: IEventManager;
+
+			enterFullscreen(): void;
+
+			exitFullscreen(): void;
+
+			fitToViewport(preservePixelPosition?: boolean): void;
+
+			getElement(): HTMLElement;
+
+			getOffset(): number[];
+
+			getParentElement(): HTMLElement;
+
+			getSize(): number[];
+
+			isFullscreen(): boolean;
+		}
+
+		class Converter {
+			constructor(map: Map);
+
+			globalToPage(globalPixelPoint: number[]): number[];
+
+			pageToGlobal(pagePixelPoint: number[]): number[];
+		}
+
+		class Copyrights {
+			constructor(map: Map);
+
+			add(customCopyrights: string | HTMLElement | Array<string | HTMLElement>): ICopyrightsAccessor;
+
+			addProvider(provider: ICopyrightsProvider): this;
+
+			get(point?: number[], zoom?: number): Promise<Array<string | HTMLElement>>;
+
+			getPromoLink(): string;
+
+			removeProvider(provider: ICopyrightsProvider): this;
+		}
+
+		class GeoObjects implements IGeoObjectCollection {
+			constructor(map: Map, options?: object);
+
+			options: IOptionManager;
+			events: IEventManager;
+
+			add(child: IGeoObject, index?: number): this;
+
+			each(callback: (object: IGeoObject) => void, context: object): void;
+
+			get(index: number): IGeoObject;
+
+			getBounds(): number[][] | null;
+
+			getIterator(): IIterator;
+
+			getLength(): number;
+
+			getPixelBounds(): number[][] | null;
+
+			indexOf(object: IGeoObject): number;
+
+			remove(child: IGeoObject): this;
+
+			removeAll(): this;
+
+			set(index: number, child: IGeoObject): this;
+
+			splice(index: number, length: number): this;
+
+			getMap(): Map;
+		}
+
+		class Hint implements IHintManager<Hint>/*, IHintSharingManager*/ {
+			constructor(map: Map);
+
+			events: IEventManager;
+
+			close(force?: boolean): Promise<Hint>;
+
+			destroy(): void;
+
+			getData(): object | null;
+
+			getOptions(): IOptionManager | null;
+
+			getOverlay(): Promise<IOverlay | null>;
+
+			getOverlaySync(): IOverlay | null;
+
+			getPosition(): number[] | null;
+
+			isOpen(): boolean;
+
+			open(position?: number[], data?: object | string | HTMLElement, options?: object): Promise<Hint>;
+
+			setData(data: object | string | HTMLElement): Promise<Hint>;
+
+			setOptions(options: object): Promise<Hint>;
+
+			setPosition(position: number[]): Promise<Hint>;
+		}
+
+		class ZoomRange implements IEventEmitter {
+			constructor(map: Map, constraints: number[]);
+
+			events: IEventManager;
+
+			get(coords?: number[]): Promise<number[]>;
+
+			getCurrent(): number[];
+		}
+	}
+
+	namespace multiRouter {
+		namespace driving {
+			class Path implements IGeoObject {
+				geometry: IGeometry | null;
+				properties: data.Manager;
+				state: IDataManager;
+				model: PathModel;
+				events: IEventManager;
+				options: IOptionManager;
+
+				getOverlay(): Promise<IOverlay | null>;
+
+				getOverlaySync(): IOverlay | null;
+
+				getParent(): object | null;
+
+				setParent(parent: object): this;
+
+				getMap(): Map;
+
+				getSegments(): GeoObjectCollection;
+			}
+
+			class PathModel implements IEventEmitter {
+				events: IEventManager;
+				properties: data.Manager;
+				route: RouteModel;
+
+				destroy(): void;
+
+				getSegments(): SegmentModel[];
+
+				getType(): string;
+
+				update(pathJson: object): void;
+			}
+
+			class Route implements IGeoObject {
+				geometry: IGeometry | null;
+				properties: IDataManager;
+				state: IDataManager;
+				events: IEventManager;
+				options: IOptionManager;
+
+				getOverlay(): Promise<IOverlay | null>;
+
+				getOverlaySync(): IOverlay | null;
+
+				getParent(): object | null;
+
+				setParent(parent: object): this;
+
+				getMap(): Map;
+
+				getPaths(): GeoObjectCollection;
+			}
+
+			class RouteModel implements IEventEmitter {
+				events: IEventManager;
+				multiRoute: MultiRouteModel;
+				properties: data.Manager;
+
+				destroy(): void;
+
+				getPaths(): PathModel[];
+
+				update(routeJson: object): void;
+
+				getType(): string;
+			}
+
+			class Segment implements IGeoObject {
+				geometry: IGeometry | null;
+				properties: data.Manager;
+				state: IDataManager;
+				events: IEventManager;
+				options: IOptionManager;
+
+				getOverlay(): Promise<IOverlay | null>;
+
+				getOverlaySync(): IOverlay | null;
+
+				getParent(): object | null;
+
+				setParent(parent: object): this;
+
+				getMap(): Map;
+			}
+
+			class SegmentModel implements IEventEmitter {
+				events: IEventManager;
+				geometry: geometry.base.LineString;
+				path: PathModel;
+
+				destroy(): void;
+
+				getType(): string;
+
+				getViaPoints(): ViaPointModel[];
+
+				update(segmentJson: object): void;
+			}
+		}
+
+		namespace masstransit {
+			class Path implements IGeoObject {
+				geometry: IGeometry | null;
+				properties: data.Manager;
+				state: IDataManager;
+				events: IEventManager;
+				options: IOptionManager;
+				model: PathModel;
+
+				getOverlay(): Promise<IOverlay | null>;
+
+				getOverlaySync(): IOverlay | null;
+
+				getParent(): object | null;
+
+				setParent(parent: object): this;
+
+				getMap(): Map;
+
+				getSegmentMarkers(): GeoObjectCollection;
+
+				getSegments(): GeoObjectCollection;
+			}
+
+			class PathModel implements IEventEmitter {
+				events: IEventManager;
+				properties: data.Manager;
+				route: RouteModel;
+
+				destroy(): void;
+
+				getSegments(): Array<TransferSegmentModel | TransportSegmentModel | WalkSegmentModel>;
+
+				getType(): string;
+
+				update(pathJson: object): void;
+			}
+
+			class Route implements IGeoObject {
+				geometry: IGeometry | null;
+				properties: data.Manager;
+				model: RouteModel;
+				state: IDataManager;
+				events: IEventManager;
+				options: IOptionManager;
+
+				getOverlay(): Promise<IOverlay | null>;
+
+				getOverlaySync(): IOverlay | null;
+
+				getParent(): object | null;
+
+				setParent(parent: object): this;
+
+				getMap(): Map;
+
+				getPaths(): GeoObjectCollection;
+			}
+
+			class RouteModel implements IEventEmitter {
+				events: IEventManager;
+				multiRoute: MultiRouteModel;
+				properties: data.Manager;
+
+				destroy(): void;
+
+				getPaths(): PathModel[];
+
+				getType(): string;
+
+				update(routeJson: object): void;
+			}
+
+			class StopModel implements IEventEmitter {
+				events: IEventManager;
+				geometry: geometry.base.Point;
+				properties: data.Manager;
+				segment: TransportSegmentModel;
+
+				update(stopJson: object): void;
+			}
+
+			class TransferSegment implements IGeoObject {
+				geometry: IGeometry | null;
+				properties: data.Manager;
+				state: IDataManager;
+				events: IEventManager;
+				options: IOptionManager;
+				model: TransferSegmentModel;
+
+				getOverlay(): Promise<IOverlay | null>;
+
+				getOverlaySync(): IOverlay | null;
+
+				getParent(): object | null;
+
+				setParent(parent: object): this;
+
+				getMap(): Map;
+			}
+
+			class TransferSegmentModel implements IEventEmitter {
+				events: IEventManager;
+				geometry: geometry.base.LineString;
+				path: PathModel;
+				properties: data.Manager;
+
+				destroy(segmentJson: object): void;
+
+				getType(): string;
+			}
+
+			class TransportSegment implements IGeoObject {
+				geometry: IGeometry | null;
+				properties: data.Manager;
+				state: IDataManager;
+				events: IEventManager;
+				options: IOptionManager;
+				model: TransportSegmentModel;
+
+				getOverlay(): Promise<IOverlay | null>;
+
+				getOverlaySync(): IOverlay | null;
+
+				getParent(): object | null;
+
+				setParent(parent: object): this;
+
+				getMap(): Map;
+			}
+
+			class TransportSegmentModel implements IEventEmitter {
+				events: IEventManager;
+				geometry: geometry.base.LineString;
+				path: PathModel;
+				properties: data.Manager;
+
+				destroy(): void;
+
+				getStops(): StopModel[];
+
+				getType(): string;
+
+				update(segmentJson: object): void;
+			}
+
+			class WalkSegment implements IGeoObject {
+				geometry: IGeometry | null;
+				properties: data.Manager;
+				state: IDataManager;
+				events: IEventManager;
+				options: IOptionManager;
+				model: WalkSegmentModel;
+
+				getOverlay(): Promise<IOverlay | null>;
+
+				getOverlaySync(): IOverlay | null;
+
+				getParent(): object | null;
+
+				setParent(parent: object): this;
+
+				getMap(): Map;
+			}
+
+			class WalkSegmentModel implements IEventEmitter {
+				events: IEventManager;
+				geometry: geometry.base.LineString;
+				path: PathModel;
+				properties: data.Manager;
+
+				destroy(): void;
+
+				getType(): string;
+			}
+		}
+
+		class EditorAddon implements ICustomizable, IEventEmitter {
+			options: IOptionManager;
+			events: IEventManager;
+			state: data.Manager;
+
+			isActive(): boolean;
+
+			start(state: object): void;
+
+			stop(): void;
+		}
+
+		class MultiRoute implements IGeoObject {
+			constructor(model: MultiRouteModel | IMultiRouteModelJson, options?: {
+				activeRouteAutoSelection?: boolean;
+				boundsAutoApply?: boolean;
+				dragUpdateInterval?: string | number;
+				preventDragUpdate?: boolean;
+				useMapMargin?: boolean;
+				zoomMargin?: number[][] | number[] | number;
+				[index: string]: any;
+			});
+
+			editor: EditorAddon;
+			model: MultiRouteModel;
+			geometry: IGeometry | null;
+			properties: IDataManager;
+			state: IDataManager;
+			events: IEventManager;
+			options: IOptionManager;
+
+			getOverlay(): Promise<IOverlay | null>;
+
+			getOverlaySync(): IOverlay | null;
+
+			getParent(): object | null;
+
+			setParent(parent: object): this;
+
+			getMap(): Map;
+
+			getActiveRoute(): driving.Route | masstransit.Route | null;
+
+			getBounds(): number[][] | null;
+
+			getPixelBounds(): number[][] | null;
+
+			getRoutes(): GeoObjectCollection;
+
+			getViaPoints(): GeoObjectCollection;
+
+			getWayPoints(): GeoObjectCollection;
+
+			setActiveRoute(route: driving.Route | masstransit.Route | null): void;
+		}
+
+		class MultiRouteModel implements IEventEmitter {
+			constructor(referencePoints: IMultiRouteReferencePoint[], params?: IMultiRouteParams);
+
+			events: IEventManager;
+			properties: data.Manager;
+
+			destroy(): void;
+
+			getAllPoints(): Array<WayPointModel | ViaPointModel>;
+
+			getJson(): object;
+
+			getParams(): IMultiRouteParams;
+
+			getPoints(): Array<WayPointModel | ViaPointModel>;
+
+			getReferencePointIndexes(): object;
+
+			getReferencePoints(): IMultiRouteReferencePoint[];
+
+			getRoutes(): driving.RouteModel[] | masstransit.RouteModel[];
+
+			getViaPoints(): ViaPointModel[];
+
+			getWayPoints(): WayPointModel[];
+
+			setParams(params: IMultiRouteParams, extend?: boolean, clearRequests?: boolean): void;
+
+			setReferencePoints(referencePoints: IMultiRouteReferencePoint[], viaIndexes?: number[], clearRequests?: boolean): void;
+		}
+
+		class ViaPoint implements IGeoObject {
+			geometry: IGeometry | null;
+			properties: data.Manager;
+			state: IDataManager;
+			events: IEventManager;
+			options: IOptionManager;
+
+			getOverlay(): Promise<IOverlay | null>;
+
+			getOverlaySync(): IOverlay | null;
+
+			getParent(): object | null;
+
+			setParent(parent: object): this;
+
+			getMap(): Map;
+		}
+
+		class ViaPointModel implements IEventEmitter {
+			events: IEventManager;
+			geometry: geometry.base.Point;
+			multiRoute: MultiRouteModel;
+			properties: data.Manager;
+
+			destroy(): void;
+
+			getReferencePoint(): object;
+
+			getReferencePointIndex(): number;
+
+			setReferencePoint(referencePoint: object): void;
+
+			update(viaPointJson: object): void;
+		}
+
+		class WayPoint implements IGeoObject {
+			geometry: IGeometry | null;
+			properties: data.Manager;
+			state: IDataManager;
+			events: IEventManager;
+			options: IOptionManager;
+			model: WayPointModel;
+
+			getOverlay(): Promise<IOverlay | null>;
+
+			getOverlaySync(): IOverlay | null;
+
+			getParent(): object | null;
+
+			setParent(parent: object): this;
+
+			getMap(): Map;
+		}
+
+		class WayPointModel implements IEventEmitter {
+			events: IEventManager;
+			geometry: geometry.base.Point;
+			multiRoute: MultiRouteModel;
+			properties: data.Manager;
+
+			destroy(): void;
+
+			getReferencePoint(): object;
+
+			getReferencePointIndex(): number;
+
+			setReferencePoint(referencePoint: object): void;
+
+			update(wayPointJson: object): void;
+		}
+	}
+
+	namespace option {
+		class Manager implements IOptionManager {
+			constructor(options?: object, parent?: IOptionManager, name?: string);
+
+			events: IEventManager;
+
+			get(key: string, defaultValue: object): object;
+
+			getAll(): object;
+
+			getName(): string;
+
+			getNative(key: string): object;
+
+			resolve(key: string, name?: string): object;
+
+			set(key: object | string, value?: object): this;
+
+			unset(keys: string[][] | string[] | string): this;
+
+			unsetAll(): this;
+
+			setName(name: string): void;
+
+			getParent(): null | IOptionManager;
+
+			setParent(parent: IOptionManager): this;
+
+			freeze(): IFreezable;
+
+			isFrozen(): boolean;
+
+			unfreeze(): IFreezable;
+
+			add(types: string[][] | string[] | string, callback: (event: (object | IEvent)) => void, context?: object, priority?: number): this;
+
+			group(): IEventGroup;
+
+			remove(types: string[][] | string[] | string, callback: (event: (object | IEvent)) => void, context?: object, priority?: number): this;
+
+			fire(type: string, eventobject: object | IEvent): this;
+		}
+	}
+
+	namespace panorama {
+		class Manager implements IEventEmitter {
+			events: IEventManager;
+
+			closePlayer(): void;
+
+			disableLookup(): void;
+
+			enableLookup(): void;
+
+			getPlayer(): Player;
+
+			isLookupEnabled(): boolean;
+
+			openPlayer(panorama: IPanorama[] | number): Promise<void>;
+		}
+
+		class Player implements IEventEmitter {
+			constructor(element: HTMLElement | string, panorama: IPanorama, options?: {
+				autoFitToViewport?: "none" | "ifNull" | "always";
+				controls?: string[];
+				direction?: number[] | string;
+				hotkeysEnabled?: boolean;
+				scrollZoomBehavior?: boolean;
+				span?: number[] | string;
+				suppressMapOpenBlock?: boolean;
+			})
+
+			events: IEventManager;
+
+			destroy(): void;
+
+			fitToViewport(): void;
+
+			getDirection(): number[];
+
+			getPanorama(): IPanorama;
+
+			getSpan(): number[];
+
+			lookAt(point: number[]): this;
+
+			moveTo(point: number[], options?: {
+				direction?: number[] | string;
+				layer?: "yandex#panorama" | "yandex#airPanorama";
+				span?: number[] | string;
+			}): Promise<void>;
+
+			setDirection(direction: number[] | string): this;
+
+			setPanorama(panorama: IPanorama): this;
+
+			setSpan(span: number[] | string): this;
+		}
+	}
+
+	namespace router {
+		class Editor implements ICustomizable, IEventEmitter {
+			options: IOptionManager;
+			events: IEventManager;
+
+			start(options?: {
+				addViaPoints?: boolean;
+				addWayPoints?: boolean;
+				editViaPoints?: boolean;
+				editWayPoints?: boolean;
+				removeViaPoints?: boolean;
+				removeWayPoints?: boolean;
+			}): void;
+
+			stop(): void;
+		}
+
+		abstract class Route implements IGeoObject {
+			geometry: IGeometry | null;
+			properties: IDataManager;
+			state: IDataManager;
+			events: IEventManager;
+			options: IOptionManager;
+			editor: Editor;
+
+			getOverlay(): Promise<IOverlay | null>;
+
+			getOverlaySync(): IOverlay | null;
+
+			getParent(): null | IControlParent;
+
+			setParent(parent: IControlParent): this;
+
+			getMap(): Map;
+
+			getHumanJamsTime(): string;
+
+			getHumanLength(): string;
+
+			getHumanTime(): string;
+
+			getJamsTime(): number;
+
+			getLength(): number;
+
+			getPaths(): GeoObjectCollection;
+
+			getTime(): number;
+
+			getViaPoints(): GeoObjectCollection;
+
+			getWayPoints(): GeoObjectCollection;
+		}
+	}
+
+	class Balloon extends Popup<Balloon> implements IBaloon<Balloon> {
+		constructor(map: Map, options?: IBalloonOptions);
+
+		getData(): object;
+
+		close(force?: boolean): Promise<Balloon>;
+
+		getParent(): Balloon | null;
+
+		setParent(parent: Balloon): this;
+
+		autoPan(): Promise<Balloon>;
+
+		freeze(): IFreezable;
+
+		isFrozen(): boolean;
+
+		unfreeze(): IFreezable;
+
+		add(types: string[][] | string[] | string, callback: (event: (object | IEvent)) => void, context?: object, priority?: number): this;
+
+		group(): IEventGroup;
+
+		remove(types: string[][] | string[] | string, callback: (event: (object | IEvent)) => void, context?: object, priority?: number): this;
+
+		fire(type: string, eventobject: object | IEvent): this;
+	}
+
+	interface IBalloonOptions {
+		autoPan?: boolean;
+		autoPanCheckZoomRange?: boolean;
+		autoPanDuration?: number;
+		autoPanMargin?: number[][] | number[] | number;
+		autoPanUseMapMargin?: boolean;
+		closeButton?: boolean;
+		contentLayout?: IClassConstructor<ILayout> | string;
+		layout?: IClassConstructor<ILayout> | string;
+		maxHeight?: number;
+		maxWidth?: number;
+		minHeight?: number;
+		minWidth?: number;
+		offset?: number[];
+		pane?: string;
+		panelContentLayout?: IClassConstructor<ILayout> | string;
+		panelMaxHeightRatio?: number;
+		panelMaxMapArea?: number;
+		shadow?: boolean;
+		shadowLayout?: IClassConstructor<ILayout> | string;
+		shadowOffset?: number[];
+	}
+
+	class Circle implements GeoObject {
+		constructor(geometry: ICircleGeometry[][][][] | number[][] | object, properties?: object | IDataManager, options?: ICircleOptions)
+
+		balloon: geoObject.Balloon;
+		editor: IGeometryEditor;
+		hint: geoObject.Hint;
+		events: event.Manager;
+		options: option.Manager;
+		properties: data.Manager;
+		state: data.Manager;
+
+		geometry: IGeometry | null;
+		indices: ArrayBuffer;
+		vertices: ArrayBuffer;
+
+		getOverlay(): Promise<IOverlay | null>;
+
+		getOverlaySync(): IOverlay | null;
+
+		getParent(): null | IControlParent;
+
+		setParent(parent: IControlParent): this;
+
+		getMap(): Map;
+	}
+
+	interface ICircleOptions {
+		circleOverlay?: string | ((geometry: IPixelCircleGeometry, data: object, options: object) => Promise<IOverlay>);
+		cursor?: string;
+		draggable?: boolean;
+		fill?: boolean;
+		fillColor?: string;
+		fillImageHref?: string;
+		fillMethod?: "stretch" | "tile";
+		fillOpacity?: number;
+		hasBalloon?: boolean;
+		hasHint?: boolean;
+		hideIconOnBalloonOpen?: boolean;
+		interactiveZIndex?: boolean;
+		interactivityModel?: InteractivityModelKey;
+		opacity?: number;
+		openBalloonOnClick?: boolean;
+		openEmptyBalloon?: boolean;
+		openEmptyHint?: boolean;
+		openHintOnHover?: boolean;
+		outline?: boolean;
+		pane?: string;
+		strokeColor?: string[][] | string[] | string;
+		strokeOpacity?: number[][] | number[] | number;
+		strokeStyle?: string[][][] | object[][] | string[] | object[] | string | object;
+		strokeWidth?: number[][] | number[] | number;
+		syncOverlayInit?: boolean;
+		useMapMarginInDragging?: boolean;
+		visible?: boolean;
+		zIndex?: number;
+		zIndexActive?: number;
+		zIndexDrag?: number;
+		zIndexHover?: number;
+	}
+
+	class Clusterer implements IChildOnMap, ICustomizable, IEventEmitter, IParentOnMap {
+		constructor(options?: IClustererOptions);
+
+		events: IEventManager;
+		options: IOptionManager;
+		balloon: clusterer.Balloon;
+		// 	balloonopen:
+		hint: clusterer.Hint;
+
+		getParent(): null | IControlParent;
+
+		setParent(parent: IControlParent): this;
+
+		// balloonclose:
+
+		getMap(): Map;
+	}
+
+	interface IClustererOptions {
+		gridSize?: number;
+		groupByCoordinates?: boolean;
+		hasBalloon?: boolean;
+		hasHint?: boolean;
+		margin?: number[][] | number[] | number;
+		maxZoom?: number[] | number;
+		minClusterSize?: number;
+		preset?: PresetKey;
+		showInAlphabeticalOrder?: boolean;
+		useMapMargin?: boolean;
+		viewportMargin?: number[][] | number[] | number;
+		zoomMargin?: number[][] | number[] | number;
+	}
+
+	class ClusterPlacemark implements IGeoObject, collection.Item {
+		constructor(geometry: number[] | object | IPointGeometry, properties: IClusterPlacemarkProperties, options?: IClusterPlacemarkOptions);
+
+		geometry: IGeometry | null;
+		properties: IDataManager;
+		events: IEventManager;
+		options: IOptionManager;
+		state: data.Manager;
+
+		getOverlay(): Promise<IOverlay | null>;
+
+		getOverlaySync(): IOverlay | null;
+
+		getParent(): null | IControlParent;
+
+		setParent(parent: IControlParent): this;
+
+		getMap(): Map;
+
+		onAddToMap(map: Map): void;
+
+		onRemoveFromMap(oldMap: Map): void;
+
+		getBounds(): number[][] | null;
+
+		getGeoObjects(): IGeoObject[];
+	}
+
+	interface IClusterPlacemarkProperties extends IDataManager {
+		geoObjects: IGeoObject[];
+	}
+
+	interface IClusterPlacemarkOptions {
+		balloonContentLayout?: "cluster#balloonTwoColumns" | "cluster#balloonCarousel" | "cluster#balloonAccordion" | string | IClassConstructor<ILayout>;
+		balloonContentLayoutHeight?: number;
+		balloonContentLayoutWidth?: number;
+		balloonItemContentLayout?: ILayout | string;
+		balloonPanelContentLayout?: string | IClassConstructor<ILayout>;
+		cursor?: string;
+		disableClickZoom?: boolean;
+		hideIconOnBalloonOpen?: boolean;
+		iconColor?: string;
+		iconContentLayout?: string | IClassConstructor<ILayout>;
+		iconLayout?: string | IClassConstructor<ILayout>;
+		icons?: Array<{
+			href: string;
+			size: number[];
+			ooffset: number[];
+			shape?: IShape | IGeometryJson;
+		}>;
+		iconShape?: IGeometryJson;
+		interactivityModel?: InteractivityModelKey;
+		numbers?: number[];
+		openBalloonOnClick?: boolean;
+		openEmptyHint?: boolean;
+		openHintOnHover?: boolean;
+		zIndexHover?: number;
+	}
+
+	class Collection implements ICollection, collection.Item {
+		constructor(options?: object);
+
+		events: IEventManager;
+		options: IOptionManager;
+
+		add(object: object): this;
+
+		getIterator(): IIterator;
+
+		remove(object: object): this;
+
+		getParent(): null | IControlParent;
+
+		setParent(parent: IControlParent): this;
+
+		getMap(): Map;
+
+		onAddToMap(map: Map): void;
+
+		onRemoveFromMap(oldMap: Map): void;
+
+		filter(filterFunction: (object: object) => boolean): object[];
+
+		get(index: number): object;
+
+		getAll(): object[];
+
+		getLength(): number;
+
+		indexOf(childToFind: object): number;
+
+		removeAll(): this;
+	}
+
+	class Event implements IEvent {
+		constructor(originalEvent: object, sourceEvent: IEvent);
+
+		allowMapEvent(): void;
+
+		callMethod(name: string): void;
+
+		get(name: string): object;
+
+		getSourceEvent(): IEvent | null;
+
+		isDefaultPrevented(): boolean;
+
+		isImmediatePropagationStopped(): boolean;
+
+		isMapEventAllowed(): boolean;
+
+		isPropagationStopped(): boolean;
+
+		preventDefault(): boolean;
+
+		stopImmediatePropagation(): boolean;
+
+		stopPropagation(): boolean;
+	}
+
+	class GeoObject implements IGeoObject {
+		constructor(feature?: IGeoObjectFeature, options?: IGeoObjectOptions);
+
+		geometry: IGeometry | null;
+		balloon: geoObject.Balloon;
+		editor: IGeometryEditor;
+		hint: geoObject.Hint;
+		events: event.Manager;
+		options: option.Manager;
+		properties: data.Manager;
+		state: data.Manager;
+
+		getOverlay(): Promise<IOverlay | null>;
+
+		getOverlaySync(): IOverlay | null;
+
+		getParent(): null | IControlParent;
+
+		setParent(parent: IControlParent): this;
+
+		getMap(): Map;
+	}
+
+	interface IGeoObjectFeature {
+		geometry?: IGeometry | IGeometryJson;
+		properties?: IDataManager | object;
+	}
+
+	interface IGeoObjectOptions extends ICircleOptions {
+		iconCaptionMaxWidth?: number;
+		iconColor?: string;
+		iconContentLayout?: string | IClassConstructor<ILayout>;
+		iconContentOffset?: number[];
+		iconContentPadding?: number[];
+		iconContentSize?: number[];
+		iconImageClipRect?: number[][];
+		iconImageHref?: string;
+		iconImageOffset?: number[];
+		iconImageShape?: IShape | null;
+		iconImageSize?: number[];
+		iconLayout?: string | IClassConstructor<ILayout>;
+		iconMaxHeight?: number;
+		iconMaxWidth?: number;
+		iconOffset?: number[];
+		iconShadow?: boolean;
+		iconShadowImageClipRect?: number[][];
+		iconShadowImageHref?: string;
+		iconShadowImageOffset?: number[];
+		iconShadowImageSize?: number[];
+		iconShadowLayout?: string | IClassConstructor<ILayout>;
+		iconShadowOffset?: number[];
+		lineStringOverlay?: OverlayKey;
+		pointOverlay?: OverlayKey;
+		polygonOverlay?: OverlayKey;
+		preset?: string;
+		rectangleOverlay?: OverlayKey;
+		setMapCursorInDragging?: boolean;
+	}
+
+	class GeoObjectCollection implements IGeoObject, IGeoObjectCollection {
+		constructor(feature?: {
+			children?: IGeoObject[];
+			geometry?: IGeometry | object;
+			properties?: IDataManager | object;
+		}, options?: object);
+
+		geometry: IGeometry | null;
+		properties: IDataManager;
+		state: IDataManager;
+		events: IEventManager;
+		options: IOptionManager;
+
+		getOverlay(): Promise<IOverlay | null>;
+
+		getOverlaySync(): IOverlay | null;
+
+		getParent(): null | IControlParent;
+
+		setParent(parent: IControlParent): this;
+
+		getMap(): Map;
+
+		add(child: IGeoObject, index?: number): this;
+
+		each(callback: (object: IGeoObject) => void, context: object): void;
+
+		get(index: number): IGeoObject;
+
+		getBounds(): number[][] | null;
+
+		getIterator(): IIterator;
+
+		getLength(): number;
+
+		getPixelBounds(): number[][] | null;
+
+		indexOf(object: IGeoObject): number;
+
+		remove(child: IGeoObject): this;
+
+		removeAll(): this;
+
+		set(index: number, child: IGeoObject): this;
+
+		splice(index: number, length: number): this;
+
+		toArray(): IGeoObject[];
+	}
+
+	class Layer implements ILayer, IParentOnMap, IPositioningContext {
+		constructor(tileUrlTemplate: string | ((tileNumber: number[], tileZoom: number) => string));
+
+		events: IEventManager;
+		options: IOptionManager;
+
+		fromClientPixels(clientPixelPoint: number[]): number[];
+
+		getZoom(): number;
+
+		toClientPixels(globalPixelPoint: number[]): number[];
+
+		getParent(): null | IControlParent;
+
+		setParent(parent: IControlParent): this;
+
+		getMap(): Map;
+	}
+
+	class Map implements IDomEventEmitter {
+		constructor(parentElement: HTMLElement | string, state: IMapState, options?: IMapOptions)
+
+		action: map.action.Manager;
+		balloon: map.Balloon;
+		behaviors: map.behavior.Manager;
+		container: map.Container;
+		controls: control.Manager;
+		converter: map.Converter;
+		copyrights: map.Copyrights;
+		cursors: util.cursor.Manager;
+		events: event.Manager;
+		geoObjects: map.GeoObjects;
+		hint: map.Hint;
+		layers: map.layer.Manager;
+		margin: map.margin.Manager;
+		options: option.Manager;
+		panes: map.pane.Manager;
+		zoomRange: map.ZoomRange;
+
+		destroy(): void;
+
+		getBounds(options?: IMapMarginOptions): number[][];
+
+		getCenter(options?: IMapMarginOptions): number[];
+
+		getGlobalPixelCenter(options?: IMapMarginOptions): number[];
+
+		getPanoramaManager(): Promise<panorama.Manager>;
+
+		getType(): string | MapType;
+
+		getZoom(): number;
+
+		panTo(center: number[] | object[], options?: IMapPanOptions): Promise<void>;
+
+		setBounds(bounds: number[][], options?: IMapBoundsOptions): Promise<void>;
+
+		setCenter(center: number[], zoom?: number, options?: IMapPositionOptions): Promise<void>;
+
+		setGlobalPixelCenter(globalPixelCenter: number[], zoom?: number, options?: IMapPositionOptions): Promise<void>;
+
+		setType(type: string | MapType, options?: IMapCheckZoomRangeOptions): Promise<void>;
+
+		setZoom(zoom: number, options?: IMapZoomOptions): Promise<void>;
+	}
+
+	interface IMapMarginOptions {
+		useMapMargin?: boolean;
+	}
+
+	interface IMapCheckZoomRangeOptions {
+		checkZoomRange?: boolean;
+	}
+
+	interface IMapZoomOptions extends IMapMarginOptions, IMapCheckZoomRangeOptions {
+		duration?: number;
+	}
+
+	interface IMapPositionOptions extends IMapZoomOptions {
+		timingFunction?: string;
+	}
+
+	interface IMapBoundsOptions extends IMapPositionOptions {
+		preciseZoom?: boolean;
+		zoomMargin?: number[][] | number[];
+	}
+
+	interface IMapPanOptions extends IMapPositionOptions {
+		delay?: number;
+		flying?: boolean;
+		safe?: boolean;
+	}
+
+	class MapType {
+		constructor(name: string, layers: Array<IClassConstructor<Layer> | string>)
+	}
+
+	interface IMapState {
+		behaviors?: string[];
+		bounds?: number[][];
+		center?: number[];
+		controls?: string[];
+		margin?: number[][] | number[];
+		type?: "yandex#map" | "yandex#satellite" | "yandex#hybrid";
+		zoom?: number;
+	}
+
+	interface IMapOptions {
+		autoFitToViewport?: "none" | "ifNull" | "always";
+		avoidFractionalZoom?: boolean;
+		exitFullscreenByEsc?: boolean;
+		fullscreenZIndex?: number;
+		mapAutoFocus?: boolean;
+		maxAnimationZoomDifference?: number;
+		maxZoom?: number;
+		minZoom?: number;
+		nativeFullscreen?: boolean;
+		projection?: IProjection;
+		restrictMapArea?: boolean;
+		suppressMapOpenBlock?: boolean;
+		suppressObsoleteBrowserNotifier?: boolean;
+		yandexMapAutoSwitch?: boolean;
+		yandexMapDisablePoiInteractivity?: boolean;
+	}
+
+	class Placemark extends GeoObject {
+		constructor(geometry: number[] | object | IPointGeometry, properties: object | IDataManager, options?: IPlacemarkOptions)
+	}
+
+	interface IPlacemarkOptions {
+		cursor?: string;
+		draggable?: boolean;
+        hasBalloon?: boolean;
+        hasHint?: boolean;
+        hideIconOnBalloonOpen?: boolean;
+        iconOffset?: number[];
+        iconShape?: IGeometryJson | null;
+        interactiveZIndex?: boolean;
+        interactivityModel?: string;
+        openBalloonOnClick?: boolean;
+        openEmptyBalloon?: boolean;
+        openEmptyHint?: boolean;
+        openHintOnHover?: boolean;
         pane?: string;
-        panelContentLayout?: IClassConstructor<ILayout> | string;
-        panelMaxHeightRatio?: number;
-        panelMaxMapArea?: number;
-        shadow?: boolean;
-        shadowLayout?: IClassConstructor<ILayout> | string;
-        shadowOffset?: number[];
+        pointOverlay?: string;
+        syncOverlayInit?: boolean;
+        useMapMarginInDragging?: boolean;
+        visible?: boolean;
+        zIndex?: number;
+        zIndexActive?: number;
+        zIndexDrag?: number;
+        zIndexHover?: number;
+	}
+
+	class Polygon extends GeoObject {
+	    constructor(geometry: number[][][] | object| IPolygonGeometry, properties?: object | IDataManager, options?: IPolygonOptions)
     }
 
-    class Circle implements GeoObject {
-        constructor(geometry: ICircleGeometry[][][][] | number[][] | object, properties?: object | IDataManager, options?: ICircleOptions)
-
-        balloon: geoObject.Balloon;
-        editor: IGeometryEditor;
-        hint: geoObject.Hint;
-        events: event.Manager;
-        options: option.Manager;
-        properties: data.Manager;
-        state: data.Manager;
-
-        geometry: IGeometry | null;
-        indices: ArrayBuffer;
-        vertices: ArrayBuffer;
-
-        getOverlay(): Promise<IOverlay | null>;
-
-        getOverlaySync(): IOverlay | null;
-
-        getParent(): null | IControlParent;
-
-        setParent(parent: IControlParent): this;
-
-        getMap(): Map;
-    }
-
-    interface ICircleOptions {
-        circleOverlay?: string | ((geometry: IPixelCircleGeometry, data: object, options: object) => Promise<IOverlay>);
+    interface IPolygonOptions {
         cursor?: string;
         draggable?: boolean;
         fill?: boolean;
         fillColor?: string;
         fillImageHref?: string;
-        fillMethod?: "stretch" | "tile";
+        fillMethod?: 'stretch' | 'tile';
         fillOpacity?: number;
         hasBalloon?: boolean;
         hasHint?: boolean;
-        hideIconOnBalloonOpen?: boolean;
         interactiveZIndex?: boolean;
-        interactivityModel?: InteractivityModelKey;
+        interactivityModel?: string;
         opacity?: number;
         openBalloonOnClick?: boolean;
         openEmptyBalloon?: boolean;
@@ -1936,10 +2627,11 @@ declare namespace ymaps {
         openHintOnHover?: boolean;
         outline?: boolean;
         pane?: string;
-        strokeColor?: string[][] | string[] | string;
-        strokeOpacity?: number[][] | number[] | number;
-        strokeStyle?: string[][][] | object[][] | string[] | object[] | string | object;
-        strokeWidth?: number[][] | number[] | number;
+        polygonOverlay?: string;
+        strokeColor?: string | string[];
+        strokeOpacity?: number | number[];
+        strokeStyle?: string | string[] | object | object[];
+        strokeWidth?: number | number[];
         syncOverlayInit?: boolean;
         useMapMarginInDragging?: boolean;
         visible?: boolean;
@@ -1949,770 +2641,447 @@ declare namespace ymaps {
         zIndexHover?: number;
     }
 
-    class Clusterer implements IChildOnMap, ICustomizable, IEventEmitter, IParentOnMap {
-        constructor(options?: IClustererOptions);
-
-        events: IEventManager;
-        options: IOptionManager;
-        balloon: clusterer.Balloon;
-        // 	balloonopen:
-        hint: clusterer.Hint;
-
-        getParent(): null | IControlParent;
-
-        setParent(parent: IControlParent): this;
-
-        // balloonclose:
-
-        getMap(): Map;
+    class Polyline extends GeoObject {
+        constructor(geometry: number[][]| object | ILineStringGeometry, properties?: object | IDataManager, options?: IPolylineOptions)
     }
 
-    interface IClustererOptions {
-        gridSize?: number;
-        groupByCoordinates?: boolean;
+    interface IPolylineOptions {
+        cursor?: string;
+        draggable?: boolean;
         hasBalloon?: boolean;
         hasHint?: boolean;
-        margin?: number[][] | number[] | number;
-        maxZoom?: number[] | number;
-        minClusterSize?: number;
-        preset?: PresetKey;
-        showInAlphabeticalOrder?: boolean;
-        useMapMargin?: boolean;
-        viewportMargin?: number[][] | number[] | number;
-        zoomMargin?: number[][] | number[] | number;
-    }
-
-    class ClusterPlacemark implements IGeoObject, collection.Item {
-        constructor(geometry: number[] | object | IPointGeometry, properties: IClusterPlacemarkProperties, options?: IClusterPlacemarkOptions);
-
-        geometry: IGeometry | null;
-        properties: IDataManager;
-        events: IEventManager;
-        options: IOptionManager;
-        state: data.Manager;
-
-        getOverlay(): Promise<IOverlay | null>;
-
-        getOverlaySync(): IOverlay | null;
-
-        getParent(): null | IControlParent;
-
-        setParent(parent: IControlParent): this;
-
-        getMap(): Map;
-
-        onAddToMap(map: Map): void;
-
-        onRemoveFromMap(oldMap: Map): void;
-
-        getBounds(): number[][] | null;
-
-        getGeoObjects(): IGeoObject[];
-    }
-
-    interface IClusterPlacemarkProperties extends IDataManager {
-        geoObjects: IGeoObject[];
-    }
-
-    interface IClusterPlacemarkOptions {
-        balloonContentLayout?: "cluster#balloonTwoColumns" | "cluster#balloonCarousel" | "cluster#balloonAccordion" | string | IClassConstructor<ILayout>;
-        balloonContentLayoutHeight?: number;
-        balloonContentLayoutWidth?: number;
-        balloonItemContentLayout?: ILayout | string;
-        balloonPanelContentLayout?: string | IClassConstructor<ILayout>;
-        cursor?: string;
-        disableClickZoom?: boolean;
-        hideIconOnBalloonOpen?: boolean;
-        iconColor?: string;
-        iconContentLayout?: string | IClassConstructor<ILayout>;
-        iconLayout?: string | IClassConstructor<ILayout>;
-        icons?: Array<{
-            href: string;
-            size: number[];
-            ooffset: number[];
-            shape?: IShape | IGeometryJson;
-        }>;
-        iconShape?: IGeometryJson;
-        interactivityModel?: InteractivityModelKey;
-        numbers?: number[];
+        interactiveZIndex?: boolean;
+        interactivityModel?: string;
+        lineStringOverlay?: () => object | string;
+        opacity?: number;
         openBalloonOnClick?: boolean;
+        openEmptyBalloon?: boolean;
         openEmptyHint?: boolean;
         openHintOnHover?: boolean;
+        pane?: string;
+        strokeColor?: string | string[];
+        strokeOpacity?: number | number[];
+        strokeStyle?: string | string[] | object | object[];
+        strokeWidth?: number | number[];
+        syncOverlayInit?: boolean;
+        useMapMarginInDragging?: boolean;
+        visible?: boolean;
+        zIndex?: number;
+        zIndexActive?: number;
+        zIndexDrag?: number;
         zIndexHover?: number;
     }
 
-    class Collection implements ICollection, collection.Item {
-        constructor(options?: object);
+	class Popup<T> implements IPopup<T> {
+		constructor(map: Map, options?: IPopupOptions);
 
-        events: IEventManager;
-        options: IOptionManager;
+		options: IOptionManager;
+		events: IEventManager;
 
-        add(object: object): this;
+		close(force?: boolean): Promise<T>;
 
-        getIterator(): IIterator;
+		getData(): object;
 
-        remove(object: object): this;
+		getOverlay(): Promise<IOverlay>;
 
-        getParent(): null | IControlParent;
+		getOverlaySync(): IOverlay;
 
-        setParent(parent: IControlParent): this;
+		getPosition(): number[];
 
-        getMap(): Map;
+		isOpen(): boolean;
 
-        onAddToMap(map: Map): void;
+		open(position: number[], data: object | string | HTMLElement): Promise<T>;
 
-        onRemoveFromMap(oldMap: Map): void;
+		setData(data: object | string | HTMLElement): Promise<T>;
 
-        filter(filterFunction: (object: object) => boolean): object[];
+		setPosition(position: number[]): Promise<T>;
+	}
 
-        get(index: number): object;
+	interface IPopupOptions {
+		closeTimeout?: number;
+		interactivityModel?: InteractivityModelKey;
+		openTimeout?: number;
+		pane?: IPane | string;
+		projection?: IProjection;
+		zIndex?: number;
+	}
 
-        getAll(): object[];
+	function ready(successCallback?: () => any | IReadyobject, errorCallback?: () => any, context?: object): Promise<void>;
 
-        getLength(): number;
+	interface IReadyobject {
+		require?: string[];
+		context?: object;
 
-        indexOf(childToFind: object): number;
+		successCallback?(): void;
 
-        removeAll(): this;
+		errorCallback?(): void;
+	}
+
+	namespace templateLayoutFactory {
+		function createClass(template: string, overrides?: object, staticMethods?: object): IClassConstructor<layout.templateBased.Base>;
+	}
+
+	namespace util {
+		namespace cursor {
+			class Accessor {
+				constructor(key: string);
+
+				getKey(): string;
+
+				remove(): void;
+
+				setKey(): void;
+			}
+
+			class Manager {
+				constructor(element: HTMLElement);
+
+				push(key: string): Accessor;
+			}
+		}
+
+		class Storage {
+			add(key: string, object: object): this;
+
+			get(key: string | object): object | string;
+
+			remove(key: string): object;
+		}
+	}
+
+    namespace vow {
+        class Deferred {
+            promise(): Promise;
+
+            reject(reason: object): void;
+
+            resolve(value: object): void;
+        }
+
+        class Promise {
+            constructor(resolver?: () => void);
+
+            done(onFulfilled?: () => void, onRejected?: () => void, onProgress?: () => void, ctx?: object): void;
+
+            spread(onFulfilled?: () => void, onRejected?: () => void, ctx?: object): Promise;
+
+            then(onFulfilled?: () => void, onRejected?: () => void, onProgress?: () => void, ctx?: object): Promise;
+
+            valueOf(): object;
+        }
     }
 
-    class Event implements IEvent {
-        constructor(originalEvent: object, sourceEvent: IEvent);
+	/*Interfaces*/
 
-        allowMapEvent(): void;
+	interface IBaloon<T> extends IPopup<T>, ICustomizable, IChild<T>, IFreezable {
+		autoPan(): Promise<T>;
+	}
 
-        callMethod(name: string): void;
+	interface IBalloonManager<T> extends IPopupManager<T> {
+		autoPan(): Promise<T>;
+	}
 
-        get(name: string): object;
+	interface IBaseGeometry extends IEventEmitter {
+		getBounds(): number[][] | null;
 
-        getSourceEvent(): IEvent | null;
+		getType(): string;
+	}
 
-        isDefaultPrevented(): boolean;
+	interface IBaseLineStringGeometry extends IBaseGeometry, ILineStringGeometryAccess {//tslint:disable-line no-empty-interface no-empty-interfaces
+	}
 
-        isImmediatePropagationStopped(): boolean;
+	interface IBasePointGeometry extends IBaseGeometry, IPointGeometryAccess {//tslint:disable-line no-empty-interface no-empty-interfaces
+	}
 
-        isMapEventAllowed(): boolean;
+	interface IBehavior extends IChildOnMap, ICustomizable {
+		disable(): void;
 
-        isPropagationStopped(): boolean;
+		enable(): void;
 
-        preventDefault(): boolean;
+		isEnabled(): boolean;
+	}
 
-        stopImmediatePropagation(): boolean;
+	interface IChild<T> extends IEventEmitter {
+		getParent(): object | null;
 
-        stopPropagation(): boolean;
-    }
+		setParent(parent: object | null): this;
+	}
 
-    class GeoObject implements IGeoObject {
-        constructor(feature?: IGeoObjectFeature, options?: IGeoObjectOptions);
+	interface IChildOnMap extends IChild<IControlParent> { //tslint:disable-line no-empty-interface no-empty-interfaces
+	}
 
-        geometry: IGeometry | null;
-        balloon: geoObject.Balloon;
-        editor: IGeometryEditor;
-        hint: geoObject.Hint;
-        events: event.Manager;
-        options: option.Manager;
-        properties: data.Manager;
-        state: data.Manager;
+	interface ICircleGeometry extends ICircleGeometryAccess, IGeometry { //tslint:disable-line no-empty-interface no-empty-interfaces
+	}
 
-        getOverlay(): Promise<IOverlay | null>;
+	interface ICircleGeometryAccess extends IFreezable {
+		contains(position: number[]): boolean;
 
-        getOverlaySync(): IOverlay | null;
+		getClosest(anchorPosition: number[]): object;
 
-        getParent(): null | IControlParent;
+		getCoordinates(): number[] | null;
 
-        setParent(parent: IControlParent): this;
+		getRadius(): number;
 
-        getMap(): Map;
-    }
+		setCoordinates(coordinates: number[] | null): this;
 
-    interface IGeoObjectFeature {
-        geometry?: IGeometry | IGeometryJson | object;
-        properties?: IDataManager | object;
-    }
+		setRadius(radius: number): this;
+	}
 
-    interface IGeoObjectOptions extends ICircleOptions {
-        iconCaptionMaxWidth?: number;
-        iconColor?: string;
-        iconContentLayout?: string | IClassConstructor<ILayout>;
-        iconContentOffset?: number[];
-        iconContentPadding?: number[];
-        iconContentSize?: number[];
-        iconImageClipRect?: number[][];
-        iconImageHref?: string;
-        iconImageOffset?: number[];
-        iconImageShape?: IShape | null;
-        iconImageSize?: number[];
-        iconLayout?: string | IClassConstructor<ILayout>;
-        iconMaxHeight?: number;
-        iconMaxWidth?: number;
-        iconOffset?: number[];
-        iconShadow?: boolean;
-        iconShadowImageClipRect?: number[][];
-        iconShadowImageHref?: string;
-        iconShadowImageOffset?: number[];
-        iconShadowImageSize?: number[];
-        iconShadowLayout?: string | IClassConstructor<ILayout>;
-        iconShadowOffset?: number[];
-        lineStringOverlay?: OverlayKey;
-        pointOverlay?: OverlayKey;
-        polygonOverlay?: OverlayKey;
-        preset?: string;
-        rectangleOverlay?: OverlayKey;
-        setMapCursorInDragging?: boolean;
-    }
+	interface ICollection extends IEventEmitter {
+		add(object: object): this;
 
-    class GeoObjectCollection implements IGeoObject, IGeoObjectCollection {
-        constructor(feature?: {
-            children?: IGeoObject[];
-            geometry?: IGeometry | object;
-            properties?: IDataManager | object;
-        }, options?: object);
+		getIterator(): IIterator;
 
-        geometry: IGeometry | null;
-        properties: IDataManager;
+		remove(object: object): this;
+	}
+
+	interface IControl extends IChildOnMap { //tslint:disable-line no-empty-interface no-empty-interfaces
+		// new (options?: object);
+	}
+
+	interface IControlParent extends IParentOnMap {
+		getChildElement(child: IControl): Promise<HTMLElement>;
+	}
+
+	interface ICoordSystem {
+		getDistance(point1: number[], point2: number[]): number;
+
+		solveDirectProblem(startPoint: number[], direction: number[], distance: number): object;
+
+		solveInverseProblem(startPoint: number[], endPoint: number[], reverseDirection?: boolean): object;
+	}
+
+	interface ICopyrightsAccessor extends ICopyrightsProvider { //tslint:disable-line no-empty-interface no-empty-interfaces
+	}
+
+	interface ICopyrightsProvider extends IEventEmitter {
+		getCopyrights(coords: number[], zoom: number): Promise<Array<string | HTMLElement>>;
+
+		remove(): void;
+
+		setCopyrights(copyrights: string | HTMLElement | Array<string | HTMLElement>): void;
+	}
+
+	interface ICustomizable extends IEventEmitter {
+		options: IOptionManager;
+	}
+
+	interface IDataManager extends IEventEmitter {
+		get(path: string, defaultValue: object): object;
+	}
+
+	interface IDomEventEmitter extends IEventEmitter { //tslint:disable-line no-empty-interface no-empty-interfaces
+	}
+
+	interface IEvent {
+		allowMapEvent(): void;
+
+		callMethod(name: string): void;
+
+		get(name: string): object;
+
+		getSourceEvent(): IEvent | null;
+
+		isDefaultPrevented(): boolean;
+
+		isImmediatePropagationStopped(): boolean;
+
+		isMapEventAllowed(): boolean;
+
+		isPropagationStopped(): boolean;
+
+		preventDefault(): boolean;
+
+		stopImmediatePropagation(): boolean;
+
+		stopPropagation(): boolean;
+	}
+
+	interface IEventController {
+		onStartListening?(events: IEventManager, type: string): void;
+
+		onStopListening?(events: IEventManager, type: string): void;
+	}
+
+	interface IEventEmitter {
+		events: IEventManager;
+	}
+
+	interface IEventGroup {
+		add(types: string[][] | string[] | string, callback: (event: object | IEvent) => void, context?: object, priority?: number): this;
+
+		remove(types: string[][] | string[] | string, callback: (event: object | IEvent) => void, context?: object, priority?: number): this;
+
+		removeAll(): this;
+	}
+
+	interface IEventManager extends IEventTrigger {
+		add(types: string[][] | string[] | string, callback: (event: object | IEvent) => void, context?: object, priority?: number): this;
+
+		getParent(): object | null;
+
+		group(): IEventGroup;
+
+		//remove(types: string[][] | string[] | string, callback: (event: object | IEvent) => void, context?: object, priority?: number): this;
+
+		setParent(parent: object | null): this;
+	}
+
+	interface IEventTrigger {
+		fire(type: string, eventobject: object | IEvent): this;
+	}
+
+	interface IEventWorkflowController extends IEventController {
+		onAfterEventFiring?(events: IEventManager, type: string, event?: IEvent): void;
+
+		onBeforeEventFiring?(events: IEventManager, type: string, event?: IEvent): void;
+	}
+
+	interface IExpandableControlLayout extends ILayout { //tslint:disable-line no-empty-interface no-empty-interfaces
+	}
+
+	interface IFreezable extends IEventManager {
+		freeze(): IFreezable;
+
+		isFrozen(): boolean;
+
+		unfreeze(): IFreezable;
+	}
+
+	interface IGeocodeProvider {
+		geocode(request: string, options?: { boundedBy?: number[][], results?: number, skip?: number, strictBounds?: boolean }): Promise<object>;
+
+		suggest(request: string, options?: { boundedBy?: number[][], results?: number, strictBounds?: boolean }): Promise<object>;
+	}
+
+	interface IGeometry extends IBaseGeometry, ICustomizable {
+		getMap(): Map | null;
+
+		getPixelGeometry(options?: object): IPixelGeometry;
+
+		setMap(map: Map): void;
+	}
+
+	interface IGeometryEditor extends ICustomizable, IEventEmitter {
+        geometry: IGeometry;
         state: IDataManager;
-        events: IEventManager;
-        options: IOptionManager;
 
-        getOverlay(): Promise<IOverlay | null>;
+		startEditing(): void;
 
-        getOverlaySync(): IOverlay | null;
+		stopEditing(): void;
+	}
 
-        getParent(): null | IControlParent;
+    interface IGeometryEditorChildModel extends IGeometryEditorModel {
+        editor: IGeometryEditor;
+        geometry: IBaseGeometry;
 
-        setParent(parent: IControlParent): this;
+        getParent(): IGeometryEditorModel;
 
-        getMap(): Map;
-
-        add(child: IGeoObject, index?: number): this;
-
-        each(callback: (object: IGeoObject) => void, context: object): void;
-
-        get(index: number): IGeoObject;
-
-        getBounds(): number[][] | null;
-
-        getIterator(): IIterator;
-
-        getLength(): number;
-
-        getPixelBounds(): number[][] | null;
-
-        indexOf(object: IGeoObject): number;
-
-        remove(child: IGeoObject): this;
-
-        removeAll(): this;
-
-        set(index: number, child: IGeoObject): this;
-
-        splice(index: number, length: number): this;
-
-        toArray(): IGeoObject[];
+        setPixels(pixels: number[]): void;
     }
 
-    class Layer implements ILayer, IParentOnMap, IPositioningContext {
-        constructor(tileUrlTemplate: string | ((tileNumber: number[], tileZoom: number) => string));
-
-        events: IEventManager;
-        options: IOptionManager;
-
-        fromClientPixels(clientPixelPoint: number[]): number[];
-
-        getZoom(): number;
-
-        toClientPixels(globalPixelPoint: number[]): number[];
-
-        getParent(): null | IControlParent;
-
-        setParent(parent: IControlParent): this;
-
-        getMap(): Map;
-    }
-
-    class Map implements IDomEventEmitter {
-        constructor(parentElement: HTMLElement | string, state: IMapState, options?: IMapOptions)
-
-        action: map.action.Manager;
-        balloon: map.Balloon;
-        behaviors: map.behavior.Manager;
-        container: map.Container;
-        controls: control.Manager;
-        converter: map.Converter;
-        copyrights: map.Copyrights;
-        cursors: util.cursor.Manager;
-        events: event.Manager;
-        geoObjects: map.GeoObjects;
-        hint: map.Hint;
-        layers: map.layer.Manager;
-        margin: map.margin.Manager;
-        options: option.Manager;
-        panes: map.pane.Manager;
-        zoomRange: map.ZoomRange;
-
+    interface IGeometryEditorModel extends IEventEmitter {
         destroy(): void;
 
-        getBounds(options?: IMapMarginOptions): number[][];
-
-        getCenter(options?: IMapMarginOptions): number[];
-
-        getGlobalPixelCenter(options?: IMapMarginOptions): number[];
-
-        getPanoramaManager(): Promise<panorama.Manager>;
-
-        getType(): string | MapType;
-
-        getZoom(): number;
-
-        panTo(center: number[] | object[], options?: IMapPanOptions): Promise<void>;
-
-        setBounds(bounds: number[][], options?: IMapBoundsOptions): Promise<void>;
-
-        setCenter(center: number[], zoom?: number, options?: IMapPositionOptions): Promise<void>;
-
-        setGlobalPixelCenter(globalPixelCenter: number[], zoom?: number, options?: IMapPositionOptions): Promise<void>;
-
-        setType(type: string | MapType, options?: IMapCheckZoomRangeOptions): Promise<void>;
-
-        setZoom(zoom: number, options?: IMapZoomOptions): Promise<void>;
+        getPixels(): number[];
     }
 
-    interface IMapMarginOptions {
-        useMapMargin?: boolean;
+    interface IGeometryEditorRootModel extends IGeometryEditorModel { //tslint:disable-line no-empty-interface no-empty-interfaces
     }
 
-    interface IMapCheckZoomRangeOptions {
-        checkZoomRange?: boolean;
-    }
-
-    interface IMapZoomOptions extends IMapMarginOptions, IMapCheckZoomRangeOptions {
-        duration?: number;
-    }
-
-    interface IMapPositionOptions extends IMapZoomOptions {
-        timingFunction?: string;
-    }
-
-    interface IMapBoundsOptions extends IMapPositionOptions {
-        preciseZoom?: boolean;
-        zoomMargin?: number[][] | number[];
-    }
-
-    interface IMapPanOptions extends IMapPositionOptions {
-        delay?: number;
-        flying?: boolean;
-        safe?: boolean;
-    }
+	interface IGeometryJson {
+		type: string;
+	}
 
-    class MapType {
-        constructor(name: string, layers: Array<IClassConstructor<Layer> | string>)
-    }
+	interface IGeoObject extends IChildOnMap, ICustomizable, IDomEventEmitter, IParentOnMap {
+		geometry: IGeometry | null;
+		properties: IDataManager;
+		state: IDataManager;
 
-    interface IMapState {
-        behaviors?: string[];
-        bounds?: number[][];
-        center?: number[];
-        controls?: string[];
-        margin?: number[][] | number[];
-        type?: "yandex#map" | "yandex#satellite" | "yandex#hybrid";
-        zoom?: number;
-    }
+		getOverlay(): Promise<IOverlay | null>;
 
-    interface IMapOptions {
-        autoFitToViewport?: "none" | "ifNull" | "always";
-        avoidFractionalZoom?: boolean;
-        exitFullscreenByEsc?: boolean;
-        fullscreenZIndex?: number;
-        mapAutoFocus?: boolean;
-        maxAnimationZoomDifference?: number;
-        maxZoom?: number;
-        minZoom?: number;
-        nativeFullscreen?: boolean;
-        projection?: IProjection;
-        restrictMapArea?: boolean;
-        suppressMapOpenBlock?: boolean;
-        suppressObsoleteBrowserNotifier?: boolean;
-        yandexMapAutoSwitch?: boolean;
-        yandexMapDisablePoiInteractivity?: boolean;
-    }
+		getOverlaySync(): IOverlay | null;
+	}
 
-    class Placemark extends GeoObject {
-        constructor(geometry: number[] | object | IPointGeometry, properties: object | IDataManager, options?: IPlacemarkOptions)
-    }
+	interface IGeoObjectCollection extends ICustomizable, IEventEmitter, IParentOnMap {
+		add(child: IGeoObject, index?: number): this;
 
-    interface IPlacemarkOptions {
-        cursor?: string;
-        draggable?: boolean;
+		each(callback: (object: IGeoObject) => void, context: object): void;
 
-        [index: string]: any;
-    }
+		get(index: number): IGeoObject;
 
-    class Popup<T> implements IPopup<T> {
-        constructor(map: Map, options?: IPopupOptions);
+		getBounds(): number[][] | null;
 
-        options: IOptionManager;
-        events: IEventManager;
+		getIterator(): IIterator;
 
-        close(force?: boolean): Promise<T>;
+		getLength(): number;
 
-        getData(): object;
+		getPixelBounds(): number[][] | null;
 
-        getOverlay(): Promise<IOverlay>;
+		indexOf(object: IGeoObject): number;
 
-        getOverlaySync(): IOverlay;
+		remove(child: IGeoObject): this;
 
-        getPosition(): number[];
+		removeAll(): this;
 
-        isOpen(): boolean;
+		set(index: number, child: IGeoObject): this;
 
-        open(position: number[], data: object | string | HTMLElement): Promise<T>;
+		splice(index: number, length: number): this;
+	}
 
-        setData(data: object | string | HTMLElement): Promise<T>;
+	interface IGeoObjectSequence extends ICustomizable, IEventEmitter, IParentOnMap {
+		each(callback: (geoObject: IGeoObject) => void, context?: object): void;
 
-        setPosition(position: number[]): Promise<T>;
-    }
+		get(index: number): IGeoObject;
 
-    interface IPopupOptions {
-        closeTimeout?: number;
-        interactivityModel?: InteractivityModelKey;
-        openTimeout?: number;
-        pane?: IPane | string;
-        projection?: IProjection;
-        zIndex?: number;
-    }
+		getBounds(): number[][] | null;
 
-    function ready(successCallback?: () => any | IReadyobject, errorCallback?: () => any, context?: object): Promise<void>;
+		getIterator(): IIterator;
 
-    interface IReadyobject {
-        require?: string[];
-        context?: object;
+		getLength(): number;
 
-        successCallback?(): void;
+		getPixelBounds(): number[][] | null;
 
-        errorCallback?(): void;
-    }
+		indexOf(geoObject: IGeoObject): number;
+	}
 
-    namespace templateLayoutFactory {
-        function createClass(template: string, overrides?: object, staticMethods?: object): IClassConstructor<layout.templateBased.Base>;
-    }
+	interface IHintManager<T> extends IPopupManager<T> { //tslint:disable-line no-empty-interface no-empty-interfaces
+	}
 
-    namespace util {
-        namespace cursor {
-            class Accessor {
-                constructor(key: string);
+	interface IIterator {
+		getNext(): object | null;
+	}
 
-                getKey(): string;
+	interface ILayer extends IChildOnMap, ICustomizable, IEventEmitter {
+		getBrightness?(): number;
 
-                remove(): void;
+		getCopyrights?(coords: number[], zoom: number): Promise<Array<string | HTMLElement>>;
 
-                setKey(): void;
-            }
+		getZoomRange?(point: number[]): Promise<number[]>;
+	}
 
-            class Manager {
-                constructor(element: HTMLElement);
+	interface ILayout extends IDomEventEmitter {
+		// new (data: object);
+		destroy(): void;
 
-                push(key: string): Accessor;
-            }
-        }
+		getData(): object;
 
-        class Storage {
-            add(key: string, object: object): this;
+		getParentElement(): HTMLElement;
 
-            get(key: string | object): object | string;
+		getShape(): IShape | null;
 
-            remove(key: string): object;
-        }
-    }
+		isEmpty(): boolean;
 
-    /*Interfaces*/
+		setData(data: object): void;
 
-    interface IBaloon<T> extends IPopup<T>, ICustomizable, IChild<T>, IFreezable {
-        autoPan(): Promise<T>;
-    }
+		setParentElement(parent: HTMLElement | null): void;
+	}
 
-    interface IBalloonManager<T> extends IPopupManager<T> {
-        autoPan(): Promise<T>;
-    }
+    interface ILinearRingGeometryAccess extends IFreezable {
+        contain(position: number): boolean;
 
-    interface IBaseGeometry extends IEventEmitter {
-        getBounds(): number[][] | null;
-
-        getType(): string;
-    }
-
-    interface IBaseLineStringGeometry extends IBaseGeometry, ILineStringGeometryAccess {//tslint:disable-line no-empty-interface no-empty-interfaces
-    }
-
-    interface IBasePointGeometry extends IBaseGeometry, IPointGeometryAccess {//tslint:disable-line no-empty-interface no-empty-interfaces
-    }
-
-    interface IBehavior extends IChildOnMap, ICustomizable {
-        disable(): void;
-
-        enable(): void;
-
-        isEnabled(): boolean;
-    }
-
-    interface IChild<T> extends IEventEmitter {
-        getParent(): object | null;
-
-        setParent(parent: object | null): this;
-    }
-
-    interface IChildOnMap extends IChild<IControlParent> { //tslint:disable-line no-empty-interface no-empty-interfaces
-    }
-
-    interface ICircleGeometry extends ICircleGeometryAccess, IGeometry { //tslint:disable-line no-empty-interface no-empty-interfaces
-    }
-
-    interface ICircleGeometryAccess extends IFreezable {
-        contains(position: number[]): boolean;
-
-        getClosest(anchorPosition: number[]): object;
-
-        getCoordinates(): number[] | null;
-
-        getRadius(): number;
-
-        setCoordinates(coordinates: number[] | null): this;
-
-        setRadius(radius: number): this;
-    }
-
-    interface ICollection extends IEventEmitter {
-        add(object: object): this;
-
-        getIterator(): IIterator;
-
-        remove(object: object): this;
-    }
-
-    interface IControl extends IChildOnMap { //tslint:disable-line no-empty-interface no-empty-interfaces
-        // new (options?: object);
-    }
-
-    interface IControlParent extends IParentOnMap {
-        getChildElement(child: IControl): Promise<HTMLElement>;
-    }
-
-    interface ICoordSystem {
-        getDistance(point1: number[], point2: number[]): number;
-
-        solveDirectProblem(startPoint: number[], direction: number[], distance: number): object;
-
-        solveInverseProblem(startPoint: number[], endPoint: number[], reverseDirection?: boolean): object;
-    }
-
-    interface ICopyrightsAccessor extends ICopyrightsProvider { //tslint:disable-line no-empty-interface no-empty-interfaces
-    }
-
-    interface ICopyrightsProvider extends IEventEmitter {
-        getCopyrights(coords: number[], zoom: number): Promise<Array<string | HTMLElement>>;
-
-        remove(): void;
-
-        setCopyrights(copyrights: string | HTMLElement | Array<string | HTMLElement>): void;
-    }
-
-    interface ICustomizable extends IEventEmitter {
-        options: IOptionManager;
-    }
-
-    interface IDataManager extends IEventEmitter {
-        get(path: string, defaultValue: object): object;
-    }
-
-    interface IDomEventEmitter extends IEventEmitter { //tslint:disable-line no-empty-interface no-empty-interfaces
-    }
-
-    interface IEvent {
-        allowMapEvent(): void;
-
-        callMethod(name: string): void;
-
-        get(name: string): object;
-
-        getSourceEvent(): IEvent | null;
-
-        isDefaultPrevented(): boolean;
-
-        isImmediatePropagationStopped(): boolean;
-
-        isMapEventAllowed(): boolean;
-
-        isPropagationStopped(): boolean;
-
-        preventDefault(): boolean;
-
-        stopImmediatePropagation(): boolean;
-
-        stopPropagation(): boolean;
-    }
-
-    interface IEventController {
-        onStartListening?(events: IEventManager, type: string): void;
-
-        onStopListening?(events: IEventManager, type: string): void;
-    }
-
-    interface IEventEmitter {
-        events: IEventManager;
-    }
-
-    interface IEventGroup {
-        add(types: string[][] | string[] | string, callback: (event: object | IEvent) => void, context?: object, priority?: number): this;
-
-        remove(types: string[][] | string[] | string, callback: (event: object | IEvent) => void, context?: object, priority?: number): this;
-
-        removeAll(): this;
-    }
-
-    interface IEventManager extends IEventTrigger {
-        add(types: string[][] | string[] | string, callback: (event: object | IEvent) => void, context?: object, priority?: number): this;
-
-        getParent(): object | null;
-
-        group(): IEventGroup;
-
-        //remove(types: string[][] | string[] | string, callback: (event: object | IEvent) => void, context?: object, priority?: number): this;
-
-        setParent(parent: object | null): this;
-    }
-
-    interface IEventTrigger {
-        fire(type: string, eventobject: object | IEvent): this;
-    }
-
-    interface IEventWorkflowController extends IEventController {
-        onAfterEventFiring?(events: IEventManager, type: string, event?: IEvent): void;
-
-        onBeforeEventFiring?(events: IEventManager, type: string, event?: IEvent): void;
-    }
-
-    interface IExpandableControlLayout extends ILayout { //tslint:disable-line no-empty-interface no-empty-interfaces
-    }
-
-    interface IFreezable extends IEventManager {
         freeze(): IFreezable;
 
-        isFrozen(): boolean;
-
-        unfreeze(): IFreezable;
-    }
-
-    interface IGeocodeProvider {
-        geocode(request: string, options?: { boundedBy?: number[][], results?: number, skip?: number, strictBounds?: boolean }): Promise<object>;
-
-        suggest(request: string, options?: { boundedBy?: number[][], results?: number, strictBounds?: boolean }): Promise<object>;
-    }
-
-    interface IGeometry extends IBaseGeometry, ICustomizable {
-        getMap(): Map | null;
-
-        getPixelGeometry(options?: object): IPixelGeometry;
-
-        setMap(map: Map): void;
-    }
-
-    interface IGeometryEditor extends ICustomizable, IEventEmitter {
-        startEditing(): void;
-
-        stopEditing(): void;
-    }
-
-    interface IGeometryJson {
-        type: string;
-    }
-
-    interface IGeoObject extends IChildOnMap, ICustomizable, IDomEventEmitter, IParentOnMap {
-        geometry: IGeometry | null;
-        properties: IDataManager;
-        state: IDataManager;
-
-        getOverlay(): Promise<IOverlay | null>;
-
-        getOverlaySync(): IOverlay | null;
-    }
-
-    interface IGeoObjectCollection extends ICustomizable, IEventEmitter, IParentOnMap {
-        add(child: IGeoObject, index?: number): this;
-
-        each(callback: (object: IGeoObject) => void, context: object): void;
-
-        get(index: number): IGeoObject;
-
-        getBounds(): number[][] | null;
-
-        getIterator(): IIterator;
-
-        getLength(): number;
-
-        getPixelBounds(): number[][] | null;
-
-        indexOf(object: IGeoObject): number;
-
-        remove(child: IGeoObject): this;
-
-        removeAll(): this;
-
-        set(index: number, child: IGeoObject): this;
-
-        splice(index: number, length: number): this;
-    }
-
-    interface IGeoObjectSequence extends ICustomizable, IEventEmitter, IParentOnMap {
-        each(callback: (geoObject: IGeoObject) => void, context?: object): void;
-
-        get(index: number): IGeoObject;
-
-        getBounds(): number[][] | null;
-
-        getIterator(): IIterator;
-
-        getLength(): number;
-
-        getPixelBounds(): number[][] | null;
-
-        indexOf(geoObject: IGeoObject): number;
-    }
-
-    interface IHintManager<T> extends IPopupManager<T> { //tslint:disable-line no-empty-interface no-empty-interfaces
-    }
-
-    interface IIterator {
-        getNext(): object | null;
-    }
-
-    interface ILayer extends IChildOnMap, ICustomizable, IEventEmitter {
-        getBrightness?(): number;
-
-        getCopyrights?(coords: number[], zoom: number): Promise<Array<string | HTMLElement>>;
-
-        getZoomRange?(point: number[]): Promise<number[]>;
-    }
-
-    interface ILayout extends IDomEventEmitter {
-        // new (data: object);
-        destroy(): void;
-
-        getData(): object;
-
-        getParentElement(): HTMLElement;
-
-        getShape(): IShape | null;
-
-        isEmpty(): boolean;
-
-        setData(data: object): void;
-
-        setParentElement(parent: HTMLElement | null): void;
-    }
-
-    interface ILineStringGeometry extends IGeometry, ILineStringGeometryAccess {  //tslint:disable-line no-empty-interface no-empty-interfaces
-    }
-
-    interface ILineStringGeometryAccess extends IFreezable {
         get(index: number): number[];
 
         getChildGeometry(index: number): IPointGeometryAccess;
@@ -2721,337 +3090,391 @@ declare namespace ymaps {
 
         getCoordinates(): number[][];
 
+        getFillRule(): string;
+
         getLength(): number;
 
-        insert(index: number, coordinates: number[][]): ILineStringGeometryAccess;
+        insert(index: number, coordinates: number[]): ILinearRingGeometryAccess;
+
+        isFrozen(): boolean;
 
         remove(index: number): number[];
 
-        set(index: number, coordinates: number[]): ILineStringGeometryAccess;
+        set(index: number, coordinates: number[]): ILinearRingGeometryAccess;
 
-        setCoordinates(coordinates: number[]): ILineStringGeometryAccess;
+        setCoordinates(coordinates: number[][]): ILinearRingGeometryAccess;
 
-        splice(index: number, length: number): number[][];
+        setFillRule(fillRule: string): ILinearRingGeometryAccess;
+
+        splice(index: number, number: number): number[][];
+
+        unfreeze(): IFreezable;
     }
 
-    interface IMapAction extends IEventEmitter {
-        begin(mapActionManager: map.action.Manager): void;
+	interface ILineStringGeometry extends IGeometry, ILineStringGeometryAccess {  //tslint:disable-line no-empty-interface no-empty-interfaces
+	}
 
-        end(): void;
+	interface ILineStringGeometryAccess extends IFreezable {
+		get(index: number): number[];
+
+		getChildGeometry(index: number): IPointGeometryAccess;
+
+		getClosest(anchorPosition: number[]): object;
+
+		getCoordinates(): number[][];
+
+		getLength(): number;
+
+		insert(index: number, coordinates: number[][]): ILineStringGeometryAccess;
+
+		remove(index: number): number[];
+
+		set(index: number, coordinates: number[]): ILineStringGeometryAccess;
+
+		setCoordinates(coordinates: number[]): ILineStringGeometryAccess;
+
+		splice(index: number, length: number): number[][];
+	}
+
+	interface IMapAction extends IEventEmitter {
+		begin(mapActionManager: map.action.Manager): void;
+
+		end(): void;
+	}
+
+	interface IMapObjectCollection extends ICollection, ICustomizable, IParentOnMap {  //tslint:disable-line no-empty-interface no-empty-interfaces
+	}
+
+	interface IMultiRouteModelJson {
+		params: IMultiRouteParams;
+		referencePoints: IMultiRouteReferencePoint[];
+	}
+
+	interface IMultiRouteParams {
+		avoidTrafficJams?: boolean;
+		boundedBy?: number[][] | null;
+		requestSendInterval?: string | number;
+		results?: number;
+		reverseGeocoding?: boolean;
+		routingMode?: "auto" | "masstransit" | "pedestrian";
+		searchCoordOrder?: string;
+		strictBounds?: boolean;
+		viaIndexes?: number[];
+	}
+
+	type IMultiRouteReferencePoint = string | number[] | geometry.Point;
+
+	interface IOptionManager extends IChild<IOptionManager>, IEventEmitter, IFreezable {
+		get(key: string, defaultValue: object): object;
+
+		getAll(): object;
+
+		getName(): string;
+
+		getNative(key: string): object;
+
+		resolve(key: string, name?: string): object;
+
+		setName(name: string): void;
+	}
+
+	interface IOverlay extends ICustomizable, IDomEventEmitter {
+		getData(): object;
+
+		getGeometry(): IPixelGeometry;
+
+		getMap(): Map | null;
+
+		getShape(): IShape | null;
+
+		isEmpty(): boolean;
+
+		setData(data: object): void;
+
+		setGeometry(geometry: IPixelGeometry): void;
+
+		setMap(map: Map | null): void;
+	}
+
+	interface IPane extends IEventEmitter {
+		destroy(): void;
+
+		getElement(): HTMLElement;
+
+		getMap(): Map;
+
+		getOverflow(): "visible" | "hidden";
+
+		getZIndex(): number;
+	}
+
+	interface IPanorama {
+		getAngularBBox(): number[];
+
+		getConnectionArrows(): IPanoramaConnectionArrow[];
+
+		getConnectionMarkers(): IPanoramaConnectionMarker[];
+
+		getCoordSystem(): ICoordSystem;
+
+		getDefaultDirection(): number[];
+
+		getDefaultSpan(): number[];
+
+		getGraph(): IPanoramaGraph | null;
+
+		getMarkers(): IPanoramaMarker[];
+
+		getName(): string;
+
+		getPosition(): number[];
+
+		getTileLevels(): IPanoramaTileLevel[];
+
+		getTileSize(): number[];
+	}
+
+	interface IPanoramaConnection {
+		getConnectedPanorama(): Promise<IPanorama>;
+	}
+
+	interface IPanoramaConnectionArrow extends IPanoramaConnection {
+		properties: data.Manager;
+
+		getDirection(): number[];
+
+		getPanorama(): IPanorama;
+	}
+
+	interface IPanoramaConnectionMarker extends IPanoramaConnection, IPanoramaMarker {  //tslint:disable-line no-empty-interface no-empty-interfaces
+	}
+
+	interface IPanoramaGraph {
+		getEdges(): IPanoramaGraphEdge[];
+
+		getNodes(): IPanoramaGraphEdge[];
+
+		getPanorama(): IPanorama;
+	}
+
+	interface IPanoramaGraphEdge {
+		getEndNodes(): IPanoramaGraphNode[];
+	}
+
+	interface IPanoramaGraphNode {
+		getConnectedPanorama(): Promise<IPanorama>;
+	}
+
+	interface IPanoramaMarker {
+		properties: data.Manager;
+
+		getIconSet(): Promise<IPanoramaMarkerIconSet>;
+
+		getPanorama(): IPanorama;
+
+		getPosition(): number[];
+	}
+
+	interface IPanoramaMarkerIcon {
+		image: HTMLCanvasElement | HTMLImageElement;
+		offset: number[];
+	}
+
+	interface IPanoramaMarkerIconSet {
+		default: IPanoramaMarkerIcon | null;
+		expanded: IPanoramaMarkerIcon | null;
+		expandedHovered: IPanoramaMarkerIcon | null;
+		hovered: IPanoramaMarkerIcon | null;
+	}
+
+	interface IPanoramaTileLevel {
+		getImageSize(): number[];
+
+		getTileUrl(x: number, y: number): string;
+	}
+
+	interface IParentOnMap {
+		getMap(): Map;
+	}
+
+	interface IPixelCircleGeometry extends IPixelGeometry {
+		getCoordinates(): number[];
+
+		getRadius(): number;
+	}
+
+	interface IPixelLineStringGeometry extends IPixelGeometry {
+		getClosest(anchorPosition: number[]): object;
+
+		getCoordinates(): number[][];
+
+		getLength(): number;
+	}
+
+	interface IPixelGeometry extends IBaseGeometry {
+		equals(geometry: IPixelGeometry): boolean;
+
+		getMetaData(): object;
+
+		scale(factor: number): IPixelGeometry;
+
+		shift(offset: number[]): IPixelGeometry;
+	}
+
+	interface IPointGeometry extends IGeometry, IPointGeometryAccess { //tslint:disable-line no-empty-interface no-empty-interfaces
+	}
+
+	interface IPointGeometryAccess {
+		getCoordinates(): number[] | null;
+
+		setCoordinates(coordinates: number[] | null): this;
+	}
+
+    interface IPolygonGeometry extends IGeometry, IPolygonGeometryAccess { //tslint:disable-line no-empty-interface no-empty-interfaces
     }
 
-    interface IMapObjectCollection extends ICollection, ICustomizable, IParentOnMap {  //tslint:disable-line no-empty-interface no-empty-interfaces
-    }
-
-    interface IMultiRouteModelJson {
-        params: IMultiRouteParams;
-        referencePoints: IMultiRouteReferencePoint[];
-    }
-
-    interface IMultiRouteParams {
-        avoidTrafficJams?: boolean;
-        boundedBy?: number[][] | null;
-        requestSendInterval?: string | number;
-        results?: number;
-        reverseGeocoding?: boolean;
-        routingMode?: "auto" | "masstransit" | "pedestrian";
-        searchCoordOrder?: string;
-        strictBounds?: boolean;
-        viaIndexes?: number[];
-    }
-
-    type IMultiRouteReferencePoint = string | number[] | geometry.Point;
-
-    interface IOptionManager extends IChild<IOptionManager>, IEventEmitter, IFreezable {
-        get(key: string, defaultValue: object): object;
-
-        getAll(): object;
-
-        getName(): string;
-
-        getNative(key: string): object;
-
-        resolve(key: string, name?: string): object;
-
-        setName(name: string): void;
-    }
-
-    interface IOverlay extends ICustomizable, IDomEventEmitter {
-        getData(): object;
-
-        getGeometry(): IPixelGeometry;
-
-        getMap(): Map | null;
-
-        getShape(): IShape | null;
-
-        isEmpty(): boolean;
-
-        setData(data: object): void;
-
-        setGeometry(geometry: IPixelGeometry): void;
-
-        setMap(map: Map | null): void;
-    }
-
-    interface IPane extends IEventEmitter {
-        destroy(): void;
-
-        getElement(): HTMLElement;
-
-        getMap(): Map;
-
-        getOverflow(): "visible" | "hidden";
-
-        getZIndex(): number;
-    }
-
-    interface IPanorama {
-        getAngularBBox(): number[];
-
-        getConnectionArrows(): IPanoramaConnectionArrow[];
-
-        getConnectionMarkers(): IPanoramaConnectionMarker[];
-
-        getCoordSystem(): ICoordSystem;
-
-        getDefaultDirection(): number[];
-
-        getDefaultSpan(): number[];
-
-        getGraph(): IPanoramaGraph | null;
-
-        getMarkers(): IPanoramaMarker[];
-
-        getName(): string;
-
-        getPosition(): number[];
-
-        getTileLevels(): IPanoramaTileLevel[];
-
-        getTileSize(): number[];
-    }
-
-    interface IPanoramaConnection {
-        getConnectedPanorama(): Promise<IPanorama>;
-    }
-
-    interface IPanoramaConnectionArrow extends IPanoramaConnection {
-        properties: data.Manager;
-
-        getDirection(): number[];
-
-        getPanorama(): IPanorama;
-    }
-
-    interface IPanoramaConnectionMarker extends IPanoramaConnection, IPanoramaMarker {  //tslint:disable-line no-empty-interface no-empty-interfaces
-    }
-
-    interface IPanoramaGraph {
-        getEdges(): IPanoramaGraphEdge[];
-
-        getNodes(): IPanoramaGraphEdge[];
-
-        getPanorama(): IPanorama;
-    }
-
-    interface IPanoramaGraphEdge {
-        getEndNodes(): IPanoramaGraphNode[];
-    }
-
-    interface IPanoramaGraphNode {
-        getConnectedPanorama(): Promise<IPanorama>;
-    }
-
-    interface IPanoramaMarker {
-        properties: data.Manager;
-
-        getIconSet(): Promise<IPanoramaMarkerIconSet>;
-
-        getPanorama(): IPanorama;
-
-        getPosition(): number[];
-    }
-
-    interface IPanoramaMarkerIcon {
-        image: HTMLCanvasElement | HTMLImageElement;
-        offset: number[];
-    }
-
-    interface IPanoramaMarkerIconSet {
-        default: IPanoramaMarkerIcon | null;
-        expanded: IPanoramaMarkerIcon | null;
-        expandedHovered: IPanoramaMarkerIcon | null;
-        hovered: IPanoramaMarkerIcon | null;
-    }
-
-    interface IPanoramaTileLevel {
-        getImageSize(): number[];
-
-        getTileUrl(x: number, y: number): string;
-    }
-
-    interface IParentOnMap {
-        getMap(): Map;
-    }
-
-    interface IPixelCircleGeometry extends IPixelGeometry {
-        getCoordinates(): number[];
-
-        getRadius(): number;
-    }
-
-    interface IPixelLineStringGeometry extends IPixelGeometry {
-        getClosest(anchorPosition: number[]): object;
-
-        getCoordinates(): number[][];
-
-        getLength(): number;
-    }
-
-    interface IPixelGeometry extends IBaseGeometry {
-        equals(geometry: IPixelGeometry): boolean;
-
-        getMetaData(): object;
-
-        scale(factor: number): IPixelGeometry;
-
-        shift(offset: number[]): IPixelGeometry;
-    }
-
-    interface IPointGeometry extends IGeometry, IPointGeometryAccess { //tslint:disable-line no-empty-interface no-empty-interfaces
-    }
-
-    interface IPointGeometryAccess {
-        getCoordinates(): number[] | null;
-
-        setCoordinates(coordinates: number[] | null): this;
-    }
-
-    interface IPopup<T> extends ICustomizable, IEventEmitter {
-        close(force?: boolean): Promise<T>;
-
-        getData(): object;
-
-        getOverlay(): Promise<IOverlay>;
-
-        getOverlaySync(): IOverlay;
-
-        getPosition(): number[];
-
-        isOpen(): boolean;
-
-        open(position: number[], data: object | string | HTMLElement): Promise<T>;
-
-        setData(data: object | string | HTMLElement): Promise<T>;
-
-        setPosition(position: number[]): Promise<T>;
-    }
-
-    interface IPopupManager<T> extends IEventEmitter {
-        close(force?: boolean): Promise<T>;
-
-        destroy(): void;
-
-        getData(): object | null;
-
-        getOptions(): IOptionManager | null;
-
-        getOverlay(): Promise<IOverlay | null>;
-
-        getOverlaySync(): IOverlay | null;
-
-        getPosition(): number[] | null;
-
-        isOpen(): boolean;
-
-        open(position?: number[], data?: object | string | HTMLElement, options?: object): Promise<T>;
-
-        setData(data: object | string | HTMLElement): Promise<T>;
-
-        setOptions(options: object): Promise<T>;
-
-        setPosition(position: number[]): Promise<T>;
-    }
-
-    interface IPositioningContext {
-        fromClientPixels(clientPixelPoint: number[]): number[];
-
-        getZoom(): number;
-
-        toClientPixels(globalPixelPoint: number[]): number[];
-    }
-
-    interface IProjection {
-        fromGlobalPixels(globalPixelPoint: number[], zoom: number): number[];
-
-        getCoordSystem(): ICoordSystem;
-
-        isCycled(): boolean[];
-
-        toGlobalPixels(coordPoint: number[], zoom: number): number[];
-    }
-
-    interface IRoutePanel {
-        options: IOptionManager;
-        state: IDataManager;
-
-        getRoute(): multiRouter.MultiRoute;
-
-        switchPoints(): void;
-    }
-
-    interface ISearchControlLayout extends IExpandableControlLayout { //tslint:disable-line no-empty-interface no-empty-interfaces
-    }
-
-    interface ISelectableControl extends IControl {
-        deselect(): void;
-
-        disable(): void;
-
-        enable(): void;
-
-        isEnabled(): boolean;
-
-        isSelected(): boolean;
-
-        select(): void;
-    }
-
-    interface ISelectableControlLayout extends ILayout { //tslint:disable-line no-empty-interface no-empty-interfaces
-    }
-
-    interface IShape {
+    interface IPolygonGeometryAccess extends IFreezable {
         contains(position: number[]): boolean;
 
-        equals(shape: IShape): boolean;
+        get(index: number): number[][];
 
-        getBounds(): number[][] | null;
+        getChildGeometry(index: number): ILinearRingGeometryAccess;
 
-        getGeometry(): IPixelGeometry;
+        getClosest(anchorPosition: number[]): object;
 
-        getType(): string;
+        getCoordinates(): number[][][];
 
-        scale(factor: number): IShape;
+        getFillRule(): string;
 
-        shift(offset: number[]): IShape;
+        getLength(): number;
+
+        insert(index: number, path: number[][]): IPolygonGeometryAccess;
+
+        remove(index: number): ILinearRingGeometryAccess;
+
+        set(index: number, path: number[][]): IPolygonGeometryAccess;
+
+        setCoordinates(coordinates: number[][][]): IPolygonGeometryAccess;
+
+        setFillRule(fillRule: string): IPolygonGeometryAccess;
+
+        splice(index: number, number: number): ILinearRingGeometryAccess[];
     }
 
-    class Monitor {
-        constructor(dataManager: IDataManager | IOptionManager);
-        add(name: string[] | string, changeCallback: (event: (object | IEvent)) => void, context?: any, params?: any): Monitor;
-        forceChange(): Monitor;
-        get(name: string): any;
-        remove(name: string): Monitor;
-        removeAll(): Monitor;
-    }
+	interface IPopup<T> extends ICustomizable, IEventEmitter {
+		close(force?: boolean): Promise<T>;
 
-    class Polyline extends GeoObject {
-        constructor(geometry: number[][] | object | ILineStringGeometry, properties: object | IDataManager, options?: IPolylineOptions);
-    }
+		getData(): object;
 
-    interface IPolylineOptions {
-        cursor?: string;
-        [index: string]: any;
-    }
+		getOverlay(): Promise<IOverlay>;
+
+		getOverlaySync(): IOverlay;
+
+		getPosition(): number[];
+
+		isOpen(): boolean;
+
+		open(position: number[], data: object | string | HTMLElement): Promise<T>;
+
+		setData(data: object | string | HTMLElement): Promise<T>;
+
+		setPosition(position: number[]): Promise<T>;
+	}
+
+	interface IPopupManager<T> extends IEventEmitter {
+		close(force?: boolean): Promise<T>;
+
+		destroy(): void;
+
+		getData(): object | null;
+
+		getOptions(): IOptionManager | null;
+
+		getOverlay(): Promise<IOverlay | null>;
+
+		getOverlaySync(): IOverlay | null;
+
+		getPosition(): number[] | null;
+
+		isOpen(): boolean;
+
+		open(position?: number[], data?: object | string | HTMLElement, options?: object): Promise<T>;
+
+		setData(data: object | string | HTMLElement): Promise<T>;
+
+		setOptions(options: object): Promise<T>;
+
+		setPosition(position: number[]): Promise<T>;
+	}
+
+	interface IPositioningContext {
+		fromClientPixels(clientPixelPoint: number[]): number[];
+
+		getZoom(): number;
+
+		toClientPixels(globalPixelPoint: number[]): number[];
+	}
+
+	interface IProjection {
+		fromGlobalPixels(globalPixelPoint: number[], zoom: number): number[];
+
+		getCoordSystem(): ICoordSystem;
+
+		isCycled(): boolean[];
+
+		toGlobalPixels(coordPoint: number[], zoom: number): number[];
+	}
+
+	interface IRoutePanel {
+		options: IOptionManager;
+		state: IDataManager;
+
+		getRoute(): multiRouter.MultiRoute;
+
+		switchPoints(): void;
+	}
+
+	interface ISearchControlLayout extends IExpandableControlLayout { //tslint:disable-line no-empty-interface no-empty-interfaces
+	}
+
+	interface ISelectableControl extends IControl {
+		deselect(): void;
+
+		disable(): void;
+
+		enable(): void;
+
+		isEnabled(): boolean;
+
+		isSelected(): boolean;
+
+		select(): void;
+	}
+
+	interface ISelectableControlLayout extends ILayout { //tslint:disable-line no-empty-interface no-empty-interfaces
+	}
+
+	interface IShape {
+		contains(position: number[]): boolean;
+
+		equals(shape: IShape): boolean;
+
+		getBounds(): number[][] | null;
+
+		getGeometry(): IPixelGeometry;
+
+		getType(): string;
+
+		scale(factor: number): IShape;
+
+		shift(offset: number[]): IShape;
+	}
+	class Monitor {
+    	constructor(dataManager: IDataManager | IOptionManager);
+   		add(name: string[] | string, changeCallback: (event: (object | IEvent)) => void, context?: any, params?: any): Monitor;
+    	forceChange(): Monitor;
+    	get(name: string): any;
+    	remove(name: string): Monitor;
+    	removeAll(): Monitor;
+	}
 }

From 1d69ae66948c781aa5cabd1e4aad0360dde16161 Mon Sep 17 00:00:00 2001
From: Pascal Sthamer <sthamer.pascal@gmail.com>
Date: Tue, 11 Dec 2018 17:50:07 +0100
Subject: [PATCH 801/836] dockerode definition update

---
 types/dockerode/index.d.ts | 261 +++++++++++++++++++++++++++----------
 1 file changed, 194 insertions(+), 67 deletions(-)

diff --git a/types/dockerode/index.d.ts b/types/dockerode/index.d.ts
index 5c1c1bfae6..e467441634 100644
--- a/types/dockerode/index.d.ts
+++ b/types/dockerode/index.d.ts
@@ -6,6 +6,8 @@
 //                 Ray Fang <https://github.com/lazarusx>
 //                 Marius Meisenzahl <https://github.com/meisenzahl>
 //                 Rob Moran <https://github.com/thegecko>
+//                 Cameron Diver <https://github.com/CameronDiver>
+//                 Pascal Sthamer <https://github.com/p4sca1>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
 
@@ -14,8 +16,16 @@
 import * as stream from 'stream';
 import * as events from 'events';
 
+// The modem parameter is an instance of docker-modem, which is missing type declarations.
+// https://github.com/apocas/docker-modem
+
 declare namespace Dockerode {
-  interface Container {
+  class Container {
+    constructor(modem: any, id: string);
+
+    modem: any;
+    id: string;
+
     inspect(options: {}, callback: Callback<ContainerInspectInfo>): void;
     inspect(callback: Callback<ContainerInspectInfo>): void;
     inspect(options?: {}): Promise<ContainerInspectInfo>;
@@ -103,14 +113,16 @@ declare namespace Dockerode {
     stats(callback: Callback<any>): void;
     stats(options?: {}): Promise<any>;
 
-    attach(options: {}, callback: Callback<NodeJS.ReadableStream>): void;
-    attach(options: {}): Promise<NodeJS.ReadableStream>;
-
-    modem: any;
-    id?: string;
+    attach(options: {}, callback: Callback<NodeJS.ReadWriteStream>): void;
+    attach(options: {}): Promise<NodeJS.ReadWriteStream>;
   }
 
-  interface Image {
+  class Image {
+    constructor(modem: any, name: string);
+
+    modem: any;
+    id: string;
+
     inspect(callback: Callback<ImageInspectInfo>): void;
     inspect(): Promise<ImageInspectInfo>;
 
@@ -131,24 +143,28 @@ declare namespace Dockerode {
     remove(options: {}, callback: Callback<ImageRemoveInfo>): void;
     remove(callback: Callback<ImageRemoveInfo>): void;
     remove(options?: {}): Promise<any>;
-
-    modem: any;
-    id?: string;
   }
 
-  interface Volume {
+  class Volume {
+    constructor(modem: any, name: string);
+
+    modem: any;
+    name: string;
+
     inspect(callback: Callback<any>): void;
     inspect(): Promise<any>;
 
     remove(options: {}, callback: Callback<any>): void;
     remove(callback: Callback<any>): void;
     remove(options?: {}): Promise<any>;
-
-    modem: any;
-    name?: string;
   }
 
-  interface Service {
+  class Service {
+    constructor(modem: any, id: string);
+
+    modem: any;
+    id: string;
+
     inspect(callback: Callback<any>): void;
     inspect(): Promise<any>;
 
@@ -158,20 +174,24 @@ declare namespace Dockerode {
 
     update(options: {}, callback: Callback<any>): void;
     update(options: {}): Promise<any>;
-
-    modem: any;
-    id?: string;
   }
 
-  interface Task {
+  class Task {
+    constructor(modem: any, id: string);
+
+    modem: any;
+    id: string;
+
     inspect(callback: Callback<any>): void;
     inspect(): Promise<any>;
-
-    modem: any;
-    id?: string;
   }
 
-  interface Node {
+  class Node {
+    constructor(modem: any, id: string);
+
+    modem: any;
+    id: string;
+
     inspect(callback: Callback<any>): void;
     inspect(): Promise<any>;
 
@@ -182,12 +202,11 @@ declare namespace Dockerode {
     remove(options: {}, callback: Callback<any>): void;
     remove(callback: Callback<any>): void;
     remove(options?: {}): Promise<any>;
-
-    modem: any;
-    id?: string;
   }
 
-  interface Plugin {
+  class Plugin {
+    constructor(modem: any, name: string, remote?: any);
+
     modem: any;
     name: string;
     remote: any;
@@ -226,7 +245,12 @@ declare namespace Dockerode {
     upgrade(auth: any, options?: {}): Promise<any>;
   }
 
-  interface Secret {
+  class Secret {
+    constructor(modem: any, id: string);
+
+    modem: any;
+    id: string;
+
     inspect(callback: Callback<SecretInfo>): void;
     inspect(): Promise<SecretInfo>;
 
@@ -237,12 +261,14 @@ declare namespace Dockerode {
     remove(options: {}, callback: Callback<any>): void;
     remove(callback: Callback<any>): void;
     remove(options?: {}): Promise<any>;
-
-    modem: any;
-    id?: string;
   }
 
-  interface Network {
+  class Network {
+    constructor(modem: any, id: string);
+
+    modem: any;
+    id: string;
+
     inspect(callback: Callback<any>): void;
     inspect(): Promise<any>;
 
@@ -257,12 +283,14 @@ declare namespace Dockerode {
     disconnect(options: {}, callback: Callback<any>): void;
     disconnect(callback: Callback<any>): void;
     disconnect(options?: {}): Promise<any>;
-
-    modem: any;
-    id?: string;
   }
 
-  interface Exec {
+  class Exec {
+    constructor(modem: any, id: string);
+
+    modem: any;
+    id: string;
+
     inspect(callback: Callback<any>): void;
     inspect(): Promise<any>;
 
@@ -271,9 +299,6 @@ declare namespace Dockerode {
 
     resize(options: {}, callback: Callback<any>): void;
     resize(options: {}): Promise<any>;
-
-    modem: any;
-    id?: string;
   }
 
   interface ImageInfo {
@@ -328,6 +353,20 @@ declare namespace Dockerode {
     MacAddress: string;
   }
 
+  // not complete definition of network inspection
+  // info which is returned by list / inspect
+  interface NetworkInspectInfo {
+    Id: string;
+    Name: string;
+    Driver: string;
+    Created: string;
+    Scope: string;
+    EnableIPv6: boolean;
+    Internal: boolean;
+    Attachable: boolean;
+    Ingress: boolean;
+  }
+
   interface ContainerInspectInfo {
     Id: string;
     Created: string;
@@ -434,13 +473,13 @@ declare namespace Dockerode {
         }
       };
       Node?: {
-          ID: string;
-          IP: string;
-          Addr: string;
-          Name: string;
-          Cpus: number;
-          Memory: number;
-          Labels: any;
+        ID: string;
+        IP: string;
+        Addr: string;
+        Name: string;
+        Cpus: number;
+        Memory: number;
+        Labels: any;
       }
     };
   }
@@ -573,6 +612,77 @@ declare namespace Dockerode {
     };
   }
 
+  interface AuthConfig {
+    username: string;
+    password: string;
+    serveraddress: string;
+    email?: string;
+  }
+
+  interface PortBinding {
+    HostIp?: string;
+    HostPort?: string;
+  }
+
+  interface PortMap {
+    [key: string]: PortBinding[];
+  }
+
+  interface RestartPolicy {
+    Name: string;
+    MaximumRetryCount?: number;
+  }
+
+  type LoggingDriverType =
+    | "json-file"
+    | "syslog"
+    | "journald"
+    | "gelf"
+    | "fluentd"
+    | "awslogs"
+    | "splunk"
+    | "etwlogs"
+    | "none";
+
+  interface LogConfig {
+    Type: LoggingDriverType;
+    Config?: { [key: string]: string };
+  }
+
+  interface DeviceMapping {
+    PathOnHost: string;
+    PathInContainer: string;
+    CgroupPermissions: string;
+  }
+
+  /* tslint:disable:interface-name */
+  interface IPAMConfig {
+    IPv4Address?: string;
+    IPv6Address?: string;
+    LinkLocalIPs?: string[];
+  }
+  /* tslint:enable:interface-name */
+
+  interface EndpointSettings {
+    IPAMConfig?: IPAMConfig;
+    Links?: string[];
+    Aliases?: string[];
+    NetworkID?: string;
+    EndpointID?: string;
+    Gateway?: string;
+    IPAddress?: string;
+    IPPrefixLen?: number;
+    IPv6Gateway?: string;
+    GlobalIPv6Address?: string;
+    GlobalIPV6PrefixLen?: number;
+    MacAddress?: string;
+    DriverOpts?: { [key: string]: string };
+  }
+
+  interface EndpointsConfig {
+    [key: string]: EndpointSettings;
+  }
+
   interface ContainerCreateOptions {
     name?: string;
     Hostname?: string;
@@ -620,7 +730,7 @@ declare namespace Dockerode {
       OomScoreAdj?: number;
       PidMode?: string;
       PidsLimit?: number;
-      PortBindings?: { [portAndProtocol: string]: Array<{ [index: string]: string }> };
+      PortBindings?: PortMap;
       PublishAllPorts?: boolean;
       Privileged?: boolean;
       ReadonlyRootfs?: boolean;
@@ -632,31 +742,19 @@ declare namespace Dockerode {
       CapAdd?: string[];
       CapDrop?: string[];
       GroupAdd?: string[];
-      RestartPolicy?: { [index: string]: number | string };
+      RestartPolicy?: RestartPolicy;
       NetworkMode?: string;
-      Devices?: any[];
+      Devices?: DeviceMapping[];
       Sysctls?: { [index: string]: string };
       Ulimits?: Array<{}>;
-      LogConfig?: { [index: string]: string | {} };
+      LogConfig?: LogConfig;
       SecurityOpt?: { [index: string]: any };
       CgroupParent?: string;
       VolumeDriver?: string;
       ShmSize?: number;
     };
     NetworkingConfig?: {
-      EndpointsConfig?: {
-        [index: string]: any;
-        isolated_nw?: {
-          [index: string]: any;
-          IPAMConfig?: {
-            IPv4Address?: string;
-            IPv6Adress?: string;
-            LinkLocalIPs?: string[];
-          }
-          Links?: string[];
-          Aliases?: string[];
-        }
-      }
+      EndpointsConfig?: EndpointsConfig;
     };
   }
 
@@ -820,8 +918,37 @@ declare namespace Dockerode {
   }
 
   interface ImageBuildContext {
-  	context: string;
-  	src: string[];
+    context: string;
+    src: string[];
+  }
+
+  interface DockerVersion {
+    ApiVersion: string;
+    Arch: string;
+    BuildTime: Date;
+    Components: Array<{
+      Details: {
+        ApiVersion: string;
+        Arch: string;
+        BuilTime: Date;
+        Experimental: string;
+        GitCommit: string;
+        GoVersion: string;
+        KernelVersion: string;
+        Os: string;
+      };
+      Name: string;
+      Version: string;
+    }>;
+    GitCommit: string;
+    GoVersion: string;
+    KernelVersion: string;
+    MinAPIVersion: string;
+    Os: string;
+    Platform: {
+      Name: string;
+    };
+    Version: string;
   }
 }
 
@@ -949,8 +1076,8 @@ declare class Dockerode {
   df(callback: Callback<any>): void;
   df(): Promise<any>;
 
-  version(callback: Callback<any>): void;
-  version(): Promise<any>;
+  version(callback: Callback<Dockerode.DockerVersion>): void;
+  version(): Promise<Dockerode.DockerVersion>;
 
   ping(callback: Callback<any>): void;
   ping(): Promise<any>;

From e1b2162dce95f3e655cf918b7a9befaebe8fcb78 Mon Sep 17 00:00:00 2001
From: CameronDiver <CameronDiver@users.noreply.github.com>
Date: Tue, 11 Dec 2018 18:53:50 +0100
Subject: [PATCH 802/836] Fix typo

Co-Authored-By: P4sca1 <sthamer.pascal@gmail.com>
---
 types/dockerode/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/dockerode/index.d.ts b/types/dockerode/index.d.ts
index 64656edbb8..3ced325cb2 100644
--- a/types/dockerode/index.d.ts
+++ b/types/dockerode/index.d.ts
@@ -930,7 +930,7 @@ declare namespace Dockerode {
       Details: {
         ApiVersion: string;
         Arch: string;
-        BuilTime: Date;
+        BuildTime: Date;
         Experimental: string;
         GitCommit: string;
         GoVersion: string;

From 01401844ac7c7824ced00aeb73ea4372d20f4542 Mon Sep 17 00:00:00 2001
From: Pascal Sthamer <sthamer.pascal@gmail.com>
Date: Tue, 11 Dec 2018 18:57:07 +0100
Subject: [PATCH 803/836] Remove duplicate DockerVersion interface

---
 types/dockerode/index.d.ts | 29 -----------------------------
 1 file changed, 29 deletions(-)

diff --git a/types/dockerode/index.d.ts b/types/dockerode/index.d.ts
index 3ced325cb2..d823c46fe4 100644
--- a/types/dockerode/index.d.ts
+++ b/types/dockerode/index.d.ts
@@ -950,35 +950,6 @@ declare namespace Dockerode {
     };
     Version: string;
   }
-
-  interface DockerVersion {
-    ApiVersion: string;
-    Arch: string;
-    BuildTime: Date;
-    Components: Array<{
-      Details: {
-        ApiVersion: string;
-        Arch: string;
-        BuilTime: Date;
-        Experimental: string;
-        GitCommit: string;
-        GoVersion: string;
-        KernelVersion: string;
-        Os: string;
-      };
-      Name: string;
-      Version: string;
-    }>;
-    GitCommit: string;
-    GoVersion: string;
-    KernelVersion: string;
-    MinAPIVersion: string;
-    Os: string;
-    Platform: {
-      Name: string;
-    };
-    Version: string;
-  }
 }
 
 type Callback<T> = (error?: any, result?: T) => void;

From 291ba3002e9c7c6c0fe8ebf6da7aa9735e765b95 Mon Sep 17 00:00:00 2001
From: Jesse Trinity <42591254+jessetrinity@users.noreply.github.com>
Date: Tue, 11 Dec 2018 11:08:16 -0800
Subject: [PATCH 804/836] Clarifying tslint.json content instructions

The language and examples surrounding linting of new packages is ambiguous. This makes the language and examples more explicit in an attempt to direct contributors to remove linting rules from tslint.json before opening PRs.
---
 README.md | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index eba170c493..a9be0471a1 100644
--- a/README.md
+++ b/README.md
@@ -169,8 +169,14 @@ If a package was never on DefinitelyTyped, it does not need to be added to `notN
 
 #### Lint
 
-To lint a package, just add a `tslint.json` to that package containing `{ "extends": "dtslint/dt.json" }`. All new packages must be linted.
-If a `tslint.json` turns rules off, this is because that hasn't been fixed yet. For example:
+All new packages must be linted. To lint a package, add a `tslint.json` to that package containing 
+```js
+{ 
+    "extends": "dtslint/dt.json" 
+}
+```
+
+This should be the only content in a finished project's `tslint.json` file. If a `tslint.json` turns rules off, this is because that hasn't been fixed yet. For example:
 
 ```js
 {

From 21ab9421ab77846d826752f7ff14abdab458960a Mon Sep 17 00:00:00 2001
From: Maninder Singh <manis@microsoft.com>
Date: Wed, 12 Dec 2018 01:55:59 +0530
Subject: [PATCH 805/836] Add 'movingOut' param to Dom walker's guard method

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

diff --git a/types/ckeditor/index.d.ts b/types/ckeditor/index.d.ts
index 69c23d6a99..2889b30574 100644
--- a/types/ckeditor/index.d.ts
+++ b/types/ckeditor/index.d.ts
@@ -498,7 +498,7 @@ declare namespace CKEDITOR {
 
         class walker {
             evaluator: (node: node) => boolean;
-            guard: (node: node) => boolean;
+            guard: (node: node, movingOut?: boolean) => boolean;
 
             static validEmptyBlockContainers: { [key: string]: any };
 

From f4d137c459d2c7ff2532cec76d5814b9cea7158d Mon Sep 17 00:00:00 2001
From: David Brett <DHBrett@outlook.com>
Date: Tue, 11 Dec 2018 16:51:05 -0500
Subject: [PATCH 806/836] PR Feedback - linting and missing export

---
 types/multi-progress/index.d.ts              |  6 +-
 types/multi-progress/multi-progress-tests.ts |  6 +-
 types/multi-progress/tsconfig.json           |  2 +-
 types/multi-progress/tslint.json             | 77 +-------------------
 4 files changed, 8 insertions(+), 83 deletions(-)

diff --git a/types/multi-progress/index.d.ts b/types/multi-progress/index.d.ts
index e1ae12a4e0..ebedcf9597 100644
--- a/types/multi-progress/index.d.ts
+++ b/types/multi-progress/index.d.ts
@@ -1,14 +1,14 @@
-// Type definitions for multi-progress v2.0.0
+// Type definitions for multi-progress 2.0
 // Project: https://github.com/pitaj/multi-progress
 // Definitions by: David Brett <https://github.com/DHBrett>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="node"/>
 
-import ProgressBar, { ProgressBarOptions } from '../progress'
+import ProgressBar, { ProgressBarOptions } from '../progress';
 import { Stream } from 'stream';
 
-declare class MultiProgress {
+export default class MultiProgress {
     /**
      * Create a new @see MultiProgress with the given stream, or stderr by default
      * @param stream A stream to write the progress bars to
diff --git a/types/multi-progress/multi-progress-tests.ts b/types/multi-progress/multi-progress-tests.ts
index 3397a48428..9dde27c16b 100644
--- a/types/multi-progress/multi-progress-tests.ts
+++ b/types/multi-progress/multi-progress-tests.ts
@@ -3,14 +3,14 @@
  */
 
 // require the library
-var MultiProgress = require("multi-progress");
+import MultiProgress from 'multi-progress';
 
 // spawn an instance with the optional stream to write to
 // use of `new` is optional
-var multi = new MultiProgress(process.stderr);
+const multi = new MultiProgress(process.stderr);
 
 // create a progress bar
-var bar = multi.newBar('  downloading [:bar] :percent :etas', {
+const bar = multi.newBar('  downloading [:bar] :percent :etas', {
   complete: '=',
   incomplete: ' ',
   width: 30,
diff --git a/types/multi-progress/tsconfig.json b/types/multi-progress/tsconfig.json
index 72100a32f7..3f0dc36371 100644
--- a/types/multi-progress/tsconfig.json
+++ b/types/multi-progress/tsconfig.json
@@ -6,7 +6,7 @@
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
-        "strictNullChecks": false,
+        "strictNullChecks": true,
         "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [
diff --git a/types/multi-progress/tslint.json b/types/multi-progress/tslint.json
index a41bf5d19a..1a60b8a5dd 100644
--- a/types/multi-progress/tslint.json
+++ b/types/multi-progress/tslint.json
@@ -1,79 +1,4 @@
 {
     "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
-    }
+    "rules": { }
 }

From d5d8a4429bc0b1d0895e8f1dd2b915e9c1860ea8 Mon Sep 17 00:00:00 2001
From: jb1361 <justinbutler4@hotmail.com>
Date: Tue, 11 Dec 2018 17:25:33 -0500
Subject: [PATCH 807/836] Update styles interface

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

diff --git a/types/react-burger-menu/index.d.ts b/types/react-burger-menu/index.d.ts
index 85d49494c2..544dd84aec 100644
--- a/types/react-burger-menu/index.d.ts
+++ b/types/react-burger-menu/index.d.ts
@@ -16,6 +16,7 @@ export interface Styles {
     bmCross: Partial<CSSStyleDeclaration>;
     bmCrossButton: Partial<CSSStyleDeclaration>;
     bmItemList: Partial<CSSStyleDeclaration>;
+    bmMenuWrap: Partial<CSSStyleDeclaration>;
     bmMenu: Partial<CSSStyleDeclaration>;
     bmMorphShape: Partial<CSSStyleDeclaration>;
     bmOverlay: Partial<CSSStyleDeclaration>;

From bd464573d7946e481a041858165b1e7a2c19a1b8 Mon Sep 17 00:00:00 2001
From: Joshua O'Brien <jjobrien12@gmail.com>
Date: Wed, 12 Dec 2018 11:24:32 +1100
Subject: [PATCH 808/836] fix(gapi.people): replace deprecated RequestMask with
 PersonFields

---
 types/gapi.people/gapi.people-tests.ts |  1 +
 types/gapi.people/index.d.ts           | 11 ++++-------
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/types/gapi.people/gapi.people-tests.ts b/types/gapi.people/gapi.people-tests.ts
index 65b6339765..349f956b39 100644
--- a/types/gapi.people/gapi.people-tests.ts
+++ b/types/gapi.people/gapi.people-tests.ts
@@ -64,6 +64,7 @@
     var request = gapi.client.people.people.connections.list({
         'resourceName': 'people/me',
         'pageSize': 10,
+        'personFields': 'names'
       });
 
       request.execute(function(resp) {
diff --git a/types/gapi.people/index.d.ts b/types/gapi.people/index.d.ts
index 851eab2c0b..d39dc0b875 100644
--- a/types/gapi.people/index.d.ts
+++ b/types/gapi.people/index.d.ts
@@ -1,6 +1,7 @@
 // Type definitions for Google People API 1.0
 // Project: https://developers.google.com/people/
 // Definitions by: Tanguy Krotoff <https://github.com/tkrotoff>
+//                 Joshua O'Brien <https://github.com/joshuaobrien>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -13,7 +14,7 @@ declare namespace gapi.client.people {
       resourceName: string;
 
       // Query parameters
-      requestMask?: RequestMask;
+      personFields: string;
     }
 
     function get(parameters: GetParameters): HttpRequest<Person>;
@@ -21,7 +22,7 @@ declare namespace gapi.client.people {
     interface GetBatchGetParameters {
       // Query parameters
       resourcesName?: string;
-      requestMask?: RequestMask;
+      personFields: string;
     }
 
     function getBatchGet(parameters: GetBatchGetParameters): HttpRequest<BatchGetResponse>;
@@ -49,7 +50,7 @@ declare namespace gapi.client.people {
         pageSize?: number;
         sortOrder?: SortOrder;
         syncToken?: string;
-        requestMask?: RequestMask;
+        personFields: string;
       }
 
       interface Response {
@@ -60,10 +61,6 @@ declare namespace gapi.client.people {
     }
   }
 
-  interface RequestMask {
-    includeField: string;
-  }
-
   type SourceType = 'SOURCE_TYPE_UNSPECIFIED' | 'ACCOUNT' | 'PROFILE' | 'DOMAIN_PROFILE' | 'CONTACT';
 
   interface Source {

From dd92d2da9b7184766f41a8b6c07bb93e58d8c1d8 Mon Sep 17 00:00:00 2001
From: Joshua O'Brien <jjobrien12@gmail.com>
Date: Wed, 12 Dec 2018 11:54:59 +1100
Subject: [PATCH 809/836] Refactor gapi and gapi.auth2 tests to account for
 changes in gapi.people definitions

---
 types/gapi.auth2/gapi.auth2-tests.ts | 3 ++-
 types/gapi/gapi-tests.ts             | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/types/gapi.auth2/gapi.auth2-tests.ts b/types/gapi.auth2/gapi.auth2-tests.ts
index 1fc03f7f4f..229a18f5fc 100644
--- a/types/gapi.auth2/gapi.auth2-tests.ts
+++ b/types/gapi.auth2/gapi.auth2-tests.ts
@@ -144,7 +144,8 @@ function handleSignoutClick(event: MouseEvent) {
 // Load the API and make an API call.  Display the results on the screen.
 function makeApiCall() {
   gapi.client.people.people.get({
-    resourceName: 'people/me'
+    resourceName: 'people/me',
+    personFields: 'names'
   }).then((resp) => {
     const p = document.createElement('p');
     const name = resp.result.names[0].givenName;
diff --git a/types/gapi/gapi-tests.ts b/types/gapi/gapi-tests.ts
index 7c5308aaf9..0de37fdccb 100644
--- a/types/gapi/gapi-tests.ts
+++ b/types/gapi/gapi-tests.ts
@@ -20,7 +20,8 @@ https://developers.google.com/api-client-library/javascript/reference/referenced
     }).then(function() {
       // 3. Initialize and make the API request.
       return gapi.client.people.people.get({
-        resourceName: 'people/me'
+        resourceName: 'people/me',
+        personFields: 'name'
       });
     }).then(function(response) {
       console.log(response.result);

From 5bcb6eca220081d0cd6f81b29232956f969db8de Mon Sep 17 00:00:00 2001
From: Bradley Ayers <bradley.ayers@gmail.com>
Date: Wed, 12 Dec 2018 15:56:05 +1100
Subject: [PATCH 810/836] fix(react-router): match is only null for function
 child (#31278)

* fix(react-router): match is only null for function child

* fix(react-router): explicitly export interface (strict-export-declare-modifiers)
---
 types/react-router/index.d.ts                       | 13 +++++++++++--
 types/react-router/test/Children.tsx                |  6 ++++++
 .../Ambiguous.tsx                                   |  2 +-
 .../Animation.tsx                                   |  6 +++---
 .../examples-from-react-router-website/Basic.tsx    |  4 ++--
 .../ModalGallery.tsx                                |  8 --------
 .../examples-from-react-router-website/Params.tsx   |  2 +-
 .../Recursive.tsx                                   |  4 ----
 8 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/types/react-router/index.d.ts b/types/react-router/index.d.ts
index fff900d458..eee1b15972 100644
--- a/types/react-router/index.d.ts
+++ b/types/react-router/index.d.ts
@@ -68,15 +68,24 @@ export interface StaticContext {
 export interface RouteComponentProps<Params extends { [K in keyof Params]?: string } = {}, C extends StaticContext = StaticContext, S = H.LocationState> {
   history: H.History;
   location: H.Location<S>;
-  match: match<Params> | null;
+  match: match<Params>;
   staticContext?: C;
 }
 
+export interface RouteChildrenProps<
+  Params extends { [K in keyof Params]?: string } = {},
+  S = H.LocationState
+> {
+  history: H.History;
+  location: H.Location<S>;
+  match: match<Params> | null;
+}
+
 export interface RouteProps {
   location?: H.Location;
   component?: React.ComponentType<RouteComponentProps<any>> | React.ComponentType<any>;
   render?: ((props: RouteComponentProps<any>) => React.ReactNode);
-  children?: ((props: RouteComponentProps<any>) => React.ReactNode) | React.ReactNode;
+  children?: ((props: RouteChildrenProps<any>) => React.ReactNode) | React.ReactNode;
   path?: string | string[];
   exact?: boolean;
   sensitive?: boolean;
diff --git a/types/react-router/test/Children.tsx b/types/react-router/test/Children.tsx
index c3dea4f482..7f33629f3c 100644
--- a/types/react-router/test/Children.tsx
+++ b/types/react-router/test/Children.tsx
@@ -20,3 +20,9 @@ function RouteWithElementJsxChildren() {
         {<div>Hello!</div>}
     </Route>;
 }
+
+function RouteWithFunctionChildrenUsingNullableMatch() {
+    return <Route path="/">
+        {({ match }) => match !== null ? <div>Matched path: {match.path}</div> : <div>No match!</div>}
+    </Route>;
+}
diff --git a/types/react-router/test/examples-from-react-router-website/Ambiguous.tsx b/types/react-router/test/examples-from-react-router-website/Ambiguous.tsx
index 3f2dbc2223..6e6598fd71 100644
--- a/types/react-router/test/examples-from-react-router-website/Ambiguous.tsx
+++ b/types/react-router/test/examples-from-react-router-website/Ambiguous.tsx
@@ -41,7 +41,7 @@ const AmbiguousExample = () => (
 
 const About = () => <h2>About</h2>;
 const Company = () => <h2>Company</h2>;
-const User: React.SFC<RouteComponentProps<{user: string}>> = ({ match }) => match && (
+const User: React.SFC<RouteComponentProps<{user: string}>> = ({ match }) => (
   <div>
     <h2>User: {match.params.user}</h2>
   </div>
diff --git a/types/react-router/test/examples-from-react-router-website/Animation.tsx b/types/react-router/test/examples-from-react-router-website/Animation.tsx
index 306ad14ea4..8133528179 100644
--- a/types/react-router/test/examples-from-react-router-website/Animation.tsx
+++ b/types/react-router/test/examples-from-react-router-website/Animation.tsx
@@ -72,12 +72,12 @@ interface HSLParams {
   l: string;
 }
 
-const HSL: React.SFC<RouteComponentProps<HSLParams>> = ({ match }) => match && (
+const HSL: React.SFC<RouteComponentProps<HSLParams>> = ({ match: { params } }) => (
   <div style={{
     ...styles.fill,
     ...styles.hsl,
-    background: `hsl(${match.params.h}, ${match.params.s}%, ${match.params.l}%)`
-  }}>hsl({match.params.h}, {match.params.s}%, {match.params.l}%)</div>
+    background: `hsl(${params.h}, ${params.s}%, ${params.l}%)`
+  }}>hsl({params.h}, {params.s}%, {params.l}%)</div>
 );
 
 const styles: any = {};
diff --git a/types/react-router/test/examples-from-react-router-website/Basic.tsx b/types/react-router/test/examples-from-react-router-website/Basic.tsx
index 05e2101f85..ba6a5eabe5 100644
--- a/types/react-router/test/examples-from-react-router-website/Basic.tsx
+++ b/types/react-router/test/examples-from-react-router-website/Basic.tsx
@@ -36,7 +36,7 @@ const About = () => (
   </div>
 );
 
-const Topics: React.SFC<RouteComponentProps> = ({ match }) => match === null ? null : (
+const Topics: React.SFC<RouteComponentProps> = ({ match }) => (
   <div>
     <h2>Topics</h2>
     <ul>
@@ -64,7 +64,7 @@ const Topics: React.SFC<RouteComponentProps> = ({ match }) => match === null ? n
   </div>
 );
 
-const Topic: React.SFC<RouteComponentProps<{topicId: string}>> = ({ match }) => match && (
+const Topic: React.SFC<RouteComponentProps<{topicId: string}>> = ({ match }) => (
   <div>
     <h3>{match.params.topicId}</h3>
   </div>
diff --git a/types/react-router/test/examples-from-react-router-website/ModalGallery.tsx b/types/react-router/test/examples-from-react-router-website/ModalGallery.tsx
index be9bd1c322..c51d63ac0f 100644
--- a/types/react-router/test/examples-from-react-router-website/ModalGallery.tsx
+++ b/types/react-router/test/examples-from-react-router-website/ModalGallery.tsx
@@ -114,10 +114,6 @@ const Gallery = () => (
 );
 
 const ImageView: React.SFC<RouteComponentProps<{ id: string }>> = ({ match }) => {
-  if (!match) {
-    return null;
-  }
-
   const image = IMAGES[parseInt(match.params.id, 10)];
   if (!image) {
     return <div>Image not found</div>;
@@ -132,10 +128,6 @@ const ImageView: React.SFC<RouteComponentProps<{ id: string }>> = ({ match }) =>
 };
 
 const Modal: React.SFC<RouteComponentProps<{ id: string }>> = ({ match, history }) => {
-  if (!match) {
-    return null;
-  }
-
   const image = IMAGES[parseInt(match.params.id, 10)];
   if (!image) {
     return null;
diff --git a/types/react-router/test/examples-from-react-router-website/Params.tsx b/types/react-router/test/examples-from-react-router-website/Params.tsx
index 801a889d79..a6d0bded7f 100644
--- a/types/react-router/test/examples-from-react-router-website/Params.tsx
+++ b/types/react-router/test/examples-from-react-router-website/Params.tsx
@@ -22,7 +22,7 @@ const ParamsExample = () => (
   </Router>
 );
 
-const Child: React.SFC<RouteComponentProps<{id: string}>> = ({ match }) => match && (
+const Child: React.SFC<RouteComponentProps<{id: string}>> = ({ match }) => (
   <div>
     <h3>ID: {match.params.id}</h3>
   </div>
diff --git a/types/react-router/test/examples-from-react-router-website/Recursive.tsx b/types/react-router/test/examples-from-react-router-website/Recursive.tsx
index 9489d2fb25..534fe52931 100644
--- a/types/react-router/test/examples-from-react-router-website/Recursive.tsx
+++ b/types/react-router/test/examples-from-react-router-website/Recursive.tsx
@@ -39,10 +39,6 @@ interface InitialPersonProps {
 type PersonProps = RouteComponentProps<{ id: string }>;
 
 const Person: React.SFC<InitialPersonProps | PersonProps> = ({ match }) => {
-  if (!match) {
-    return null;
-  }
-
   const person = find(match.params.id);
 
   return (

From c2367fab52cf48fafa9daa915f0714a81d3c122f Mon Sep 17 00:00:00 2001
From: Ferdy Budhidharma <ferd312@gmail.com>
Date: Tue, 11 Dec 2018 22:57:32 -0600
Subject: [PATCH 811/836] [react] allow weaker prop declarations for nullish
 properties (#31280)

* feat(react): allow weaker prop declarations for nullish properties

* fix tests
---
 types/prop-types/index.d.ts          | 16 ++++++++------
 types/prop-types/prop-types-tests.ts | 31 ++++++++++------------------
 types/react/index.d.ts               | 16 ++++++++++----
 types/react/test/tsx.tsx             | 25 ++++++++++++++++++++++
 4 files changed, 58 insertions(+), 30 deletions(-)

diff --git a/types/prop-types/index.d.ts b/types/prop-types/index.d.ts
index b6918d9d44..5f95d354dd 100644
--- a/types/prop-types/index.d.ts
+++ b/types/prop-types/index.d.ts
@@ -5,11 +5,15 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 
+export type ReactComponentLike =
+    | string
+    | ((props: any, context?: any) => any)
+    | (new (props: any, context?: any) => any);
+
 export interface ReactElementLike {
-    type: string | ((...args: any[]) => ReactElementLike);
+    type: ReactComponentLike;
     props: any;
     key: string | number | null;
-    children?: ReactNodeLike;
 }
 
 export interface ReactNodeArray extends Array<ReactNodeLike> {}
@@ -28,9 +32,9 @@ export const nominalTypeHack: unique symbol;
 
 export type IsOptional<T> = undefined | null extends T ? true : undefined extends T ? true : null extends T ? true : false;
 
-export type RequiredKeys<V> = { [K in keyof V]: V[K] extends Validator<infer T> ? IsOptional<T> extends true ? never : K : never }[keyof V];
+export type RequiredKeys<V> = { [K in keyof V]-?: Exclude<V[K], undefined> extends Validator<infer T> ? IsOptional<T> extends true ? never : K : never }[keyof V];
 export type OptionalKeys<V> = Exclude<keyof V, RequiredKeys<V>>;
-export type InferPropsInner<V> = { [K in keyof V]: InferType<V[K]>; };
+export type InferPropsInner<V> = { [K in keyof V]-?: InferType<V[K]>; };
 
 export interface Validator<T> {
     (props: object, propName: string, componentName: string, location: string, propFullName: string): Error | null;
@@ -45,8 +49,8 @@ export type ValidationMap<T> = { [K in keyof T]?: Validator<T[K]> };
 
 export type InferType<V> = V extends Validator<infer T> ? T : any;
 export type InferProps<V> =
-    & (RequiredKeys<V> extends undefined ? {} : InferPropsInner<Pick<V, RequiredKeys<V>>>)
-    & (OptionalKeys<V> extends undefined ? {} : Partial<InferPropsInner<Pick<V, OptionalKeys<V>>>>);
+    & InferPropsInner<Pick<V, RequiredKeys<V>>>
+    & Partial<InferPropsInner<Pick<V, OptionalKeys<V>>>>;
 
 export const any: Requireable<any>;
 export const array: Requireable<any[]>;
diff --git a/types/prop-types/prop-types-tests.ts b/types/prop-types/prop-types-tests.ts
index a9bde3af00..baf210fdeb 100644
--- a/types/prop-types/prop-types-tests.ts
+++ b/types/prop-types/prop-types-tests.ts
@@ -129,35 +129,26 @@ type ExtractedPartialProps = PropTypes.InferProps<typeof partialPropTypes>;
 type ExtractedPropsWithoutAnnotation = PropTypes.InferProps<typeof propTypesWithoutAnnotation>;
 type ExtractedPropsFromOuterPropsWithoutAnnotation = PropTypes.InferProps<typeof outerPropTypesWithoutAnnotation>['props'];
 
-// $ExpectType: true
+// $ExpectType true
 type ExtractPropsMatch = ExtractedProps extends ExtractedPropsWithoutAnnotation ? true : false;
-// $ExpectType: true
+// $ExpectType true
 type ExtractPropsMatch2 = ExtractedPropsWithoutAnnotation extends ExtractedProps ? true : false;
-// $ExpectType: true
+// $ExpectType true
 type ExtractPropsMatch3 = ExtractedProps extends Props ? true : false;
-// $ExpectType: true
+// $ExpectType true
 type ExtractPropsMatch4 = Props extends ExtractedPropsWithoutAnnotation ? true : false;
-// $ExpectType: true
+// $ExpectType true
 type ExtractFromOuterPropsMatch = ExtractedPropsFromOuterProps extends ExtractedPropsFromOuterPropsWithoutAnnotation ? true : false;
-// $ExpectType: true
+// $ExpectType true
 type ExtractFromOuterPropsMatch2 = ExtractedPropsFromOuterPropsWithoutAnnotation extends ExtractedPropsFromOuterProps ? true : false;
-// $ExpectType: true
+// $ExpectType true
 type ExtractFromOuterPropsMatch3 = ExtractedPropsFromOuterProps extends Props ? true : false;
-// $ExpectType: true
+// $ExpectType true
 type ExtractFromOuterPropsMatch4 = Props extends ExtractedPropsFromOuterPropsWithoutAnnotation ? true : false;
 
-// $ExpectType: false
+// $ExpectType false
 type ExtractPropsMismatch = ExtractedPartialProps extends Props ? true : false;
 
-// $ExpectType: {}
-type UnmatchedPropKeys = Pick<ExtractedPropsWithoutAnnotation, Extract<{
-    [K in keyof ExtractedPropsWithoutAnnotation]: ExtractedPropsWithoutAnnotation[K] extends ExtractedProps[K] ? never : K
-}[keyof ExtractedPropsWithoutAnnotation], keyof ExtractedPropsWithoutAnnotation>>;
-// $ExpectType: {}
-type UnmatchedPropKeys2 = Pick<ExtractedProps, Extract<{
-    [K in keyof ExtractedProps]: ExtractedProps[K] extends ExtractedPropsWithoutAnnotation[K] ? never : K
-}[keyof ExtractedProps], keyof ExtractedProps>>;
-
 PropTypes.checkPropTypes({ xs: PropTypes.array }, { xs: [] }, 'location', 'componentName');
 
 // This would be the type that JSX sees
@@ -189,7 +180,7 @@ const componentDefaultProps = {
 type DefaultizedProps = Defaultize<PropTypes.InferProps<typeof componentPropTypes>, typeof componentDefaultProps>;
 type UndefaultizedProps = Undefaultize<PropTypes.InferProps<typeof componentPropTypes>, typeof componentDefaultProps>;
 
-// $ExpectType: true
+// $ExpectType true
 type DefaultizedPropsTest = {
     fi?: (...args: any[]) => any;
     foo?: string | null;
@@ -197,7 +188,7 @@ type DefaultizedPropsTest = {
     baz?: boolean | null;
     bat?: ReactNode;
 } extends DefaultizedProps ? true : false;
-// $ExpectType: true
+// $ExpectType true
 type UndefaultizedPropsTest = {
     fi: (...args: any[]) => any;
     foo?: string | null;
diff --git a/types/react/index.d.ts b/types/react/index.d.ts
index 4f6e7c174b..b9a460095a 100644
--- a/types/react/index.d.ts
+++ b/types/react/index.d.ts
@@ -298,7 +298,7 @@ declare namespace React {
     }
 
     interface ProviderExoticComponent<P> extends ExoticComponent<P> {
-        propTypes?: ValidationMap<P>;
+        propTypes?: WeakValidationMap<P>;
     }
 
     type ContextType<C extends Context<any>> = C extends Context<infer T> ? T : never;
@@ -461,7 +461,7 @@ declare namespace React {
 
     interface FunctionComponent<P = {}> {
         (props: P & { children?: ReactNode }, context?: any): ReactElement<any> | null;
-        propTypes?: ValidationMap<P>;
+        propTypes?: WeakValidationMap<P>;
         contextTypes?: ValidationMap<any>;
         defaultProps?: Partial<P>;
         displayName?: string;
@@ -469,7 +469,7 @@ declare namespace React {
 
     interface RefForwardingComponent<T, P = {}> {
         (props: P & { children?: ReactNode }, ref: Ref<T> | null): ReactElement<any> | null;
-        propTypes?: ValidationMap<P>;
+        propTypes?: WeakValidationMap<P>;
         contextTypes?: ValidationMap<any>;
         defaultProps?: Partial<P>;
         displayName?: string;
@@ -477,7 +477,7 @@ declare namespace React {
 
     interface ComponentClass<P = {}, S = ComponentState> extends StaticLifecycle<P, S> {
         new (props: P, context?: any): Component<P, S>;
-        propTypes?: ValidationMap<P>;
+        propTypes?: WeakValidationMap<P>;
         contextType?: Context<any>;
         contextTypes?: ValidationMap<any>;
         childContextTypes?: ValidationMap<any>;
@@ -2558,6 +2558,14 @@ declare namespace React {
 
     type ValidationMap<T> = PropTypes.ValidationMap<T>;
 
+    type WeakValidationMap<T> = {
+        [K in keyof T]?: null extends T[K]
+            ? Validator<T[K] | null | undefined>
+            : undefined extends T[K]
+            ? Validator<T[K] | null | undefined>
+            : Validator<T[K]>
+    };
+
     interface ReactPropTypes {
         any: typeof PropTypes.any;
         array: typeof PropTypes.array;
diff --git a/types/react/test/tsx.tsx b/types/react/test/tsx.tsx
index 60fcb6dccc..9309799de7 100644
--- a/types/react/test/tsx.tsx
+++ b/types/react/test/tsx.tsx
@@ -345,3 +345,28 @@ declare global {
 }
 
 const CustomElement2: React.ReactType = 'my-declared-element';
+
+interface TestPropTypesProps {
+    foo: string;
+}
+interface TestPropTypesProps1 {
+    foo?: string;
+}
+interface TestPropTypesProps2 {
+    foo: string | null;
+}
+interface TestPropTypesProps3 {
+    foo?: string | null;
+}
+const testPropTypes = {
+    foo: PropTypes.string
+};
+type DeclaredPropTypes<P> = Required<Exclude<React.ComponentType<P>['propTypes'], undefined>>;
+// $ExpectType false
+type propTypesTest = typeof testPropTypes extends DeclaredPropTypes<TestPropTypesProps> ? true : false;
+// $ExpectType true
+type propTypesTest1 = typeof testPropTypes extends DeclaredPropTypes<TestPropTypesProps1> ? true : false;
+// $ExpectType true
+type propTypesTest2 = typeof testPropTypes extends DeclaredPropTypes<TestPropTypesProps2> ? true : false;
+// $ExpectType true
+type propTypesTest3 = typeof testPropTypes extends DeclaredPropTypes<TestPropTypesProps3> ? true : false;

From 4b54a710074b94bbce5df1359781fc853b50293c Mon Sep 17 00:00:00 2001
From: Maninder Singh <manis@microsoft.com>
Date: Wed, 12 Dec 2018 11:21:14 +0530
Subject: [PATCH 812/836] Add UT to test updated DOM walker's guard property

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

diff --git a/types/ckeditor/ckeditor-tests.ts b/types/ckeditor/ckeditor-tests.ts
index 6a0b50a4d8..31c658b801 100644
--- a/types/ckeditor/ckeditor-tests.ts
+++ b/types/ckeditor/ckeditor-tests.ts
@@ -369,6 +369,7 @@ function test_dom_walker() {
     node = walker.lastForward();
     node = walker.next();
     node = walker.previous();
+    isSomething = walker.guard(node, true);
     walker.reset();
 
     isSomething = CKEDITOR.dom.walker.blockBoundary({ div: 1 })(node);

From e355f9a29f395b74f9a0dad004ada8dec064744a Mon Sep 17 00:00:00 2001
From: Maninder Singh <manis@microsoft.com>
Date: Wed, 12 Dec 2018 11:39:59 +0530
Subject: [PATCH 813/836] Fix lint error for CKEditor

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

diff --git a/types/ckeditor/ckeditor-tests.ts b/types/ckeditor/ckeditor-tests.ts
index 31c658b801..7e224ab683 100644
--- a/types/ckeditor/ckeditor-tests.ts
+++ b/types/ckeditor/ckeditor-tests.ts
@@ -486,7 +486,7 @@ function test_dialog() {
                 {
                     id: 'tab-basic',
                     label: 'Basic Settings',
-                    elements: <any[]> []
+                    elements: [] as any []
                 },
                 {
                     id: 'tab-adv',

From 354829f2f744b1d8968ac0ca715190e399aef0b8 Mon Sep 17 00:00:00 2001
From: Dimitri Benin <dimitri.benin@gmail.com>
Date: Sat, 8 Dec 2018 12:39:23 +0100
Subject: [PATCH 814/836] Add types for experimental worker_threads module

---
 types/node/index.d.ts    | 125 +++++++++++++++++++++++++++++++++++++++
 types/node/node-tests.ts |  51 ++++++++++++++++
 2 files changed, 176 insertions(+)

diff --git a/types/node/index.d.ts b/types/node/index.d.ts
index b9edae0587..9b93fe213a 100644
--- a/types/node/index.d.ts
+++ b/types/node/index.d.ts
@@ -1618,6 +1618,131 @@ declare module "cluster" {
     function eventNames(): string[];
 }
 
+declare module "worker_threads" {
+    import { EventEmitter } from "events";
+    import { Readable, Writable } from "stream";
+
+    const isMainThread: boolean;
+    const parentPort: null | MessagePort;
+    const threadId: number;
+    const workerData: any;
+
+    class MessageChannel {
+        readonly port1: MessagePort;
+        readonly port2: MessagePort;
+    }
+
+    class MessagePort extends EventEmitter {
+        close(): void;
+        postMessage(value: any, transferList?: Array<ArrayBuffer | MessagePort>): void;
+        ref(): void;
+        unref(): void;
+        start(): void;
+
+        addListener(event: "close", listener: () => void): this;
+        addListener(event: "message", listener: (value: any) => void): this;
+        addListener(event: string | symbol, listener: (...args: any[]) => void): this;
+
+        emit(event: "close"): boolean;
+        emit(event: "message", value: any): boolean;
+        emit(event: string | symbol, ...args: any[]): boolean;
+
+        on(event: "close", listener: () => void): this;
+        on(event: "message", listener: (value: any) => void): this;
+        on(event: string | symbol, listener: (...args: any[]) => void): this;
+
+        once(event: "close", listener: () => void): this;
+        once(event: "message", listener: (value: any) => void): this;
+        once(event: string | symbol, listener: (...args: any[]) => void): this;
+
+        prependListener(event: "close", listener: () => void): this;
+        prependListener(event: "message", listener: (value: any) => void): this;
+        prependListener(event: string | symbol, listener: (...args: any[]) => void): this;
+
+        prependOnceListener(event: "close", listener: () => void): this;
+        prependOnceListener(event: "message", listener: (value: any) => void): this;
+        prependOnceListener(event: string | symbol, listener: (...args: any[]) => void): this;
+
+        removeListener(event: "close", listener: () => void): this;
+        removeListener(event: "message", listener: (value: any) => void): this;
+        removeListener(event: string | symbol, listener: (...args: any[]) => void): this;
+
+        off(event: "close", listener: () => void): this;
+        off(event: "message", listener: (value: any) => void): this;
+        off(event: string | symbol, listener: (...args: any[]) => void): this;
+    }
+
+    interface WorkerOptions {
+        eval?: boolean;
+        workerData?: any;
+        stdin?: boolean;
+        stdout?: boolean;
+        stderr?: boolean;
+    }
+
+    class Worker extends EventEmitter {
+        readonly stdin: Writable | null;
+        readonly stdout: Readable;
+        readonly stderr: Readable;
+        readonly threadId: number;
+
+        constructor(filename: string, options?: WorkerOptions);
+
+        postMessage(value: any, transferList?: Array<ArrayBuffer | MessagePort>): void;
+        ref(): void;
+        unref(): void;
+        terminate(callback?: (err: any, exitCode: number) => void): void;
+
+        addListener(event: "error", listener: (err: any) => void): this;
+        addListener(event: "exit", listener: (exitCode: number) => void): this;
+        addListener(event: "message", listener: (value: any) => void): this;
+        addListener(event: "online", listener: () => void): this;
+        addListener(event: string | symbol, listener: (...args: any[]) => void): this;
+
+        emit(event: "error", err: any): boolean;
+        emit(event: "exit", exitCode: number): boolean;
+        emit(event: "message", value: any): boolean;
+        emit(event: "online"): boolean;
+        emit(event: string | symbol, ...args: any[]): boolean;
+
+        on(event: "error", listener: (err: any) => void): this;
+        on(event: "exit", listener: (exitCode: number) => void): this;
+        on(event: "message", listener: (value: any) => void): this;
+        on(event: "online", listener: () => void): this;
+        on(event: string | symbol, listener: (...args: any[]) => void): this;
+
+        once(event: "error", listener: (err: any) => void): this;
+        once(event: "exit", listener: (exitCode: number) => void): this;
+        once(event: "message", listener: (value: any) => void): this;
+        once(event: "online", listener: () => void): this;
+        once(event: string | symbol, listener: (...args: any[]) => void): this;
+
+        prependListener(event: "error", listener: (err: any) => void): this;
+        prependListener(event: "exit", listener: (exitCode: number) => void): this;
+        prependListener(event: "message", listener: (value: any) => void): this;
+        prependListener(event: "online", listener: () => void): this;
+        prependListener(event: string | symbol, listener: (...args: any[]) => void): this;
+
+        prependOnceListener(event: "error", listener: (err: any) => void): this;
+        prependOnceListener(event: "exit", listener: (exitCode: number) => void): this;
+        prependOnceListener(event: "message", listener: (value: any) => void): this;
+        prependOnceListener(event: "online", listener: () => void): this;
+        prependOnceListener(event: string | symbol, listener: (...args: any[]) => void): this;
+
+        removeListener(event: "error", listener: (err: any) => void): this;
+        removeListener(event: "exit", listener: (exitCode: number) => void): this;
+        removeListener(event: "message", listener: (value: any) => void): this;
+        removeListener(event: "online", listener: () => void): this;
+        removeListener(event: string | symbol, listener: (...args: any[]) => void): this;
+
+        off(event: "error", listener: (err: any) => void): this;
+        off(event: "exit", listener: (exitCode: number) => void): this;
+        off(event: "message", listener: (value: any) => void): this;
+        off(event: "online", listener: () => void): this;
+        off(event: string | symbol, listener: (...args: any[]) => void): this;
+    }
+}
+
 declare module "zlib" {
     import * as stream from "stream";
 
diff --git a/types/node/node-tests.ts b/types/node/node-tests.ts
index c0f80728fc..a638f0fee8 100644
--- a/types/node/node-tests.ts
+++ b/types/node/node-tests.ts
@@ -17,6 +17,7 @@ import * as path from "path";
 import * as readline from "readline";
 import * as childProcess from "child_process";
 import * as cluster from "cluster";
+import * as workerThreads from "worker_threads";
 import * as os from "os";
 import * as vm from "vm";
 import * as console2 from "console";
@@ -2932,6 +2933,56 @@ async function asyncStreamPipelineFinished() {
     }
 }
 
+//////////////////////////////////////////////////////////////////////
+/// worker_threads tests: https://nodejs.org/api/worker_threads.html ///
+//////////////////////////////////////////////////////////////////////
+
+{
+    {
+        if (workerThreads.isMainThread) {
+            module.exports = async function parseJSAsync(script: string) {
+                return new Promise((resolve, reject) => {
+                    const worker = new workerThreads.Worker(__filename, {
+                        workerData: script
+                    });
+                    worker.on('message', resolve);
+                    worker.on('error', reject);
+                    worker.on('exit', (code) => {
+                        if (code !== 0)
+                            reject(new Error(`Worker stopped with exit code ${code}`));
+                    });
+                });
+            };
+        } else {
+            const script = workerThreads.workerData;
+            workerThreads.parentPort.postMessage(script);
+        }
+    }
+
+    {
+        const { port1, port2 } = new workerThreads.MessageChannel();
+        port1.on('message', (message) => console.log('received', message));
+        port2.postMessage({ foo: 'bar' });
+    }
+
+    {
+        if (workerThreads.isMainThread) {
+            const worker = new workerThreads.Worker(__filename);
+            const subChannel = new workerThreads.MessageChannel();
+            worker.postMessage({ hereIsYourPort: subChannel.port1 }, [subChannel.port1]);
+            subChannel.port2.on('message', (value) => {
+                console.log('received:', value);
+            });
+        } else {
+            workerThreads.parentPort.once('message', (value) => {
+                assert(value.hereIsYourPort instanceof MessagePort);
+                value.hereIsYourPort.postMessage('the worker is sending this');
+                value.hereIsYourPort.close();
+            });
+        }
+    }
+}
+
 ////////////////////////////////////////////////////
 /// os tests : https://nodejs.org/api/os.html
 ////////////////////////////////////////////////////

From cca60bd5447b1d86d3c296c995c766de7c2ea3d5 Mon Sep 17 00:00:00 2001
From: UrielCh <uriel.chemouni@gmail.com>
Date: Wed, 12 Dec 2018 10:46:22 +0200
Subject: [PATCH 815/836] Add Document as JQuery.contents() output encapsulated
 type. (#31296)

$('iframe').contents() is a JQuery<Document>;
---
 types/jquery/JQuery.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/jquery/JQuery.d.ts b/types/jquery/JQuery.d.ts
index 123fad3b34..78602a2d8b 100644
--- a/types/jquery/JQuery.d.ts
+++ b/types/jquery/JQuery.d.ts
@@ -2090,7 +2090,7 @@ $( "#frameDemo" ).contents().find( "a" ).css( "background-color", "#BADA55" );
 </html>
 ```
      */
-    contents(): JQuery<TElement | Text | Comment>;
+    contents(): JQuery<TElement | Text | Comment | Document>;
     /**
      * Bind an event handler to the "contextmenu" JavaScript event, or trigger that event on an element.
      * @param eventData An object containing data that will be passed to the event handler.

From 00262b050a466fead06c973b08395b981ac48581 Mon Sep 17 00:00:00 2001
From: Tomas Hubelbauer <tom.hubelbauer@microsoft.com>
Date: Wed, 12 Dec 2018 10:08:00 +0100
Subject: [PATCH 816/836] Add movementX and movementY to MouseEvent

React now polyfills `movementX` and `movementY`, see facebook/react#6723.
---
 types/react/index.d.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/types/react/index.d.ts b/types/react/index.d.ts
index b9a460095a..c40df0db5b 100644
--- a/types/react/index.d.ts
+++ b/types/react/index.d.ts
@@ -1013,6 +1013,8 @@ declare namespace React {
          */
         getModifierState(key: string): boolean;
         metaKey: boolean;
+        movementX: number;
+        movementY: number;
         nativeEvent: NativeMouseEvent;
         pageX: number;
         pageY: number;

From c73305cc54f9ad601b68cd9289f127671de01cd8 Mon Sep 17 00:00:00 2001
From: Pascal Sthamer <sthamer.pascal@gmail.com>
Date: Wed, 12 Dec 2018 12:42:20 +0100
Subject: [PATCH 817/836] Include container.stats types

---
 types/dockerode/index.d.ts | 83 +++++++++++++++++++++++++++++++++++++-
 1 file changed, 81 insertions(+), 2 deletions(-)

diff --git a/types/dockerode/index.d.ts b/types/dockerode/index.d.ts
index d823c46fe4..6a988ba5c2 100644
--- a/types/dockerode/index.d.ts
+++ b/types/dockerode/index.d.ts
@@ -470,7 +470,7 @@ declare namespace Dockerode {
           GlobalIPv6Address: string;
           GlobalIPv6PrefixLen: number;
           MacAddress: string;
-        }
+        };
       };
       Node?: {
         ID: string;
@@ -480,10 +480,89 @@ declare namespace Dockerode {
         Cpus: number;
         Memory: number;
         Labels: any;
-      }
+      };
     };
   }
+  
+  interface NetworkStats {
+		[name: string]: {
+			rx_bytes: number;
+			rx_dropped: number;
+			rx_errors: number;
+			rx_packets: number;
+			tx_bytes: number;
+			tx_dropped: number;
+			tx_errors: number;
+			tx_packets: number;
+		};
+	}
 
+	interface CPUStats {
+		cpu_usage: {
+			percpu_usage: Array<number>;
+			usage_in_usermode: number;
+			total_usage: number;
+			usage_in_kernelmode: number;
+		};
+		system_cpu_usage: number;
+		online_cpus: number;
+		throttling_data: {
+			periods: number;
+			throttled_periods: number;
+			throttled_time: number;
+		};
+	}
+
+	interface MemoryStats {
+		stats: {
+			total_pgmajfault: number;
+			cache: number;
+			mapped_file: number;
+			total_inactive_file: number;
+			pgpgout: number;
+			rss: number;
+			total_mapped_file: number;
+			writeback: number;
+			unevictable: number;
+			pgpgin: number;
+			total_unevictable: number;
+			pgmajfault: number;
+			total_rss: number;
+			total_rss_huge: number;
+			total_writeback: number;
+			total_inactive_anon: number;
+			rss_huge: number;
+			hierarchical_memory_limit: number;
+			total_pgfault: number;
+			total_active_file: number;
+			active_anon: number;
+			total_active_anon: number;
+			total_pgpgout: number;
+			total_cache: number;
+			inactive_anon: number;
+			active_file: number;
+			pgfault: number;
+			inactive_file: number;
+			total_pgpgin: number;
+		};
+		max_usage: number;
+		usage: number;
+		failcnt: number;
+		limit: number;
+	}
+
+	interface ContainerStats {
+		read: string;
+		pid_stats: {
+			current: number;
+		};
+		networks: NetworkStats;
+		memory_stats: MemoryStats;
+		blkio_stats: {};
+		cpu_stats: CPUStats;
+		precpu_stats: CPUStats;
+	}
+  
   interface HostConfig {
     AutoRemove: boolean;
     Binds: string[];

From cea66cd28fc108a0328b8c9b407007c6ac9aa2f8 Mon Sep 17 00:00:00 2001
From: Pascal Sthamer <sthamer.pascal@gmail.com>
Date: Wed, 12 Dec 2018 12:44:19 +0100
Subject: [PATCH 818/836] Forgot to update return types

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

diff --git a/types/dockerode/index.d.ts b/types/dockerode/index.d.ts
index 6a988ba5c2..1dd099f1c3 100644
--- a/types/dockerode/index.d.ts
+++ b/types/dockerode/index.d.ts
@@ -109,9 +109,9 @@ declare namespace Dockerode {
     logs(callback: Callback<NodeJS.ReadableStream>): void;
     logs(options?: ContainerLogsOptions): Promise<NodeJS.ReadableStream>;
 
-    stats(options: {}, callback: Callback<any>): void;
-    stats(callback: Callback<any>): void;
-    stats(options?: {}): Promise<any>;
+    stats(options: {}, callback: Callback<ContainerStats>): void;
+    stats(callback: Callback<ContainerStats>): void;
+    stats(options?: {}): Promise<ContainerStats>;
 
     attach(options: {}, callback: Callback<NodeJS.ReadWriteStream>): void;
     attach(options: {}): Promise<NodeJS.ReadWriteStream>;

From ba36ee16316092fa2e83c2ec70b658c37a19db1e Mon Sep 17 00:00:00 2001
From: Pascal Sthamer <sthamer.pascal@gmail.com>
Date: Wed, 12 Dec 2018 12:53:43 +0100
Subject: [PATCH 819/836] Fix tslint error

---
 types/dockerode/index.d.ts | 152 ++++++++++++++++++-------------------
 1 file changed, 76 insertions(+), 76 deletions(-)

diff --git a/types/dockerode/index.d.ts b/types/dockerode/index.d.ts
index 1dd099f1c3..694cc295b4 100644
--- a/types/dockerode/index.d.ts
+++ b/types/dockerode/index.d.ts
@@ -483,86 +483,86 @@ declare namespace Dockerode {
       };
     };
   }
-  
+
   interface NetworkStats {
-		[name: string]: {
-			rx_bytes: number;
-			rx_dropped: number;
-			rx_errors: number;
-			rx_packets: number;
-			tx_bytes: number;
-			tx_dropped: number;
-			tx_errors: number;
-			tx_packets: number;
-		};
-	}
+    [name: string]: {
+      rx_bytes: number;
+      rx_dropped: number;
+      rx_errors: number;
+      rx_packets: number;
+      tx_bytes: number;
+      tx_dropped: number;
+      tx_errors: number;
+      tx_packets: number;
+    };
+  }
 
-	interface CPUStats {
-		cpu_usage: {
-			percpu_usage: Array<number>;
-			usage_in_usermode: number;
-			total_usage: number;
-			usage_in_kernelmode: number;
-		};
-		system_cpu_usage: number;
-		online_cpus: number;
-		throttling_data: {
-			periods: number;
-			throttled_periods: number;
-			throttled_time: number;
-		};
-	}
+  interface CPUStats {
+    cpu_usage: {
+      percpu_usage: number[];
+      usage_in_usermode: number;
+      total_usage: number;
+      usage_in_kernelmode: number;
+    };
+    system_cpu_usage: number;
+    online_cpus: number;
+    throttling_data: {
+      periods: number;
+      throttled_periods: number;
+      throttled_time: number;
+    };
+  }
 
-	interface MemoryStats {
-		stats: {
-			total_pgmajfault: number;
-			cache: number;
-			mapped_file: number;
-			total_inactive_file: number;
-			pgpgout: number;
-			rss: number;
-			total_mapped_file: number;
-			writeback: number;
-			unevictable: number;
-			pgpgin: number;
-			total_unevictable: number;
-			pgmajfault: number;
-			total_rss: number;
-			total_rss_huge: number;
-			total_writeback: number;
-			total_inactive_anon: number;
-			rss_huge: number;
-			hierarchical_memory_limit: number;
-			total_pgfault: number;
-			total_active_file: number;
-			active_anon: number;
-			total_active_anon: number;
-			total_pgpgout: number;
-			total_cache: number;
-			inactive_anon: number;
-			active_file: number;
-			pgfault: number;
-			inactive_file: number;
-			total_pgpgin: number;
-		};
-		max_usage: number;
-		usage: number;
-		failcnt: number;
-		limit: number;
-	}
+  interface MemoryStats {
+    stats: {
+      total_pgmajfault: number;
+      cache: number;
+      mapped_file: number;
+      total_inactive_file: number;
+      pgpgout: number;
+      rss: number;
+      total_mapped_file: number;
+      writeback: number;
+      unevictable: number;
+      pgpgin: number;
+      total_unevictable: number;
+      pgmajfault: number;
+      total_rss: number;
+      total_rss_huge: number;
+      total_writeback: number;
+      total_inactive_anon: number;
+      rss_huge: number;
+      hierarchical_memory_limit: number;
+      total_pgfault: number;
+      total_active_file: number;
+      active_anon: number;
+      total_active_anon: number;
+      total_pgpgout: number;
+      total_cache: number;
+      inactive_anon: number;
+      active_file: number;
+      pgfault: number;
+      inactive_file: number;
+      total_pgpgin: number;
+    };
+    max_usage: number;
+    usage: number;
+    failcnt: number;
+    limit: number;
+  }
+
+  interface ContainerStats {
+    read: string;
+    pid_stats: {
+      current: number;
+    };
+    networks: NetworkStats;
+    memory_stats: MemoryStats;
+    blkio_stats: {};
+    cpu_stats: CPUStats;
+    precpu_stats: CPUStats;
+  }
 
-	interface ContainerStats {
-		read: string;
-		pid_stats: {
-			current: number;
-		};
-		networks: NetworkStats;
-		memory_stats: MemoryStats;
-		blkio_stats: {};
-		cpu_stats: CPUStats;
-		precpu_stats: CPUStats;
-	}
-  
   interface HostConfig {
     AutoRemove: boolean;
     Binds: string[];

From e7be2c68faaa2e54aba9c7d795b12a6fdfd20491 Mon Sep 17 00:00:00 2001
From: Harald Korneliussen <harald.korneliussen@cordel.no>
Date: Wed, 12 Dec 2018 12:59:51 +0100
Subject: [PATCH 820/836] When filterAll is set, filterMethod must be a
 function that takes and returns any[]

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

diff --git a/types/react-table/index.d.ts b/types/react-table/index.d.ts
index 1afb6eb0fd..42d09c4338 100644
--- a/types/react-table/index.d.ts
+++ b/types/react-table/index.d.ts
@@ -23,7 +23,7 @@ export type ComponentPropsGetterC = (finalState: any, rowInfo?: undefined, colum
 export type ComponentPropsGetterRC = (finalState: any, rowInfo?: RowInfo, column?: Column, instance?: any) => object | undefined;
 
 export type DefaultFilterFunction = (filter: Filter, row: any, column: any) => boolean;
-export type FilterFunction = (filter: Filter, rows: any[], column: any) => boolean;
+export type FilterFunction = (filter: Filter, rows: any[], column: any) => any[];
 export type SubComponentFunction = (rowInfo: RowInfo) => React.ReactNode;
 export type PageChangeFunction = (page: number) => void;
 export type PageSizeChangeFunction = (newPageSize: number, newPage: number) => void;

From 60eb70b81ed4c17ba657d272738884ec2ccbd668 Mon Sep 17 00:00:00 2001
From: Nokky Goren <30292793+ApeNox@users.noreply.github.com>
Date: Wed, 12 Dec 2018 14:51:41 +0200
Subject: [PATCH 821/836] rename Options to searchOptions in props

This should have been added before, but has been left out
---
 types/react-places-autocomplete/index.d.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/types/react-places-autocomplete/index.d.ts b/types/react-places-autocomplete/index.d.ts
index 6a6a85c19e..1309211c13 100644
--- a/types/react-places-autocomplete/index.d.ts
+++ b/types/react-places-autocomplete/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/kenny-hibino/react-places-autocomplete/
 // Definitions by: Guilherme Hübner <https://github.com/guilhermehubner>
 //                 Andrew Makarov <https://github.com/r3nya>
+//                 Nokky Goren
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 //
@@ -38,7 +39,7 @@ export interface PropTypes {
         autocompleteItem?: React.CSSProperties;
         autocompleteItemActive?: React.CSSProperties;
     };
-    options?: {
+    searchOptions?: {
         bounds?: google.maps.LatLngBounds | google.maps.LatLngBoundsLiteral;
         componentRestrictions?: google.maps.GeocoderComponentRestrictions;
         location?: google.maps.LatLng | google.maps.LatLngLiteral;

From 84efa71066822fca8efa9155ab1d7a41b637bdc0 Mon Sep 17 00:00:00 2001
From: Pascal Sthamer <sthamer.pascal@gmail.com>
Date: Wed, 12 Dec 2018 14:05:43 +0100
Subject: [PATCH 822/836] Mount config for creating a container

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

diff --git a/types/dockerode/index.d.ts b/types/dockerode/index.d.ts
index 694cc295b4..cd06bc7ebb 100644
--- a/types/dockerode/index.d.ts
+++ b/types/dockerode/index.d.ts
@@ -762,6 +762,38 @@ declare namespace Dockerode {
     [key: string]: EndpointSettings;
   }
 
+  type MountType =
+    | "bind"
+    | "volume"
+    | "tmpfs";
+
+  type MountConsistency =
+    | "default"
+    | "consistent"
+    | "cached"
+    | "delegated";
+
+  type MountPropagation =
+    | "private"
+    | "rprivate"
+    | "shared"
+    | "rshared"
+    | "slave"
+    | "rslave";
+
+  interface MountSettings {
+    Target: string;
+    Source: string;
+    Type: MountType;
+    ReadOnly ?: boolean;
+    Consistency ?: MountConsistency;
+    BindOptions ?: {
+      Propagation: MountPropagation;
+    };
+  }
+
+  type MountConfig = MountSettings[];
+
   interface ContainerCreateOptions {
     name?: string;
     Hostname?: string;
@@ -818,6 +850,7 @@ declare namespace Dockerode {
       DnsSearch?: string[];
       ExtraHosts?: any;
       VolumesFrom?: string[];
+      Mounts?: MountConfig;
       CapAdd?: string[];
       CapDrop?: string[];
       GroupAdd?: string[];

From f8077c82027918706a453dbb6b1b89b9729dc309 Mon Sep 17 00:00:00 2001
From: Nokky Goren <30292793+ApeNox@users.noreply.github.com>
Date: Wed, 12 Dec 2018 15:20:49 +0200
Subject: [PATCH 823/836] update contributor name

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

diff --git a/types/react-places-autocomplete/index.d.ts b/types/react-places-autocomplete/index.d.ts
index 1309211c13..e24e479be8 100644
--- a/types/react-places-autocomplete/index.d.ts
+++ b/types/react-places-autocomplete/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/kenny-hibino/react-places-autocomplete/
 // Definitions by: Guilherme Hübner <https://github.com/guilhermehubner>
 //                 Andrew Makarov <https://github.com/r3nya>
-//                 Nokky Goren
+//                 Nokky Goren <https://github.com/ApeNox>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 //

From 6b45c74db0148c612b716bd8fe24a33ce372072a Mon Sep 17 00:00:00 2001
From: Dimitri Benin <dimitri.benin@gmail.com>
Date: Wed, 12 Dec 2018 16:03:11 +0100
Subject: [PATCH 824/836] Update types for proj4

---
 types/proj4/index.d.ts     | 69 ++++++++++++++++++++++++++++++++------
 types/proj4/proj4-tests.ts | 50 ++++++++++++++++++++-------
 types/proj4/tsconfig.json  |  4 +--
 3 files changed, 98 insertions(+), 25 deletions(-)

diff --git a/types/proj4/index.d.ts b/types/proj4/index.d.ts
index afba494556..d7d4cf1ae5 100644
--- a/types/proj4/index.d.ts
+++ b/types/proj4/index.d.ts
@@ -1,6 +1,7 @@
-// Type definitions for proj4 2.3
+// Type definitions for proj4 2.5
 // Project: https://github.com/proj4js/proj4js
 // Definitions by: Denis Carriere <https://github.com/DenisCarriere>
+//                 BendingBender <https://github.com/BendingBender>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 declare namespace proj4 {
@@ -21,9 +22,9 @@ declare namespace proj4 {
         ep2: number;
     }
 
-    interface Static {
-        forward(coordinates: TemplateCoordinates): number[];
-        inverse(coordinates: TemplateCoordinates): number[];
+    interface Converter {
+        forward<T extends TemplateCoordinates>(coordinates: T): T;
+        inverse<T extends TemplateCoordinates>(coordinates: T): T;
     }
 
     interface InterfaceProjection {
@@ -38,6 +39,39 @@ declare namespace proj4 {
         inverse(coordinates: TemplateCoordinates): number[];
     }
 
+    interface ProjectionDefinition {
+        title: string;
+        projName?: string;
+        ellps?: string;
+        datum?: string;
+        datumName?: string;
+        rf?: number;
+        lat0?: number;
+        lat1?: number;
+        lat2?: number;
+        lat_ts?: number;
+        long0?: number;
+        long1?: number;
+        long2?: number;
+        alpha?: number;
+        longc?: number;
+        x0?: number;
+        y0?: number;
+        k0?: number;
+        a?: number;
+        b?: number;
+        R_A?: true;
+        zone?: number;
+        utmSouth?: true;
+        datum_params?: string | number[];
+        to_meter?: number;
+        units?: string;
+        from_greenwich?: number;
+        datumCode?: string;
+        natGrids?: string;
+        axis?: string;
+    }
+
     const defaultDatum: string;
 
     function Proj(srsCode: any, callback?: any): InterfaceProjection;
@@ -45,23 +79,38 @@ declare namespace proj4 {
     const WGS84: any;
 
     /**
-     * Depecrated v3
+     * @deprecated v3
      */
     function Point(x: number, y: number, z?: number): InterfaceCoordinates;
     function Point(coordinates: TemplateCoordinates | string): InterfaceCoordinates;
 
     function toPoint(array: number[]): InterfaceCoordinates;
 
-    function defs(name: string, projection?: string): any;
-    function defs(name: string[][]): any;
+    function defs(name: string, projection: string | ProjectionDefinition): void;
+    function defs(name: string[][]): undefined[];
+    function defs(name: string): ProjectionDefinition;
 
-    function transform(source: InterfaceProjection, dest: InterfaceProjection, point: TemplateCoordinates): any;
+    function transform(
+        source: InterfaceProjection,
+        dest: InterfaceProjection,
+        point: TemplateCoordinates
+    ): any;
 
     function mgrs(coordinates: number[], accuracy: number): string;
 
     const version: string;
 }
 
-declare function proj4(fromProjection: string, toProjection?: string, coordinates?: proj4.TemplateCoordinates): proj4.Static;
-declare function proj4(fromProjection: string, coordinates: proj4.TemplateCoordinates): number[];
+declare function proj4(fromProjection: string, toProjection?: string): proj4.Converter;
+declare function proj4<T extends proj4.TemplateCoordinates>(
+    toProjection: string,
+    coordinates: T
+): T;
+declare function proj4<T extends proj4.TemplateCoordinates>(
+    fromProjection: string,
+    toProjection: string,
+    coordinates: T
+): T;
+
 export = proj4;
+export as namespace proj4;
diff --git a/types/proj4/proj4-tests.ts b/types/proj4/proj4-tests.ts
index 3d1ab1ab9b..7df09014db 100644
--- a/types/proj4/proj4-tests.ts
+++ b/types/proj4/proj4-tests.ts
@@ -3,31 +3,55 @@ import proj4 = require('proj4');
 ///////////////////////////////////////////
 // Tests data initialisation
 ///////////////////////////////////////////
-const name = 'WGS84';
 const epsg = {
     4269: '+title=NAD83 (long/lat) +proj=longlat +a=6378137.0 +b=6356752.31414036 +ellps=GRS80 +datum=NAD83 +units=degrees',
     4326: '+title=WGS 84 (long/lat) +proj=longlat +ellps=WGS84 +datum=WGS84 +units=degrees',
 };
-const point1 = [-71, 41];
-const point2 = {x: 2, y: 5};
-const mgrs = "24XWT783908";
+const firstProjection = epsg[4269];
+const secondProjection = epsg[4326];
+
+const pointArr = [-71, 41];
+const pointObj = { x: 2, y: 5 };
 
 ///////////////////////////////////////////
 // Tests Measurement
 ///////////////////////////////////////////
-proj4(epsg['4269'], epsg['4326'], point1);
-proj4(epsg['4269'], point1);
-proj4(epsg['4269'], epsg['4326']).forward(point2);
-proj4(epsg['4269'], epsg['4326']).inverse(point2);
+proj4(firstProjection, secondProjection, pointArr);
+proj4(firstProjection, pointArr);
+
+// $ExpectType number[]
+proj4(firstProjection, secondProjection, pointArr);
+// $ExpectType { x: number; y: number; }
+proj4(firstProjection, secondProjection, pointObj);
+
+// $ExpectType number[]
+proj4(firstProjection, pointArr);
+// $ExpectType { x: number; y: number; }
+proj4(firstProjection, pointObj);
+
+// $ExpectType Converter
+proj4(firstProjection, secondProjection);
+// $ExpectType Converter
+proj4(firstProjection);
+
+// $ExpectType number[]
+proj4(firstProjection, secondProjection).forward(pointArr);
+// $ExpectType { x: number; y: number; }
+proj4(firstProjection, secondProjection).forward(pointObj);
+// $ExpectType number[]
+proj4(firstProjection, secondProjection).inverse(pointArr);
+// $ExpectType { x: number; y: number; }
+proj4(firstProjection, secondProjection).inverse(pointObj);
 
 ///////////////////////////////////
 // Named Projections
 ///////////////////////////////////
-proj4.defs('WGS84', epsg['4326']);
-proj4.defs([
-  ['EPSG:4326', epsg['4326']],
-  ['EPSG:4269', epsg['4269']]
-]);
+
+// $ExpectType ProjectionDefinition
+proj4.defs('WGS84');
+proj4.defs('WGS84', secondProjection);
+// $ExpectType undefined[]
+proj4.defs([['EPSG:4326', secondProjection], ['EPSG:4269', firstProjection]]);
 proj4.defs('urn:x-ogc:def:crs:EPSG:4326', proj4.defs('EPSG:4326'));
 
 ///////////////////////////////////
diff --git a/types/proj4/tsconfig.json b/types/proj4/tsconfig.json
index a55659d52c..02713475d5 100644
--- a/types/proj4/tsconfig.json
+++ b/types/proj4/tsconfig.json
@@ -6,7 +6,7 @@
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
-        "strictNullChecks": false,
+        "strictNullChecks": true,
         "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [
@@ -20,4 +20,4 @@
         "index.d.ts",
         "proj4-tests.ts"
     ]
-}
\ No newline at end of file
+}

From 56b611f6873fc63c02ee6b2f7a1bec58537bce1f Mon Sep 17 00:00:00 2001
From: James Garbutt <43081j@users.noreply.github.com>
Date: Tue, 27 Nov 2018 10:38:18 +0000
Subject: [PATCH 825/836] sinon: allow matchers as args

---
 types/sinon/index.d.ts | 52 +++++++++++++++++++++---------------------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/types/sinon/index.d.ts b/types/sinon/index.d.ts
index b5c3952e7a..d0748e9ac4 100644
--- a/types/sinon/index.d.ts
+++ b/types/sinon/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Sinon 5.0
+// Type definitions for Sinon 7.0
 // Project: http://sinonjs.org/
 // Definitions by: William Sears <https://github.com/mrbigdog2u>
 //                 Jonathan Little <https://github.com/rationull>
@@ -18,12 +18,12 @@ interface Event {} // tslint:disable-line no-empty-interface
 interface Document {} // tslint:disable-line no-empty-interface
 
 declare namespace Sinon {
-    interface SinonSpyCallApi<TArgs extends any[] = any[], TReturnValue = any> {
+    interface SinonSpyCallApi<TArgs extends any = any, TReturnValue = any> {
         // Properties
         /**
          * Array of received arguments.
          */
-        args: TArgs;
+        args: TArgs[];
 
         // Methods
         /**
@@ -38,11 +38,11 @@ declare namespace Sinon {
          * so a call that received the provided arguments (in the same spots) and possibly others as well will return true.
          * @param args
          */
-        calledWith(...args: TArgs): boolean;
+        calledWith(...args: Array<TArgs|SinonMatcher>): boolean;
         /**
          * Returns true if spy was called at least once with the provided arguments and no others.
          */
-        calledWithExactly(...args: TArgs): boolean;
+        calledWithExactly(...args: Array<TArgs|SinonMatcher>): boolean;
         /**
          * Returns true if spy/stub was called the new operator.
          * Beware that this is inferred based on the value of the this object and the spy function’s prototype,
@@ -53,31 +53,31 @@ declare namespace Sinon {
          * Returns true if spy was called at exactly once with the provided arguments.
          * @param args
          */
-        calledOnceWith(...args: TArgs): boolean;
-        calledOnceWithExactly(...args: TArgs): boolean;
+        calledOnceWith(...args: Array<TArgs|SinonMatcher>): boolean;
+        calledOnceWithExactly(...args: Array<TArgs|SinonMatcher>): boolean;
         /**
          * Returns true if spy was called with matching arguments (and possibly others).
          * This behaves the same as spy.calledWith(sinon.match(arg1), sinon.match(arg2), ...).
          * @param args
          */
-        calledWithMatch(...args: TArgs): boolean;
+        calledWithMatch(...args: TArgs[]): boolean;
         /**
          * Returns true if call did not receive provided arguments.
          * @param args
          */
-        notCalledWith(...args: TArgs): boolean;
+        notCalledWith(...args: Array<TArgs|SinonMatcher>): boolean;
         /**
          * Returns true if call did not receive matching arguments.
          * This behaves the same as spyCall.notCalledWith(sinon.match(arg1), sinon.match(arg2), ...).
          * @param args
          */
-        notCalledWithMatch(...args: TArgs): boolean;
+        notCalledWithMatch(...args: TArgs[]): boolean;
         /**
          * Returns true if spy returned the provided value at least once.
          * Uses deep comparison for objects and arrays. Use spy.returned(sinon.match.same(obj)) for strict comparison (see matchers).
          * @param value
          */
-        returned(value: TReturnValue): boolean;
+        returned(value: TReturnValue|SinonMatcher): boolean;
         /**
          * Returns true if spy threw an exception at least once.
          */
@@ -118,7 +118,7 @@ declare namespace Sinon {
         yieldToOn(property: string, obj: any, ...args: any[]): void;
     }
 
-    interface SinonSpyCall<TArgs extends any[] = any[], TReturnValue = any>
+    interface SinonSpyCall<TArgs extends any = any, TReturnValue = any>
         extends SinonSpyCallApi<TArgs, TReturnValue> {
         /**
          * The call’s this value.
@@ -154,7 +154,7 @@ declare namespace Sinon {
         calledAfter(call: SinonSpyCall): boolean;
     }
 
-    interface SinonSpy<TArgs extends any[] = any[], TReturnValue = any>
+    interface SinonSpy<TArgs extends any = any, TReturnValue = any>
         extends Pick<
                 SinonSpyCallApi<TArgs, TReturnValue>,
                 Exclude<keyof SinonSpyCallApi<TArgs, TReturnValue>, 'args'>
@@ -207,7 +207,7 @@ declare namespace Sinon {
         /**
          * Array of arguments received, spy.args[0] is an array of arguments received in the first call.
          */
-        args: TArgs[];
+        args: TArgs[][];
         /**
          * Array of exception objects thrown, spy.exceptions[0] is the exception thrown by the first call.
          * If the call did not throw an error, the value at the call’s location in .exceptions will be undefined.
@@ -246,7 +246,7 @@ declare namespace Sinon {
          * This is useful to be more expressive in your assertions, where you can access the spy with the same call.
          * @param args Expected args
          */
-        withArgs(...args: TArgs): SinonSpy<TArgs, TReturnValue>;
+        withArgs(...args: Array<TArgs|SinonMatcher>): SinonSpy<TArgs, TReturnValue>;
         /**
          * Returns true if the spy was always called with @param obj as this.
          * @param obj
@@ -255,29 +255,29 @@ declare namespace Sinon {
         /**
          * Returns true if spy was always called with the provided arguments (and possibly others).
          */
-        alwaysCalledWith(...args: TArgs): boolean;
+        alwaysCalledWith(...args: Array<TArgs|SinonMatcher>): boolean;
         /**
          * Returns true if spy was always called with the exact provided arguments.
          * @param args
          */
-        alwaysCalledWithExactly(...args: TArgs): boolean;
+        alwaysCalledWithExactly(...args: Array<TArgs|SinonMatcher>): boolean;
         /**
          * Returns true if spy was always called with matching arguments (and possibly others).
          * This behaves the same as spy.alwaysCalledWith(sinon.match(arg1), sinon.match(arg2), ...).
          * @param args
          */
-        alwaysCalledWithMatch(...args: TArgs): boolean;
+        alwaysCalledWithMatch(...args: TArgs[]): boolean;
         /**
          * Returns true if the spy/stub was never called with the provided arguments.
          * @param args
          */
-        neverCalledWith(...args: TArgs): boolean;
+        neverCalledWith(...args: Array<TArgs|SinonMatcher>): boolean;
         /**
          * Returns true if the spy/stub was never called with matching arguments.
          * This behaves the same as spy.neverCalledWith(sinon.match(arg1), sinon.match(arg2), ...).
          * @param args
          */
-        neverCalledWithMatch(...args: TArgs): boolean;
+        neverCalledWithMatch(...args: TArgs[]): boolean;
         /**
          * Returns true if spy always threw an exception.
          */
@@ -300,7 +300,7 @@ declare namespace Sinon {
          * If the stub was never called with a function argument, yield throws an error.
          * Returns an Array with all callbacks return values in the order they were called, if no error is thrown.
          */
-        invokeCallback(...args: TArgs): void;
+        invokeCallback(...args: TArgs[]): void;
         /**
          * Set the displayName of the spy or stub.
          * @param name
@@ -356,13 +356,13 @@ declare namespace Sinon {
          * The returned spy is the function object which replaced the original method. spy === object.method.
          */
         <T, K extends keyof T>(obj: T, method: K): T[K] extends (
-            ...args: infer TArgs
+            ...args: Array<infer TArgs>
         ) => infer TReturnValue
             ? SinonSpy<TArgs, TReturnValue>
             : SinonSpy;
     }
 
-    interface SinonStub<TArgs extends any[] = any[], TReturnValue = any>
+    interface SinonStub<TArgs extends any = any, TReturnValue = any>
         extends SinonSpy<TArgs, TReturnValue> {
         /**
          * Resets the stub’s behaviour to the default behaviour
@@ -524,7 +524,7 @@ declare namespace Sinon {
          * Makes the stub call the provided @param func when invoked.
          * @param func
          */
-        callsFake(func: (...args: TArgs) => TReturnValue): SinonStub<TArgs, TReturnValue>;
+        callsFake(func: (...args: TArgs[]) => TReturnValue): SinonStub<TArgs, TReturnValue>;
         /**
          * Replaces a new getter for this stub.
          */
@@ -631,7 +631,7 @@ declare namespace Sinon {
          * It is also useful to create a stub that can act differently in response to different arguments.
          * @param args
          */
-        withArgs(...args: TArgs): SinonStub<TArgs, TReturnValue>;
+        withArgs(...args: Array<TArgs|SinonMatcher>): SinonStub<TArgs, TReturnValue>;
     }
 
     interface SinonStubStatic {
@@ -652,7 +652,7 @@ declare namespace Sinon {
          * The original function can be restored by calling object.method.restore(); (or stub.restore();).
          */
         <T, K extends keyof T>(obj: T, method: K): T[K] extends (
-            ...args: infer TArgs
+            ...args: Array<infer TArgs>
         ) => infer TReturnValue
             ? SinonStub<TArgs, TReturnValue>
             : SinonStub;

From 91e0fb86382bf9a3af6b7fd640643dc7f44314d0 Mon Sep 17 00:00:00 2001
From: James Garbutt <43081j@users.noreply.github.com>
Date: Tue, 27 Nov 2018 11:51:01 +0000
Subject: [PATCH 826/836] sinon: add typed args tests

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

diff --git a/types/sinon/sinon-tests.ts b/types/sinon/sinon-tests.ts
index d5ae4b0eb2..31dfa64e22 100644
--- a/types/sinon/sinon-tests.ts
+++ b/types/sinon/sinon-tests.ts
@@ -288,6 +288,41 @@ function testAssert() {
     sinon.assert.expose(obj, { includeFail: true });
 }
 
+function testTypedSpy() {
+    const cls = class {
+        foo(a: number, b: string): number {
+            return 3;
+        }
+    }
+
+    const instance = new cls();
+    const spy = sinon.spy(instance, 'foo');
+
+    spy.calledWith(5, 'x');
+    spy.calledWith(sinon.match(5), 'x');
+    spy.calledWithExactly(5, 'x');
+    spy.calledWithExactly(5, sinon.match('x'));
+    spy.calledOnceWith(5, 'x');
+    spy.calledOnceWith(sinon.match(5), 'x');
+    spy.notCalledWith(5, 'x');
+    spy.notCalledWith(sinon.match(5), 'x');
+    spy.returned(5);
+    spy.returned(sinon.match(5));
+
+    spy.withArgs(sinon.match(5), 'x').calledWith(5, 'x');
+    spy.alwaysCalledWith(sinon.match(5), 'x');
+    spy.alwaysCalledWith(5, 'x');
+    spy.alwaysCalledWithExactly(sinon.match(5), 'x');
+    spy.alwaysCalledWithExactly(5, 'x');
+    spy.neverCalledWith(sinon.match(5), 'x');
+    spy.neverCalledWith(5, 'x');
+
+    const stub = sinon.stub(instance, 'foo');
+
+    stub.withArgs(5, 'x').returns(3);
+    stub.withArgs(sinon.match(5), 'x').returns(5);
+}
+
 function testSpy() {
     const fn = () => { };
     const obj = class {

From b4715b48d6a64a288f4ca6d0d2efcbffb36dd1cf Mon Sep 17 00:00:00 2001
From: James Garbutt <43081j@users.noreply.github.com>
Date: Tue, 27 Nov 2018 11:58:30 +0000
Subject: [PATCH 827/836] sinon: resolve version issues

---
 types/karma-chai-sinon/index.d.ts   |    2 +-
 types/mochaccino/index.d.ts         |    2 +-
 types/should-sinon/index.d.ts       |    2 +-
 types/sinon-as-promised/index.d.ts  |    2 +-
 types/sinon-chai/index.d.ts         |    2 +-
 types/sinon-chai/v2/index.d.ts      |    2 +-
 types/sinon-chrome/index.d.ts       |    2 +-
 types/sinon-express-mock/index.d.ts |    2 +-
 types/sinon-mongoose/index.d.ts     |    2 +-
 types/sinon-stub-promise/index.d.ts |    2 +-
 types/sinon-test/index.d.ts         |    2 +-
 types/sinon/index.d.ts              |  293 ++---
 types/sinon/package.json            |    7 +
 types/sinon/sinon-tests.ts          |    2 +-
 types/sinon/ts3.1/index.d.ts        | 1747 +++++++++++++++++++++++++++
 types/sinon/ts3.1/sinon-tests.ts    |  488 ++++++++
 types/sinon/ts3.1/tsconfig.json     |   25 +
 17 files changed, 2377 insertions(+), 207 deletions(-)
 create mode 100644 types/sinon/package.json
 create mode 100644 types/sinon/ts3.1/index.d.ts
 create mode 100644 types/sinon/ts3.1/sinon-tests.ts
 create mode 100644 types/sinon/ts3.1/tsconfig.json

diff --git a/types/karma-chai-sinon/index.d.ts b/types/karma-chai-sinon/index.d.ts
index 0b14373a99..9a14f659e2 100644
--- a/types/karma-chai-sinon/index.d.ts
+++ b/types/karma-chai-sinon/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/tubalmartin/karma-chai-sinon
 // Definitions by: Václav Ostrožlík <https://github.com/vasek17>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
-// TypeScript Version: 3.0
+// TypeScript Version: 2.8
 
 /// <reference types="chai" />
 import Sinon = require('sinon');
diff --git a/types/mochaccino/index.d.ts b/types/mochaccino/index.d.ts
index 4dbc62b7d9..3d5d9570a8 100644
--- a/types/mochaccino/index.d.ts
+++ b/types/mochaccino/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/pawelgalazka/mochaccino#readme
 // Definitions by: Thomas-P <https://github.com/thomas-p>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 3.0
+// TypeScript Version: 2.8
 import * as Sinon from 'sinon';
 export interface Expect {
     not: Expect;
diff --git a/types/should-sinon/index.d.ts b/types/should-sinon/index.d.ts
index 79b04d5092..6544a55253 100644
--- a/types/should-sinon/index.d.ts
+++ b/types/should-sinon/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/shouldjs/sinon
 // Definitions by: AryloYeung <https://github.com/Arylo>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 3.0
+// TypeScript Version: 2.8
 
 import * as s from 'sinon';
 import should = require('should');
diff --git a/types/sinon-as-promised/index.d.ts b/types/sinon-as-promised/index.d.ts
index 5e2e06ed83..5187168d61 100644
--- a/types/sinon-as-promised/index.d.ts
+++ b/types/sinon-as-promised/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/bendrucker/sinon-as-promised
 // Definitions by: igrayson <https://github.com/igrayson>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 3.0
+// TypeScript Version: 2.8
 
 import * as s from "sinon";
 
diff --git a/types/sinon-chai/index.d.ts b/types/sinon-chai/index.d.ts
index 6a0901eb8c..ad7c8cb857 100644
--- a/types/sinon-chai/index.d.ts
+++ b/types/sinon-chai/index.d.ts
@@ -4,7 +4,7 @@
 //                 Jed Mao <https://github.com/jedmao>
 //                 Eyal Lapid <https://github.com/elpdpt>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 3.0
+// TypeScript Version: 2.8
 
 /// <reference types="chai" />
 /// <reference types="sinon" />
diff --git a/types/sinon-chai/v2/index.d.ts b/types/sinon-chai/v2/index.d.ts
index 8a03ea671c..cff6d0b3a2 100644
--- a/types/sinon-chai/v2/index.d.ts
+++ b/types/sinon-chai/v2/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/domenic/sinon-chai
 // Definitions by: Kazi Manzur Rashid <https://github.com/kazimanzurrashid>, Jed Mao <https://github.com/jedmao>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 3.0
+// TypeScript Version: 2.8
 
 /// <reference types="chai" />
 /// <reference types="sinon" />
diff --git a/types/sinon-chrome/index.d.ts b/types/sinon-chrome/index.d.ts
index eec9604dec..c25273d757 100644
--- a/types/sinon-chrome/index.d.ts
+++ b/types/sinon-chrome/index.d.ts
@@ -4,7 +4,7 @@
 //                 CRIMX <https://github.com/crimx>
 //                 kobanyan <https://github.com/kobanyan>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 3.0
+// TypeScript Version: 2.8
 
 /// <reference types="chrome"/>
 /// <reference types="sinon"/>
diff --git a/types/sinon-express-mock/index.d.ts b/types/sinon-express-mock/index.d.ts
index 84454048cd..f3974fc005 100644
--- a/types/sinon-express-mock/index.d.ts
+++ b/types/sinon-express-mock/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Jared Chapiewsky <https://github.com/jpchip>
 //                 Tomek Łaziuk <https://github.com/tlaziuk>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 3.0
+// TypeScript Version: 2.8
 
 import {
     SinonStub,
diff --git a/types/sinon-mongoose/index.d.ts b/types/sinon-mongoose/index.d.ts
index f725965349..86109b4917 100644
--- a/types/sinon-mongoose/index.d.ts
+++ b/types/sinon-mongoose/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/underscopeio/sinon-mongoose
 // Definitions by: stevehipwell <https://github.com/stevehipwell>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 3.0
+// TypeScript Version: 2.8
 
 import * as s from "sinon";
 
diff --git a/types/sinon-stub-promise/index.d.ts b/types/sinon-stub-promise/index.d.ts
index 298eed87c0..d817113cf7 100644
--- a/types/sinon-stub-promise/index.d.ts
+++ b/types/sinon-stub-promise/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Thiago Temple <https://github.com/vintem>
 //                 Tim Stackhouse <https://github.com/tstackhouse>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 3.0
+// TypeScript Version: 2.8
 
 /// <reference types="sinon"/>
 
diff --git a/types/sinon-test/index.d.ts b/types/sinon-test/index.d.ts
index 63318554ae..902064a7cb 100644
--- a/types/sinon-test/index.d.ts
+++ b/types/sinon-test/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/sinonjs/sinon-test
 // Definitions by: Francis Saul <https://github.com/mummybot>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 3.0
+// TypeScript Version: 2.8
 
 import * as Sinon from 'sinon';
 
diff --git a/types/sinon/index.d.ts b/types/sinon/index.d.ts
index d0748e9ac4..bc265d6718 100644
--- a/types/sinon/index.d.ts
+++ b/types/sinon/index.d.ts
@@ -9,21 +9,21 @@
 //                 Greg Jednaszewski <https://github.com/gjednaszewski>
 //                 John Wood <https://github.com/johnjesse>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 3.0
+// TypeScript Version: 2.8
 
 // sinon uses DOM dependencies which are absent in browser-less environment like node.js
 // to avoid compiler errors this monkey patch is used
 // see more details in https://github.com/DefinitelyTyped/DefinitelyTyped/issues/11351
-interface Event {} // tslint:disable-line no-empty-interface
-interface Document {} // tslint:disable-line no-empty-interface
+interface Event { } // tslint:disable-line no-empty-interface
+interface Document { } // tslint:disable-line no-empty-interface
 
 declare namespace Sinon {
-    interface SinonSpyCallApi<TArgs extends any = any, TReturnValue = any> {
+    interface SinonSpyCallApi {
         // Properties
         /**
          * Array of received arguments.
          */
-        args: TArgs[];
+        args: any[];
 
         // Methods
         /**
@@ -38,11 +38,11 @@ declare namespace Sinon {
          * so a call that received the provided arguments (in the same spots) and possibly others as well will return true.
          * @param args
          */
-        calledWith(...args: Array<TArgs|SinonMatcher>): boolean;
+        calledWith(...args: any[]): boolean;
         /**
          * Returns true if spy was called at least once with the provided arguments and no others.
          */
-        calledWithExactly(...args: Array<TArgs|SinonMatcher>): boolean;
+        calledWithExactly(...args: any[]): boolean;
         /**
          * Returns true if spy/stub was called the new operator.
          * Beware that this is inferred based on the value of the this object and the spy function’s prototype,
@@ -53,31 +53,31 @@ declare namespace Sinon {
          * Returns true if spy was called at exactly once with the provided arguments.
          * @param args
          */
-        calledOnceWith(...args: Array<TArgs|SinonMatcher>): boolean;
-        calledOnceWithExactly(...args: Array<TArgs|SinonMatcher>): boolean;
+        calledOnceWith(...args: any[]): boolean;
+        calledOnceWithExactly(...args: any[]): boolean;
         /**
          * Returns true if spy was called with matching arguments (and possibly others).
          * This behaves the same as spy.calledWith(sinon.match(arg1), sinon.match(arg2), ...).
          * @param args
          */
-        calledWithMatch(...args: TArgs[]): boolean;
+        calledWithMatch(...args: any[]): boolean;
         /**
          * Returns true if call did not receive provided arguments.
          * @param args
          */
-        notCalledWith(...args: Array<TArgs|SinonMatcher>): boolean;
+        notCalledWith(...args: any[]): boolean;
         /**
          * Returns true if call did not receive matching arguments.
          * This behaves the same as spyCall.notCalledWith(sinon.match(arg1), sinon.match(arg2), ...).
          * @param args
          */
-        notCalledWithMatch(...args: TArgs[]): boolean;
+        notCalledWithMatch(...args: any[]): boolean;
         /**
          * Returns true if spy returned the provided value at least once.
          * Uses deep comparison for objects and arrays. Use spy.returned(sinon.match.same(obj)) for strict comparison (see matchers).
          * @param value
          */
-        returned(value: TReturnValue|SinonMatcher): boolean;
+        returned(value: any): boolean;
         /**
          * Returns true if spy threw an exception at least once.
          */
@@ -118,8 +118,7 @@ declare namespace Sinon {
         yieldToOn(property: string, obj: any, ...args: any[]): void;
     }
 
-    interface SinonSpyCall<TArgs extends any = any, TReturnValue = any>
-        extends SinonSpyCallApi<TArgs, TReturnValue> {
+    interface SinonSpyCall extends SinonSpyCallApi {
         /**
          * The call’s this value.
          */
@@ -131,7 +130,7 @@ declare namespace Sinon {
         /**
          * Return value.
          */
-        returnValue: TReturnValue;
+        returnValue: any;
         /**
          * This property is a convenience for a call’s callback.
          * When the last argument in a call is a Function, then callback will reference that. Otherwise it will be undefined.
@@ -154,11 +153,7 @@ declare namespace Sinon {
         calledAfter(call: SinonSpyCall): boolean;
     }
 
-    interface SinonSpy<TArgs extends any = any, TReturnValue = any>
-        extends Pick<
-                SinonSpyCallApi<TArgs, TReturnValue>,
-                Exclude<keyof SinonSpyCallApi<TArgs, TReturnValue>, 'args'>
-            > {
+    interface SinonSpy extends SinonSpyCallApi {
         // Properties
         /**
          * The number of recorded calls.
@@ -187,19 +182,19 @@ declare namespace Sinon {
         /**
          * The first call
          */
-        firstCall: SinonSpyCall<TArgs, TReturnValue>;
+        firstCall: SinonSpyCall;
         /**
          * The second call
          */
-        secondCall: SinonSpyCall<TArgs, TReturnValue>;
+        secondCall: SinonSpyCall;
         /**
          * The third call
          */
-        thirdCall: SinonSpyCall<TArgs, TReturnValue>;
+        thirdCall: SinonSpyCall;
         /**
          * The last call
          */
-        lastCall: SinonSpyCall<TArgs, TReturnValue>;
+        lastCall: SinonSpyCall;
         /**
          * Array of this objects, spy.thisValues[0] is the this object for the first call.
          */
@@ -207,7 +202,7 @@ declare namespace Sinon {
         /**
          * Array of arguments received, spy.args[0] is an array of arguments received in the first call.
          */
-        args: TArgs[][];
+        args: any[][];
         /**
          * Array of exception objects thrown, spy.exceptions[0] is the exception thrown by the first call.
          * If the call did not throw an error, the value at the call’s location in .exceptions will be undefined.
@@ -217,7 +212,7 @@ declare namespace Sinon {
          * Array of return values, spy.returnValues[0] is the return value of the first call.
          * If the call did not explicitly return a value, the value at the call’s location in .returnValues will be undefined.
          */
-        returnValues: TReturnValue[];
+        returnValues: any[];
 
         // Methods
         (...args: any[]): any;
@@ -246,7 +241,7 @@ declare namespace Sinon {
          * This is useful to be more expressive in your assertions, where you can access the spy with the same call.
          * @param args Expected args
          */
-        withArgs(...args: Array<TArgs|SinonMatcher>): SinonSpy<TArgs, TReturnValue>;
+        withArgs(...args: any[]): SinonSpy;
         /**
          * Returns true if the spy was always called with @param obj as this.
          * @param obj
@@ -255,29 +250,29 @@ declare namespace Sinon {
         /**
          * Returns true if spy was always called with the provided arguments (and possibly others).
          */
-        alwaysCalledWith(...args: Array<TArgs|SinonMatcher>): boolean;
+        alwaysCalledWith(...args: any[]): boolean;
         /**
          * Returns true if spy was always called with the exact provided arguments.
          * @param args
          */
-        alwaysCalledWithExactly(...args: Array<TArgs|SinonMatcher>): boolean;
+        alwaysCalledWithExactly(...args: any[]): boolean;
         /**
          * Returns true if spy was always called with matching arguments (and possibly others).
          * This behaves the same as spy.alwaysCalledWith(sinon.match(arg1), sinon.match(arg2), ...).
          * @param args
          */
-        alwaysCalledWithMatch(...args: TArgs[]): boolean;
+        alwaysCalledWithMatch(...args: any[]): boolean;
         /**
          * Returns true if the spy/stub was never called with the provided arguments.
          * @param args
          */
-        neverCalledWith(...args: Array<TArgs|SinonMatcher>): boolean;
+        neverCalledWith(...args: any[]): boolean;
         /**
          * Returns true if the spy/stub was never called with matching arguments.
          * This behaves the same as spy.neverCalledWith(sinon.match(arg1), sinon.match(arg2), ...).
          * @param args
          */
-        neverCalledWithMatch(...args: TArgs[]): boolean;
+        neverCalledWithMatch(...args: any[]): boolean;
         /**
          * Returns true if spy always threw an exception.
          */
@@ -300,22 +295,22 @@ declare namespace Sinon {
          * If the stub was never called with a function argument, yield throws an error.
          * Returns an Array with all callbacks return values in the order they were called, if no error is thrown.
          */
-        invokeCallback(...args: TArgs[]): void;
+        invokeCallback(...args: any[]): void;
         /**
          * Set the displayName of the spy or stub.
          * @param name
          */
-        named(name: string): SinonSpy<TArgs, TReturnValue>;
+        named(name: string): SinonSpy;
         /**
          * Returns the nth call.
          * Accessing individual calls helps with more detailed behavior verification when the spy is called more than once.
          * @param n
          */
-        getCall(n: number): SinonSpyCall<TArgs, TReturnValue>;
+        getCall(n: number): SinonSpyCall;
         /**
          * Returns an Array of all calls recorded by the spy.
          */
-        getCalls(): Array<SinonSpyCall<TArgs, TReturnValue>>;
+        getCalls(): SinonSpyCall[];
         /**
          * Resets the state of a spy.
          */
@@ -355,15 +350,10 @@ declare namespace Sinon {
          * The original method can be restored by calling object.method.restore().
          * The returned spy is the function object which replaced the original method. spy === object.method.
          */
-        <T, K extends keyof T>(obj: T, method: K): T[K] extends (
-            ...args: Array<infer TArgs>
-        ) => infer TReturnValue
-            ? SinonSpy<TArgs, TReturnValue>
-            : SinonSpy;
+        <T>(obj: T, method: keyof T): SinonSpy;
     }
 
-    interface SinonStub<TArgs extends any = any, TReturnValue = any>
-        extends SinonSpy<TArgs, TReturnValue> {
+    interface SinonStub extends SinonSpy {
         /**
          * Resets the stub’s behaviour to the default behaviour
          * You can reset behaviour of all stubs using sinon.resetBehavior()
@@ -381,13 +371,13 @@ declare namespace Sinon {
          * Causes the stub to return promises using a specific Promise library instead of the global one when using stub.rejects or stub.resolves.
          * Returns the stub to allow chaining.
          */
-        usingPromise(promiseLibrary: any): SinonStub<TArgs, TReturnValue>;
+        usingPromise(promiseLibrary: any): SinonStub;
 
         /**
          * Makes the stub return the provided @param obj value.
          * @param obj
          */
-        returns(obj: TReturnValue): SinonStub<TArgs, TReturnValue>;
+        returns(obj: any): SinonStub;
         /**
          * Causes the stub to return the argument at the provided @param index.
          * stub.returnsArg(0); causes the stub to return the first argument.
@@ -395,12 +385,12 @@ declare namespace Sinon {
          * starting from sinon@6.1.2, a TypeError will be thrown.
          * @param index
          */
-        returnsArg(index: number): SinonStub<TArgs, TReturnValue>;
+        returnsArg(index: number): SinonStub;
         /**
          * Causes the stub to return its this value.
          * Useful for stubbing jQuery-style fluent APIs.
          */
-        returnsThis(): SinonStub<TArgs, TReturnValue>;
+        returnsThis(): SinonStub;
         /**
          * Causes the stub to return a Promise which resolves to the provided value.
          * When constructing the Promise, sinon uses the Promise.resolve method.
@@ -408,26 +398,26 @@ declare namespace Sinon {
          * The Promise library can be overwritten using the usingPromise method.
          * Since sinon@2.0.0
          */
-        resolves(value?: any): SinonStub<TArgs, TReturnValue>;
+        resolves(value?: any): SinonStub;
         /**
          * Causes the stub to return a Promise which resolves to the argument at the provided index.
          * stub.resolvesArg(0); causes the stub to return a Promise which resolves to the first argument.
          * If the argument at the provided index is not available, a TypeError will be thrown.
          */
-        resolvesArg(index: number): SinonStub<TArgs, TReturnValue>;
+        resolvesArg(index: number): SinonStub;
         /**
          * Causes the stub to return a Promise which resolves to its this value.
          */
-        resolvesThis(): SinonStub<TArgs, TReturnValue>;
+        resolvesThis(): SinonStub;
         /**
          * Causes the stub to throw an exception (Error).
          * @param type
          */
-        throws(type?: string): SinonStub<TArgs, TReturnValue>;
+        throws(type?: string): SinonStub;
         /**
          * Causes the stub to throw the provided exception object.
          */
-        throws(obj: any): SinonStub<TArgs, TReturnValue>;
+        throws(obj: any): SinonStub;
         /**
          * Causes the stub to throw the argument at the provided index.
          * stub.throwsArg(0); causes the stub to throw the first argument as the exception.
@@ -435,9 +425,9 @@ declare namespace Sinon {
          * Since sinon@2.3.0
          * @param index
          */
-        throwsArg(index: number): SinonStub<TArgs, TReturnValue>;
-        throwsException(type?: string): SinonStub<TArgs, TReturnValue>;
-        throwsException(obj: any): SinonStub<TArgs, TReturnValue>;
+        throwsArg(index: number): SinonStub;
+        throwsException(type?: string): SinonStub;
+        throwsException(obj: any): SinonStub;
         /**
          * Causes the stub to return a Promise which rejects with an exception (Error).
          * When constructing the Promise, sinon uses the Promise.reject method.
@@ -445,57 +435,53 @@ declare namespace Sinon {
          * The Promise library can be overwritten using the usingPromise method.
          * Since sinon@2.0.0
          */
-        rejects(): SinonStub<TArgs, TReturnValue>;
+        rejects(): SinonStub;
         /**
          * Causes the stub to return a Promise which rejects with an exception of the provided type.
          * Since sinon@2.0.0
          */
-        rejects(errorType: string): SinonStub<TArgs, TReturnValue>;
+        rejects(errorType: string): SinonStub;
         /**
          * Causes the stub to return a Promise which rejects with the provided exception object.
          * Since sinon@2.0.0
          */
-        rejects(value: any): SinonStub<TArgs, TReturnValue>;
+        rejects(value: any): SinonStub;
         /**
          * Causes the stub to call the argument at the provided index as a callback function.
          * stub.callsArg(0); causes the stub to call the first argument as a callback.
          * If the argument at the provided index is not available or is not a function, a TypeError will be thrown.
          */
-        callsArg(index: number): SinonStub<TArgs, TReturnValue>;
+        callsArg(index: number): SinonStub;
         /**
          * Causes the original method wrapped into the stub to be called when none of the conditional stubs are matched.
          */
-        callThrough(): SinonStub<TArgs, TReturnValue>;
+        callThrough(): SinonStub;
         /**
          * Like stub.callsArg(index); but with an additional parameter to pass the this context.
          * @param index
          * @param context
          */
-        callsArgOn(index: number, context: any): SinonStub<TArgs, TReturnValue>;
+        callsArgOn(index: number, context: any): SinonStub;
         /**
          * Like callsArg, but with arguments to pass to the callback.
          * @param index
          * @param args
          */
-        callsArgWith(index: number, ...args: any[]): SinonStub<TArgs, TReturnValue>;
+        callsArgWith(index: number, ...args: any[]): SinonStub;
         /**
          * Like above but with an additional parameter to pass the this context.
          * @param index
          * @param context
          * @param args
          */
-        callsArgOnWith(
-            index: number,
-            context: any,
-            ...args: any[]
-        ): SinonStub<TArgs, TReturnValue>;
+        callsArgOnWith(index: number, context: any, ...args: any[]): SinonStub;
         /**
          * Same as their corresponding non-Async counterparts, but with callback being deferred at called after all instructions in the current call stack are processed.
          * In Node environment the callback is deferred with process.nextTick.
          * In a browser the callback is deferred with setTimeout(callback, 0).
          * @param index
          */
-        callsArgAsync(index: number): SinonStub<TArgs, TReturnValue>;
+        callsArgAsync(index: number): SinonStub;
         /**
          * Same as their corresponding non-Async counterparts, but with callback being deferred at called after all instructions in the current call stack are processed.
          * In Node environment the callback is deferred with process.nextTick.
@@ -503,99 +489,91 @@ declare namespace Sinon {
          * @param index
          * @param context
          */
-        callsArgOnAsync(index: number, context: any): SinonStub<TArgs, TReturnValue>;
+        callsArgOnAsync(index: number, context: any): SinonStub;
         /**
          * Same as their corresponding non-Async counterparts, but with callback being deferred at called after all instructions in the current call stack are processed.
          * In Node environment the callback is deferred with process.nextTick.
          * In a browser the callback is deferred with setTimeout(callback, 0).
          */
-        callsArgWithAsync(index: number, ...args: any[]): SinonStub<TArgs, TReturnValue>;
+        callsArgWithAsync(index: number, ...args: any[]): SinonStub;
         /**
          * Same as their corresponding non-Async counterparts, but with callback being deferred at called after all instructions in the current call stack are processed.
          * In Node environment the callback is deferred with process.nextTick.
          * In a browser the callback is deferred with setTimeout(callback, 0).
          */
-        callsArgOnWithAsync(
-            index: number,
-            context: any,
-            ...args: any[]
-        ): SinonStub<TArgs, TReturnValue>;
+        callsArgOnWithAsync(index: number, context: any, ...args: any[]): SinonStub;
         /**
          * Makes the stub call the provided @param func when invoked.
          * @param func
          */
-        callsFake(func: (...args: TArgs[]) => TReturnValue): SinonStub<TArgs, TReturnValue>;
+        callsFake(func: (...args: any[]) => any): SinonStub;
         /**
          * Replaces a new getter for this stub.
          */
-        get(func: () => any): SinonStub<TArgs, TReturnValue>;
+        get(func: () => any): SinonStub;
         /**
          * Defines a new setter for this stub.
          * @param func
          */
-        set(func: (v: any) => void): SinonStub<TArgs, TReturnValue>;
+        set(func: (v: any) => void): SinonStub;
         /**
          * Defines the behavior of the stub on the @param n call. Useful for testing sequential interactions.
          * There are methods onFirstCall, onSecondCall,onThirdCall to make stub definitions read more naturally.
          * onCall can be combined with all of the behavior defining methods in this section. In particular, it can be used together with withArgs.
          * @param n
          */
-        onCall(n: number): SinonStub<TArgs, TReturnValue>;
+        onCall(n: number): SinonStub;
         /**
          * Alias for stub.onCall(0);
          */
-        onFirstCall(): SinonStub<TArgs, TReturnValue>;
+        onFirstCall(): SinonStub;
         /**
          * Alias for stub.onCall(1);
          */
-        onSecondCall(): SinonStub<TArgs, TReturnValue>;
+        onSecondCall(): SinonStub;
         /**
          * Alias for stub.onCall(2);
          */
-        onThirdCall(): SinonStub<TArgs, TReturnValue>;
+        onThirdCall(): SinonStub;
         /**
          * Defines a new value for this stub.
          * @param val
          */
-        value(val: any): SinonStub<TArgs, TReturnValue>;
+        value(val: any): SinonStub;
         /**
          * Set the displayName of the spy or stub.
          * @param name
          */
-        named(name: string): SinonStub<TArgs, TReturnValue>;
+        named(name: string): SinonStub;
         /**
          * Similar to callsArg.
          * Causes the stub to call the first callback it receives with the provided arguments (if any).
          * If a method accepts more than one callback, you need to use callsArg to have the stub invoke other callbacks than the first one.
          */
-        yields(...args: any[]): SinonStub<TArgs, TReturnValue>;
+        yields(...args: any[]): SinonStub;
         /**
          * Like above but with an additional parameter to pass the this context.
          */
-        yieldsOn(context: any, ...args: any[]): SinonStub<TArgs, TReturnValue>;
-        yieldsRight(...args: any[]): SinonStub<TArgs, TReturnValue>;
+        yieldsOn(context: any, ...args: any[]): SinonStub;
+        yieldsRight(...args: any[]): SinonStub;
         /**
          * Causes the spy to invoke a callback passed as a property of an object to the spy.
          * Like yields, yieldsTo grabs the first matching argument, finds the callback and calls it with the (optional) arguments.
          * @param property
          * @param args
          */
-        yieldsTo(property: string, ...args: any[]): SinonStub<TArgs, TReturnValue>;
+        yieldsTo(property: string, ...args: any[]): SinonStub;
         /**
          * Like above but with an additional parameter to pass the this context.
          */
-        yieldsToOn(
-            property: string,
-            context: any,
-            ...args: any[]
-        ): SinonStub<TArgs, TReturnValue>;
+        yieldsToOn(property: string, context: any, ...args: any[]): SinonStub;
         /**
          * Same as their corresponding non-Async counterparts, but with callback being deferred at called after all instructions in the current call stack are processed.
          * In Node environment the callback is deferred with process.nextTick.
          * In a browser the callback is deferred with setTimeout(callback, 0).
          * @param args
          */
-        yieldsAsync(...args: any[]): SinonStub<TArgs, TReturnValue>;
+        yieldsAsync(...args: any[]): SinonStub;
         /**
          * Same as their corresponding non-Async counterparts, but with callback being deferred at called after all instructions in the current call stack are processed.
          * In Node environment the callback is deferred with process.nextTick.
@@ -603,7 +581,7 @@ declare namespace Sinon {
          * @param context
          * @param args
          */
-        yieldsOnAsync(context: any, ...args: any[]): SinonStub<TArgs, TReturnValue>;
+        yieldsOnAsync(context: any, ...args: any[]): SinonStub;
         /**
          * Same as their corresponding non-Async counterparts, but with callback being deferred at called after all instructions in the current call stack are processed.
          * In Node environment the callback is deferred with process.nextTick.
@@ -611,7 +589,7 @@ declare namespace Sinon {
          * @param property
          * @param args
          */
-        yieldsToAsync(property: string, ...args: any[]): SinonStub<TArgs, TReturnValue>;
+        yieldsToAsync(property: string, ...args: any[]): SinonStub;
         /**
          * Same as their corresponding non-Async counterparts, but with callback being deferred at called after all instructions in the current call stack are processed.
          * In Node environment the callback is deferred with process.nextTick.
@@ -620,18 +598,14 @@ declare namespace Sinon {
          * @param context
          * @param args
          */
-        yieldsToOnAsync(
-            property: string,
-            context: any,
-            ...args: any[]
-        ): SinonStub<TArgs, TReturnValue>;
+        yieldsToOnAsync(property: string, context: any, ...args: any[]): SinonStub;
         /**
          * Stubs the method only for the provided arguments.
          * This is useful to be more expressive in your assertions, where you can access the spy with the same call.
          * It is also useful to create a stub that can act differently in response to different arguments.
          * @param args
          */
-        withArgs(...args: Array<TArgs|SinonMatcher>): SinonStub<TArgs, TReturnValue>;
+        withArgs(...args: any[]): SinonStub;
     }
 
     interface SinonStubStatic {
@@ -651,11 +625,7 @@ declare namespace Sinon {
          * An exception is thrown if the property is not already a function.
          * The original function can be restored by calling object.method.restore(); (or stub.restore();).
          */
-        <T, K extends keyof T>(obj: T, method: K): T[K] extends (
-            ...args: Array<infer TArgs>
-        ) => infer TReturnValue
-            ? SinonStub<TArgs, TReturnValue>
-            : SinonStub;
+        <T>(obj: T, method: keyof T): SinonStub;
     }
 
     interface SinonExpectation extends SinonStub {
@@ -757,22 +727,11 @@ declare namespace Sinon {
     interface SinonFakeTimers {
         now: number;
 
-        setTimeout(
-            callback: (...args: any[]) => void,
-            timeout: number,
-            ...args: any[]
-        ): SinonTimerId;
+        setTimeout(callback: (...args: any[]) => void, timeout: number, ...args: any[]): SinonTimerId;
         clearTimeout(id: SinonTimerId): void;
-        setInterval(
-            callback: (...args: any[]) => void,
-            timeout: number,
-            ...args: any[]
-        ): SinonTimerId;
+        setInterval(callback: (...args: any[]) => void, timeout: number, ...args: any[]): SinonTimerId;
         clearInterval(id: SinonTimerId): void;
-        setImmediate(
-            callback: (...args: any[]) => void,
-            ...args: any[]
-        ): SinonTimerId;
+        setImmediate(callback: (...args: any[]) => void, ...args: any[]): SinonTimerId;
         clearImmediate(id: SinonTimerId): void;
         requestAnimationFrame(callback: (...args: any[]) => void): number;
         cancelAnimationFrame(id: number): void;
@@ -806,30 +765,9 @@ declare namespace Sinon {
         Date(year: number, month: number): Date;
         Date(year: number, month: number, day: number): Date;
         Date(year: number, month: number, day: number, hour: number): Date;
-        Date(
-            year: number,
-            month: number,
-            day: number,
-            hour: number,
-            minute: number
-        ): Date;
-        Date(
-            year: number,
-            month: number,
-            day: number,
-            hour: number,
-            minute: number,
-            second: number
-        ): Date;
-        Date(
-            year: number,
-            month: number,
-            day: number,
-            hour: number,
-            minute: number,
-            second: number,
-            ms: number
-        ): Date;
+        Date(year: number, month: number, day: number, hour: number, minute: number): Date;
+        Date(year: number, month: number, day: number, hour: number, minute: number, second: number): Date;
+        Date(year: number, month: number, day: number, hour: number, minute: number, second: number, ms: number): Date;
 
         /**
          * Restore the faked methods.
@@ -950,7 +888,7 @@ declare namespace Sinon {
     }
 
     interface SinonFakeXMLHttpRequestStatic {
-        new (): SinonFakeXMLHttpRequest;
+        new(): SinonFakeXMLHttpRequest;
         /**
          * Default false.
          * When set to true, Sinon will check added filters if certain requests should be “unfaked”
@@ -962,15 +900,7 @@ declare namespace Sinon {
          * If the filter returns true, the request will not be faked.
          * @param filter
          */
-        addFilter(
-            filter: (
-                method: string,
-                url: string,
-                async: boolean,
-                username: string,
-                password: string
-            ) => boolean
-        ): void;
+        addFilter(filter: (method: string, url: string, async: boolean, username: string, password: string) => boolean): void;
         /**
          * By assigning a function to the onCreate property of the returned object from useFakeXMLHttpRequest()
          * you can subscribe to newly created FakeXMLHttpRequest objects. See below for the fake xhr object API.
@@ -1036,10 +966,7 @@ declare namespace Sinon {
         /**
          * Responds to all requests to given URL, e.g. /posts/1.
          */
-        respondWith(
-            url: string,
-            fn: (xhr: SinonFakeXMLHttpRequest) => void
-        ): void;
+        respondWith(url: string, fn: (xhr: SinonFakeXMLHttpRequest) => void): void;
         /**
          * Responds to all method requests to the given URL with the given response.
          * method is an HTTP verb.
@@ -1054,11 +981,7 @@ declare namespace Sinon {
          * Responds to all method requests to the given URL with the given response.
          * method is an HTTP verb.
          */
-        respondWith(
-            method: string,
-            url: string,
-            fn: (xhr: SinonFakeXMLHttpRequest) => void
-        ): void;
+        respondWith(method: string, url: string, fn: (xhr: SinonFakeXMLHttpRequest) => void): void;
         /**
          * URL may be a regular expression, e.g. /\\/post\\//\\d+
          * If the response is a Function, it will be passed any capture groups from the regular expression along with the XMLHttpRequest object:
@@ -1073,10 +996,7 @@ declare namespace Sinon {
          * URL may be a regular expression, e.g. /\\/post\\//\\d+
          * If the response is a Function, it will be passed any capture groups from the regular expression along with the XMLHttpRequest object:
          */
-        respondWith(
-            url: RegExp,
-            fn: (xhr: SinonFakeXMLHttpRequest) => void
-        ): void;
+        respondWith(url: RegExp, fn: (xhr: SinonFakeXMLHttpRequest) => void): void;
         /**
          * Responds to all method requests to URLs matching the regular expression.
          */
@@ -1088,11 +1008,7 @@ declare namespace Sinon {
         /**
          * Responds to all method requests to URLs matching the regular expression.
          */
-        respondWith(
-            method: string,
-            url: RegExp,
-            fn: (xhr: SinonFakeXMLHttpRequest) => void
-        ): void;
+        respondWith(method: string, url: RegExp, fn: (xhr: SinonFakeXMLHttpRequest) => void): void;
         /**
          * Causes all queued asynchronous requests to receive a response.
          * If none of the responses added through respondWith match, the default response is [404, {}, ""].
@@ -1221,10 +1137,7 @@ declare namespace Sinon {
          * @param spyOrSpyCall
          * @param args
          */
-        calledWithExactly(
-            spyOrSpyCall: SinonSpy | SinonSpyCall,
-            ...args: any[]
-        ): void;
+        calledWithExactly(spyOrSpyCall: SinonSpy | SinonSpyCall, ...args: any[]): void;
         /**
          * Passes if spy was always called with the provided arguments and no others.
          */
@@ -1234,10 +1147,7 @@ declare namespace Sinon {
          * This behaves the same way as sinon.assert.calledWith(spy, sinon.match(arg1), sinon.match(arg2), ...).
          * It’s possible to assert on a dedicated spy call: sinon.assert.calledWithMatch(spy.secondCall, arg1, arg2, ...);.
          */
-        calledWithMatch(
-            spyOrSpyCall: SinonSpy | SinonSpyCall,
-            ...args: any[]
-        ): void;
+        calledWithMatch(spyOrSpyCall: SinonSpy | SinonSpyCall, ...args: any[]): void;
         /**
          * Passes if spy was always called with matching arguments.
          * This behaves the same way as sinon.assert.alwaysCalledWith(spy, sinon.match(arg1), sinon.match(arg2), ...).
@@ -1529,7 +1439,7 @@ declare namespace Sinon {
      * @template TType Object type being stubbed.
      */
     type SinonStubbedInstance<TType> = {
-        [P in keyof TType]: SinonStubbedMember<TType[P]>
+        [P in keyof TType]: SinonStubbedMember<TType[P]>;
     };
 
     /**
@@ -1619,9 +1529,7 @@ declare namespace Sinon {
          * You would have to call either clock.next(), clock.tick(), clock.runAll() or clock.runToLast() (see example below). Please refer to the lolex documentation for more information.
          * @param config
          */
-        useFakeTimers(
-            config?: number | Date | Partial<SinonFakeTimersConfig>
-        ): SinonFakeTimers;
+        useFakeTimers(config?: number | Date | Partial<SinonFakeTimersConfig>): SinonFakeTimers;
         /**
          * Causes Sinon to replace the native XMLHttpRequest object in browsers that support it with a custom implementation which does not send actual requests.
          * In browsers that support ActiveXObject, this constructor is replaced, and fake objects are returned for XMLHTTP progIds.
@@ -1675,8 +1583,7 @@ declare namespace Sinon {
         replace<T, TKey extends keyof T>(
             obj: T,
             prop: TKey,
-            replacement: T[TKey]
-        ): T[TKey];
+            replacement: T[TKey]): T[TKey];
         /**
          * Replaces getter for property on object with replacement argument. Attempts to replace an already replaced getter cause an exception.
          * replacement must be a Function, and can be instances of spies, stubs and fakes.
@@ -1687,8 +1594,7 @@ declare namespace Sinon {
         replaceGetter<T, TKey extends keyof T>(
             obj: T,
             prop: TKey,
-            replacement: () => T[TKey]
-        ): () => T[TKey];
+            replacement: () => T[TKey]): () => T[TKey];
         /**
          * Replaces setter for property on object with replacement argument. Attempts to replace an already replaced setter cause an exception.
          * replacement must be a Function, and can be instances of spies, stubs and fakes.
@@ -1699,8 +1605,7 @@ declare namespace Sinon {
         replaceSetter<T, TKey extends keyof T>(
             obj: T,
             prop: TKey,
-            replacement: (val: T[TKey]) => void
-        ): (val: T[TKey]) => void;
+            replacement: (val: T[TKey]) => void): (val: T[TKey]) => void;
 
         /**
          * Creates a new object with the given functions as the prototype and stubs all implemented functions.
@@ -1710,9 +1615,7 @@ declare namespace Sinon {
          * @returns A stubbed version of the constructor.
          * @remarks The given constructor function is not invoked. See also the stub API.
          */
-        createStubInstance<TType>(
-            constructor: StubbableType<TType>
-        ): SinonStubbedInstance<TType>;
+        createStubInstance<TType>(constructor: StubbableType<TType>): SinonStubbedInstance<TType>;
     }
 
     interface SinonApi {
diff --git a/types/sinon/package.json b/types/sinon/package.json
new file mode 100644
index 0000000000..bb80441dc0
--- /dev/null
+++ b/types/sinon/package.json
@@ -0,0 +1,7 @@
+{
+    "private": true,
+    "types": "index",
+    "typesVersions": {
+        ">=3.1.0-0": { "*": ["ts3.1/*"] }
+    }
+}
diff --git a/types/sinon/sinon-tests.ts b/types/sinon/sinon-tests.ts
index 31dfa64e22..b892f22980 100644
--- a/types/sinon/sinon-tests.ts
+++ b/types/sinon/sinon-tests.ts
@@ -293,7 +293,7 @@ function testTypedSpy() {
         foo(a: number, b: string): number {
             return 3;
         }
-    }
+    };
 
     const instance = new cls();
     const spy = sinon.spy(instance, 'foo');
diff --git a/types/sinon/ts3.1/index.d.ts b/types/sinon/ts3.1/index.d.ts
new file mode 100644
index 0000000000..bc91a3285a
--- /dev/null
+++ b/types/sinon/ts3.1/index.d.ts
@@ -0,0 +1,1747 @@
+// sinon uses DOM dependencies which are absent in browser-less environment like node.js
+// to avoid compiler errors this monkey patch is used
+// see more details in https://github.com/DefinitelyTyped/DefinitelyTyped/issues/11351
+interface Event {} // tslint:disable-line no-empty-interface
+interface Document {} // tslint:disable-line no-empty-interface
+
+declare namespace Sinon {
+    type MatchArguments<T> = {
+        [K in keyof T]: SinonMatcher | T[K];
+    };
+
+    interface SinonSpyCallApi<TArgs extends any[] = any[], TReturnValue = any> {
+        // Properties
+        /**
+         * Array of received arguments.
+         */
+        args: TArgs;
+
+        // Methods
+        /**
+         * Returns true if the spy was called at least once with @param obj as this.
+         * calledOn also accepts a matcher spyCall.calledOn(sinon.match(fn)) (see matchers).
+         * @param obj
+         */
+        calledOn(obj: any): boolean;
+        /**
+         * Returns true if spy was called at least once with the provided arguments.
+         * Can be used for partial matching, Sinon only checks the provided arguments against actual arguments,
+         * so a call that received the provided arguments (in the same spots) and possibly others as well will return true.
+         * @param args
+         */
+        calledWith(...args: MatchArguments<TArgs>): boolean;
+        /**
+         * Returns true if spy was called at least once with the provided arguments and no others.
+         */
+        calledWithExactly(...args: MatchArguments<TArgs>): boolean;
+        /**
+         * Returns true if spy/stub was called the new operator.
+         * Beware that this is inferred based on the value of the this object and the spy function’s prototype,
+         * so it may give false positives if you actively return the right kind of object.
+         */
+        calledWithNew(): boolean;
+        /**
+         * Returns true if spy was called at exactly once with the provided arguments.
+         * @param args
+         */
+        calledOnceWith(...args: MatchArguments<TArgs>): boolean;
+        calledOnceWithExactly(...args: MatchArguments<TArgs>): boolean;
+        /**
+         * Returns true if spy was called with matching arguments (and possibly others).
+         * This behaves the same as spy.calledWith(sinon.match(arg1), sinon.match(arg2), ...).
+         * @param args
+         */
+        calledWithMatch(...args: TArgs): boolean;
+        /**
+         * Returns true if call did not receive provided arguments.
+         * @param args
+         */
+        notCalledWith(...args: MatchArguments<TArgs>): boolean;
+        /**
+         * Returns true if call did not receive matching arguments.
+         * This behaves the same as spyCall.notCalledWith(sinon.match(arg1), sinon.match(arg2), ...).
+         * @param args
+         */
+        notCalledWithMatch(...args: TArgs): boolean;
+        /**
+         * Returns true if spy returned the provided value at least once.
+         * Uses deep comparison for objects and arrays. Use spy.returned(sinon.match.same(obj)) for strict comparison (see matchers).
+         * @param value
+         */
+        returned(value: TReturnValue|SinonMatcher): boolean;
+        /**
+         * Returns true if spy threw an exception at least once.
+         */
+        threw(): boolean;
+        /**
+         * Returns true if spy threw an exception of the provided type at least once.
+         */
+        threw(type: string): boolean;
+        /**
+         * Returns true if spy threw the provided exception object at least once.
+         */
+        threw(obj: any): boolean;
+        /**
+         * Like yield, but with an explicit argument number specifying which callback to call.
+         * Useful if a function is called with more than one callback, and simply calling the first callback is not desired.
+         * @param pos
+         */
+        callArg(pos: number): void;
+        callArgOn(pos: number, obj: any, ...args: any[]): void;
+        /**
+         * Like callArg, but with arguments.
+         */
+        callArgWith(pos: number, ...args: any[]): void;
+        callArgOnWith(pos: number, obj: any, ...args: any[]): void;
+        /**
+         * Invoke callbacks passed to the stub with the given arguments.
+         * If the stub was never called with a function argument, yield throws an error.
+         * Returns an Array with all callbacks return values in the order they were called, if no error is thrown.
+         * Also aliased as invokeCallback.
+         */
+        yield(...args: any[]): void;
+        yieldOn(obj: any, ...args: any[]): void;
+        /**
+         * Invokes callbacks passed as a property of an object to the stub.
+         * Like yield, yieldTo grabs the first matching argument, finds the callback and calls it with the (optional) arguments.
+         */
+        yieldTo(property: string, ...args: any[]): void;
+        yieldToOn(property: string, obj: any, ...args: any[]): void;
+    }
+
+    interface SinonSpyCall<TArgs extends any[] = any[], TReturnValue = any>
+        extends SinonSpyCallApi<TArgs, TReturnValue> {
+        /**
+         * The call’s this value.
+         */
+        thisValue: any;
+        /**
+         * Exception thrown, if any.
+         */
+        exception: any;
+        /**
+         * Return value.
+         */
+        returnValue: TReturnValue;
+        /**
+         * This property is a convenience for a call’s callback.
+         * When the last argument in a call is a Function, then callback will reference that. Otherwise it will be undefined.
+         */
+        callback: Function | undefined;
+        /**
+         * This property is a convenience for the last argument of the call.
+         */
+        lastArg: any;
+
+        /**
+         * Returns true if the spy call occurred before another spy call.
+         * @param call
+         */
+        calledBefore(call: SinonSpyCall): boolean;
+        /**
+         * Returns true if the spy call occurred after another spy call.
+         * @param call
+         */
+        calledAfter(call: SinonSpyCall): boolean;
+    }
+
+    interface SinonSpy<TArgs extends any[] = any[], TReturnValue = any>
+        extends Pick<
+                SinonSpyCallApi<TArgs, TReturnValue>,
+                Exclude<keyof SinonSpyCallApi<TArgs, TReturnValue>, 'args'>
+            > {
+        // Properties
+        /**
+         * The number of recorded calls.
+         */
+        callCount: number;
+        /**
+         * true if the spy was called at least once
+         */
+        called: boolean;
+        /**
+         * true if the spy was not called
+         */
+        notCalled: boolean;
+        /**
+         * true if spy was called exactly once
+         */
+        calledOnce: boolean;
+        /**
+         * true if the spy was called exactly twice
+         */
+        calledTwice: boolean;
+        /**
+         * true if the spy was called exactly thrice
+         */
+        calledThrice: boolean;
+        /**
+         * The first call
+         */
+        firstCall: SinonSpyCall<TArgs, TReturnValue>;
+        /**
+         * The second call
+         */
+        secondCall: SinonSpyCall<TArgs, TReturnValue>;
+        /**
+         * The third call
+         */
+        thirdCall: SinonSpyCall<TArgs, TReturnValue>;
+        /**
+         * The last call
+         */
+        lastCall: SinonSpyCall<TArgs, TReturnValue>;
+        /**
+         * Array of this objects, spy.thisValues[0] is the this object for the first call.
+         */
+        thisValues: any[];
+        /**
+         * Array of arguments received, spy.args[0] is an array of arguments received in the first call.
+         */
+        args: TArgs[];
+        /**
+         * Array of exception objects thrown, spy.exceptions[0] is the exception thrown by the first call.
+         * If the call did not throw an error, the value at the call’s location in .exceptions will be undefined.
+         */
+        exceptions: any[];
+        /**
+         * Array of return values, spy.returnValues[0] is the return value of the first call.
+         * If the call did not explicitly return a value, the value at the call’s location in .returnValues will be undefined.
+         */
+        returnValues: TReturnValue[];
+
+        // Methods
+        (...args: any[]): any;
+        /**
+         * Returns true if the spy was called before @param anotherSpy
+         * @param anotherSpy
+         */
+        calledBefore(anotherSpy: SinonSpy): boolean;
+        /**
+         * Returns true if the spy was called after @param anotherSpy
+         * @param anotherSpy
+         */
+        calledAfter(anotherSpy: SinonSpy): boolean;
+        /**
+         * Returns true if spy was called before @param anotherSpy, and no spy calls occurred between spy and @param anotherSpy.
+         * @param anotherSpy
+         */
+        calledImmediatelyBefore(anotherSpy: SinonSpy): boolean;
+        /**
+         * Returns true if spy was called after @param anotherSpy, and no spy calls occurred between @param anotherSpy and spy.
+         * @param anotherSpy
+         */
+        calledImmediatelyAfter(anotherSpy: SinonSpy): boolean;
+        /**
+         * Creates a spy that only records calls when the received arguments match those passed to withArgs.
+         * This is useful to be more expressive in your assertions, where you can access the spy with the same call.
+         * @param args Expected args
+         */
+        withArgs(...args: MatchArguments<TArgs>): SinonSpy<TArgs, TReturnValue>;
+        /**
+         * Returns true if the spy was always called with @param obj as this.
+         * @param obj
+         */
+        alwaysCalledOn(obj: any): boolean;
+        /**
+         * Returns true if spy was always called with the provided arguments (and possibly others).
+         */
+        alwaysCalledWith(...args: MatchArguments<TArgs>): boolean;
+        /**
+         * Returns true if spy was always called with the exact provided arguments.
+         * @param args
+         */
+        alwaysCalledWithExactly(...args: MatchArguments<TArgs>): boolean;
+        /**
+         * Returns true if spy was always called with matching arguments (and possibly others).
+         * This behaves the same as spy.alwaysCalledWith(sinon.match(arg1), sinon.match(arg2), ...).
+         * @param args
+         */
+        alwaysCalledWithMatch(...args: TArgs): boolean;
+        /**
+         * Returns true if the spy/stub was never called with the provided arguments.
+         * @param args
+         */
+        neverCalledWith(...args: MatchArguments<TArgs>): boolean;
+        /**
+         * Returns true if the spy/stub was never called with matching arguments.
+         * This behaves the same as spy.neverCalledWith(sinon.match(arg1), sinon.match(arg2), ...).
+         * @param args
+         */
+        neverCalledWithMatch(...args: TArgs): boolean;
+        /**
+         * Returns true if spy always threw an exception.
+         */
+        alwaysThrew(): boolean;
+        /**
+         * Returns true if spy always threw an exception of the provided type.
+         */
+        alwaysThrew(type: string): boolean;
+        /**
+         * Returns true if spy always threw the provided exception object.
+         */
+        alwaysThrew(obj: any): boolean;
+        /**
+         * Returns true if spy always returned the provided value.
+         * @param obj
+         */
+        alwaysReturned(obj: any): boolean;
+        /**
+         * Invoke callbacks passed to the stub with the given arguments.
+         * If the stub was never called with a function argument, yield throws an error.
+         * Returns an Array with all callbacks return values in the order they were called, if no error is thrown.
+         */
+        invokeCallback(...args: TArgs): void;
+        /**
+         * Set the displayName of the spy or stub.
+         * @param name
+         */
+        named(name: string): SinonSpy<TArgs, TReturnValue>;
+        /**
+         * Returns the nth call.
+         * Accessing individual calls helps with more detailed behavior verification when the spy is called more than once.
+         * @param n
+         */
+        getCall(n: number): SinonSpyCall<TArgs, TReturnValue>;
+        /**
+         * Returns an Array of all calls recorded by the spy.
+         */
+        getCalls(): Array<SinonSpyCall<TArgs, TReturnValue>>;
+        /**
+         * Resets the state of a spy.
+         */
+        resetHistory(): void;
+        /**
+         * Returns the passed format string with the following replacements performed:
+         * * %n - the name of the spy "spy" by default)
+         * * %c - the number of times the spy was called, in words ("once", "twice", etc.)
+         * * %C - a list of string representations of the calls to the spy, with each call prefixed by a newline and four spaces
+         * * %t - a comma-delimited list of this values the spy was called on
+         * * %n - the formatted value of the nth argument passed to printf
+         * * %* - a comma-delimited list of the (non-format string) arguments passed to printf
+         * * %D - a multi-line list of the arguments received by all calls to the spy
+         * @param format
+         * @param args
+         */
+        printf(format: string, ...args: any[]): string;
+        /**
+         * Replaces the spy with the original method. Only available if the spy replaced an existing method.
+         */
+        restore(): void;
+    }
+
+    interface SinonSpyStatic {
+        /**
+         * Creates an anonymous function that records arguments, this value, exceptions and return values for all calls.
+         */
+        (): SinonSpy;
+        /**
+         * Spies on the provided function
+         */
+        (func: Function): SinonSpy;
+        /**
+         * Creates a spy for object.method and replaces the original method with the spy.
+         * An exception is thrown if the property is not already a function.
+         * The spy acts exactly like the original method in all cases.
+         * The original method can be restored by calling object.method.restore().
+         * The returned spy is the function object which replaced the original method. spy === object.method.
+         */
+        <T, K extends keyof T>(obj: T, method: K): T[K] extends (
+            ...args: infer TArgs
+        ) => infer TReturnValue
+            ? SinonSpy<TArgs, TReturnValue>
+            : SinonSpy;
+    }
+
+    interface SinonStub<TArgs extends any[] = any[], TReturnValue = any>
+        extends SinonSpy<TArgs, TReturnValue> {
+        /**
+         * Resets the stub’s behaviour to the default behaviour
+         * You can reset behaviour of all stubs using sinon.resetBehavior()
+         */
+        resetBehavior(): void;
+        /**
+         * Resets both behaviour and history of the stub.
+         * This is equivalent to calling both stub.resetBehavior() and stub.resetHistory()
+         * Updated in sinon@2.0.0
+         * Since sinon@5.0.0
+         * As a convenience, you can apply stub.reset() to all stubs using sinon.reset()
+         */
+        reset(): void;
+        /**
+         * Causes the stub to return promises using a specific Promise library instead of the global one when using stub.rejects or stub.resolves.
+         * Returns the stub to allow chaining.
+         */
+        usingPromise(promiseLibrary: any): SinonStub<TArgs, TReturnValue>;
+
+        /**
+         * Makes the stub return the provided @param obj value.
+         * @param obj
+         */
+        returns(obj: TReturnValue): SinonStub<TArgs, TReturnValue>;
+        /**
+         * Causes the stub to return the argument at the provided @param index.
+         * stub.returnsArg(0); causes the stub to return the first argument.
+         * If the argument at the provided index is not available, prior to sinon@6.1.2, an undefined value will be returned;
+         * starting from sinon@6.1.2, a TypeError will be thrown.
+         * @param index
+         */
+        returnsArg(index: number): SinonStub<TArgs, TReturnValue>;
+        /**
+         * Causes the stub to return its this value.
+         * Useful for stubbing jQuery-style fluent APIs.
+         */
+        returnsThis(): SinonStub<TArgs, TReturnValue>;
+        /**
+         * Causes the stub to return a Promise which resolves to the provided value.
+         * When constructing the Promise, sinon uses the Promise.resolve method.
+         * You are responsible for providing a polyfill in environments which do not provide Promise.
+         * The Promise library can be overwritten using the usingPromise method.
+         * Since sinon@2.0.0
+         */
+        resolves(value?: any): SinonStub<TArgs, TReturnValue>;
+        /**
+         * Causes the stub to return a Promise which resolves to the argument at the provided index.
+         * stub.resolvesArg(0); causes the stub to return a Promise which resolves to the first argument.
+         * If the argument at the provided index is not available, a TypeError will be thrown.
+         */
+        resolvesArg(index: number): SinonStub<TArgs, TReturnValue>;
+        /**
+         * Causes the stub to return a Promise which resolves to its this value.
+         */
+        resolvesThis(): SinonStub<TArgs, TReturnValue>;
+        /**
+         * Causes the stub to throw an exception (Error).
+         * @param type
+         */
+        throws(type?: string): SinonStub<TArgs, TReturnValue>;
+        /**
+         * Causes the stub to throw the provided exception object.
+         */
+        throws(obj: any): SinonStub<TArgs, TReturnValue>;
+        /**
+         * Causes the stub to throw the argument at the provided index.
+         * stub.throwsArg(0); causes the stub to throw the first argument as the exception.
+         * If the argument at the provided index is not available, a TypeError will be thrown.
+         * Since sinon@2.3.0
+         * @param index
+         */
+        throwsArg(index: number): SinonStub<TArgs, TReturnValue>;
+        throwsException(type?: string): SinonStub<TArgs, TReturnValue>;
+        throwsException(obj: any): SinonStub<TArgs, TReturnValue>;
+        /**
+         * Causes the stub to return a Promise which rejects with an exception (Error).
+         * When constructing the Promise, sinon uses the Promise.reject method.
+         * You are responsible for providing a polyfill in environments which do not provide Promise.
+         * The Promise library can be overwritten using the usingPromise method.
+         * Since sinon@2.0.0
+         */
+        rejects(): SinonStub<TArgs, TReturnValue>;
+        /**
+         * Causes the stub to return a Promise which rejects with an exception of the provided type.
+         * Since sinon@2.0.0
+         */
+        rejects(errorType: string): SinonStub<TArgs, TReturnValue>;
+        /**
+         * Causes the stub to return a Promise which rejects with the provided exception object.
+         * Since sinon@2.0.0
+         */
+        rejects(value: any): SinonStub<TArgs, TReturnValue>;
+        /**
+         * Causes the stub to call the argument at the provided index as a callback function.
+         * stub.callsArg(0); causes the stub to call the first argument as a callback.
+         * If the argument at the provided index is not available or is not a function, a TypeError will be thrown.
+         */
+        callsArg(index: number): SinonStub<TArgs, TReturnValue>;
+        /**
+         * Causes the original method wrapped into the stub to be called when none of the conditional stubs are matched.
+         */
+        callThrough(): SinonStub<TArgs, TReturnValue>;
+        /**
+         * Like stub.callsArg(index); but with an additional parameter to pass the this context.
+         * @param index
+         * @param context
+         */
+        callsArgOn(index: number, context: any): SinonStub<TArgs, TReturnValue>;
+        /**
+         * Like callsArg, but with arguments to pass to the callback.
+         * @param index
+         * @param args
+         */
+        callsArgWith(index: number, ...args: any[]): SinonStub<TArgs, TReturnValue>;
+        /**
+         * Like above but with an additional parameter to pass the this context.
+         * @param index
+         * @param context
+         * @param args
+         */
+        callsArgOnWith(
+            index: number,
+            context: any,
+            ...args: any[]
+        ): SinonStub<TArgs, TReturnValue>;
+        /**
+         * Same as their corresponding non-Async counterparts, but with callback being deferred at called after all instructions in the current call stack are processed.
+         * In Node environment the callback is deferred with process.nextTick.
+         * In a browser the callback is deferred with setTimeout(callback, 0).
+         * @param index
+         */
+        callsArgAsync(index: number): SinonStub<TArgs, TReturnValue>;
+        /**
+         * Same as their corresponding non-Async counterparts, but with callback being deferred at called after all instructions in the current call stack are processed.
+         * In Node environment the callback is deferred with process.nextTick.
+         * In a browser the callback is deferred with setTimeout(callback, 0).
+         * @param index
+         * @param context
+         */
+        callsArgOnAsync(index: number, context: any): SinonStub<TArgs, TReturnValue>;
+        /**
+         * Same as their corresponding non-Async counterparts, but with callback being deferred at called after all instructions in the current call stack are processed.
+         * In Node environment the callback is deferred with process.nextTick.
+         * In a browser the callback is deferred with setTimeout(callback, 0).
+         */
+        callsArgWithAsync(index: number, ...args: any[]): SinonStub<TArgs, TReturnValue>;
+        /**
+         * Same as their corresponding non-Async counterparts, but with callback being deferred at called after all instructions in the current call stack are processed.
+         * In Node environment the callback is deferred with process.nextTick.
+         * In a browser the callback is deferred with setTimeout(callback, 0).
+         */
+        callsArgOnWithAsync(
+            index: number,
+            context: any,
+            ...args: any[]
+        ): SinonStub<TArgs, TReturnValue>;
+        /**
+         * Makes the stub call the provided @param func when invoked.
+         * @param func
+         */
+        callsFake(func: (...args: TArgs) => TReturnValue): SinonStub<TArgs, TReturnValue>;
+        /**
+         * Replaces a new getter for this stub.
+         */
+        get(func: () => any): SinonStub<TArgs, TReturnValue>;
+        /**
+         * Defines a new setter for this stub.
+         * @param func
+         */
+        set(func: (v: any) => void): SinonStub<TArgs, TReturnValue>;
+        /**
+         * Defines the behavior of the stub on the @param n call. Useful for testing sequential interactions.
+         * There are methods onFirstCall, onSecondCall,onThirdCall to make stub definitions read more naturally.
+         * onCall can be combined with all of the behavior defining methods in this section. In particular, it can be used together with withArgs.
+         * @param n
+         */
+        onCall(n: number): SinonStub<TArgs, TReturnValue>;
+        /**
+         * Alias for stub.onCall(0);
+         */
+        onFirstCall(): SinonStub<TArgs, TReturnValue>;
+        /**
+         * Alias for stub.onCall(1);
+         */
+        onSecondCall(): SinonStub<TArgs, TReturnValue>;
+        /**
+         * Alias for stub.onCall(2);
+         */
+        onThirdCall(): SinonStub<TArgs, TReturnValue>;
+        /**
+         * Defines a new value for this stub.
+         * @param val
+         */
+        value(val: any): SinonStub<TArgs, TReturnValue>;
+        /**
+         * Set the displayName of the spy or stub.
+         * @param name
+         */
+        named(name: string): SinonStub<TArgs, TReturnValue>;
+        /**
+         * Similar to callsArg.
+         * Causes the stub to call the first callback it receives with the provided arguments (if any).
+         * If a method accepts more than one callback, you need to use callsArg to have the stub invoke other callbacks than the first one.
+         */
+        yields(...args: any[]): SinonStub<TArgs, TReturnValue>;
+        /**
+         * Like above but with an additional parameter to pass the this context.
+         */
+        yieldsOn(context: any, ...args: any[]): SinonStub<TArgs, TReturnValue>;
+        yieldsRight(...args: any[]): SinonStub<TArgs, TReturnValue>;
+        /**
+         * Causes the spy to invoke a callback passed as a property of an object to the spy.
+         * Like yields, yieldsTo grabs the first matching argument, finds the callback and calls it with the (optional) arguments.
+         * @param property
+         * @param args
+         */
+        yieldsTo(property: string, ...args: any[]): SinonStub<TArgs, TReturnValue>;
+        /**
+         * Like above but with an additional parameter to pass the this context.
+         */
+        yieldsToOn(
+            property: string,
+            context: any,
+            ...args: any[]
+        ): SinonStub<TArgs, TReturnValue>;
+        /**
+         * Same as their corresponding non-Async counterparts, but with callback being deferred at called after all instructions in the current call stack are processed.
+         * In Node environment the callback is deferred with process.nextTick.
+         * In a browser the callback is deferred with setTimeout(callback, 0).
+         * @param args
+         */
+        yieldsAsync(...args: any[]): SinonStub<TArgs, TReturnValue>;
+        /**
+         * Same as their corresponding non-Async counterparts, but with callback being deferred at called after all instructions in the current call stack are processed.
+         * In Node environment the callback is deferred with process.nextTick.
+         * In a browser the callback is deferred with setTimeout(callback, 0).
+         * @param context
+         * @param args
+         */
+        yieldsOnAsync(context: any, ...args: any[]): SinonStub<TArgs, TReturnValue>;
+        /**
+         * Same as their corresponding non-Async counterparts, but with callback being deferred at called after all instructions in the current call stack are processed.
+         * In Node environment the callback is deferred with process.nextTick.
+         * In a browser the callback is deferred with setTimeout(callback, 0).
+         * @param property
+         * @param args
+         */
+        yieldsToAsync(property: string, ...args: any[]): SinonStub<TArgs, TReturnValue>;
+        /**
+         * Same as their corresponding non-Async counterparts, but with callback being deferred at called after all instructions in the current call stack are processed.
+         * In Node environment the callback is deferred with process.nextTick.
+         * In a browser the callback is deferred with setTimeout(callback, 0).
+         * @param property
+         * @param context
+         * @param args
+         */
+        yieldsToOnAsync(
+            property: string,
+            context: any,
+            ...args: any[]
+        ): SinonStub<TArgs, TReturnValue>;
+        /**
+         * Stubs the method only for the provided arguments.
+         * This is useful to be more expressive in your assertions, where you can access the spy with the same call.
+         * It is also useful to create a stub that can act differently in response to different arguments.
+         * @param args
+         */
+        withArgs(...args: MatchArguments<TArgs>): SinonStub<TArgs, TReturnValue>;
+    }
+
+    interface SinonStubStatic {
+        /**
+         * Creates an anonymous stub function
+         */
+        (): SinonStub;
+        /**
+         * Stubs all the object’s methods.
+         * Note that it’s usually better practice to stub individual methods, particularly on objects that you don’t understand or control all the methods for (e.g. library dependencies).
+         * Stubbing individual methods tests intent more precisely and is less susceptible to unexpected behavior as the object’s code evolves.
+         * If you want to create a stub object of MyConstructor, but don’t want the constructor to be invoked, use this utility function.
+         */
+        <T>(obj: T): SinonStubbedInstance<T>;
+        /**
+         * Replaces obj.method with a stub function.
+         * An exception is thrown if the property is not already a function.
+         * The original function can be restored by calling object.method.restore(); (or stub.restore();).
+         */
+        <T, K extends keyof T>(obj: T, method: K): T[K] extends (
+            ...args: infer TArgs
+        ) => infer TReturnValue
+            ? SinonStub<TArgs, TReturnValue>
+            : SinonStub;
+    }
+
+    interface SinonExpectation extends SinonStub {
+        /**
+         * Specify the minimum amount of calls expected.
+         */
+        atLeast(n: number): SinonExpectation;
+        /**
+         * Specify the maximum amount of calls expected.
+         * @param n
+         */
+        atMost(n: number): SinonExpectation;
+        /**
+         * Expect the method to never be called.
+         */
+        never(): SinonExpectation;
+        /**
+         * Expect the method to be called exactly once.
+         */
+        once(): SinonExpectation;
+        /**
+         * Expect the method to be called exactly twice.
+         */
+        twice(): SinonExpectation;
+        /**
+         * Expect the method to be called exactly thrice.
+         */
+        thrice(): SinonExpectation;
+        /**
+         * Expect the method to be called exactly @param n times.
+         */
+        exactly(n: number): SinonExpectation;
+        /**
+         * Expect the method to be called with the provided arguments and possibly others.
+         * An expectation instance only holds onto a single set of arguments specified with withArgs.
+         * Subsequent calls will overwrite the previously-specified set of arguments (even if they are different),
+         * so it is generally not intended that this method be invoked more than once per test case.
+         * @param args
+         */
+        withArgs(...args: any[]): SinonExpectation;
+        /**
+         * Expect the method to be called with the provided arguments and no others.
+         * An expectation instance only holds onto a single set of arguments specified with withExactArgs.
+         * Subsequent calls will overwrite the previously-specified set of arguments (even if they are different),
+         * so it is generally not intended that this method be invoked more than once per test case.
+         * @param args
+         */
+        withExactArgs(...args: any[]): SinonExpectation;
+        on(obj: any): SinonExpectation;
+        /**
+         * Verifies all expectations on the mock.
+         * If any expectation is not satisfied, an exception is thrown.
+         * Also restores the mocked methods.
+         */
+        verify(): SinonExpectation;
+        /**
+         * Restores all mocked methods.
+         */
+        restore(): void;
+    }
+
+    interface SinonExpectationStatic {
+        /**
+         * Creates an expectation without a mock object, basically an anonymous mock function.
+         * Method name is optional and is used in exception messages to make them more readable.
+         * @param methodName
+         */
+        create(methodName?: string): SinonExpectation;
+    }
+
+    interface SinonMock {
+        /**
+         * Overrides obj.method with a mock function and returns it.
+         */
+        expects(method: string): SinonExpectation;
+        /**
+         * Restores all mocked methods.
+         */
+        restore(): void;
+        /**
+         * Verifies all expectations on the mock.
+         * If any expectation is not satisfied, an exception is thrown.
+         * Also restores the mocked methods.
+         */
+        verify(): void;
+    }
+
+    interface SinonMockStatic {
+        (): SinonExpectation;
+        /**
+         * Creates a mock for the provided object.
+         * Does not change the object, but returns a mock object to set expectations on the object’s methods.
+         */
+        (obj: any): SinonMock;
+    }
+
+    type SinonTimerId = number | { id: number };
+
+    interface SinonFakeTimers {
+        now: number;
+
+        setTimeout(
+            callback: (...args: any[]) => void,
+            timeout: number,
+            ...args: any[]
+        ): SinonTimerId;
+        clearTimeout(id: SinonTimerId): void;
+        setInterval(
+            callback: (...args: any[]) => void,
+            timeout: number,
+            ...args: any[]
+        ): SinonTimerId;
+        clearInterval(id: SinonTimerId): void;
+        setImmediate(
+            callback: (...args: any[]) => void,
+            ...args: any[]
+        ): SinonTimerId;
+        clearImmediate(id: SinonTimerId): void;
+        requestAnimationFrame(callback: (...args: any[]) => void): number;
+        cancelAnimationFrame(id: number): void;
+        nextTick(callback: () => void): void;
+
+        /**
+         * Tick the clock ahead time milliseconds.
+         * Causes all timers scheduled within the affected time range to be called.
+         * time may be the number of milliseconds to advance the clock by or a human-readable string.
+         * Valid string formats are “08” for eight seconds, “01:00” for one minute and “02:34:10” for two hours, 34 minutes and ten seconds.
+         * time may be negative, which causes the clock to change but won’t fire any callbacks.
+         * @param ms
+         */
+        tick(ms: number | string): void;
+        /**
+         * Advances the clock to the the moment of the first scheduled timer, firing it.
+         */
+        next(): void;
+        /**
+         * This runs all pending timers until there are none remaining. If new timers are added while it is executing they will be run as well.
+         * This makes it easier to run asynchronous tests to completion without worrying about the number of timers they use, or the delays in those timers.
+         */
+        runAll(): void;
+        runToLast(): void;
+        reset(): void;
+        runMicrotasks(): void;
+        runToFrame(): void;
+
+        Date(): Date;
+        Date(year: number): Date;
+        Date(year: number, month: number): Date;
+        Date(year: number, month: number, day: number): Date;
+        Date(year: number, month: number, day: number, hour: number): Date;
+        Date(
+            year: number,
+            month: number,
+            day: number,
+            hour: number,
+            minute: number
+        ): Date;
+        Date(
+            year: number,
+            month: number,
+            day: number,
+            hour: number,
+            minute: number,
+            second: number
+        ): Date;
+        Date(
+            year: number,
+            month: number,
+            day: number,
+            hour: number,
+            minute: number,
+            second: number,
+            ms: number
+        ): Date;
+
+        /**
+         * Restore the faked methods.
+         * Call in e.g. tearDown.
+         */
+        restore(): void;
+        uninstall(): void;
+
+        /**
+         * Simulate the user changing the system clock while your program is running. It changes the 'now' timestamp
+         * without affecting timers, intervals or immediates.
+         * @param now The new 'now' in unix milliseconds
+         */
+        setSystemTime(now: number): void;
+        /**
+         * Simulate the user changing the system clock while your program is running. It changes the 'now' timestamp
+         * without affecting timers, intervals or immediates.
+         * @param now The new 'now' as a JavaScript Date
+         */
+        setSystemTime(date: Date): void;
+    }
+
+    interface SinonFakeTimersConfig {
+        now: number | Date;
+        toFake: string[];
+        shouldAdvanceTime: boolean;
+    }
+
+    interface SinonFakeUploadProgress {
+        eventListeners: {
+            progress: any[];
+            load: any[];
+            abort: any[];
+            error: any[];
+        };
+
+        addEventListener(event: string, listener: (e: Event) => any): void;
+        removeEventListener(event: string, listener: (e: Event) => any): void;
+        dispatchEvent(event: Event): void;
+    }
+
+    interface SinonFakeXMLHttpRequest {
+        // Properties
+        /**
+         * The URL set on the request object.
+         */
+        url: string;
+        /**
+         * The request method as a string.
+         */
+        method: string;
+        /**
+         * An object of all request headers, i.e.:
+         */
+        requestHeaders: any;
+        /**
+         * The request body
+         */
+        requestBody: string;
+        /**
+         * The request’s status code.
+         * undefined if the request has not been handled (see respond below)
+         */
+        status: number;
+        /**
+         * Only populated if the respond method is called (see below).
+         */
+        statusText: string;
+        /**
+         * Whether or not the request is asynchronous.
+         */
+        async: boolean;
+        /**
+         * Username, if any.
+         */
+        username: string;
+        /**
+         * Password, if any.
+         */
+        password: string;
+        withCredentials: boolean;
+        upload: SinonFakeUploadProgress;
+        /**
+         * When using respond, this property is populated with a parsed document if response headers indicate as much (see the spec)
+         */
+        responseXML: Document;
+        /**
+         * The value of the given response header, if the request has been responded to (see respond).
+         * @param header
+         */
+        getResponseHeader(header: string): string;
+        /**
+         * All response headers as an object.
+         */
+        getAllResponseHeaders(): any;
+
+        // Methods
+        /**
+         * Sets response headers (e.g. { "Content-Type": "text/html", ... }, updates the readyState property and fires onreadystatechange.
+         * @param headers
+         */
+        setResponseHeaders(headers: any): void;
+        /**
+         * Sets the respond body, updates the readyState property and fires onreadystatechange.
+         * Additionally, populates responseXML with a parsed document if response headers indicate as much.
+         */
+        setResponseBody(body: string): void;
+        /**
+         * Calls the above three methods.
+         */
+        respond(status: number, headers: any, body: string): void;
+        autoRespond(ms: number): void;
+        /**
+         * Simulates a network error on the request. The onerror handler will be called and the status will be 0.
+         */
+        error(): void;
+        onerror(): void;
+    }
+
+    interface SinonFakeXMLHttpRequestStatic {
+        new (): SinonFakeXMLHttpRequest;
+        /**
+         * Default false.
+         * When set to true, Sinon will check added filters if certain requests should be “unfaked”
+         */
+        useFilters: boolean;
+        /**
+         * Add a filter that will decide whether or not to fake a request.
+         * The filter will be called when xhr.open is called, with the exact same arguments (method, url, async, username, password).
+         * If the filter returns true, the request will not be faked.
+         * @param filter
+         */
+        addFilter(
+            filter: (
+                method: string,
+                url: string,
+                async: boolean,
+                username: string,
+                password: string
+            ) => boolean
+        ): void;
+        /**
+         * By assigning a function to the onCreate property of the returned object from useFakeXMLHttpRequest()
+         * you can subscribe to newly created FakeXMLHttpRequest objects. See below for the fake xhr object API.
+         * Using this observer means you can still reach objects created by e.g. jQuery.ajax (or other abstractions/frameworks).
+         * @param xhr
+         */
+        onCreate(xhr: SinonFakeXMLHttpRequest): void;
+        /**
+         * Restore original function(s).
+         */
+        restore(): void;
+    }
+
+    interface SinonFakeServer extends SinonFakeServerOptions {
+        // Properties
+        /**
+         * Used internally to determine the HTTP method used with the provided request.
+         * By default this method simply returns request.method.
+         * When server.fakeHTTPMethods is true, the method will return the value of the _method parameter if the method is “POST”.
+         * This method can be overridden to provide custom behavior.
+         * @param request
+         */
+        getHTTPMethod(request: SinonFakeXMLHttpRequest): string;
+        /**
+         * You can inspect the server.requests to verify request ordering, find unmatched requests or check that no requests has been done.
+         * server.requests is an array of all the FakeXMLHttpRequest objects that have been created.
+         */
+        requests: SinonFakeXMLHttpRequest[];
+
+        // Methods
+        /**
+         * Causes the server to respond to any request not matched by another response with the provided data. The default catch-all response is [404, {}, ""].
+         * A String representing the response body
+         * An Array with status, headers and response body, e.g. [200, { "Content-Type": "text/html", "Content-Length": 2 }, "OK"]
+         * A Function.
+         * Default status is 200 and default headers are none.
+         * When the response is a Function, it will be passed the request object. You must manually call respond on it to complete the request.
+         * @param body A String representing the response body
+         */
+        respondWith(body: string): void;
+        /**
+         * Causes the server to respond to any request not matched by another response with the provided data. The default catch-all response is [404, {}, ""].
+         * Default status is 200 and default headers are none.
+         * When the response is a Function, it will be passed the request object. You must manually call respond on it to complete the request.
+         * @param response An Array with status, headers and response body, e.g. [200, { "Content-Type": "text/html", "Content-Length": 2 }, "OK"]
+         */
+        respondWith(response: any[]): void;
+        /**
+         * Causes the server to respond to any request not matched by another response with the provided data. The default catch-all response is [404, {}, ""].
+         * Default status is 200 and default headers are none.
+         * When the response is a Function, it will be passed the request object. You must manually call respond on it to complete the request.
+         * @param fn A Function.
+         */
+        respondWith(fn: (xhr: SinonFakeXMLHttpRequest) => void): void;
+        /**
+         * Responds to all requests to given URL, e.g. /posts/1.
+         */
+        respondWith(url: string, body: string): void;
+        /**
+         * Responds to all requests to given URL, e.g. /posts/1.
+         */
+        respondWith(url: string, response: any[]): void;
+        /**
+         * Responds to all requests to given URL, e.g. /posts/1.
+         */
+        respondWith(
+            url: string,
+            fn: (xhr: SinonFakeXMLHttpRequest) => void
+        ): void;
+        /**
+         * Responds to all method requests to the given URL with the given response.
+         * method is an HTTP verb.
+         */
+        respondWith(method: string, url: string, body: string): void;
+        /**
+         * Responds to all method requests to the given URL with the given response.
+         * method is an HTTP verb.
+         */
+        respondWith(method: string, url: string, response: any[]): void;
+        /**
+         * Responds to all method requests to the given URL with the given response.
+         * method is an HTTP verb.
+         */
+        respondWith(
+            method: string,
+            url: string,
+            fn: (xhr: SinonFakeXMLHttpRequest) => void
+        ): void;
+        /**
+         * URL may be a regular expression, e.g. /\\/post\\//\\d+
+         * If the response is a Function, it will be passed any capture groups from the regular expression along with the XMLHttpRequest object:
+         */
+        respondWith(url: RegExp, body: string): void;
+        /**
+         * URL may be a regular expression, e.g. /\\/post\\//\\d+
+         * If the response is a Function, it will be passed any capture groups from the regular expression along with the XMLHttpRequest object:
+         */
+        respondWith(url: RegExp, response: any[]): void;
+        /**
+         * URL may be a regular expression, e.g. /\\/post\\//\\d+
+         * If the response is a Function, it will be passed any capture groups from the regular expression along with the XMLHttpRequest object:
+         */
+        respondWith(
+            url: RegExp,
+            fn: (xhr: SinonFakeXMLHttpRequest) => void
+        ): void;
+        /**
+         * Responds to all method requests to URLs matching the regular expression.
+         */
+        respondWith(method: string, url: RegExp, body: string): void;
+        /**
+         * Responds to all method requests to URLs matching the regular expression.
+         */
+        respondWith(method: string, url: RegExp, response: any[]): void;
+        /**
+         * Responds to all method requests to URLs matching the regular expression.
+         */
+        respondWith(
+            method: string,
+            url: RegExp,
+            fn: (xhr: SinonFakeXMLHttpRequest) => void
+        ): void;
+        /**
+         * Causes all queued asynchronous requests to receive a response.
+         * If none of the responses added through respondWith match, the default response is [404, {}, ""].
+         * Synchronous requests are responded to immediately, so make sure to call respondWith upfront.
+         * If called with arguments, respondWith will be called with those arguments before responding to requests.
+         */
+        respond(): void;
+        restore(): void;
+    }
+
+    interface SinonFakeServerOptions {
+        /**
+         * When set to true, causes the server to automatically respond to incoming requests after a timeout.
+         * The default timeout is 10ms but you can control it through the autoRespondAfter property.
+         * Note that this feature is intended to help during mockup development, and is not suitable for use in tests.
+         */
+        autoRespond: boolean;
+        /**
+         * When autoRespond is true, respond to requests after this number of milliseconds. Default is 10.
+         */
+        autoRespondAfter: number;
+        /**
+         * If set to true, server will find _method parameter in POST body and recognize that as the actual method.
+         * Supports a pattern common to Ruby on Rails applications. For custom HTTP method faking, override server.getHTTPMethod(request).
+         */
+        fakeHTTPMethods: boolean;
+        /**
+         * If set, the server will respond to every request immediately and synchronously.
+         * This is ideal for faking the server from within a test without having to call server.respond() after each request made in that test.
+         * As this is synchronous and immediate, this is not suitable for simulating actual network latency in tests or mockups.
+         * To simulate network latency with automatic responses, see server.autoRespond and server.autoRespondAfter.
+         */
+        respondImmediately: boolean;
+    }
+
+    interface SinonFakeServerStatic {
+        create(options?: Partial<SinonFakeServerOptions>): SinonFakeServer;
+    }
+
+    interface SinonExposeOptions {
+        prefix: string;
+        includeFail: boolean;
+    }
+
+    interface SinonAssert {
+        // Properties
+        /**
+         * Defaults to AssertError.
+         */
+        failException: string;
+        /**
+         * Every assertion fails by calling this method.
+         * By default it throws an error of type sinon.assert.failException.
+         * If the test framework looks for assertion errors by checking for a specific exception, you can simply override the kind of exception thrown.
+         * If that does not fit with your testing framework of choice, override the fail method to do the right thing.
+         */
+        fail(message?: string): void; // Overridable
+        /**
+         * Called every time assertion passes.
+         * Default implementation does nothing.
+         */
+        pass(assertion: any): void; // Overridable
+
+        // Methods
+        /**
+         * Passes if spy was never called
+         * @param spy
+         */
+        notCalled(spy: SinonSpy): void;
+        /**
+         * Passes if spy was called at least once.
+         */
+        called(spy: SinonSpy): void;
+        /**
+         * Passes if spy was called once and only once.
+         */
+        calledOnce(spy: SinonSpy): void;
+        /**
+         * Passes if spy was called exactly twice.
+         */
+        calledTwice(spy: SinonSpy): void;
+        /**
+         * Passes if spy was called exactly three times.
+         */
+        calledThrice(spy: SinonSpy): void;
+        /**
+         * Passes if spy was called exactly num times.
+         */
+        callCount(spy: SinonSpy, count: number): void;
+        /**
+         * Passes if provided spies were called in the specified order.
+         * @param spies
+         */
+        callOrder(...spies: SinonSpy[]): void;
+        /**
+         * Passes if spy was ever called with obj as its this value.
+         * It’s possible to assert on a dedicated spy call: sinon.assert.calledOn(spy.firstCall, arg1, arg2, ...);.
+         */
+        calledOn(spyOrSpyCall: SinonSpy | SinonSpyCall, obj: any): void;
+        /**
+         * Passes if spy was always called with obj as its this value.
+         */
+        alwaysCalledOn(spy: SinonSpy, obj: any): void;
+        /**
+         * Passes if spy was called with the provided arguments.
+         * It’s possible to assert on a dedicated spy call: sinon.assert.calledWith(spy.firstCall, arg1, arg2, ...);.
+         * @param spyOrSpyCall
+         * @param args
+         */
+        calledWith(spyOrSpyCall: SinonSpy | SinonSpyCall, ...args: any[]): void;
+        /**
+         * Passes if spy was always called with the provided arguments.
+         * @param spy
+         * @param args
+         */
+        alwaysCalledWith(spy: SinonSpy, ...args: any[]): void;
+        /**
+         * Passes if spy was never called with the provided arguments.
+         * @param spy
+         * @param args
+         */
+        neverCalledWith(spy: SinonSpy, ...args: any[]): void;
+        /**
+         * Passes if spy was called with the provided arguments and no others.
+         * It’s possible to assert on a dedicated spy call: sinon.assert.calledWithExactly(spy.getCall(1), arg1, arg2, ...);.
+         * @param spyOrSpyCall
+         * @param args
+         */
+        calledWithExactly(
+            spyOrSpyCall: SinonSpy | SinonSpyCall,
+            ...args: any[]
+        ): void;
+        /**
+         * Passes if spy was always called with the provided arguments and no others.
+         */
+        alwaysCalledWithExactly(spy: SinonSpy, ...args: any[]): void;
+        /**
+         * Passes if spy was called with matching arguments.
+         * This behaves the same way as sinon.assert.calledWith(spy, sinon.match(arg1), sinon.match(arg2), ...).
+         * It’s possible to assert on a dedicated spy call: sinon.assert.calledWithMatch(spy.secondCall, arg1, arg2, ...);.
+         */
+        calledWithMatch(
+            spyOrSpyCall: SinonSpy | SinonSpyCall,
+            ...args: any[]
+        ): void;
+        /**
+         * Passes if spy was always called with matching arguments.
+         * This behaves the same way as sinon.assert.alwaysCalledWith(spy, sinon.match(arg1), sinon.match(arg2), ...).
+         */
+        alwaysCalledWithMatch(spy: SinonSpy, ...args: any[]): void;
+        /**
+         * Passes if spy was never called with matching arguments.
+         * This behaves the same way as sinon.assert.neverCalledWith(spy, sinon.match(arg1), sinon.match(arg2), ...).
+         * @param spy
+         * @param args
+         */
+        neverCalledWithMatch(spy: SinonSpy, ...args: any[]): void;
+        /**
+         * Passes if spy was called with the new operator.
+         * It’s possible to assert on a dedicated spy call: sinon.assert.calledWithNew(spy.secondCall, arg1, arg2, ...);.
+         * @param spyOrSpyCall
+         */
+        calledWithNew(spyOrSpyCall: SinonSpy | SinonSpyCall): void;
+        /**
+         * Passes if spy threw any exception.
+         */
+        threw(spyOrSpyCall: SinonSpy | SinonSpyCall): void;
+        /**
+         * Passes if spy threw the given exception.
+         * The exception is an actual object.
+         * It’s possible to assert on a dedicated spy call: sinon.assert.threw(spy.thirdCall, exception);.
+         */
+        threw(spyOrSpyCall: SinonSpy | SinonSpyCall, exception: string): void;
+        /**
+         * Passes if spy threw the given exception.
+         * The exception is a String denoting its type.
+         * It’s possible to assert on a dedicated spy call: sinon.assert.threw(spy.thirdCall, exception);.
+         */
+        threw(spyOrSpyCall: SinonSpy | SinonSpyCall, exception: any): void;
+        /**
+         * Like threw, only required for all calls to the spy.
+         */
+        alwaysThrew(spy: SinonSpy): void;
+        /**
+         * Like threw, only required for all calls to the spy.
+         */
+        alwaysThrew(spy: SinonSpy, exception: string): void;
+        /**
+         * Like threw, only required for all calls to the spy.
+         */
+        alwaysThrew(spy: SinonSpy, exception: any): void;
+        /**
+         * Uses sinon.match to test if the arguments can be considered a match.
+         */
+        match(actual: any, expected: any): void;
+        /**
+         * Exposes assertions into another object, to better integrate with the test framework.
+         * For instance, JsTestDriver uses global assertions, and to make Sinon.JS assertions appear alongside them, you can do.
+         * @example sinon.assert.expose(this);
+         * This will give you assertCalled(spy),assertCallOrder(spy1, spy2, ...) and so on.
+         * The method accepts an optional options object with two options.
+         */
+        expose(obj: any, options?: Partial<SinonExposeOptions>): void;
+    }
+
+    interface SinonMatcher {
+        /**
+         * All matchers implement and and or. This allows to logically combine mutliple matchers.
+         * The result is a new matchers that requires both (and) or one of the matchers (or) to return true.
+         * @example var stringOrNumber = sinon.match.string.or(sinon.match.number);
+         * var bookWithPages = sinon.match.instanceOf(Book).and(sinon.match.has("pages"));
+         */
+        and(expr: SinonMatcher): SinonMatcher;
+        /**
+         * All matchers implement and and or. This allows to logically combine mutliple matchers.
+         * The result is a new matchers that requires both (and) or one of the matchers (or) to return true.
+         * @example var stringOrNumber = sinon.match.string.or(sinon.match.number);
+         * var bookWithPages = sinon.match.instanceOf(Book).and(sinon.match.has("pages"));
+         */
+        or(expr: SinonMatcher): SinonMatcher;
+        test(val: any): boolean;
+    }
+
+    interface SinonArrayMatcher extends SinonMatcher {
+        /**
+         * Requires an Array to be deep equal another one.
+         */
+        deepEquals(expected: any[]): SinonMatcher;
+        /**
+         * Requires an Array to start with the same values as another one.
+         */
+        startsWith(expected: any[]): SinonMatcher;
+        /**
+         * Requires an Array to end with the same values as another one.
+         */
+        endsWith(expected: any[]): SinonMatcher;
+        /**
+         * Requires an Array to contain each one of the values the given array has.
+         */
+        contains(expected: any[]): SinonMatcher;
+    }
+
+    interface SimplifiedSet {
+        has(el: any): boolean;
+    }
+
+    interface SimplifiedMap extends SimplifiedSet {
+        get(key: any): any;
+    }
+
+    interface SinonMapMatcher extends SinonMatcher {
+        /**
+         * Requires a Map to be deep equal another one.
+         */
+        deepEquals(expected: SimplifiedMap): SinonMatcher;
+        /**
+         * Requires a Map to contain each one of the items the given map has.
+         */
+        contains(expected: SimplifiedMap): SinonMatcher;
+    }
+
+    interface SinonSetMatcher extends SinonMatcher {
+        /**
+         *  Requires a Set to be deep equal another one.
+         */
+        deepEquals(expected: SimplifiedSet): SinonMatcher;
+        /**
+         * Requires a Set to contain each one of the items the given set has.
+         */
+        contains(expected: SimplifiedSet): SinonMatcher;
+    }
+
+    interface SinonMatch {
+        /**
+         * Requires the value to be == to the given number.
+         */
+        (value: number): SinonMatcher;
+        /**
+         * Requires the value to be a string and have the expectation as a substring.
+         */
+        (value: string): SinonMatcher;
+        /**
+         * Requires the value to be a string and match the given regular expression.
+         */
+        (expr: RegExp): SinonMatcher;
+        /**
+         * See custom matchers.
+         */
+        (callback: (value: any) => boolean, message?: string): SinonMatcher;
+        /**
+         * Requires the value to be not null or undefined and have at least the same properties as expectation.
+         * This supports nested matchers.
+         */
+        (obj: object): SinonMatcher;
+        /**
+         * Matches anything.
+         */
+        any: SinonMatcher;
+        /**
+         * Requires the value to be defined.
+         */
+        defined: SinonMatcher;
+        /**
+         * Requires the value to be truthy.
+         */
+        truthy: SinonMatcher;
+        /**
+         * Requires the value to be falsy.
+         */
+        falsy: SinonMatcher;
+        /**
+         * Requires the value to be a Boolean
+         */
+        bool: SinonMatcher;
+        /**
+         * Requires the value to be a Number.
+         */
+        number: SinonMatcher;
+        /**
+         * Requires the value to be a String.
+         */
+        string: SinonMatcher;
+        /**
+         * Requires the value to be an Object.
+         */
+        object: SinonMatcher;
+        /**
+         * Requires the value to be a Function.
+         */
+        func: SinonMatcher;
+        /**
+         * Requires the value to be a Map.
+         */
+        map: SinonMapMatcher;
+        /**
+         * Requires the value to be a Set.
+         */
+        set: SinonSetMatcher;
+        /**
+         * Requires the value to be an Array.
+         */
+        array: SinonArrayMatcher;
+        /**
+         * Requires the value to be a regular expression.
+         */
+        regexp: SinonMatcher;
+        /**
+         * Requires the value to be a Date object.
+         */
+        date: SinonMatcher;
+        /**
+         * Requires the value to be a Symbol.
+         */
+        symbol: SinonMatcher;
+        /**
+         * Requires the value to strictly equal ref.
+         */
+        same(obj: any): SinonMatcher;
+        /**
+         * Requires the value to be of the given type, where type can be one of "undefined", "null", "boolean", "number", "string", "object", "function", "array", "regexp", "date" or "symbol".
+         */
+        typeOf(type: string): SinonMatcher;
+        /**
+         * Requires the value to be an instance of the given type.
+         */
+        instanceOf(type: any): SinonMatcher;
+        /**
+         * Requires the value to define the given property.
+         * The property might be inherited via the prototype chain.
+         * If the optional expectation is given, the value of the property is deeply compared with the expectation.
+         * The expectation can be another matcher.
+         * @param property
+         * @param expect
+         */
+        has(property: string, expect?: any): SinonMatcher;
+        /**
+         * Same as sinon.match.has but the property must be defined by the value itself. Inherited properties are ignored.
+         * @param property
+         * @param expect
+         */
+        hasOwn(property: string, expect?: any): SinonMatcher;
+        /**
+         * Requires the value to define the given propertyPath. Dot (prop.prop) and bracket (prop[0]) notations are supported as in Lodash.get.
+         * The propertyPath might be inherited via the prototype chain.
+         * If the optional expectation is given, the value at the propertyPath is deeply compared with the expectation.
+         * The expectation can be another matcher.
+         */
+        hasNested(path: string, expect?: any): SinonMatcher;
+        /**
+         * Requires every element of an Array, Set or Map, or alternatively every value of an Object to match the given matcher.
+         */
+        every(matcher: SinonMatcher): SinonMatcher;
+        /**
+         * Requires any element of an Array, Set or Map, or alternatively any value of an Object to match the given matcher.
+         */
+        some(matcher: SinonMatcher): SinonMatcher;
+    }
+
+    interface SinonSandboxConfig {
+        /**
+         * The sandbox’s methods can be injected into another object for convenience.
+         * The injectInto configuration option can name an object to add properties to.
+         */
+        injectInto: object | null;
+        /**
+         * What properties to inject.
+         * Note that simply naming “server” here is not sufficient to have a server property show up in the target object,
+         * you also have to set useFakeServer to true.
+         */
+        properties: string[];
+        /**
+         * If set to true, the sandbox will have a clock property.
+         * You can optionally pass in a configuration object that follows the specification for fake timers, such as { toFake: ["setTimeout", "setInterval"] }.
+         */
+        useFakeTimers: boolean | Partial<SinonFakeTimersConfig>;
+        /**
+         * If true, server and requests properties are added to the sandbox. Can also be an object to use for fake server.
+         * The default one is sinon.fakeServer, but if you’re using jQuery 1.3.x or some other library that does not set the XHR’s onreadystatechange handler,
+         * you might want to do:
+         */
+        useFakeServer: boolean | SinonFakeServer;
+    }
+
+    /**
+     * Stubbed type of an object with members replaced by stubs.
+     *
+     * @template TType Type being stubbed.
+     */
+    type StubbableType<TType> = Function & { prototype: TType };
+
+    /**
+     * An instance of a stubbed object type with functions replaced by stubs.
+     *
+     * @template TType Object type being stubbed.
+     */
+    type SinonStubbedInstance<TType> = {
+        [P in keyof TType]: SinonStubbedMember<TType[P]>
+    };
+
+    /**
+     * Replaces a type with a Sinon stub if it's a function.
+     */
+    type SinonStubbedMember<T> = T extends Function ? SinonStub : T;
+
+    interface SinonFake {
+        /**
+         * Creates a basic fake, with no behavior
+         */
+        (): SinonSpy;
+        /**
+         * Wraps an existing Function to record all interactions, while leaving it up to the func to provide the behavior.
+         * This is useful when complex behavior not covered by the sinon.fake.* methods is required or when wrapping an existing function or method.
+         */
+        (fn: Function): SinonSpy;
+        /**
+         * Creates a fake that returns the val argument
+         * @param val Returned value
+         */
+        returns(val: any): SinonSpy;
+        /**
+         * Creates a fake that throws an Error with the provided value as the message property.
+         * If an Error is passed as the val argument, then that will be the thrown value. If any other value is passed, then that will be used for the message property of the thrown Error.
+         * @param val Returned value or throw value if an Error
+         */
+        throws(val: Error | string): SinonSpy;
+        /**
+         * Creates a fake that returns a resolved Promise for the passed value.
+         * @param val Resolved promise
+         */
+        resolves(val: any): SinonSpy;
+        /**
+         * Creates a fake that returns a rejected Promise for the passed value.
+         * If an Error is passed as the value argument, then that will be the value of the promise.
+         * If any other value is passed, then that will be used for the message property of the Error returned by the promise.
+         * @param val Rejected promise
+         */
+        rejects(val: any): SinonSpy;
+        /**
+         * fake expects the last argument to be a callback and will invoke it with the given arguments.
+         */
+        yields(...args: any[]): SinonSpy;
+        /**
+         * fake expects the last argument to be a callback and will invoke it asynchronously with the given arguments.
+         */
+        yieldsAsync(...args: any[]): SinonSpy;
+    }
+
+    interface SinonSandbox {
+        /**
+         * A convenience reference for sinon.assert
+         * Since sinon@2.0.0
+         */
+        assert: SinonAssert;
+        clock: SinonFakeTimers;
+        requests: SinonFakeXMLHttpRequest[];
+        server: SinonFakeServer;
+        /**
+         * Works exactly like sinon.spy
+         */
+        spy: SinonSpyStatic;
+        /**
+         * Works exactly like sinon.stub.
+         */
+        stub: SinonStubStatic;
+        /**
+         * Works exactly like sinon.mock
+         */
+        mock: SinonMockStatic;
+
+        /**
+         * * No param : Causes Sinon to replace the global setTimeout, clearTimeout, setInterval, clearInterval, setImmediate, clearImmediate, process.hrtime, performance.now(when available)
+         * and Date with a custom implementation which is bound to the returned clock object.
+         * Starts the clock at the UNIX epoch (timestamp of 0).
+         * * Now : As above, but rather than starting the clock with a timestamp of 0, start at the provided timestamp now.
+         * Since sinon@2.0.0
+         * You can also pass in a Date object, and its getTime() will be used for the starting timestamp.
+         * * Config : As above, but allows further configuration options, some of which are:
+         * * config.now - Number/Date - installs lolex with the specified unix epoch (default: 0)
+         * * config.toFake - String[ ] - an array with explicit function names to fake.
+         * By default lolex will automatically fake all methods except process.nextTick. You could, however, still fake nextTick by providing it explicitly
+         * * config.shouldAdvanceTime - Boolean - tells lolex to increment mocked time automatically based on the real system time shift (default: false)
+         * * Please visit the lolex.install documentation for the full feature set.
+         * * Important note: when faking nextTick, normal calls to process.nextTick() would not execute automatically as they would during normal event-loop phases.
+         * You would have to call either clock.next(), clock.tick(), clock.runAll() or clock.runToLast() (see example below). Please refer to the lolex documentation for more information.
+         * @param config
+         */
+        useFakeTimers(
+            config?: number | Date | Partial<SinonFakeTimersConfig>
+        ): SinonFakeTimers;
+        /**
+         * Causes Sinon to replace the native XMLHttpRequest object in browsers that support it with a custom implementation which does not send actual requests.
+         * In browsers that support ActiveXObject, this constructor is replaced, and fake objects are returned for XMLHTTP progIds.
+         * Other progIds, such as XMLDOM are left untouched.
+         * The native XMLHttpRequest object will be available at sinon.xhr.XMLHttpRequest
+         */
+        useFakeXMLHttpRequest(): SinonFakeXMLHttpRequestStatic;
+        /**
+         * Fakes XHR and binds a server object to the sandbox such that it too is restored when calling sandbox.restore().
+         * Access requests through sandbox.requests and server through sandbox.server
+         */
+        useFakeServer(): SinonFakeServer;
+        /**
+         * Restores all fakes created through sandbox.
+         */
+        restore(): void;
+        /**
+         * Resets the internal state of all fakes created through sandbox.
+         */
+        reset(): void;
+        /**
+         * Resets the history of all stubs created through the sandbox.
+         * Since sinon@2.0.0
+         */
+        resetHistory(): void;
+        /**
+         * Resets the behaviour of all stubs created through the sandbox.
+         * Since sinon@2.0.0
+         */
+        resetBehavior(): void;
+        /**
+         * Causes all stubs created from the sandbox to return promises using a specific Promise library instead of the global one when using stub.rejects or stub.resolves.
+         * Returns the stub to allow chaining.
+         * Since sinon@2.0.0
+         */
+        usingPromise(promiseLibrary: any): SinonSandbox;
+        /**
+         * Verifies all mocks created through the sandbox.
+         */
+        verify(): void;
+        /**
+         * Verifies all mocks and restores all fakes created through the sandbox.
+         */
+        verifyAndRestore(): void;
+
+        /**
+         * Replaces property on object with replacement argument. Attempts to replace an already replaced value cause an exception.
+         * replacement can be any value, including spies, stubs and fakes.
+         * This method only works on non-accessor properties, for replacing accessors, use sandbox.replaceGetter() and sandbox.replaceSetter().
+         */
+        replace<T, TKey extends keyof T>(
+            obj: T,
+            prop: TKey,
+            replacement: T[TKey]
+        ): T[TKey];
+        /**
+         * Replaces getter for property on object with replacement argument. Attempts to replace an already replaced getter cause an exception.
+         * replacement must be a Function, and can be instances of spies, stubs and fakes.
+         * @param obj
+         * @param prop
+         * @param replacement
+         */
+        replaceGetter<T, TKey extends keyof T>(
+            obj: T,
+            prop: TKey,
+            replacement: () => T[TKey]
+        ): () => T[TKey];
+        /**
+         * Replaces setter for property on object with replacement argument. Attempts to replace an already replaced setter cause an exception.
+         * replacement must be a Function, and can be instances of spies, stubs and fakes.
+         * @param obj
+         * @param prop
+         * @param replacement
+         */
+        replaceSetter<T, TKey extends keyof T>(
+            obj: T,
+            prop: TKey,
+            replacement: (val: T[TKey]) => void
+        ): (val: T[TKey]) => void;
+
+        /**
+         * Creates a new object with the given functions as the prototype and stubs all implemented functions.
+         *
+         * @template TType Type being stubbed.
+         * @param constructor   Object or class to stub.
+         * @returns A stubbed version of the constructor.
+         * @remarks The given constructor function is not invoked. See also the stub API.
+         */
+        createStubInstance<TType>(
+            constructor: StubbableType<TType>
+        ): SinonStubbedInstance<TType>;
+    }
+
+    interface SinonApi {
+        fake: SinonFake;
+        match: SinonMatch;
+        spyCall(...args: any[]): SinonSpyCall;
+        expectation: SinonExpectationStatic;
+
+        clock: {
+            create(now: number | Date): SinonFakeTimers;
+        };
+
+        FakeXMLHttpRequest: SinonFakeXMLHttpRequestStatic;
+
+        fakeServer: SinonFakeServerStatic;
+        fakeServerWithClock: SinonFakeServerStatic;
+
+        /**
+         * Creates a new sandbox object with spies, stubs, and mocks.
+         * @param config
+         */
+        createSandbox(config?: Partial<SinonSandboxConfig>): SinonSandbox;
+        defaultConfig: Partial<SinonSandboxConfig>;
+    }
+
+    interface LegacySandbox {
+        sandbox: {
+            /**
+             * @deprecated Since 5.0, use `sinon.createSandbox` instead
+             */
+            create(config?: Partial<SinonSandboxConfig>): SinonSandbox;
+        };
+    }
+
+    type SinonStatic = SinonSandbox & LegacySandbox & SinonApi;
+}
+
+declare const Sinon: Sinon.SinonStatic;
+
+export = Sinon;
+export as namespace sinon;
diff --git a/types/sinon/ts3.1/sinon-tests.ts b/types/sinon/ts3.1/sinon-tests.ts
new file mode 100644
index 0000000000..b892f22980
--- /dev/null
+++ b/types/sinon/ts3.1/sinon-tests.ts
@@ -0,0 +1,488 @@
+import sinon = require("sinon");
+
+function testSandbox() {
+    const obj = {};
+
+    sinon.createSandbox({
+        injectInto: obj,
+        properties: ['spy', 'stub'],
+        useFakeTimers: true,
+        useFakeServer: true
+    });
+    sinon.createSandbox({
+        injectInto: null
+    });
+    sinon.createSandbox({
+        useFakeTimers: {
+            now: 1000,
+            shouldAdvanceTime: false
+        },
+        useFakeServer: sinon.fakeServer.create()
+    });
+    sinon.createSandbox(sinon.defaultConfig);
+    sinon.sandbox.create();
+    sinon.sandbox.create(sinon.defaultConfig);
+
+    const sb = sinon.createSandbox();
+
+    sb.assert.pass('foo');
+    sb.clock.tick(1000);
+    sb.spy();
+    sb.stub();
+    sb.mock(obj);
+
+    sb.useFakeTimers();
+    sb.useFakeTimers(1000);
+    sb.useFakeTimers(new Date());
+    sb.useFakeTimers({
+        now: 1000
+    });
+
+    const xhr = sb.useFakeXMLHttpRequest();
+    xhr.useFilters = true;
+    xhr.restore();
+
+    const server = sb.useFakeServer();
+    server.respondWith('foo');
+
+    sb.restore();
+    sb.reset();
+    sb.resetHistory();
+    sb.resetBehavior();
+    sb.usingPromise(Promise);
+    sb.verify();
+    sb.verifyAndRestore();
+
+    const replaceMe = {
+        prop: 5,
+        method() { return 6; },
+        get getter() { return 7; },
+        get setter() { return true; },
+        set setter(val) { }
+    };
+
+    sb.replace(replaceMe, 'prop', 10);
+    sb.replace(replaceMe, 'method', sb.spy());
+    sb.replaceGetter(replaceMe, 'getter', () => 14);
+    sb.replaceSetter(replaceMe, 'setter', (v) => { });
+
+    const cls = class {
+        foo() { }
+        bar: number;
+    };
+    const PrivateFoo = class {
+        private constructor() { }
+        foo() { }
+        bar: number;
+        static create() {
+            return new PrivateFoo();
+        }
+    };
+
+    const stubInstance = sb.createStubInstance(cls);
+    const privateFooStubbedInstance = sb.createStubInstance(PrivateFoo);
+    stubInstance.foo.calledWith('foo');
+    privateFooStubbedInstance.foo.calledWith('foo');
+    const clsFoo: sinon.SinonStub = stubInstance.foo;
+    const privateFooFoo: sinon.SinonStub = privateFooStubbedInstance.foo;
+    const clsBar: number = stubInstance.bar;
+    const privateFooBar: number = privateFooStubbedInstance.bar;
+}
+
+function testFakeServer() {
+    let s = sinon.fakeServer.create();
+    s = sinon.fakeServerWithClock.create();
+
+    sinon.fakeServer.create({
+        autoRespond: true,
+        autoRespondAfter: 3,
+        fakeHTTPMethods: true,
+        respondImmediately: false
+    });
+
+    sinon.fakeServer.create({
+        autoRespond: true,
+        autoRespondAfter: 3
+    });
+}
+
+function testXHR() {
+    const xhr = new sinon.FakeXMLHttpRequest();
+    const headers = xhr.getAllResponseHeaders();
+    const header = xhr.getResponseHeader('foo');
+
+    xhr.setResponseHeaders({ 'Content-Type': 'text/html' });
+    xhr.setResponseBody('foo');
+    xhr.respond(200, { 'Content-Type': 'foo' }, 'bar');
+    xhr.error();
+
+    sinon.FakeXMLHttpRequest.useFilters = true;
+    sinon.FakeXMLHttpRequest.addFilter((method, url, async, user, pass) => true);
+    sinon.FakeXMLHttpRequest.onCreate = (xhr) => { };
+    sinon.FakeXMLHttpRequest.restore();
+}
+
+function testClock() {
+    let clock = sinon.clock.create(1000);
+    clock = sinon.clock.create(new Date());
+
+    let now = 0;
+    now = clock.now;
+
+    const fn = () => { };
+
+    clock.setTimeout(fn, 0);
+    clock.setTimeout(fn, 0, 'a', 'b');
+    clock.setInterval(fn, 0);
+    clock.setInterval(fn, 0, 'a', 'b');
+    clock.setImmediate(fn);
+    clock.setImmediate(fn, 'a', 'b');
+    clock.requestAnimationFrame(fn);
+
+    let timer = clock.setTimeout(fn, 0);
+    clock.clearTimeout(timer);
+    timer = clock.setInterval(fn, 0);
+    clock.clearInterval(timer);
+    timer = clock.setImmediate(fn);
+    clock.clearImmediate(timer);
+
+    const animTimer = clock.requestAnimationFrame(fn);
+    clock.cancelAnimationFrame(animTimer);
+
+    clock.nextTick(fn);
+    clock.tick(1);
+    clock.tick('00:10');
+    clock.next();
+    clock.runAll();
+    clock.runToLast();
+    clock.reset();
+    clock.runMicrotasks();
+    clock.runToFrame();
+    clock.restore();
+    clock.uninstall();
+    clock.setSystemTime(1000);
+    clock.setSystemTime(new Date());
+}
+
+function testExpectation() {
+    const obj = {};
+
+    let ex = sinon.expectation.create();
+    ex = sinon.expectation.create('some name');
+
+    ex.atLeast(5).atMost(10);
+    ex.never();
+    ex.once();
+    ex.twice();
+    ex.thrice();
+    ex.exactly(5);
+    ex.withArgs('a', 'b');
+    ex.withExactArgs('a', 'b');
+    ex.on(obj);
+    ex.verify();
+    ex.restore();
+}
+
+function testMatch() {
+    const obj = {};
+    const fn = () => { };
+
+    sinon.match(5).test(5);
+    sinon.match('str').test('foo');
+    sinon.match(/foo/).test('foo');
+    sinon.match({ a: 5, b: 6 }).test({});
+    sinon.match((v) => true).test('foo');
+    sinon.match((v) => true, 'some message').test('foo');
+    sinon.match.any.test('foo');
+    sinon.match.defined.test('foo');
+    sinon.match.truthy.test('foo');
+    sinon.match.falsy.test('foo');
+    sinon.match.bool.test('foo');
+    sinon.match.number.test('foo');
+    sinon.match.string.test('foo');
+    sinon.match.object.test('foo');
+    sinon.match.func.test(fn);
+    sinon.match.map.test(new Map([['a', 1], ['b', 2]]));
+    sinon.match.set.test(new Set([1, 2, 3]));
+    sinon.match.array.test([1, 2, 3]);
+    sinon.match.regexp.test('foo');
+    sinon.match.date.test('foo');
+    sinon.match.symbol.test('foo');
+    sinon.match.same(obj);
+    sinon.match.typeOf('string').test('foo');
+    sinon.match.instanceOf(fn).test('foo');
+    sinon.match.has('prop').test(obj);
+    sinon.match.has('prop', 123).test(obj);
+    sinon.match.hasOwn('prop').test(obj);
+    sinon.match.hasOwn('prop', 123).test(obj);
+    sinon.match.hasNested('prop.foo.bar').test(obj);
+    sinon.match.hasNested('prop.foo.bar', 123).test(obj);
+    sinon.match.every(sinon.match.number).test([1, 2, 'three']);
+    sinon.match.some(sinon.match.number).test([1, 2, 'three']);
+    sinon.match.array.deepEquals([{ a: 'b' }]).test([]);
+    sinon.match.array.startsWith([{ a: 'b' }]).test([]);
+    sinon.match.array.deepEquals([{ a: 'b' }]).test([]);
+    sinon.match.array.contains([{ a: 'b' }]).test([]);
+    sinon.match.map.deepEquals(new Map([['a', true], ['b', false]])).test(new Map());
+    sinon.match.map.contains(new Map([['a', true]])).test(new Map());
+}
+
+function testFake() {
+    const fn = () => { };
+    let fake = sinon.fake();
+
+    fake = sinon.fake(() => true);
+    fake = sinon.fake.returns(5);
+    fake = sinon.fake.throws('foo');
+    fake = sinon.fake.throws(new Error('foo'));
+    fake = sinon.fake.resolves('foo');
+    fake = sinon.fake.rejects('foo');
+    fake = sinon.fake.yields(1, 2, fn);
+    fake = sinon.fake.yieldsAsync(1, 2, fn);
+
+    fake.calledWith('foo');
+}
+
+function testAssert() {
+    const spy = sinon.spy();
+    const spyTwo = sinon.spy();
+    const obj = {};
+
+    sinon.assert.fail();
+    sinon.assert.fail('foo');
+    sinon.assert.pass('foo');
+    sinon.assert.notCalled(spy);
+    sinon.assert.called(spy);
+    sinon.assert.calledOnce(spy);
+    sinon.assert.calledTwice(spy);
+    sinon.assert.calledThrice(spy);
+    sinon.assert.callCount(spy, 3);
+    sinon.assert.callOrder(spy, spyTwo);
+    sinon.assert.calledOn(spy, obj);
+    sinon.assert.calledOn(spy.firstCall, obj);
+    sinon.assert.alwaysCalledOn(spy, obj);
+    sinon.assert.alwaysCalledWith(spy, 'a', 'b', 'c');
+    sinon.assert.neverCalledWith(spy, 'a', 'b', 'c');
+    sinon.assert.calledWithExactly(spy, 'a', 'b', 'c');
+    sinon.assert.alwaysCalledWithExactly(spy, 'a', 'b', 'c');
+    sinon.assert.calledWithMatch(spy, 'a', 'b', 'c');
+    sinon.assert.calledWithMatch(spy.firstCall, 'a', 'b', 'c');
+    sinon.assert.alwaysCalledWithMatch(spy, 'a', 'b', 'c');
+    sinon.assert.neverCalledWithMatch(spy, 'a', 'b', 'c');
+    sinon.assert.calledWithNew(spy);
+    sinon.assert.calledWithNew(spy.firstCall);
+    sinon.assert.threw(spy);
+    sinon.assert.threw(spy.firstCall);
+    sinon.assert.threw(spy, 'foo error');
+    sinon.assert.threw(spy.firstCall, 'foo error');
+    sinon.assert.threw(spy, new Error('foo'));
+    sinon.assert.threw(spy.firstCall, new Error('foo'));
+    sinon.assert.alwaysThrew(spy);
+    sinon.assert.alwaysThrew(spy, 'foo error');
+    sinon.assert.alwaysThrew(spy, new Error('foo'));
+    sinon.assert.match('a', 'b');
+    sinon.assert.match(1, 1 + 1);
+    sinon.assert.match({ a: 1 }, { b: 2, c: 'abc' });
+    sinon.assert.expose(obj);
+    sinon.assert.expose(obj, { prefix: 'blah' });
+    sinon.assert.expose(obj, { includeFail: true });
+}
+
+function testTypedSpy() {
+    const cls = class {
+        foo(a: number, b: string): number {
+            return 3;
+        }
+    };
+
+    const instance = new cls();
+    const spy = sinon.spy(instance, 'foo');
+
+    spy.calledWith(5, 'x');
+    spy.calledWith(sinon.match(5), 'x');
+    spy.calledWithExactly(5, 'x');
+    spy.calledWithExactly(5, sinon.match('x'));
+    spy.calledOnceWith(5, 'x');
+    spy.calledOnceWith(sinon.match(5), 'x');
+    spy.notCalledWith(5, 'x');
+    spy.notCalledWith(sinon.match(5), 'x');
+    spy.returned(5);
+    spy.returned(sinon.match(5));
+
+    spy.withArgs(sinon.match(5), 'x').calledWith(5, 'x');
+    spy.alwaysCalledWith(sinon.match(5), 'x');
+    spy.alwaysCalledWith(5, 'x');
+    spy.alwaysCalledWithExactly(sinon.match(5), 'x');
+    spy.alwaysCalledWithExactly(5, 'x');
+    spy.neverCalledWith(sinon.match(5), 'x');
+    spy.neverCalledWith(5, 'x');
+
+    const stub = sinon.stub(instance, 'foo');
+
+    stub.withArgs(5, 'x').returns(3);
+    stub.withArgs(sinon.match(5), 'x').returns(5);
+}
+
+function testSpy() {
+    const fn = () => { };
+    const obj = class {
+        foo() { }
+    };
+    const instance = new obj();
+
+    let spy = sinon.spy();
+    const spyTwo = sinon.spy().named('spyTwo');
+
+    spy = sinon.spy(fn);
+    spy = sinon.spy(instance, 'foo');
+
+    let count = 0;
+    count = spy.callCount;
+
+    let called = false;
+    called = spy.called;
+    called = spy.notCalled;
+    called = spy.calledOnce;
+    called = spy.calledTwice;
+    called = spy.calledThrice;
+
+    let arr: any[] = [];
+    arr = spy.thisValues;
+    arr = spy.args;
+    arr = spy.exceptions;
+    arr = spy.returnValues;
+
+    spy('a', 'b');
+    spy(1, 2);
+    spy(true);
+
+    spy.calledBefore(spyTwo);
+    spy.calledAfter(spyTwo);
+    spy.calledImmediatelyBefore(spyTwo);
+    spy.calledImmediatelyAfter(spyTwo);
+    spy.calledWithNew();
+    spy.withArgs('a', 1).calledBefore(spyTwo);
+    spy.alwaysCalledOn(instance);
+    spy.alwaysCalledWith('a', 1);
+    spy.alwaysCalledWith('a');
+    spy.alwaysCalledWithExactly('a', 1);
+    spy.alwaysCalledWithMatch('foo');
+    spy.neverCalledWith('b', 2);
+    spy.neverCalledWith('b');
+    spy.neverCalledWithMatch('foo', 'bar');
+    spy.alwaysThrew();
+    spy.alwaysThrew('foo');
+    spy.alwaysThrew(new Error('foo'));
+    spy.alwaysReturned('foo');
+    spy.invokeCallback('a', 'b');
+    spy.calledOn(instance);
+    spy.calledWith('a', 2);
+    spy.calledWithExactly('a', 2);
+    spy.calledOnceWith('a', 2);
+    spy.calledOnceWithExactly('a', 2);
+    spy.calledWithMatch('bar', 2);
+    spy.notCalledWith('a', 2);
+    spy.notCalledWithMatch('a', 2);
+    spy.returned(true);
+    spy.returned('foo');
+    spy.returned(2);
+    spy.threw();
+    spy.threw('foo');
+    spy.threw(new Error('foo'));
+    spy.callArg(1);
+    spy.callArgOn(1, instance);
+    spy.callArgOn(1, instance, 'a', 2);
+    spy.callArgWith(1, 'a', 2);
+    spy.callArgOnWith(1, instance, 'a', 2);
+    spy.yield('a', 2);
+    spy.yieldOn(instance, 'a', 2);
+    spy.yieldTo('prop', 'a', 2);
+    spy.yieldToOn('prop', instance, 'a', 2);
+
+    let call = spy.firstCall;
+    call = spy.secondCall;
+    call = spy.thirdCall;
+    call = spy.lastCall;
+    call = spy.getCall(1);
+    call = spy.getCalls()[0];
+
+    call.calledBefore(call);
+    call.calledAfter(call);
+    call.calledWithNew();
+
+    spy.resetHistory();
+    spy.restore();
+}
+
+function testStub() {
+    const obj = class {
+        foo() { }
+    };
+    const instance = new obj();
+
+    let stub = sinon.stub();
+    stub = sinon.stub(instance, 'foo').named('namedStub');
+
+    const spy: sinon.SinonSpy = stub;
+
+    sinon.stub(instance);
+
+    stub.reset();
+    stub.resetBehavior();
+    stub.usingPromise(Promise);
+
+    stub.returns(true);
+    stub.returns(5);
+    stub.returns('foo');
+    stub.returnsArg(1);
+    stub.returnsThis();
+    stub.resolves();
+    stub.resolves('foo');
+    stub.resolvesArg(1);
+    stub.resolvesThis();
+    stub.throws();
+    stub.throws('err');
+    stub.throws(new Error('err'));
+    stub.throwsArg(1);
+    stub.throwsException('err');
+    stub.throwsException(new Error('err'));
+    stub.rejects();
+    stub.rejects('TypeError');
+    stub.rejects(1234);
+    stub.callsArg(1);
+    stub.callThrough();
+    stub.callsArgOn(1, instance);
+    stub.callsArgWith(1, 'a', 2);
+    stub.callsArgAsync(1);
+    stub.callsArgOnAsync(1, instance);
+    stub.callsArgWithAsync(1, 'a', 2);
+    stub.callsArgOnWithAsync(1, instance, 'a', 2);
+    stub.callsFake((s1, s2, s3) => { });
+    stub.callsFake(() => { });
+    stub.get(() => true);
+    stub.set((v) => { });
+    stub.onCall(1).returns(true);
+    stub.onFirstCall().resolves('foo');
+    stub.onSecondCall().resolves('foo');
+    stub.onThirdCall().resolves('foo');
+    stub.value('foo');
+    stub.yields('a', 2);
+    stub.yieldsOn(instance, 'a', 2);
+    stub.yieldsRight('a', 2);
+    stub.yieldsTo('foo', 'a', 2);
+    stub.yieldsToOn('foo', instance, 'a', 2);
+    stub.yieldsAsync('a', 2);
+    stub.yieldsOnAsync(instance, 'a', 2);
+    stub.yieldsToAsync('foo', 'a', 2);
+    stub.yieldsToOnAsync('foo', instance, 'a', 2);
+    stub.withArgs('a', 2).returns(true);
+}
+
+function testMock() {
+    const obj = {};
+    const mock = sinon.mock(obj);
+
+    mock.expects('method').atLeast(2).atMost(5);
+    mock.restore();
+    mock.verify();
+}
diff --git a/types/sinon/ts3.1/tsconfig.json b/types/sinon/ts3.1/tsconfig.json
new file mode 100644
index 0000000000..7468efa8bf
--- /dev/null
+++ b/types/sinon/ts3.1/tsconfig.json
@@ -0,0 +1,25 @@
+{
+    "compilerOptions": {
+        "target": "es5",
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../../",
+        "typeRoots": [
+            "../../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "sinon-tests.ts"
+    ]
+}

From b6ed9ced6374a38e41b83cacf60bf3d7a5dddadd Mon Sep 17 00:00:00 2001
From: Kelvin Jin <kelvinjin@google.com>
Date: Mon, 10 Dec 2018 14:54:12 -0800
Subject: [PATCH 828/836] [node] add trace_events type definitions

---
 types/node/index.d.ts    | 62 ++++++++++++++++++++++++++++++++++++++++
 types/node/node-tests.ts | 14 +++++++++
 2 files changed, 76 insertions(+)

diff --git a/types/node/index.d.ts b/types/node/index.d.ts
index b9edae0587..547a30b84a 100644
--- a/types/node/index.d.ts
+++ b/types/node/index.d.ts
@@ -9008,3 +9008,65 @@ declare module "perf_hooks" {
 
     const performance: Performance;
 }
+
+declare module "trace_events" {
+    /**
+     * The `Tracing` object is used to enable or disable tracing for sets of
+     * categories. Instances are created using the
+     * `trace_events.createTracing()` method.
+     *
+     * When created, the `Tracing` object is disabled. Calling the
+     * `tracing.enable()` method adds the categories to the set of enabled trace
+     * event categories. Calling `tracing.disable()` will remove the categories
+     * from the set of enabled trace event categories.
+     */
+    export interface Tracing {
+        /**
+         * A comma-separated list of the trace event categories covered by this
+         * `Tracing` object.
+         */
+        readonly categories: string;
+
+        /**
+         * Disables this `Tracing` object.
+         *
+         * Only trace event categories _not_ covered by other enabled `Tracing`
+         * objects and _not_ specified by the `--trace-event-categories` flag
+         * will be disabled.
+         */
+        disable(): void;
+
+        /**
+         * Enables this `Tracing` object for the set of categories covered by
+         * the `Tracing` object.
+         */
+        enable(): void;
+
+        /**
+         * `true` only if the `Tracing` object has been enabled.
+         */
+        readonly enabled: boolean;
+    }
+
+    interface CreateTracingOptions {
+        /**
+         * An array of trace category names. Values included in the array are
+         * coerced to a string when possible. An error will be thrown if the
+         * value cannot be coerced.
+         */
+        categories: string[];
+    }
+
+    /**
+     * Creates and returns a Tracing object for the given set of categories.
+     */
+    export function createTracing(options: CreateTracingOptions): Tracing;
+
+    /**
+     * Returns a comma-separated list of all currently-enabled trace event
+     * categories. The current set of enabled trace event categories is
+     * determined by the union of all currently-enabled `Tracing` objects and
+     * any categories enabled using the `--trace-event-categories` flag.
+     */
+    export function getEnabledCategories(): string;
+}
diff --git a/types/node/node-tests.ts b/types/node/node-tests.ts
index c0f80728fc..7bb69e87e4 100644
--- a/types/node/node-tests.ts
+++ b/types/node/node-tests.ts
@@ -30,6 +30,7 @@ import * as async_hooks from "async_hooks";
 import * as http2 from "http2";
 import * as inspector from "inspector";
 import * as perf_hooks from "perf_hooks";
+import * as trace_events from "trace_events";
 import Module = require("module");
 
 // Specifically test buffer module regression.
@@ -4676,6 +4677,19 @@ import * as constants from 'constants';
     }
 }
 
+///////////////////////////////////////////////////////////
+/// Trace Events Tests                                  ///
+///////////////////////////////////////////////////////////
+
+{
+    const enabledCategories: string = trace_events.getEnabledCategories();
+    const tracing: trace_events.Tracing = trace_events.createTracing({ categories: ['node', 'v8'] });
+    const categories: string = tracing.categories;
+    const enabled: boolean = tracing.enabled;
+    tracing.enable();
+    tracing.disable();
+}
+
 ////////////////////////////////////////////////////
 /// module tests : http://nodejs.org/api/modules.html
 ////////////////////////////////////////////////////

From 7c55f186436f825e312850ca67d7d951e9aa974d Mon Sep 17 00:00:00 2001
From: 43081j <43081j@users.noreply.github.com>
Date: Wed, 12 Dec 2018 19:05:28 +0000
Subject: [PATCH 829/836] sinon: add tslint config

---
 types/sinon/ts3.1/tslint.json | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 types/sinon/ts3.1/tslint.json

diff --git a/types/sinon/ts3.1/tslint.json b/types/sinon/ts3.1/tslint.json
new file mode 100644
index 0000000000..1b62a88e52
--- /dev/null
+++ b/types/sinon/ts3.1/tslint.json
@@ -0,0 +1,7 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "ban-types": false,
+        "unified-signatures": false
+    }
+}

From dade8fa6f710f802fd100c27ca7a480f1df8a52c Mon Sep 17 00:00:00 2001
From: Asif Rahman <asif_rahman@ultimatesoftware.com>
Date: Wed, 12 Dec 2018 14:59:56 -0500
Subject: [PATCH 830/836] Swiper 4.4 typings update

- Added missing swiper options
- Added missing methods
---
 types/swiper/index.d.ts | 64 +++++++++++++++++++++++++++++++++++++++--
 1 file changed, 62 insertions(+), 2 deletions(-)

diff --git a/types/swiper/index.d.ts b/types/swiper/index.d.ts
index 9e77516978..74b8d928b9 100644
--- a/types/swiper/index.d.ts
+++ b/types/swiper/index.d.ts
@@ -1,10 +1,11 @@
-// Type definitions for Swiper 4.2
+// Type definitions for Swiper 4.4
 // Project: https://github.com/nolimits4web/Swiper
 // Definitions by: Sebastián Galiano <https://github.com/sgaliano>
 //                 Luca Trazzi <https://github.com/lucax88x>
 //                 Eugene Matseruk <https://github.com/ematseruk>
 //                 Luiz M. <https://github.com/odahcam>
 //                 Justin Abene <https://github.com/jmca>
+//                 Asif Rahman <https://github.com/daem0ndev>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.9
 
@@ -221,6 +222,7 @@ export interface SwiperOptions {
     slidesOffsetBefore?: number;
     slidesOffsetAfter?: number;
     normalizeSlideIndex?: boolean;
+    centerInsufficientSlides?: boolean;
 
     // Grab Cursor
     grabCursor?: boolean;
@@ -238,6 +240,8 @@ export interface SwiperOptions {
     followFinger?: boolean;
     allowTouchMove?: boolean;
     threshold?: number;
+    touchStartPreventDefault?: boolean;
+    touchStartForcePreventDefault?: boolean;
     touchMoveStopPropagation?: boolean;
     iOSEdgeSwipeDetection?: boolean;
     iOSEdgeSwipeThreshold?: number;
@@ -249,11 +253,12 @@ export interface SwiperOptions {
     resistanceRatio?: number;
 
     // Swiping / No swiping
+    preventInteractionOnTransition?: boolean;
     allowSlidePrev?: boolean;
     allowSlideNext?: boolean;
     noSwiping?: boolean;
     noSwipingClass?: string;
-    // noSwipingSelector?: string;
+    noSwipingSelector?: string;
     swipeHandler?: SelectableElement;
 
     // Clicks
@@ -289,6 +294,7 @@ export interface SwiperOptions {
     breakpoints?: {
         [index: number]: SwiperOptions;
     };
+    breakpointsInverse?: boolean;
 
     // Observer
     observer?: boolean;
@@ -1073,6 +1079,44 @@ export default class Swiper {
      */
     slideTo(index: number, speed?: number, runCallbacks?: boolean): void;
 
+    /**
+     * Does the same as .slideTo but for the case when used with enabled loop. So this
+     * method will slide to slides with realIndex matching to passed index
+     *
+     * @param index Index number of slide.
+     * @param speed Transition duration (in ms).
+     * @param runCallbacks Set it to false (by default it is true) and transition will
+     *  not produce transition events.
+     */
+    slideToLoop(index: number, speed?: number, runCallbacks?: boolean): void;
+
+    /**
+     * Reset swiper position to currently active slide for the duration equal to 'speed'
+     * parameter.
+     *
+     * @param speed Transition duration (in ms).
+     * @param runCallbacks Set it to false (by default it is true) and transition will
+     *  not produce transition events.
+     */
+    slideReset(speed?: number, runCallbacks?: boolean): void;
+
+    /**
+     * Reset swiper position to closest slide/snap point for the duration equal to 'speed' parameter.
+     *
+     * @param speed Transition duration (in ms).
+     * @param runCallbacks Set it to false (by default it is true) and transition will
+     *  not produce transition events.
+     */
+    slideToClosest(speed?: number, runCallbacks?: boolean): void;
+
+    /**
+     * Force swiper to update its height (when autoHeight enabled) for the duration equal to
+     * 'speed' parameter
+     *
+     * @param speed Transition duration (in ms).
+     */
+    updateAutoHeight(speed?: number): void;
+
     /**
      * You should call it after you add/remove slides
      * manually, or after you hide/show it, or do any
@@ -1162,6 +1206,17 @@ export default class Swiper {
      */
     prependSlide(slides: HTMLElement | string | string[]): void;
 
+    /**
+     * Add new slides to the required index. slides could be HTMLElement or HTML string with new slide or array with such slides, for example:
+     *
+     * @example addSlide(1, '<div class="swiper-slide">Slide 10"</div>')
+     * @example addSlide(1, [
+     *  '<div class="swiper-slide">Slide 10"</div>',
+     *  '<div class="swiper-slide">Slide 11"</div>'
+     * ]);
+     */
+    addSlide(index: number, slides: HTMLElement | string | string[]): void;
+
     /**
      * Remove selected slides. slideIndex could be a number with slide index to remove or array with indexes.
      *
@@ -1171,6 +1226,11 @@ export default class Swiper {
      */
     removeSlide(slideIndex: number | number[]): void;
 
+    /**
+     * Remove all slides
+     */
+    removeAllSlides(): any;
+
     /**
      * Set custom css3 transform's translate value for swiper wrapper
      */

From 969421fd0e73a46a1ce7fadfbfe5a91632f968f9 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <293473+sandersn@users.noreply.github.com>
Date: Wed, 12 Dec 2018 12:58:11 -0800
Subject: [PATCH 831/836] Fix multi-progress reference to progress

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

diff --git a/types/multi-progress/index.d.ts b/types/multi-progress/index.d.ts
index ebedcf9597..db15a15b1b 100644
--- a/types/multi-progress/index.d.ts
+++ b/types/multi-progress/index.d.ts
@@ -5,7 +5,7 @@
 
 /// <reference types="node"/>
 
-import ProgressBar, { ProgressBarOptions } from '../progress';
+import ProgressBar, { ProgressBarOptions } from 'progress';
 import { Stream } from 'stream';
 
 export default class MultiProgress {

From fee22b212b1c2f31ad2556ab780750cc22d3773e Mon Sep 17 00:00:00 2001
From: Mike North <michael.l.north@gmail.com>
Date: Wed, 12 Dec 2018 13:08:54 -0800
Subject: [PATCH 832/836] fix: add @ember/object notifyPropertyChange

---
 types/ember/index.d.ts             | 1 +
 types/ember/test/object.ts         | 7 +++++++
 types/ember__object/index.d.ts     | 2 ++
 types/ember__object/test/object.ts | 8 +++++++-
 4 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/types/ember/index.d.ts b/types/ember/index.d.ts
index fdb89d3823..4e2b45cd55 100755
--- a/types/ember/index.d.ts
+++ b/types/ember/index.d.ts
@@ -478,6 +478,7 @@ export namespace Ember {
     const addObserver: typeof EmberObjectObserversNs.addObserver;
     const removeObserver: typeof EmberObjectObserversNs.removeObserver;
     const get: typeof EmberObjectNs.get;
+    const notifyPropertyChange: typeof EmberObjectNs.notifyPropertyChange;
     const getWithDefault: typeof EmberObjectNs.getWithDefault;
     const getProperties: typeof EmberObjectNs.getProperties;
     const setProperties: typeof EmberObjectNs.setProperties;
diff --git a/types/ember/test/object.ts b/types/ember/test/object.ts
index 060bf8ca81..853ed46d46 100755
--- a/types/ember/test/object.ts
+++ b/types/ember/test/object.ts
@@ -65,4 +65,11 @@ export class Foo2 extends Ember.Object {
         name
     });
   }
+
+  bar() {
+      Ember.notifyPropertyChange(this, 'name');
+      Ember.notifyPropertyChange(this); // $ExpectError
+      Ember.notifyPropertyChange('name'); // $ExpectError
+      Ember.notifyPropertyChange(this, 'name', 'bar'); // $ExpectError
+  }
 }
diff --git a/types/ember__object/index.d.ts b/types/ember__object/index.d.ts
index f915bdc82a..06e417999d 100644
--- a/types/ember__object/index.d.ts
+++ b/types/ember__object/index.d.ts
@@ -385,6 +385,8 @@ export function defineProperty(
     meta?: any
 ): void;
 
+export function notifyPropertyChange(obj: object, keyName: string): void;
+
 declare module '@ember/utils/-private/types' {
     interface TypeLookup {
         class: typeof EmberObject;
diff --git a/types/ember__object/test/object.ts b/types/ember__object/test/object.ts
index b47aa22ffb..391ac183a9 100644
--- a/types/ember__object/test/object.ts
+++ b/types/ember__object/test/object.ts
@@ -1,4 +1,4 @@
-import EmberObject, { computed } from "@ember/object";
+import EmberObject, { computed, notifyPropertyChange } from "@ember/object";
 
 const LifetimeHooks = EmberObject.extend({
     resource: null as {} | null,
@@ -47,6 +47,12 @@ class Foo extends EmberObject {
             b: 11
         });
     }
+    bar() {
+        notifyPropertyChange(this, 'name');
+        notifyPropertyChange(this); // $ExpectError
+        notifyPropertyChange('name'); // $ExpectError
+        notifyPropertyChange(this, 'name', 'bar'); // $ExpectError
+    }
 }
 
 // TODO: enable after TS 3.0 https://github.com/typed-ember/ember-cli-typescript/issues/291

From a01d23b10cb43cdc051b70c35758294a5a651a43 Mon Sep 17 00:00:00 2001
From: mAAdhaTTah <jamesorodig@gmail.com>
Date: Tue, 4 Dec 2018 11:27:07 -0500
Subject: [PATCH 833/836] Add barWidth & barRatio props to VictoryBarProps

---
 types/victory/index.d.ts        | 91 +++++++++++++++++++--------------
 types/victory/tslint.json       |  1 -
 types/victory/victory-tests.tsx |  2 +
 3 files changed, 55 insertions(+), 39 deletions(-)

diff --git a/types/victory/index.d.ts b/types/victory/index.d.ts
index 5670547317..d002a3d695 100644
--- a/types/victory/index.d.ts
+++ b/types/victory/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Victory 0.9.3
+// Type definitions for Victory 31.0
 // Project: https://github.com/FormidableLabs/victory
 // Definitions by: Alexey Svetliakov <https://github.com/asvetliakov>
 //                 snerks <https://github.com/snerks>
@@ -269,16 +269,16 @@ declare module "victory" {
      */
     cursorLabel?: (point: CursorData) => void;
     /**
-     * The cursorLabelComponent prop takes a component instance which will be 
-     * used to render a label for the cursor. The new element created from the passed 
+     * The cursorLabelComponent prop takes a component instance which will be
+     * used to render a label for the cursor. The new element created from the passed
      * cursorLabelComponent will be supplied with the following props: x, y,
      * active, text. If cursorLabelComponent is omitted, a new VictoryLabel will be created with the props described above.
      * @default cursorLabelComponent={<VictoryLabel/>}
      */
     cursorLabelComponent?: React.ReactElement<any>;
     /**
-     * The cursorLabelOffset prop determines the pixel offset of the cursor label 
-     * from the cursor point. This prop should be an Object with x and y properties, or a 
+     * The cursorLabelOffset prop determines the pixel offset of the cursor label
+     * from the cursor point. This prop should be an Object with x and y properties, or a
      * number to be used for both dimensions.
      * @default "{ x: 5, y: -10 }"
      */
@@ -315,45 +315,45 @@ declare module "victory" {
      */
     allowDrag?: boolean;
     /**
-     * The optional allowResize prop accepts a boolean that enables resizing the 
+     * The optional allowResize prop accepts a boolean that enables resizing the
      * highlighted brush area. Dragging will still be enabled when the allowResize
      * prop is set to false, but the dimensions of the brush area will be fixed.
      * @default true
      */
     allowResize?: boolean;
     /**
-     * The brushComponent prop specifies the component to be rendered for the 
-     * highlighted area. This component will be supplied with the following props: x, y, 
+     * The brushComponent prop specifies the component to be rendered for the
+     * highlighted area. This component will be supplied with the following props: x, y,
      * width, height, and style. When this prop is not specified, a <rect/> will be rendered.
      * @default brushComponent={<rect/>}
      */
     brushComponent?: React.ReactElement<any>;
     /**
-     * When the brushDimension prop is set, brushing will only be specific to the to 
-     * the given dimension (either "x" or "y"), and the entire domain of the other 
+     * When the brushDimension prop is set, brushing will only be specific to the to
+     * the given dimension (either "x" or "y"), and the entire domain of the other
      * dimension will be highlighted. When this prop is not specified, highlighting will
      * occur along both dimensions.
      * @example brushDimension="x"
      */
     brushDimension?: 'x' | 'y';
     /**
-     * The optional brushDomain prop describes the highlighted state. This prop is an 
-     * object that specifies separate arrays for x and y. Each array is a tuple that 
-     * describes the minimum and maximum values to render. If this prop is not provided 
-     * initially, the chart will render with the entire domain highlighted. When this prop 
+     * The optional brushDomain prop describes the highlighted state. This prop is an
+     * object that specifies separate arrays for x and y. Each array is a tuple that
+     * describes the minimum and maximum values to render. If this prop is not provided
+     * initially, the chart will render with the entire domain highlighted. When this prop
      * changes, the chart will render with a new highlighted domain.
      * @example brushDomain={{ x: [50, 100], y: [0, 100] }}
      */
     brushDomain?: DomainPropType;
     /**
-     * The brushStyle adds custom styles to the brushComponent. This prop 
+     * The brushStyle adds custom styles to the brushComponent. This prop
      * should be given as an object of SVG style attributes.
      * @default "brushStyle={{ stroke: "transparent", fill: "black", fillOpacity: 0.1 }}"
      */
     brushStyle?: React.CSSProperties;
     /**
-     * The defaultBrushArea prop specifies how the container will behave when a 
-     * region outside the active brush is clicked without selecting a new area. When the 
+     * The defaultBrushArea prop specifies how the container will behave when a
+     * region outside the active brush is clicked without selecting a new area. When the
      * prop is set to "all", the entire domain will be selected. When the prop is set to "none",
      * no new region will be selected, and any existing active brush will be cleared. When
      * the prop is set to "disable" the new selected region will default to the current active brush.
@@ -364,8 +364,8 @@ declare module "victory" {
      */
     disable?: boolean;
     /**
-     * The handleComponent prop specifies the component to be rendered for each 
-     * handle for the highlighted area. This component will be supplied with the following 
+     * The handleComponent prop specifies the component to be rendered for each
+     * handle for the highlighted area. This component will be supplied with the following
      * props: x, y, width, height, cursor, and style. When this prop is not
      * specified, a <rect/> will be rendered.
      * @default handleComponent={<rect/>}
@@ -373,7 +373,7 @@ declare module "victory" {
     handleComponent?: React.ReactElement<any>;
     /**
      * The handleStyle adds custom styles to the handleComponents. This prop should be given as an object of SVG style attributes.
-     * 
+     *
      * Handles refer to the region on each highlighted area where the area may be
      * expanded. Only handles relevant to the given dimension will be rendered. For
      * example, when brushDimension="x" only "left" and "right" handles will be
@@ -382,8 +382,8 @@ declare module "victory" {
      */
     handleStyle?: React.CSSProperties;
     /**
-     * The optional onBrushDomainChange prop accepts an function to be called on 
-     * each update to the highlighted domain. The function accepts the parameters of 
+     * The optional onBrushDomainChange prop accepts an function to be called on
+     * each update to the highlighted domain. The function accepts the parameters of
      * domain (the updated domain), and props (the props used by VictoryBrushContainer).
      * @example onBrushDomainChange={(domain, props) => handleDomainChange(domain, props)}
      */
@@ -394,7 +394,7 @@ declare module "victory" {
 
   export interface VictoryZoomContainerProps extends VictoryContainerProps {
     /**
-     * The optional allowPan prop accepts a boolean that enables the panning 
+     * The optional allowPan prop accepts a boolean that enables the panning
      * functionality. Zooming will still be enabled when the allowPan prop is set to false.
      * @default true
      */
@@ -406,7 +406,7 @@ declare module "victory" {
      */
     allowZoom?: boolean;
     /**
-     * VictoryZoomContainer works by clipping data outside of a given domain. 
+     * VictoryZoomContainer works by clipping data outside of a given domain.
      * VictoryZoomContainer uses VictoryClipContainer by default.
      * This prop should not be replaced with a custom component, but you may want to set
      * props on VictoryClipContainer, such as clipPadding.
@@ -414,30 +414,30 @@ declare module "victory" {
      */
     clipContainerComponent?: React.ReactElement<any>;
     /**
-     * When the zoomDimension prop is set, panning and zooming will be restricted to 
-     * the given dimension (either x or y), and the domain of the other dimension will 
+     * When the zoomDimension prop is set, panning and zooming will be restricted to
+     * the given dimension (either x or y), and the domain of the other dimension will
      * remain static. When this prop is not specified, both x and y dimensions will pan and zoom.
      * @example zoomDimension="x"
      */
     zoomDimension?: 'x' | 'y';
     /**
-     * The zoomDomain prop describes the zoomed state. This prop is an object that 
-     * specifies separate arrays for x and y. Each array is a tuple that describes the 
-     * minimum and maximum values to render. If this prop is not provided initially, the 
-     * chart will render without an initial zoom, displaying the entire dataset. Updates to 
+     * The zoomDomain prop describes the zoomed state. This prop is an object that
+     * specifies separate arrays for x and y. Each array is a tuple that describes the
+     * minimum and maximum values to render. If this prop is not provided initially, the
+     * chart will render without an initial zoom, displaying the entire dataset. Updates to
      * zoomDomain will trigger a re-render of the chart with the new domain.
      * @example zoomDomain={{x: [0, 100]}}
      */
     zoomDomain?: DomainPropType;
     /**
-     * The brushStyle adds custom styles to the brushComponent. This prop 
+     * The brushStyle adds custom styles to the brushComponent. This prop
      * should be given as an object of SVG style attributes.
      * @default "brushStyle={{ stroke: 'transparent', fill: 'black', fillOpacity: 0.1 }}"
      */
     brushStyle?: React.CSSProperties;
     /**
-     * The defaultBrushArea prop specifies how the container will behave when a 
-     * region outside the active brush is clicked without selecting a new area. When the 
+     * The defaultBrushArea prop specifies how the container will behave when a
+     * region outside the active brush is clicked without selecting a new area. When the
      * prop is set to "all", the entire domain will be selected. When the prop is set to "none",
      * no new region will be selected, and any existing active brush will be cleared. When
      * the prop is set to "disable" the new selected region will default to the current active brush.
@@ -452,10 +452,10 @@ declare module "victory" {
      */
     downsample?: number | boolean;
     /**
-     * The minimumZoom prop sets a minimum domain extent for the zoomed chart. 
+     * The minimumZoom prop sets a minimum domain extent for the zoomed chart.
      * When the difference between the maximum and minimum of a zoomed domain is equal to the minimumZoom
      * in either dimension, the component will stop responding to events that would normally trigger zooming in.
-     * Zooming out and panning will still be enabled. When this prop is not specified, the default minimum 
+     * Zooming out and panning will still be enabled. When this prop is not specified, the default minimum
      * zoom will cover 1 / 1000th of the original domain. This prop should be given as an object
      * with numeric values for x and y.
      * @example minimumZoom={{x: 1, y: 0.01}}
@@ -650,10 +650,10 @@ declare module "victory" {
      */
     y?: number;
   }
-  
- 
+
+
   /**
-   * VictoryTooltip renders a tooltip component with a set of default events. When VictoryTooltip is used as a label component for any Victory component that renders data, it will attach events to rendered data components that will activate the tooltip when hovered. 
+   * VictoryTooltip renders a tooltip component with a set of default events. When VictoryTooltip is used as a label component for any Victory component that renders data, it will attach events to rendered data components that will activate the tooltip when hovered.
    * VictoryTooltip renders text as well as a configurable Flyout container.
    */
   export class VictoryTooltip extends React.Component<
@@ -1317,6 +1317,21 @@ declare module "victory" {
      * @example {data: {fill: "red", width: 8}, labels: {fontSize: 12}}
      */
     style?: VictoryStyleInterface;
+    /**
+     * The barRatio prop specifies an approximate ratio between bar widths and spaces between bars.
+     * When width is not specified via the barWidth prop or in bar styles, the barRatio prop will
+     * be used to calculate a default width for each bar given the total number of bars in the data series
+     * and the overall width of the chart.
+     */
+    barRatio?: number;
+    /**
+     * The barWidth prop is used to specify the width of each bar. This prop may be given as
+     * a number of pixels or as a function that returns a number. When this prop is given as
+     * a function, it will be evaluated with the arguments datum, and active. When this value
+     * is not given, a default value will be calculated based on the overall dimensions of
+     * the chart, and the number of bars.
+     */
+    barWidth?: NumberOrCallback;
   }
 
   /**
diff --git a/types/victory/tslint.json b/types/victory/tslint.json
index a41bf5d19a..a0357daa61 100644
--- a/types/victory/tslint.json
+++ b/types/victory/tslint.json
@@ -7,7 +7,6 @@
         "ban-types": false,
         "callable-types": false,
         "comment-format": false,
-        "dt-header": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/victory/victory-tests.tsx b/types/victory/victory-tests.tsx
index 3b882c7583..d7ddd7c33b 100644
--- a/types/victory/victory-tests.tsx
+++ b/types/victory/victory-tests.tsx
@@ -253,6 +253,8 @@ test = (
             {x: 4, y: 2},
             {x: 5, y: 1}
         ]}
+        barWidth={20}
+        barRatio={100}
     />
 );
 

From e24f349f8135beafd1d9a0226debcd8f17733b5a Mon Sep 17 00:00:00 2001
From: perry <perry@blend.com>
Date: Wed, 12 Dec 2018 17:38:44 -0800
Subject: [PATCH 834/836] Add new supported plugins from 0.7

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

diff --git a/types/dd-trace/index.d.ts b/types/dd-trace/index.d.ts
index 311fa7675e..68c047203f 100644
--- a/types/dd-trace/index.d.ts
+++ b/types/dd-trace/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for dd-trace-js 0.6
+// Type definitions for dd-trace-js 0.7
 // Project: https://github.com/DataDog/dd-trace-js
 // Definitions by: Colin Bradley <https://github.com/ColinBradley>
 //                 Eloy Durán <https://github.com/alloy>
@@ -185,6 +185,7 @@ declare class Scope {
 type Plugin =
     | "amqp10"
     | "amqplib"
+    | "bluebird"
     | "elasticsearch"
     | "express"
     | "graphql"
@@ -197,8 +198,10 @@ type Plugin =
     | "mysql"
     | "mysql2"
     | "pg"
+    | "q"
     | "redis"
-    | "restify";
+    | "restify"
+    | "when";
 
 interface BasePluginOptions {
     /**

From f80c5fbfea909c964f22663cb329b8e0701354c4 Mon Sep 17 00:00:00 2001
From: perry <perry@blend.com>
Date: Wed, 12 Dec 2018 17:39:03 -0800
Subject: [PATCH 835/836] Add missing option: enabled

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

diff --git a/types/dd-trace/dd-trace-tests.ts b/types/dd-trace/dd-trace-tests.ts
index 9d6936875a..f98a0853cf 100644
--- a/types/dd-trace/dd-trace-tests.ts
+++ b/types/dd-trace/dd-trace-tests.ts
@@ -2,6 +2,7 @@ import * as tracer from "dd-trace";
 import SpanContext = require("dd-trace/src/opentracing/span_context");
 
 tracer.init({
+    enabled: true,
     service: "MyLovelyService",
     hostname: "localhost",
     port: 8126,
diff --git a/types/dd-trace/index.d.ts b/types/dd-trace/index.d.ts
index 68c047203f..43bfd7183f 100644
--- a/types/dd-trace/index.d.ts
+++ b/types/dd-trace/index.d.ts
@@ -54,6 +54,12 @@ declare class TraceProxy extends Tracer {
 }
 
 interface TracerOptions {
+    /**
+     * Whether to enable the tracer.
+     * @default true
+     */
+    enabled?: boolean;
+
     /**
      * Enable debug logging in the tracer.
      * @default false

From c1ce0b8e964fc89a2beaace7a75a323fd801239c Mon Sep 17 00:00:00 2001
From: Vincent <projects@vinnl.nl>
Date: Thu, 13 Dec 2018 08:46:52 +0100
Subject: [PATCH 836/836] Include the react-syntax-highlighter version

---
 types/react-syntax-highlighter/index.d.ts  | 2 +-
 types/react-syntax-highlighter/tslint.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/types/react-syntax-highlighter/index.d.ts b/types/react-syntax-highlighter/index.d.ts
index 825608fe92..c1ad8f0242 100644
--- a/types/react-syntax-highlighter/index.d.ts
+++ b/types/react-syntax-highlighter/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for react-syntax-highlighter
+// Type definitions for react-syntax-highlighter 10.1
 // Project: https://github.com/conorhastings/react-syntax-highlighter
 // Definitions by: Ivo Stratev <https://github.com/NoHomey>
 //                 Aimee Gamble-Milner <https://github.com/ajgamble-milner>
diff --git a/types/react-syntax-highlighter/tslint.json b/types/react-syntax-highlighter/tslint.json
index a41bf5d19a..4cfa77fc40 100644
--- a/types/react-syntax-highlighter/tslint.json
+++ b/types/react-syntax-highlighter/tslint.json
@@ -7,7 +7,7 @@
         "ban-types": false,
         "callable-types": false,
         "comment-format": false,
-        "dt-header": false,
+        "dt-header": true,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,