[pull] master from DefinitelyTyped:master

.github/CODEOWNERS

@@ -650,7 +650,7 @@
 /types/brace-expansion/                                   @BendingBender
 /types/braces/                                            @vemoo @mrmlnc @rejunp
 /types/brainhubeu__react-carousel/                        @jackall3n @sinchang @roberthebel
-/types/braintree/                                         @smrubin @acdr @sedenardi @sebacampos
+/types/braintree/                                         @smrubin @acdr @sebacampos @claudiowilson
 /types/braintree-web/                                     @daelmaak
 /types/braintree-web-drop-in/                             @saoudrizwan @elmikosch
 /types/bramus__pagination-sequence/                       @kristjanjokull
@@ -1529,7 +1529,6 @@
 /types/dinero.js/                                         @BendingBender @juandaco @peterblazejewicz
 /types/dingtalk-robot-sender/                             @bangbang93
 /types/dir-glob/                                          @BendingBender
-/types/dir-walker-gen/                                    @aynurin
 /types/director/                                          @pastelmind
 /types/directory-structure-json/                          @vdistortion
 /types/dirname-regex/                                     @BendingBender
@@ -2218,6 +2217,7 @@
 /types/fnando__sparkline/                                 @grabofus
 /types/fnv-lite/                                          @marcind
 /types/fnv-plus/                                          @mihnea-s
+/types/focus-group/                                       @m-kawafuji
 /types/focus-within/                                      @eramdam
 /types/fold-to-ascii/                                     @mogzol
 /types/folder-hash/                                       @thekevinbrown @peterblazejewicz @marc136
@@ -2885,7 +2885,6 @@
 /types/git-user-email/                                    @BendingBender
 /types/git-user-name/                                     @BendingBender
 /types/git-username/                                      @BendingBender
-/types/gitana/                                            @tenoriojuann
 /types/gitconfiglocal/                                    @ffflorian
 /types/github-from-package/                               @e6nlaq
 /types/github-label-sync/                                 @EndBug
@@ -5574,7 +5573,6 @@
 /types/parcel-bundler/                                    @pinage404
 /types/parcel-env/                                        @fathyb
 /types/parcel__watcher/                                   @ascorbic
-/types/parent-package-json/                               @sgmccli
 /types/parents/                                           @TeamworkGuy2
 /types/parity-pmd/                                        @leovujanic
 /types/parity-pmr/                                        @leovujanic
@@ -7833,7 +7831,7 @@
 /types/system-service/                                    @leocwlam
 /types/system-sleep/                                      @ArthurKa
 /types/system-task/                                       @leocwlam
-/types/systemjs/                                          @joeldenning
+/types/systemjs/                                          @jolyndenning
 /types/systemjs/v0/                                       @ludohenin @NathanWalker @GiedriusGrabauskas @aluanhaddad
 /types/table-resolver/                                    @junalmeida
 /types/tableau/                                           @protip

attw.json

@@ -89,7 +89,6 @@
         "durandal",
         "dygraphs",
         "easy-speech",
-        "editorjs__header",
         "email-prompt",
         "ember__ordered-set",
         "ember__ordered-set/v3",

notNeededPackages.json

@@ -1617,6 +1617,10 @@
             "libraryName": "editly",
             "asOfVersion": "0.11.3"
         },
+        "editorjs__header": {
+            "libraryName": "@editorjs/header",
+            "asOfVersion": "2.8.2"
+        },
         "eev": {
             "libraryName": "eev",
             "asOfVersion": "0.1.2"
@@ -3237,6 +3241,10 @@
             "libraryName": "jsonata",
             "asOfVersion": "1.5.0"
         },
+        "jsonic": {
+            "libraryName": "jsonic",
+            "asOfVersion": "2.15.1"
+        },
         "jsonp-body": {
             "libraryName": "jsonp-body",
             "asOfVersion": "1.1.0"
@@ -4469,6 +4477,10 @@
             "libraryName": "on-change",
             "asOfVersion": "1.1.0"
         },
+        "onesignal-cordova-plugin": {
+            "libraryName": "onesignal-cordova-plugin",
+            "asOfVersion": "3.0.0"
+        },
         "onetime": {
             "libraryName": "onetime",
             "asOfVersion": "4.0.0"
@@ -5923,6 +5935,10 @@
             "libraryName": "react-webcam",
             "asOfVersion": "3.0.0"
         },
+        "react-widgets": {
+            "libraryName": "react-widgets",
+            "asOfVersion": "5.0.0"
+        },
         "react-youtube": {
             "libraryName": "react-youtube",
             "asOfVersion": "7.10.0"
@@ -7007,6 +7023,10 @@
             "libraryName": "ttf2woff2",
             "asOfVersion": "6.0.0"
         },
+        "tunnel-ssh": {
+            "libraryName": "tunnel-ssh",
+            "asOfVersion": "5.1.0"
+        },
         "tus-js-client": {
             "libraryName": "tus-js-client",
             "asOfVersion": "2.1.0"

types/chai/chai-tests.ts

@@ -117,6 +117,9 @@ function equal() {
 function containSubset() {
     expect({}).to.containSubset({});
     ({}).should.containSubset({});
+    assert.containSubset({}, {});
+    assert.containsSubset({}, {});
+    assert.doesNotContainSubset({}, {});
 }
 
 function _typeof() {

types/chai/index.d.ts

@@ -537,6 +537,24 @@ declare global {
              */
             containSubset(val: any, exp: any, msg?: string): void;
 
+            /**
+             * Partially matches actual and expected.
+             *
+             * @param actual   Actual value.
+             * @param expected   Potential subset of the value.
+             * @param message   Message to display on error.
+             */
+            containsSubset(val: any, exp: any, msg?: string): void;
+
+            /**
+             * No partial match between actual and expected exists.
+             *
+             * @param actual   Actual value.
+             * @param expected   Potential subset of the value.
+             * @param message   Message to display on error.
+             */
+            doesNotContainSubset(val: any, exp: any, msg?: string): void;
+
             /**
              * Asserts valueToCheck is strictly greater than (>) valueToBeAbove.
              *

types/diff/diff-tests.ts

@@ -115,7 +115,9 @@ function verifyApplyMethods(oldStr: string, newStr: string, uniDiffStr: string)
         },
         patched(index, content) {
             index; // $ExpectType ParsedDiff
-            verifyApply.push(content);
+            if (content !== false) {
+                verifyApply.push(content);
+            }
         },
         complete(err) {
             if (err) {

types/diff/index.d.ts

@@ -127,7 +127,7 @@ export interface ApplyPatchOptions {
 
 export interface ApplyPatchesOptions extends ApplyPatchOptions {
     loadFile(index: ParsedDiff, callback: (err: any, data: string) => void): void;
-    patched(index: ParsedDiff, content: string, callback: (err: any) => void): void;
+    patched(index: ParsedDiff, content: string | false, callback: (err: any) => void): void;
     complete(err: any): void;
 }
 

types/dir-walker-gen/package.json

@@ -8,10 +8,5 @@
     "devDependencies": {
         "@types/dir-walker-gen": "workspace:."
     },
-    "owners": [
-        {
-            "name": "Shavkat Aynurin",
-            "githubUsername": "aynurin"
-        }
-    ]
+    "owners": []
 }

types/estree/estree-tests.ts

@@ -84,6 +84,7 @@ declare var moduleDeclaration: ESTree.ModuleDeclaration;
 declare var moduleSpecifier: ESTree.ModuleSpecifier;
 declare var importDeclaration: ESTree.ImportDeclaration;
 declare var importSpecifier: ESTree.ImportSpecifier;
+declare var importAttribute: ESTree.ImportAttribute;
 declare var importDefaultSpecifier: ESTree.ImportDefaultSpecifier;
 declare var importNamespaceSpecifier: ESTree.ImportNamespaceSpecifier;
 declare var exportNamedDeclaration: ESTree.ExportNamedDeclaration;
@@ -261,6 +262,11 @@ if (memberExpressionOrCallExpression.type === "MemberExpression") {
     expressionOrSpread = callExpression.arguments[0];
 }
 
+// ImportExpression
+var importExpression: ESTree.ImportExpression;
+expression = importExpression.source;
+expressionMaybe = importExpression.options;
+
 // Declarations
 var functionDeclaration: ESTree.FunctionDeclaration;
 var identifierOrNull: ESTree.Identifier | null = functionDeclaration.id;
@@ -286,6 +292,7 @@ classDeclaration.id = null;
 
 var identifierOrLiteral: ESTree.Identifier | ESTree.Literal;
 identifierOrLiteral = importSpecifier.imported;
+identifierOrLiteral = importAttribute.key;
 identifierOrLiteral = exportSpecifier.local;
 identifierOrLiteral = exportSpecifier.exported;
 var identifierOrLiteralOrNull: ESTree.Identifier | ESTree.Literal | null;

types/estree/index.d.ts

@@ -633,6 +633,7 @@ export interface BaseModuleSpecifier extends BaseNode {
 export interface ImportDeclaration extends BaseModuleDeclaration {
     type: "ImportDeclaration";
     specifiers: Array<ImportSpecifier | ImportDefaultSpecifier | ImportNamespaceSpecifier>;
+    attributes: ImportAttribute[];
     source: Literal;
 }
 
@@ -641,9 +642,16 @@ export interface ImportSpecifier extends BaseModuleSpecifier {
     imported: Identifier | Literal;
 }
 
+export interface ImportAttribute extends BaseNode {
+    type: "ImportAttribute";
+    key: Identifier | Literal;
+    value: Literal;
+}
+
 export interface ImportExpression extends BaseExpression {
     type: "ImportExpression";
     source: Expression;
+    options?: Expression | null | undefined;
 }
 
 export interface ImportDefaultSpecifier extends BaseModuleSpecifier {
@@ -658,6 +666,7 @@ export interface ExportNamedDeclaration extends BaseModuleDeclaration {
     type: "ExportNamedDeclaration";
     declaration?: Declaration | null | undefined;
     specifiers: ExportSpecifier[];
+    attributes: ImportAttribute[];
     source?: Literal | null | undefined;
 }
 
@@ -675,6 +684,7 @@ export interface ExportDefaultDeclaration extends BaseModuleDeclaration {
 export interface ExportAllDeclaration extends BaseModuleDeclaration {
     type: "ExportAllDeclaration";
     exported: Identifier | Literal | null;
+    attributes: ImportAttribute[];
     source: Literal;
 }